Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r73981 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-08-21 07:57:43


Author: danieljames
Date: 2011-08-21 07:57:42 EDT (Sun, 21 Aug 2011)
New Revision: 73981
URL: http://svn.boost.org/trac/boost/changeset/73981

Log:
Quickbook: Don't normalize parent ids.
Text files modified:
   trunk/tools/quickbook/src/id_generator.cpp | 4 ++--
   trunk/tools/quickbook/test/identifier_1_5.gold | 12 ++++++++++++
   trunk/tools/quickbook/test/identifier_1_5.quickbook | 7 +++++++
   trunk/tools/quickbook/test/identifier_1_6.gold | 12 ++++++++++++
   trunk/tools/quickbook/test/identifier_1_6.quickbook | 7 +++++++
   5 files changed, 40 insertions(+), 2 deletions(-)

Modified: trunk/tools/quickbook/src/id_generator.cpp
==============================================================================
--- trunk/tools/quickbook/src/id_generator.cpp (original)
+++ trunk/tools/quickbook/src/id_generator.cpp 2011-08-21 07:57:42 EDT (Sun, 21 Aug 2011)
@@ -181,12 +181,12 @@
 
         if (!data->generation_data)
         {
- std::string name = normalize_id(data->name);
+ std::string const& name = data->name;
 
             std::size_t seperator = name.rfind('.') + 1;
             data->generation_data.reset(new id_generation_data(
                 std::string(name, 0, seperator),
- std::string(name, seperator)
+ normalize_id(std::string(name, seperator))
             ));
 
             try_potential_id(placeholder);

Modified: trunk/tools/quickbook/test/identifier_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/identifier_1_5.gold (original)
+++ trunk/tools/quickbook/test/identifier_1_5.gold 2011-08-21 07:57:42 EDT (Sun, 21 Aug 2011)
@@ -595,4 +595,16 @@
       </tgroup>
     </table>
   </section>
+ <section id="identifiers_in_quickbook_1_5.punctuation___stuff">
+ <title><link linkend="identifiers_in_quickbook_1_5.punctuation___stuff">Punctuation
+ &amp; stuff</link></title> <anchor id="identifiers_in_quickbook_1_5.punctuation___stuff.a___b"/>
+ <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.punctuation___stuff.h0">
+ <link linkend="identifiers_in_quickbook_1_5.punctuation___stuff.a___b">A +
+ B</link>
+ </bridgehead>
+ <anchor id="identifiers_in_quickbook_1_5.punctuation___stuff.a_b0"/>
+ <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.punctuation___stuff.h1">
+ <link linkend="identifiers_in_quickbook_1_5.punctuation___stuff.a_b0">A + B</link>
+ </bridgehead>
+ </section>
 </article>

Modified: trunk/tools/quickbook/test/identifier_1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/identifier_1_5.quickbook (original)
+++ trunk/tools/quickbook/test/identifier_1_5.quickbook 2011-08-21 07:57:42 EDT (Sun, 21 Aug 2011)
@@ -138,4 +138,11 @@
 [[]]
 ]
 
+[endsect]
+
+[section Punctuation & stuff]
+
+[heading A + B]
+[heading A + B]
+
 [endsect]
\ No newline at end of file

Modified: trunk/tools/quickbook/test/identifier_1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/identifier_1_6.gold (original)
+++ trunk/tools/quickbook/test/identifier_1_6.gold 2011-08-21 07:57:42 EDT (Sun, 21 Aug 2011)
@@ -595,4 +595,16 @@
       </tgroup>
     </table>
   </section>
+ <section id="identifiers_in_quickbook_1_6.punctuation___stuff">
+ <title><link linkend="identifiers_in_quickbook_1_6.punctuation___stuff">Punctuation
+ &amp; stuff</link></title> <anchor id="identifiers_in_quickbook_1_6.punctuation___stuff.a___b"/>
+ <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.punctuation___stuff.h0">
+ <link linkend="identifiers_in_quickbook_1_6.punctuation___stuff.a___b">A +
+ B</link>
+ </bridgehead>
+ <anchor id="identifiers_in_quickbook_1_6.punctuation___stuff.a_b0"/>
+ <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.punctuation___stuff.h1">
+ <link linkend="identifiers_in_quickbook_1_6.punctuation___stuff.a_b0">A + B</link>
+ </bridgehead>
+ </section>
 </article>

Modified: trunk/tools/quickbook/test/identifier_1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/identifier_1_6.quickbook (original)
+++ trunk/tools/quickbook/test/identifier_1_6.quickbook 2011-08-21 07:57:42 EDT (Sun, 21 Aug 2011)
@@ -138,4 +138,11 @@
 [[]]
 ]
 
+[endsect]
+
+[section Punctuation & stuff]
+
+[heading A + B]
+[heading A + B]
+
 [endsect]
\ No newline at end of file


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