Commit Graph

1426 Commits

Author SHA1 Message Date
Daniel James
b7e989f452 Copy latest quickbook CMakeLists.txt from release.
[SVN r56755]
2009-10-12 20:21:13 +00:00
Daniel James
6977d5f96e Merge newline in quickbook.hpp
[SVN r56754]
2009-10-12 20:18:43 +00:00
Daniel James
056170abed Merge quickbook 1.5 from trunk.
Merged revisions 55905-55917,56077,56715,56717-56719 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r55905 | danieljames | 2009-08-31 12:36:13 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Update quickbook version number.
........
  r55906 | danieljames | 2009-08-31 12:36:23 +0100 (Mon, 31 Aug 2009) | 4 lines
  
  Create entry for 1.5 in the change log.
  
  Starting it of with some of the changes that have been made to quickbook
  since 1.4 - considering the first 1.4 release as the proper 1.4 release.
........
  r55907 | danieljames | 2009-08-31 12:36:34 +0100 (Mon, 31 Aug 2009) | 3 lines
  
  Wrap the template info in a struct.
  
  So that I can add extra scoping info.
........
  r55908 | danieljames | 2009-08-31 12:36:47 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Implement static/lexical scoping for 1.5. Refs #2034.
........
  r55909 | danieljames | 2009-08-31 12:37:04 +0100 (Mon, 31 Aug 2009) | 1 line
  
  In quickbook 1.5 don't mix '..' and whitespace seperators for template arguments. Refs #1174
........
  r55910 | danieljames | 2009-08-31 12:37:17 +0100 (Mon, 31 Aug 2009) | 2 lines
  
  Put the quickbook version numbers in a single header, along with convenience
  functions for using them in spirit grammars.
........
  r55911 | danieljames | 2009-08-31 12:37:32 +0100 (Mon, 31 Aug 2009) | 3 lines
  
  Ignore spaces after 'section:' for quickbook 1.5+ Refs #2712
  
  And warn when section id is empty after colon.
........
  r55912 | danieljames | 2009-08-31 12:37:48 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Introduce temporary id variable.
........
  r55913 | danieljames | 2009-08-31 12:37:59 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Table ids. Refs #1194.
........
  r55914 | danieljames | 2009-08-31 12:38:11 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Separate out the current version of the template argument parser, as I want to create a new one for 1.5
........
  r55915 | danieljames | 2009-08-31 12:38:20 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Don't use seperators that are in brackets, or are escaped. Refs #2036.
........
  r55916 | danieljames | 2009-08-31 12:38:33 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Add missing table tests.
........
  r55917 | danieljames | 2009-08-31 12:38:47 +0100 (Mon, 31 Aug 2009) | 1 line
  
  Support image attributes. Refs #1157.
........
  r56077 | djowel | 2009-09-07 02:35:24 +0100 (Mon, 07 Sep 2009) | 1 line
  
  fix for msvc
........
  r56715 | danieljames | 2009-10-11 17:18:04 +0100 (Sun, 11 Oct 2009) | 1 line
  
  Use qualified ids in tables, and fix a bug generating ids when there isn't a section.
........
  r56717 | danieljames | 2009-10-11 19:21:11 +0100 (Sun, 11 Oct 2009) | 1 line
  
  Document the simplified quickbook 1.5 argument separators.
........
  r56718 | danieljames | 2009-10-11 19:21:32 +0100 (Sun, 11 Oct 2009) | 1 line
  
  Use quickbook 1.5 in the document block example.
........
  r56719 | danieljames | 2009-10-11 19:21:48 +0100 (Sun, 11 Oct 2009) | 1 line
  
  Add table ids to the documentation.
........


[SVN r56752]
2009-10-12 19:54:36 +00:00
Daniel James
f9f5b8a25e Add table ids to the documentation.
[SVN r56719]
2009-10-11 18:21:48 +00:00
Daniel James
1cdfbb519c Use quickbook 1.5 in the document block example.
[SVN r56718]
2009-10-11 18:21:32 +00:00
Daniel James
42a4d94ee2 Document the simplified quickbook 1.5 argument separators.
[SVN r56717]
2009-10-11 18:21:11 +00:00
Daniel James
84bcb02298 Use qualified ids in tables, and fix a bug generating ids when there isn't a section.
[SVN r56715]
2009-10-11 16:18:04 +00:00
Daniel James
50abf7639b Various inspect fixes.
[SVN r56603]
2009-10-05 21:29:39 +00:00
Joel de Guzman
82fbbf05dc fix for msvc
[SVN r56077]
2009-09-07 01:35:24 +00:00
Daniel James
724da46536 Support image attributes. Refs #1157.
[SVN r55917]
2009-08-31 11:38:47 +00:00
Daniel James
7e39c930c2 Add missing table tests.
[SVN r55916]
2009-08-31 11:38:33 +00:00
Daniel James
52a56c1233 Don't use seperators that are in brackets, or are escaped. Refs #2036.
[SVN r55915]
2009-08-31 11:38:20 +00:00
Daniel James
aa97578c28 Separate out the current version of the template argument parser, as I want to create a new one for 1.5
[SVN r55914]
2009-08-31 11:38:11 +00:00
Daniel James
e9e100e881 Table ids. Refs #1194.
[SVN r55913]
2009-08-31 11:37:59 +00:00
Daniel James
aff762eee4 Introduce temporary id variable.
[SVN r55912]
2009-08-31 11:37:48 +00:00
Daniel James
3b839f1eb0 Ignore spaces after 'section:' for quickbook 1.5+ Refs #2712
And warn when section id is empty after colon.

[SVN r55911]
2009-08-31 11:37:32 +00:00
Daniel James
56e4e76941 Put the quickbook version numbers in a single header, along with convenience
functions for using them in spirit grammars.

[SVN r55910]
2009-08-31 11:37:17 +00:00
Daniel James
b23d6a9de7 In quickbook 1.5 don't mix '..' and whitespace seperators for template arguments. Refs #1174
[SVN r55909]
2009-08-31 11:37:04 +00:00
Daniel James
d2e0488349 Implement static/lexical scoping for 1.5. Refs #2034.
[SVN r55908]
2009-08-31 11:36:47 +00:00
Daniel James
c0661a9991 Wrap the template info in a struct.
So that I can add extra scoping info.

[SVN r55907]
2009-08-31 11:36:34 +00:00
Daniel James
cf94d24976 Create entry for 1.5 in the change log.
Starting it of with some of the changes that have been made to quickbook
since 1.4 - considering the first 1.4 release as the proper 1.4 release.

[SVN r55906]
2009-08-31 11:36:23 +00:00
Daniel James
4826a25212 Update quickbook version number.
[SVN r55905]
2009-08-31 11:36:13 +00:00
Troy D. Straszheim
8fdede8775 Copyrights on CMakeLists.txt to keep them from clogging up the inspect
reports.  This is essentially the same commit as r55095 on the release
branch.



[SVN r55159]
2009-07-26 00:49:56 +00:00
Troy D. Straszheim
7733f0b8ee Add basic copyright/license to keep cmake out of the inspection report
[SVN r55095]
2009-07-22 21:51:01 +00:00
Daniel James
af25300f1c Merge changes to documentation tools. Fixes #1202, #3242.
Merged revisions 54812-54818 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r54812 | danieljames | 2009-07-08 22:40:14 +0100 (Wed, 08 Jul 2009) | 1 line
  
  Add a couple of tests for quickbook 1.4 behaviour to try to preserve it.
........
  r54813 | danieljames | 2009-07-08 22:40:24 +0100 (Wed, 08 Jul 2009) | 1 line
  
  Move all the syntax highlighting code into a single class.
........
  r54814 | danieljames | 2009-07-08 22:40:33 +0100 (Wed, 08 Jul 2009) | 1 line
  
  Move the code actions a bit later in actions.hpp so they can use 'plain_char_action'.
........
  r54815 | danieljames | 2009-07-08 22:40:46 +0100 (Wed, 08 Jul 2009) | 1 line
  
  Teletype source mode. Refs #1202.
........
  r54816 | danieljames | 2009-07-08 22:41:00 +0100 (Wed, 08 Jul 2009) | 14 lines
  
  Make sure that a template expansion ends with a ']'.
  
  {{{
  [template foo 1]
  [fool]
  }}}
  
  was generating `1[fool]` - the template would be expanded but then when it
  didn't match the `]` it would fail and just get copied to the output. This
  change checks for `]` before expanding the template. So it now generates
  `[fool]` which is an improvement.
  
  I'm not including a version switch as I see this as a plain bug fix - I can't
  imagine this change ever being anything but beneficial.
........
  r54817 | danieljames | 2009-07-08 22:41:10 +0100 (Wed, 08 Jul 2009) | 1 line
  
  I got a bit confused by this comment, so try to make it clearer.
........
  r54818 | danieljames | 2009-07-08 22:53:15 +0100 (Wed, 08 Jul 2009) | 3 lines
  
  Support INTERNAL ONLY enums in doxygen/boostbook documenation. Refs #3242.
  
  Patch by Mathias Gaunard.
........


[SVN r54910]
2009-07-12 16:09:04 +00:00
Daniel James
7ccea53425 I got a bit confused by this comment, so try to make it clearer.
[SVN r54817]
2009-07-08 21:41:10 +00:00
Daniel James
0ef306d485 Make sure that a template expansion ends with a ']'.
{{{
[template foo 1]
[fool]
}}}

was generating `1[fool]` - the template would be expanded but then when it
didn't match the `]` it would fail and just get copied to the output. This
change checks for `]` before expanding the template. So it now generates
`[fool]` which is an improvement.

I'm not including a version switch as I see this as a plain bug fix - I can't
imagine this change ever being anything but beneficial.

[SVN r54816]
2009-07-08 21:41:00 +00:00
Daniel James
a087316841 Teletype source mode. Refs #1202.
[SVN r54815]
2009-07-08 21:40:46 +00:00
Daniel James
5e52d075fa Move the code actions a bit later in actions.hpp so they can use 'plain_char_action'.
[SVN r54814]
2009-07-08 21:40:33 +00:00
Daniel James
f1c6aa36a7 Move all the syntax highlighting code into a single class.
[SVN r54813]
2009-07-08 21:40:24 +00:00
Daniel James
7c7c1a1765 Add a couple of tests for quickbook 1.4 behaviour to try to preserve it.
[SVN r54812]
2009-07-08 21:40:14 +00:00
Daniel James
8d8bdd73ea Merge latest hash developments:
* Avoid float to int warning.
 * Work around 'using namespace' bug in Visual C++.
 * Make `<boost/functional/hash/extensions.hpp> self contained.
 * Move some of the extension implementation from the main hash header
   into the exensions header.
 * Remove BOOST_HASH_CHAR_TRAITS from `container_fwd.hpp`.
 * Other minor changes.

Merged revisions 53828,53924,54024-54025,54033-54034,54139-54145,54399 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r53828 | danieljames | 2009-06-12 19:24:47 +0100 (Fri, 12 Jun 2009) | 1 line
  
  Try to avoid float to int warning when a float function doesn't exist.
........
  r53924 | danieljames | 2009-06-15 08:37:42 +0100 (Mon, 15 Jun 2009) | 4 lines
  
  Remove hash_complex_test's dependency on Boost.Random.
  
  Only test for a few values, but that should be okay as there isn't much
  to test.
........
  r54024 | danieljames | 2009-06-17 22:22:49 +0100 (Wed, 17 Jun 2009) | 1 line
  
  Put the minimum amount of implementation in the same namespace as the 'using namespace' directives in order to avoid Visual C++ 8 bug.
........
  r54025 | danieljames | 2009-06-17 22:23:42 +0100 (Wed, 17 Jun 2009) | 1 line
  
  Try to avoid using special macro handling code.
........
  r54033 | danieljames | 2009-06-18 00:24:28 +0100 (Thu, 18 Jun 2009) | 1 line
  
  Add copyright to namespace_fail_test.cpp
........
  r54034 | danieljames | 2009-06-18 00:25:12 +0100 (Thu, 18 Jun 2009) | 1 line
  
  A couple of missing newlines.
........
  r54139 | danieljames | 2009-06-21 10:41:11 +0100 (Sun, 21 Jun 2009) | 1 line
  
  A few more comments in boost::hash.
........
  r54140 | danieljames | 2009-06-21 10:41:30 +0100 (Sun, 21 Jun 2009) | 1 line
  
  Move includes to the header which they're used in.
........
  r54141 | danieljames | 2009-06-21 10:41:46 +0100 (Sun, 21 Jun 2009) | 1 line
  
  Revert [54025] "Try to avoid using special macro handling code."
........
  r54142 | danieljames | 2009-06-21 10:42:05 +0100 (Sun, 21 Jun 2009) | 1 line
  
  Get <boost/functional/hash/extensions.hpp> to work.
........
  r54143 | danieljames | 2009-06-21 10:42:20 +0100 (Sun, 21 Jun 2009) | 1 line
  
  Move BOOST_HASH_CHAR_TRAITS from container_fwd into the hash headers, and undefine it.
........
  r54144 | danieljames | 2009-06-21 10:42:40 +0100 (Sun, 21 Jun 2009) | 1 line
  
  Move the support for hashing containers into the extension header, and improve the standard tests.
........
  r54145 | danieljames | 2009-06-21 10:51:59 +0100 (Sun, 21 Jun 2009) | 1 line
  
  I didn't mean to comment this out.
........
  r54399 | danieljames | 2009-06-27 08:39:12 +0100 (Sat, 27 Jun 2009) | 1 line
  
  Add am implementation note about the Visual C++ problems.
........


[SVN r54402]
2009-06-27 08:12:20 +00:00
Daniel James
e9455295ff A couple of missing newlines.
[SVN r54034]
2009-06-17 23:25:12 +00:00
Troy D. Straszheim
89991aa11f Merge of cmakefiles *from* (that's right, *FROM* :/ ) release branch.
[SVN r53150]
2009-05-21 14:05:15 +00:00
Daniel James
34650a5518 Import Python and C code snippets in quickbook.
Merged revisions 53018-53022 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r53018 | danieljames | 2009-05-15 07:12:13 +0100 (Fri, 15 May 2009) | 1 line
  
  Import Python and C code snippets in quickbook, by Jaroslav Gresula.
........
  r53019 | danieljames | 2009-05-15 07:12:42 +0100 (Fri, 15 May 2009) | 1 line
  
  Use '.py' when checking for python files.
........
  r53020 | danieljames | 2009-05-15 07:12:59 +0100 (Fri, 15 May 2009) | 1 line
  
  Use the correct source type for snippets.
........
  r53021 | danieljames | 2009-05-15 07:13:17 +0100 (Fri, 15 May 2009) | 1 line
  
  Separate code snippet grammar and actions.
........
  r53022 | danieljames | 2009-05-15 07:13:34 +0100 (Fri, 15 May 2009) | 1 line
  
  Make code_snippet_action language ignorant.
........


[SVN r53045]
2009-05-16 13:48:54 +00:00
Daniel James
c03018061e Make code_snippet_action language ignorant.
[SVN r53022]
2009-05-15 06:13:34 +00:00
Daniel James
19feea7249 Separate code snippet grammar and actions.
[SVN r53021]
2009-05-15 06:13:17 +00:00
Daniel James
177b47c57f Use the correct source type for snippets.
[SVN r53020]
2009-05-15 06:12:59 +00:00
Daniel James
bbed541eb1 Use '.py' when checking for python files.
[SVN r53019]
2009-05-15 06:12:42 +00:00
Daniel James
9d8da44b97 Import Python and C code snippets in quickbook, by Jaroslav Gresula. Refs #3029.
[SVN r53018]
2009-05-15 06:12:13 +00:00
Douglas Gregor
a53f744bd2 Merge CMake fixes from the trunk
[SVN r52811]
2009-05-06 21:12:42 +00:00
Douglas Gregor
2578d3a288 Update subdirectories that Quickbook needs to use when building modularized
[SVN r52801]
2009-05-06 14:37:31 +00:00
Daniel James
4078431c29 Document 'boost:' links in boostbook & quickbook.
Merged revisions 52352 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r52352 | danieljames | 2009-04-12 12:21:59 +0100 (Sun, 12 Apr 2009) | 3 lines
  
  Document 'boost:' links in boostbook & quickbook.
  
  Fixes #2861.
........


[SVN r52398]
2009-04-15 07:37:45 +00:00
Daniel James
573d7b76f5 Document 'boost:' links in boostbook & quickbook.
Fixes #2861.

[SVN r52352]
2009-04-12 11:21:59 +00:00
Daniel James
2da89ae716 Merge various documentation changes.
Merged revisions 51323-51324,51680,52082-52083,52237,52321,52326,52344 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r51323 | danieljames | 2009-02-18 21:24:36 +0000 (Wed, 18 Feb 2009) | 1 line
  
  More information in error messages in the doxygen2boostbook script.
........
  r51324 | danieljames | 2009-02-18 21:25:12 +0000 (Wed, 18 Feb 2009) | 1 line
  
  Deal with top level enums from doxygen.
........
  r51680 | danieljames | 2009-03-10 08:09:14 +0000 (Tue, 10 Mar 2009) | 1 line
  
  Try to support inbodydescription in doxygen xml.
........
  r52082 | danieljames | 2009-03-31 20:43:13 +0100 (Tue, 31 Mar 2009) | 1 line
  
  Support global variable reference in boostbook.
........
  r52083 | danieljames | 2009-03-31 20:43:35 +0100 (Tue, 31 Mar 2009) | 2 lines
  
  Support reference for variables that are both static and mutable in
  boostbook.
........
  r52237 | danieljames | 2009-04-07 20:26:18 +0100 (Tue, 07 Apr 2009) | 7 lines
  
  Fix calculate_relative_path
  
  When outdir == "." calculate_relative_path was counting that dot as a
  directory and adding an extra ".." to the result. So only count parts
  that don't equal ".".
  
  Refs #2921
........
  r52321 | danieljames | 2009-04-11 08:55:00 +0100 (Sat, 11 Apr 2009) | 5 lines
  
  Partially revert [51323].
  
  It added partial support for protected and private attributes and friend
  functions. But since it isn't complete support it was doing more harm
  than good.
........
  r52326 | danieljames | 2009-04-11 13:38:30 +0100 (Sat, 11 Apr 2009) | 1 line
  
  Workaround buggy doxygen output. Refs #2937
........
  r52344 | danieljames | 2009-04-12 11:06:24 +0100 (Sun, 12 Apr 2009) | 1 line
  
  Add a test document for doxygen integration.
........


[SVN r52345]
2009-04-12 10:19:46 +00:00
Troy D. Straszheim
532d0bebc3 Silly BUILD_QUICKBOOK. Just use the cmake target.
[SVN r52252]
2009-04-08 12:37:39 +00:00
Daniel James
566b8dd369 Fix calculate_relative_path
When outdir == "." calculate_relative_path was counting that dot as a
directory and adding an extra ".." to the result. So only count parts
that don't equal ".".

Refs #2921

[SVN r52237]
2009-04-07 19:26:18 +00:00
Daniel James
ed6ff64dcc Fix bug handling python and C++ strings.
Fixes #2860.

Merged revisions 51949 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r51949 | danieljames | 2009-03-24 08:34:09 +0000 (Tue, 24 Mar 2009) | 21 lines
  
  Use our own escape character parser.
  
  We're currently using the spirit escaped character parser. This is a
  strict C parser and causes parse errors for code that we probably should
  accept, such as any hexadecimal encoded characters with a value greater
  than the maximum value of the current platform's 'char'.  This is \x7F
  on some platforms so it rejects '\x80' upwards. As well as rejecting
  characters that might be valid, it also means that quickbook will act
  differently on different platforms.
  
  In python strings, '\xaaa' is equivalent to '\xaa' + 'a', but the spirit
  parser interprets this as a character with value '0xaaa'. So we probably
  should accept these.
  
  I also think we should be liberal about what we accept. IMO it isn't our
  job to enforce correct C++/python, just to create a reasonable
  rendering of our input. So rather than write a parser which understands
  the various types of escapes, I just wrote one that ignores any
  character following a backslash.
  
  Refs #2860.
........


[SVN r52064]
2009-03-30 17:49:15 +00:00
Daniel James
d86a2fe747 Use our own escape character parser.
We're currently using the spirit escaped character parser. This is a
strict C parser and causes parse errors for code that we probably should
accept, such as any hexadecimal encoded characters with a value greater
than the maximum value of the current platform's 'char'.  This is \x7F
on some platforms so it rejects '\x80' upwards. As well as rejecting
characters that might be valid, it also means that quickbook will act
differently on different platforms.

In python strings, '\xaaa' is equivalent to '\xaa' + 'a', but the spirit
parser interprets this as a character with value '0xaaa'. So we probably
should accept these.

I also think we should be liberal about what we accept. IMO it isn't our
job to enforce correct C++/python, just to create a reasonable
rendering of our input. So rather than write a parser which understands
the various types of escapes, I just wrote one that ignores any
character following a backslash.

Refs #2860.

[SVN r51949]
2009-03-24 08:34:09 +00:00
Daniel James
02d3e8e5e8 Sync up the quickbook CMakeLists.txt file
[SVN r51887]
2009-03-21 16:20:03 +00:00