Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r70191 - in trunk/tools/quickbook: . doc src test
From: dnljms_at_[hidden]
Date: 2011-03-19 11:27:53


Author: danieljames
Date: 2011-03-19 11:27:51 EDT (Sat, 19 Mar 2011)
New Revision: 70191
URL: http://svn.boost.org/trac/boost/changeset/70191

Log:
Quickbook: Go back to using invalid markup for lists.
Properties modified:
   trunk/tools/quickbook/ (props changed)
Text files modified:
   trunk/tools/quickbook/doc/quickbook.qbk | 1
   trunk/tools/quickbook/src/actions.cpp | 13 -
   trunk/tools/quickbook/test/list_test.gold | 236 ++++++++++++++++++++--------------------
   trunk/tools/quickbook/test/quickbook-manual.gold | 212 +++++++++++++++++-----------------
   4 files changed, 230 insertions(+), 232 deletions(-)

Modified: trunk/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- trunk/tools/quickbook/doc/quickbook.qbk (original)
+++ trunk/tools/quickbook/doc/quickbook.qbk 2011-03-19 11:27:51 EDT (Sat, 19 Mar 2011)
@@ -281,6 +281,7 @@
   `[copyright 2001-2006, 2010 One person, 2008 Another person]`.
 * Fix delimeter checking for simple markup.
 * Allow more block elements to be nested.
+* Go back to using invalid markup for lists. It generates better html.
 * Quickbook 1.6:
   * Scope source mode changes to the file they're made in.
 

Modified: trunk/tools/quickbook/src/actions.cpp
==============================================================================
--- trunk/tools/quickbook/src/actions.cpp (original)
+++ trunk/tools/quickbook/src/actions.cpp 2011-03-19 11:27:51 EDT (Sat, 19 Mar 2011)
@@ -405,15 +405,14 @@
                 {
                     char mark = list_marks.top().first;
                     list_marks.pop();
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
                     actions.out << ((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
                 }
-
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
             }
             else
             {
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
             }
 
             if (mark != list_marks.top().first) // new_indent == list_indent
@@ -426,10 +425,8 @@
                 ++actions.error_count;
             }
             
- actions.out << "<listitem>";
- actions.out << "<simpara>\n";
+ actions.out << "<listitem><simpara>";
             actions.out << content;
- actions.out << "\n</simpara>";
         }
 
         assert(!list_marks.empty());
@@ -437,7 +434,7 @@
         {
             char mark = list_marks.top().first;
             list_marks.pop();
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
             actions.out << ((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
         }
     }

Modified: trunk/tools/quickbook/test/list_test.gold
==============================================================================
--- trunk/tools/quickbook/test/list_test.gold (original)
+++ trunk/tools/quickbook/test/list_test.gold 2011-03-19 11:27:51 EDT (Sat, 19 Mar 2011)
@@ -39,36 +39,36 @@
     <listitem>
       <simpara>
         A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
       </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
     </listitem>
     <listitem>
       <simpara>
         B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
       </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
     </listitem>
   </itemizedlist>
   <para>
@@ -78,36 +78,36 @@
     <listitem>
       <simpara>
         A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
       </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
     </listitem>
     <listitem>
       <simpara>
         B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
       </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
     </listitem>
   </orderedlist>
   <para>
@@ -117,53 +117,53 @@
     <listitem>
       <simpara>
         A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ C
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ E
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ F
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ G
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ H
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
       </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- C
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D
- </simpara>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <simpara>
- E
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- F
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- G
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- H
- </simpara>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist>
     </listitem>
   </orderedlist>
   <para>
@@ -173,31 +173,31 @@
     <listitem>
       <simpara>
         A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <orderedlist>
+ <listitem>
+ <simpara>
+ C
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
       </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- C
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D
- </simpara>
- </listitem>
- </orderedlist>
- </listitem>
- </itemizedlist>
     </listitem>
     <listitem>
       <simpara>

Modified: trunk/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- trunk/tools/quickbook/test/quickbook-manual.gold (original)
+++ trunk/tools/quickbook/test/quickbook-manual.gold 2011-03-19 11:27:51 EDT (Sat, 19 Mar 2011)
@@ -1272,48 +1272,48 @@
             <listitem>
               <simpara>
                 Three
+ <orderedlist>
+ <listitem>
+ <simpara>
+ Three.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.b
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.c
+ </simpara>
+ </listitem>
+ </orderedlist>
               </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- Three.a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.b
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.c
- </simpara>
- </listitem>
- </orderedlist>
             </listitem>
             <listitem>
               <simpara>
                 Fourth
+ <orderedlist>
+ <listitem>
+ <simpara>
+ Four.a
+ <orderedlist>
+ <listitem>
+ <simpara>
+ Four.a.i
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Four.a.ii
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </orderedlist>
               </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- Four.a
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- Four.a.i
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Four.a.ii
- </simpara>
- </listitem>
- </orderedlist>
- </listitem>
- </orderedlist>
             </listitem>
             <listitem>
               <simpara>
@@ -1418,24 +1418,24 @@
             <listitem>
               <simpara>
                 Three
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ Three.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.b
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.c
+ </simpara>
+ </listitem>
+ </itemizedlist>
               </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- Three.a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.b
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.c
- </simpara>
- </listitem>
- </itemizedlist>
             </listitem>
             <listitem>
               <simpara>
@@ -1467,72 +1467,72 @@
             <listitem>
               <simpara>
                 1
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 1.a
+ <orderedlist>
+ <listitem>
+ <simpara>
+ 1.a.1
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 1.a.2
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 1.b
+ </simpara>
+ </listitem>
+ </itemizedlist>
               </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- 1.a
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- 1.a.1
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- 1.a.2
- </simpara>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>
- <simpara>
- 1.b
- </simpara>
- </listitem>
- </itemizedlist>
             </listitem>
             <listitem>
               <simpara>
                 2
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- 2.a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- 2.b
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- 2.b.1
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- 2.b.2
- </simpara>
- <itemizedlist>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 2.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2.b
+ <orderedlist>
                         <listitem>
                           <simpara>
- 2.b.2.a
+ 2.b.1
                           </simpara>
                         </listitem>
                         <listitem>
                           <simpara>
- 2.b.2.b
+ 2.b.2
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 2.b.2.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2.b.2.b
+ </simpara>
+ </listitem>
+ </itemizedlist>
                           </simpara>
                         </listitem>
- </itemizedlist>
- </listitem>
- </orderedlist>
- </listitem>
- </itemizedlist>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
             </listitem>
           </orderedlist>
         </section>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk