[Boost-commit] svn:boost r85125 - trunk/tools/quickbook/test

Subject: [Boost-commit] svn:boost r85125 - trunk/tools/quickbook/test
From: dnljms_at_[hidden]
Date: 2013-07-23 04:21:32

Author: danieljames
Date: 2013-07-23 04:21:32 EDT (Tue, 23 Jul 2013)
New Revision: 85125
URL: http://svn.boost.org/trac/boost/changeset/85125

Log:
Copy old template tests to new version.

Text files modified: 
   trunk/tools/quickbook/test/templates-1_5.gold      |   268 ++++++++++++++++++++++++++++++++++----- 
   trunk/tools/quickbook/test/templates-1_5.quickbook |   239 +++++++++++++++++++++++++++++++++--     
   2 files changed, 456 insertions(+), 51 deletions(-)

Modified: trunk/tools/quickbook/test/templates-1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/templates-1_5.gold	Tue Jul 23 02:28:54 2013	(r85124)
+++ trunk/tools/quickbook/test/templates-1_5.gold	2013-07-23 04:21:32 EDT (Tue, 23 Jul 2013)	(r85125)
@@ -3,40 +3,236 @@
 <article id="template_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Template 1.5</title>
-  <para>
-    static scoping
-  </para>
-  <para>
-    [a]
-  </para>
-  <para>
-    new
-  </para>
-  <para>
-    foo foo
-  </para>
-  <para>
-    {1-2} {1-2} {1-2 3 4} {1 2-3 4} {1 2 3-4} {1..2-3} {1..2-3}
-  </para>
-  <para>
-    { {1 2-3}-4} { {1 2-3}-4} { {1-2 3}-4}
-  </para>
-  <para>
-    {[1-2] 3} {[1-2] 3} {[1-2}
-  </para>
-  <para>
-    {1-2-3} {1-2-3}
-  </para>
-  <para>
-    Some <emphasis role="bold">text</emphasis>
-  </para>
-  <para>
-    A &lt;emphasis&gt;paragraph&lt;/emphasis&gt;.
-  </para>
-  <para>
-    Some *text* A <emphasis>paragraph</emphasis>.
-  </para>
-  <para>
-    <index type="things"><title>Things</title></index>
-  </para>
+  <section id="template_1_5.templates">
+    <title><link linkend="template_1_5.templates">Templates</link></title>
+    <para>
+      nullary_arg
+    </para>
+    <para>
+      foo baz
+    </para>
+    <para>
+      foo baz
+    </para>
+    <para>
+      This is a complete paragraph. kalamazoo kalamazoo kalamazoo kalamazoo kalamazoo
+      kalamazoo kalamazoo kalamazoo kalamazoo.... blah blah blah......
+    </para>
+    <para>
+      <hey>baz</hey>
+    </para>
+    <para>
+      This is a complete paragraph. madagascar madagascar madagascar madagascar madagascar
+      madagascar madagascar madagascar madagascar.... blah blah blah......
+    </para>
+    <para>
+      zoom peanut zoom
+    </para>
+    <para>
+      exactly xanadu
+    </para>
+    <para>
+      wx
+    </para>
+    <para>
+      wxyz wxyz trail
+    </para>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
+<phrase role="special">{</phrase>
+    <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special">&lt;&lt;</phrase> &quot;Hello, World&quot; <phrase role="special">&lt;&lt;</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
+<phrase role="special">}</phrase>
+</programlisting>
+    <para>
+      x<superscript>2</superscript>
+    </para>
+    <para>
+      &alpha;<superscript>2</superscript>
+    </para>
+    <para>
+      x<superscript>2</superscript>
+    </para>
+    <para>
+      got a banana?
+    </para>
+    <para>
+      .0 00
+    </para>
+    <para>
+      [fool]
+    </para>
+  </section>
+  <section id="template_1_5.empty_templates">
+    <title><link linkend="template_1_5.empty_templates">Empty Templates</link></title>
+  </section>
+  <section id="template_1_5.nested_templates">
+    <title><link linkend="template_1_5.nested_templates">Nested Templates</link></title>
+    <para>
+      Pre
+    </para>
+    <para>
+      Start block template.
+    </para>
+    <para>
+      Start block template.
+    </para>
+    <para>
+      Hello!
+    </para>
+    <para>
+      End block template.
+    </para>
+    <para>
+      End block template.
+    </para>
+    <para>
+      Post
+    </para>
+    <para>
+      Pre
+    </para>
+    <para>
+      Start block template.
+    </para>
+    <para>
+      Start phrase template. Hello! End phrase template.
+    </para>
+    <para>
+      End block template.
+    </para>
+    <para>
+      Post
+    </para>
+    <para>
+      Pre
+    </para>
+    <para>
+      Start phrase template.
+    </para>
+    <para>
+      Start block template.
+    </para>
+    <para>
+      Hello!
+    </para>
+    <para>
+      End block template.
+    </para>
+    <para>
+      End phrase template.
+    </para>
+    <para>
+      Post
+    </para>
+    <para>
+      Pre Start phrase template. Start phrase template. Hello! End phrase template.
+      End phrase template. Post
+    </para>
+  </section>
+  <section id="template_1_5.block_markup">
+    <title><link linkend="template_1_5.block_markup">Block Markup</link></title>
+    <itemizedlist>
+      <listitem>
+        <simpara>
+          a
+        </simpara>
+      </listitem>
+      <listitem>
+        <simpara>
+          b
+        </simpara>
+      </listitem>
+    </itemizedlist>
+    <para/>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
+    <para>
+      Paragraphs 1
+    </para>
+    <para>
+      Paragraphs 2
+    </para>
+    <itemizedlist>
+      <listitem>
+        <simpara>
+          <itemizedlist>
+            <listitem>
+              <simpara>
+                a
+              </simpara>
+            </listitem>
+            <listitem>
+              <simpara>
+                b
+              </simpara>
+            </listitem>
+          </itemizedlist>
+        </simpara>
+      </listitem>
+      <listitem>
+        <simpara>
+          <para/>
+        </simpara>
+      </listitem>
+      <listitem>
+        <simpara>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
+        </simpara>
+      </listitem>
+      <listitem>
+        <simpara>
+          <para>
+            Paragraphs 1
+          </para>
+          <para>
+            Paragraphs 2
+          </para>
+        </simpara>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="template_1_5.static_scoping">
+    <title><link linkend="template_1_5.static_scoping">Static Scoping</link></title>
+    <para>
+      static scoping
+    </para>
+    <para>
+      [a]
+    </para>
+    <para>
+      new
+    </para>
+    <para>
+      foo foo
+    </para>
+  </section>
+  <section id="template_1_5.template_arguments">
+    <title><link linkend="template_1_5.template_arguments">Template Arguments</link></title>
+    <para>
+      {1-2} {1-2} {1-2 3 4} {1 2-3 4} {1 2 3-4} {1..2-3} {1..2-3}
+    </para>
+    <para>
+      { {1 2-3}-4} { {1 2-3}-4} { {1-2 3}-4}
+    </para>
+    <para>
+      {[1-2] 3} {[1-2] 3} {[1-2}
+    </para>
+    <para>
+      {1-2-3} {1-2-3}
+    </para>
+  </section>
+  <section id="template_1_5.block_and_phrase_templates">
+    <title><link linkend="template_1_5.block_and_phrase_templates">Block and phrase
+    templates</link></title>
+    <para>
+      Some <emphasis role="bold">text</emphasis>
+    </para>
+    <para>
+      A &lt;emphasis&gt;paragraph&lt;/emphasis&gt;.
+    </para>
+    <para>
+      Some *text* A <emphasis>paragraph</emphasis>.
+    </para>
+    <para>
+      <index type="things"><title>Things</title></index>
+    </para>
+  </section>
 </article>

Modified: trunk/tools/quickbook/test/templates-1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/templates-1_5.quickbook	Tue Jul 23 02:28:54 2013	(r85124)
+++ trunk/tools/quickbook/test/templates-1_5.quickbook	2013-07-23 04:21:32 EDT (Tue, 23 Jul 2013)	(r85125)
@@ -2,12 +2,211 @@
     [quickbook 1.5]
 ]
 
-[/ 1.5 uses static scoping ]
+[section Templates]
+
+[/-------------------------------- nullary arg ]
+
+[template foo0 nullary_arg]
+
+[foo0]
+
+[/-------------------------------- unary arg, phrase syle ]
+
+[template foo1[bar] foo [bar]]
+
+[foo1 baz]
+
+[/-------------------------------- unary arg, block syle ]
+
+[template foo2[bar]
+foo [bar]
+]
+
+[foo2 baz]
+
+[template foo3[bar]
+This is a complete paragraph. [bar] [bar] [bar] [bar] [bar]
+[bar] [bar] [bar] [bar].... blah blah blah......
+]
+
+[foo3 kalamazoo]
+
+[/-------------------------------- unary arg, using punctuation ]
+
+[template ![bar] '''<hey>'''[bar]'''</hey>''']
+
+[!baz]
+
+[/-------------------------------- recursive templates ]
+
+[template foo4[bar]
+[foo3 [bar]]
+]
+
+[foo3 madagascar]
+
+[template foo5[x] zoom [x]]
+[template foo6[x] [x] zoom]
+
+[foo6[foo5 peanut]]
+
+[template kinda_weird[x y] [x] [y]]
+
+[kinda_weird exactly..xanadu]
+
+
+[/-------------------------------- space delimitted args ]
+
+[template simple1[a b] [a][b]]
+
+[simple1 w x]
+
+[template simple2[a b c d] [a][b][c][d]]
+
+[simple2 w x y z][simple2 w x y z trail]
+
+[/-------------------------------- John's templates ]
+
+[template code[x]
+    int main()
+    {
+        std::cout << ``[x]`` << std::endl;
+    }
+]
+
+[code "Hello\, World"]
+
+[template alpha '''&alpha;''']
+[template pow[a b] [a]'''<superscript>'''[b]'''</superscript>''' ]
+[template super[text]'''<superscript>'''[text]'''</superscript>''' ]
+
+[pow x 2]
+
+[pow [alpha] 2]
+
+x[super 2]
+
+[/-------------------------------- Some more ]
+
+[template banana got a banana?]
+[template plantation[bananarama] [bananarama]]
+
+[plantation [banana]]
+
+[/-------------------------------- Not a bug (there was a syntax error here) ]
+
+[template join1[a b] [b][a]]
+[template join2[a b] [a][b]]
+[template test[x] [join1 [join2 0 [x]]...0]]
+[test 0]
+
+[/-------------------------------- Mismatched template ]
+
+[template foo 1]
+[fool]
+
+[template blah 10]
+
+[endsect]
+
+[section Empty Templates]
+
+[template empty1]
+[template empty2 ]
+[template empty3 [/comment]]
+[template empty4 [/comment]
+
+]
+[template empty5
+]
+[template empty6
+
+]
+[template empty7
+[/comment]
+]
+[template empty8
+
+[/comment]
+]
+[template empty_arg1[x]]
+[template empty_arg2[x y]]
+
+[empty1]
+[empty2]
+[empty3]
+[empty4]
+[empty5]
+[empty6]
+[empty7]
+[empty8]
+[empty_arg1 1]
+[empty_arg2 1 2]
+
+[endsect]
+
+[/----------------------------------- Nested templates ]
+
+[section Nested Templates]
+
+[template block[content]
+
+Start block template.
+
+[content]
+
+End block template.
+]
+
+[template phrase[content] Start phrase template. [content] End phrase template.]
+
+Pre [block [block Hello!]] Post
+
+Pre [block [phrase Hello!]] Post
+
+Pre [phrase [block Hello!]] Post
+
+Pre [phrase [phrase Hello!]] Post
+
+[endsect]
+
+[/----------------------------------- Block Markup ]
+
+[section Block Markup]
+
+[template list
+* a
+* b]
+
+[template horizontal
+----]
+
+[template codeblock
+    int main() {}]
+
+[template paragraphs
+Paragraphs 1
+
+Paragraphs 2
+]
+
+[list][horizontal][codeblock][paragraphs]
+
+* [list]
+* [horizontal]
+* [codeblock]
+* [paragraphs]
+
+[endsect]
+
+[/----------------------------------- 1.5+ use static scoping ]
+
+[section Static Scoping]
 
 [template x static scoping]
-[template foo1[] [x]]
-[template foo2[x] [foo1]]
-[foo2 dynamic scoping]
+[template static_test1[] [x]]
+[template static_test2[x] [static_test1]]
+[static_test2 dynamic scoping]
 
 [/ This should be '[a]' because [a] isn't matched. ]
 [template test1[] [a]]
@@ -17,8 +216,8 @@
 [/ In 1.5 template arguments are scoped at the point they are defined]
 
 [template y new]
-[template foo3[a y] [a]]
-[foo3 [y] old]
+[template static_test3[a y] [a]]
+[static_test3 [y] old]
 
 [/ From https://svn.boost.org/trac/boost/ticket/2034 ]
 
@@ -27,7 +226,11 @@
 [template echo_twice[x] [echo [same [x]]..[same [x]]]]
 [echo_twice foo]
 
-[/ 1.5 template arguments]
+[endsect]
+
+[/----------------------------------- 1.5+ template arguments ]
+
+[section Template Arguments]
 
 [template binary[x y] {[x]-[y]}]
 [binary 1..2]     [/ {1-2} ]
@@ -50,18 +253,22 @@
 [ternary 1..2..3]  [/ {1-2-3} ]
 [ternary 1 2 3]    [/ {1-2-3} ]
 
-[/ Block vs. phrase templates ]
+[endsect]
+
+[/----------------------------------- Block and phrases ]
 
-[template phrase[] Some *text*]
-[template block[]
+[section Block and phrase templates]
+
+[template phrase_template[] Some *text*]
+[template block_template[]
 
 A <emphasis>paragraph</emphasis>.
 ]
 
-[phrase]
-[block]
-[`phrase]
-[`block]
+[phrase_template]
+[block_template]
+[`phrase_template]
+[`block_template]
 
 [/ Trailing newline shouldn't be included]
 
@@ -69,4 +276,6 @@
 '''<index type="'''[type]'''"><title>'''[title]'''</title></index>'''
 ]
 
-[named_index things Things]
\ No newline at end of file
+[named_index things Things]
+
+[endsect]