Update of /cvsroot/boost/boost/tools/quickbook/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7436/test

Modified Files:
        quickbook-manual.gold quickbook-manual.quickbook 
        templates.gold 
Log Message:
* Simple markups can now span a whole block.
* __blurbs__, __admonitions__ and table cells (see __tables__) may now
  contain paragraphs.
* `\n` and `[br]` are now deprecated.

Index: quickbook-manual.gold
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/test/quickbook-manual.gold,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- quickbook-manual.gold       20 Dec 2006 15:41:20 -0000      1.10
+++ quickbook-manual.gold       27 Feb 2007 15:22:16 -0000      1.11
@@ -10,7 +10,8 @@
       <firstname>Eric</firstname> <surname>Niebler</surname>
     </author>
     <copyright>
-      <year>2002</year> <year>2004</year> <holder>Joel de Guzman, Eric 
Niebler</holder>
+      <year>2002</year> <year>2004</year> <year>2006</year> <holder>Joel de 
Guzman,
+      Eric Niebler</holder>
     </copyright>
     <legalnotice>
       <para>
@@ -22,16 +23,18 @@
       <emphasis>WikiWiki</emphasis> style documentation tool
[...2810 lines suppressed...]
+          </para>
+          </entry>
+        </row>
+        <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>

Index: quickbook-manual.quickbook
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/test/quickbook-manual.quickbook,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- quickbook-manual.quickbook  20 Jul 2006 13:29:26 -0000      1.3
+++ quickbook-manual.quickbook  27 Feb 2007 15:22:16 -0000      1.4
@@ -1,8 +1,8 @@
 [article Quickbook
-    [quickbook 1.3]
-    [version 1.3]
+    [quickbook 1.4]
+    [version 1.4]
     [authors [de Guzman, Joel], [Niebler, Eric]]
-    [copyright 2002 2004 Joel de Guzman, Eric Niebler]
+    [copyright 2002 2004 2006 Joel de Guzman, Eric Niebler]
     [purpose /WikiWiki/ style documentation tool]
     [license
         Distributed under the Boost Software License, Version 1.0.
[...1134 lines suppressed...]
-    [[unordered list]       [[^\* one\n\* two\n\* three\n]]                 
[__unordered_lists__]]
+    [[ordered list]         [[ordered_list_sample]]                         
[__ordered_lists__]]
+    [[unordered list]       [[unordered_list_sample]]                       
[__unordered_lists__]]
     [[code]                 [No markup. Preformatted code starts with a space 
or a tab.]        [__code__]]
     [[preformatted]         [[^'''[pre preformatted]''']]                   
[__preformatted__]]
     [[block quote]          [[^'''[:sometext...]''']]                       
[__blockquote__]]
@@ -1215,10 +1970,11 @@
     [[heading 5]            [[^'''[h5 Heading 5]''']]                       
[__heading__]]
     [[heading 6]            [[^'''[h6 Heading 6]''']]                       
[__heading__]]
     [[macro]                [[^'''[def macro_identifier some text]''']]     
[__macros__]]
+    [[template]             [[^'''[template[a b] [a] body [b]]''']]         
[__templates__]]
     [[blurb]                [[^'''[blurb advertisement or note...]''']]     
[__blurbs__]]
     [[admonition]           [[^'''[warning Warning text...]''']]            
[__admonitions__]]
-    [[table]                [[^[table Title\n \[\[a\]\[b\]\[c\]\]\n    
\[\[a\]\[b\]\[c\]\]\n\]]]    [__tables__]]
-    [[variablelist]         [[^[variablelist Title\n \[\[a\]\[b\]\]\n    
\[\[a\]\[b\]\]\n\]]]       [__variable_lists__]]
+    [[table]                [[table_sample]]                                
[__tables__]]
+    [[variablelist]         [[var_list_sample]]                             
[__variable_lists__]]
     [[include]              [[^'''[include someother.qbk]''']]              
[__include__]]
 ]
 

Index: templates.gold
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/test/templates.gold,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- templates.gold      20 Dec 2006 15:41:20 -0000      1.9
+++ templates.gold      27 Feb 2007 15:22:17 -0000      1.10
@@ -8,13 +8,10 @@
   <section id="templates.templates">
     <title><link linkend="templates.templates">Templates</link></title>
     <para>
-      <!--[/-------------------------------- nullary arg ]-->
       nullary_arg
-      <!--[/-------------------------------- unary arg, phrase syle ]-->
     </para>
     <para>
       foo baz
-      <!--[/-------------------------------- unary arg, block syle ]-->
     </para>
     <para>
       <para>
@@ -26,11 +23,9 @@
         This is a complete paragraph. kalamazoo kalamazoo kalamazoo kalamazoo 
kalamazoo
         kalamazoo kalamazoo kalamazoo kalamazoo.... blah blah blah......
       </para>
-      <!--[/-------------------------------- unary arg, using punctuation ]-->
     </para>
     <para>
       <hey>baz</hey>
-      <!--[/-------------------------------- recursive templates ]-->
     </para>
     <para>
       <para>
@@ -43,14 +38,12 @@
     </para>
     <para>
       exactly xanadu
-      <!--[/-------------------------------- space delimitted args ]-->
     </para>
     <para>
       wx
     </para>
     <para>
       wxyz wxyz trail
-      <!--[/-------------------------------- John's templates ]-->
     </para>
     <para>
       
@@ -69,7 +62,6 @@
     </para>
     <para>
       x<superscript>2</superscript>
-      <!--[/-------------------------------- Some more ]-->
     </para>
     <para>
       got a banana?


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to