diff --git a/block.hpp b/block.hpp
index 5a70ea9..aba5489 100644
--- a/block.hpp
+++ b/block.hpp
@@ -386,7 +386,7 @@ namespace quickbook
;
paragraph_end =
- '[' >> space >> paragraph_end_markups | eol >> eol
+ '[' >> space >> paragraph_end_markups >> hard_space | eol >> eol
;
paragraph =
diff --git a/code_snippet.hpp b/code_snippet.hpp
index 89dc64d..44d1cb2 100644
--- a/code_snippet.hpp
+++ b/code_snippet.hpp
@@ -72,7 +72,10 @@ namespace quickbook
*blank_p >> "//<-"
>> (*(anychar_p - "//->"))
>> "//->" >> *blank_p >> eol_p
- | "/*<-"
+ | "/*<-*/"
+ >> (*(anychar_p - "/*->*/"))
+ >> "/*->*/"
+ | "/*<-"
>> (*(anychar_p - "->*/"))
>> "->*/"
;
diff --git a/detail/markups.hpp b/detail/markups.hpp
index 809af74..0038948 100644
--- a/detail/markups.hpp
+++ b/detail/markups.hpp
@@ -35,16 +35,16 @@ namespace quickbook { namespace /*unnamed*/
const char* blockquote_post = "";
const char* preformatted_pre = " Last revised: August 01, 2007 at 23:43:11 GMT Last revised: September 24, 2007 at 06:00:48 GMT
@@ -51,7 +51,7 @@
html generated from this .qbk file
-
+
diff --git a/doc/html/quickbook/editors/kde_support.html b/doc/html/quickbook/editors/kde_support.html
index 00a161b..13f91f7 100644
--- a/doc/html/quickbook/editors/kde_support.html
+++ b/doc/html/quickbook/editors/kde_support.html
@@ -26,7 +26,7 @@
-
+
boost::hs::quickbook
-
+
Code Folding
@@ -150,7 +150,7 @@
region can be folded or unfolded independently.
@@ -414,18 +414,12 @@
![[Note]](../../../../../../doc/html/images/note.png)
-
-- boost::hs::cpp support QuickBook code import comments style! -
--
-+ boost::hs::cpp support QuickBook code import comments style! +
![[Note]](../../../../../../doc/html/images/note.png)
-
-- A copy of boost::hs::quickbook and boost::hs::cpp is available in boost/tools/quickbook/extra/katepart. -
--
-+ A copy of boost::hs::quickbook and boost::hs::cpp is available in boost/tools/quickbook/extra/katepart. +
In order to install it you must copy the content in the folder katepart/syntax/ to the appropriate katepart syntax diff --git a/doc/html/quickbook/faq.html b/doc/html/quickbook/faq.html index 475e161..a5fc1e2 100644 --- a/doc/html/quickbook/faq.html +++ b/doc/html/quickbook/faq.html @@ -26,7 +26,7 @@
Table 8. Syntax Compendium
+Table 8. Syntax Compendium
![]() |
Note | -
|---|---|
|
- - -- This is a note - -- - | |
+ This is a note + |
![]() |
Tip |
|---|---|
|
- - -- This is a tip - -- - | |
+ This is a tip + | |
![]() |
Important |
|---|---|
|
- - -- This is important - -- - | |
+ This is important + | |
![]() |
Caution |
|---|---|
|
- - -- This is a caution - -- - | |
+ This is a caution + | |
![]() |
Warning |
|---|---|
|
- - -- This is a warning - -- - | |
+ This is a warning + | |
These are the only admonitions supported by DocBook. @@ -674,27 +644,27 @@ [h6 Heading 6]
@@ -787,18 +757,12 @@ sf_logo
![[Tip]](../../../../../../doc/html/images/tip.png)
-
-- It's a good idea to use macro identifiers that are distinguishable. - For instance, in this document, macro identifiers have two leading - and trailing underscores (e.g. __spirit__). The reason is - to avoid unwanted macro replacement. -
--
-+ It's a good idea to use macro identifiers that are distinguishable. For + instance, in this document, macro identifiers have two leading and trailing + underscores (e.g. __spirit__). The reason is to avoid unwanted + macro replacement. +
Links (URLS) and images are good candidates for macros. 1) @@ -838,7 +802,7 @@ sf_logo Quickbook has some predefined macros that you can already use.
Table 3. Predefined Macros
+Table 3. Predefined Macros
|
- 2007-Aug-02 + 2007-Sep-24 |
@@ -893,7 +857,7 @@ sf_logo
- 07:43:11 AM + 02:00:48 PM |
@@ -939,7 +903,7 @@ Hi, my name is [name]. I am [age] years old. I am a [what].
]
![]() |
Caution | -
|---|---|
|
- - -- A word of caution: Templates are recursive. A template can call another - template or even itself, directly or indirectly. There are no control - structures in QuickBook (yet) so this will always mean infinite recursion. - QuickBook can detect this situation and report an error if recursion - exceeds a certain limit. - -- - | |
+ A word of caution: Templates are recursive. A template can call another + template or even itself, directly or indirectly. There are no control + structures in QuickBook (yet) so this will always mean infinite recursion. + QuickBook can detect this situation and report an error if recursion + exceeds a certain limit. + |
Each actual argument can be a word, a text fragment or just about any @@ -1059,7 +1017,7 @@ replacement text... by the close parenthesis.
![[Note]](../../../../../../doc/html/images/note.png)
-
-- Prefer admonitions - wherever appropriate. -
--
-+ Prefer admonitions + wherever appropriate. +
Table 4. A Simple Table
+Table 4. A Simple Table
![]() |
Note | -
|---|---|
|
- - -- We simply enclose the code with the tick: "`", not - the single quote: "'". - Note too that `some code` is preferred over [^some code]. - -- - | |
+ We simply enclose the code with the tick: "`", not the + single quote: "'". + Note too that `some code` is preferred over [^some code]. + |
![[Warning]](../../../../../../doc/html/images/warning.png)
-
-- [br] is now deprecated. Blurbs, - Admonitions - and table cells (see Tables) - may now contain paragraphs. -
--
-+ [br] is now deprecated. Blurbs, + Admonitions + and table cells (see Tables) + may now contain paragraphs. +
![[Warning]](../../../../../../doc/html/images/warning.png)
-
-- \n - and [br] are now deprecated. Blurbs, - Admonitions - and table cells (see Tables) - may now contain paragraphs. -
--
-+ \n + and [br] are now deprecated. Blurbs, + Admonitions + and table cells (see Tables) + may now contain paragraphs. +
The escaped space: \ also @@ -791,7 +761,7 @@ escape (no processing/formatting)
will generate this - [2] + [2] .
[2] +
[2] A sample footnote
"'" .
- Note too that "'" .
+ Note too that [ and ] .
- For example, how do you escape the triple quote? Simple: \ n
- has a special meaning. It is used to generate line breaks.
- \ n
- and [ br ] are now deprecated. Blurbs,
- Admonitions
- and table cells (see Tables)
- may now contain paragraphs.
- [ and ] .
+ For example, how do you escape the triple quote? Simple: \ also
- has a special meaning. The escaped space is removed from the output.
- \ n
+ has a special meaning. It is used to generate line breaks.
+ \ n
+ and [ br ] are now deprecated. Blurbs,
+ Admonitions
+ and table cells (see Tables)
+ may now contain paragraphs.
+ \
+ also has a special meaning. The escaped space is removed from the output.
+ [ footnote ] block, and the text will be put at the
- bottom of the current page. For example, this:
- [ footnote ]
+ block, and the text will be put at the bottom of the current page.
+ For example, this:
+ --- -- Indents the paragraph. This applies to one paragraph only. - -
+++ ++ Indents the paragraph. This applies to one paragraph only. + +
aristotle_quote ,
- and the template body "Aristotle...". This space will be part
- of the template body. If that space is unwanted, use empty brackets or
- use the space escape: "\ ".
- Example:
- aristotle_quote ,
+ and the template body "Aristotle...". This space will be
+ part of the template body. If that space is unwanted, use empty brackets
+ or use the space escape: "\
+ ". Example:
+ struct x_tag;
- struct x_tag;
+ foo
- and bar in the example
- above). This shall be the template identifier for that particular code
- snippet. The second and third line above does the actual template expansion:
- foo and bar
+ in the example above). This shall be the template identifier for
+ that particular code snippet. The second and third line above does
+ the actual template expansion:
+ //[id and //]
- will be inserted as a template in quickbook with name //] ends a code-snippet
- This too will not be visible in quickbook.
- //[id and
+ //] will be inserted
+ as a template in quickbook with name //] ends
+ a code-snippet This too will not be visible in quickbook.
+ bin
+ and bin . v2 directories generated by the build
+ before trying again. Otherwise your configuration fixes will not take
+ any effect.
bin
- and bin . v2 directories generated by the build before
- trying again. Otherwise your configuration fixes will not take any effect.
- --- -- -Section contributed by Julio M. Merino Vidal -
xsltproc
- for Windows. There are many ways to get this tool, but to keep things simple,
- use the iconv , zlib , libxml2
- and libxslt .
- bin , include
- and lib directories within
- the hierarchy. These instructions use C :\ Users \ example \ Documents \ boost \ xml
- as the root for all files.
- bin
- directory and launch xsltproc . exe
- to ensure it works. You should get usage information on screen.
- C :\ Users \ example \ Documents \ boost \ xml \ docbook - xml .
- docbook - xsl (bypassing the version name): C :\ Users \ example \ Documents \ boost \ xml \ docbook - xsl .
- user - config . jam
- file, which should live in your home directory (% HOMEDRIVE %% HOMEPATH % ).
- You must already have it somewhere or otherwise you could not be building
- Boost (i.e. missing tools configuration).
- +++ ++ +Section contributed by Julio M. Merino Vidal +
xsltproc
+ for Windows. There are many ways to get this tool, but to keep things
+ simple, use the iconv ,
+ zlib , libxml2 and libxslt .
+ bin , include and lib
+ directories within the hierarchy. These instructions use C :\ Users \ example \ Documents \ boost \ xml as the root for all files.
+ bin
+ directory and launch xsltproc . exe
+ to ensure it works. You should get usage information on screen.
+ C :\ Users \ example \ Documents \ boost \ xml \ docbook - xml .
+ docbook - xsl
+ (bypassing the version name): C :\ Users \ example \ Documents \ boost \ xml \ docbook - xsl .
+ user - config . jam
+ file, which should live in your home directory (% HOMEDRIVE %% HOMEPATH % ).
+ You must already have it somewhere or otherwise you could not be
+ building Boost (i.e. missing tools configuration).
+ BOOST_ROOT \ tools \ quickbook ).
- bjam
- -- v2 .
- quickbook . exe
- binary (located under the BOOST_ROOT \ bin . v2 hierarchy)
- to a safe place. Following our previous example, you can install it into:
- C :\ Users \ example \ Documents \ boost \ xml \ bin .
- user - config . jam
- file:
- BOOST_ROOT \ tools \ quickbook ).
+ bjam
+ -- v2 .
+ quickbook . exe
+ binary (located under the BOOST_ROOT \ bin . v2
+ hierarchy) to a safe place. Following our previous example, you can
+ install it into: C :\ Users \ example \ Documents \ boost \ xml \ bin .
+ user - config . jam
+ file:
+ bjam ,
- xsltproc , docbook - xsl and
- docbook - xml packages. For example, using apt - get :
- bjam ,
+ xsltproc , docbook - xsl and docbook - xml
+ packages. For example, using apt - get :
+ doxygen package
- as well.
- user - config . jam file, which should be in your home
- directory. If you don't have one, create a file containing this text. For
- more information on setting up user - config . jam , see
- the doxygen
+ package as well.
+ user - config . jam
+ file, which should be in your home directory. If you don't have one,
+ create a file containing this text. For more information on setting
+ up user - config . jam , see the BOOST_ROOT / tools / quickbook ).
- bjam
- -- v2 .
- quickbook
- binary (located under the BOOST_ROOT / bin . v2 hierarchy)
- to a safe place. The traditional location is / usr / local / bin .
- user - config . jam
- file, using the full path of the quickbook executable:
- BOOST_ROOT / tools / quickbook ).
+ bjam
+ -- v2 .
+ quickbook
+ binary (located under the BOOST_ROOT / bin . v2
+ hierarchy) to a safe place. The traditional location is / usr / local / bin .
+ user - config . jam
+ file, using the full path of the quickbook executable:
+ -+
+++ ++ +Section contributed by Dean Michael Berris +
--- -- -Faq contributed by Michael Marcin -
+++ ++ +Faq contributed by Michael Marcin +