Update of /cvsroot/boost/boost/tools/quickbook/doc
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27100/tools/quickbook_backend/doc
Modified Files:
Tag: QUICKBOOK_BACKEND
quickbook.qbk quickbook.xml
Log Message:
Merge from head.
Index: quickbook.qbk
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/doc/quickbook.qbk,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -u -d -r1.69.2.1 -r1.69.2.2
--- quickbook.qbk 1 Jul 2007 04:52:20 -0000 1.69.2.1
+++ quickbook.qbk 30 Jul 2007 14:47:15 -0000 1.69.2.2
@@ -45,6 +45,7 @@
[def __escape__ [link quickbook.syntax.phrase.escape Escape]]
[def __single_char_escape__ [link quickbook.syntax.phrase.single_char_escape
Single char escape]]
[def __images__ [link quickbook.syntax.phrase.images Images]]
+[def __cond__ [link quickbook.syntax.phrase.cond Conditional
Generation]]
[def __document__ [link quickbook.syntax.block.document Document]]
[def __section__ [link quickbook.syntax.block.section Section]]
@@ -160,6 +161,7 @@
* __blurbs__, __admonitions__ and table cells (see __tables__) may now
contain paragraphs.
* `\n` and `[br]` are now deprecated.
+* __cond__. Ala C++ #ifdef.
[endsect]
@@ -624,6 +626,37 @@
[endsect]
[endsect]
+
+[section:cond Conditional Generation]
+
+Like C++ `#ifdef`, you can generate phrases depending on the presence of
+a macro. Example:
+
+[pre'''
+[? __to_be__ To be or not to be]
+''']
+
+[? __to_be__ To be or not to be]
+
+Here, the phrase "To be or not to be" will only be generated if the
+macro symbol '''__to_be__''' has been previously defined. The phrase
+above will not do anything since we haven't defined '''__to_be__'''.
+Now, let's define the symbol:
+
+[pre'''
+[def __to_be__]
+''']
+
+[def __to_be__]
+
+And try again:
+
+[? __to_be__ To be or not to be]
+
+Yes![footnote Conditional Generation makes quickbook turing complete.]
+
+[endsect]
+
[endsect]
[section:block Block Level Elements]
@@ -712,6 +745,8 @@
markup is needed for paragraphs. QuickBook automatically detects paragraphs
from
the context. Block markups \[section, endsect, h1, h2, h3, h4, h5, h6, blurb,
(block-quote) ':', pre, def, table and include \] may also terminate a
paragraph.
+ [/ <-- There's a space here. Don't remove. this is intentianal, for testing]
+This is a new paragraph...
[endsect]
@@ -1481,7 +1516,7 @@
Row 0, Col 1: a big fat cell with paragraphs
Boost provides free peer-reviewed portable C++ source libraries.
-
+ [/ <-- There's a space here. Don't remove. This is intentional, for testing]
We emphasize libraries that work well with the C++ Standard
Library.
Boost libraries are intended to be widely useful, and usable across
a broad spectrum of applications. The Boost license encourages both
@@ -1797,7 +1832,7 @@
# Go to the [EMAIL
PROTECTED]://www.stack.nl/~dimitri/doxygen/download.html#latestsrc
downloads section] and get the disk image (`dmg` file) for Mac OS X.
-
+
# Open the disk image and drag the Doxygen application to your
`Applications` folder to install it.
@@ -2104,6 +2139,8 @@
[[table] [[table_sample]]
[__tables__]]
[[variablelist] [[var_list_sample]]
[__variable_lists__]]
[[include] [[^'''[include someother.qbk]''']]
[__include__]]
+ [[conditional generation]
+ [[^'''[? symbol phrase]''']]
[__cond__]]
]
[endsect]
Index: quickbook.xml
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/doc/quickbook.xml,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- quickbook.xml 1 Jul 2007 04:52:20 -0000 1.33.2.1
+++ quickbook.xml 30 Jul 2007 14:47:15 -0000 1.33.2.2
@@ -0,0 +1,3714 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd";>
+<article id="quickbook" name="Quickbook" dirname="quickbook"
last-revision="$Date$"
+ xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <articleinfo>
+ <author>
+ <firstname>Joel</firstname> <surname>de Guzman</surname>
+ </author>
+ <author>
+ <firstname>Eric</firstname> <surname>Niebler</surname>
+ </author>
[...3683 lines suppressed...]
+ <row>
+ <entry>
+ <para>
+ include
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[include someother.qbk]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.include">Include</link>
+ </para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+</article>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
