[Boost-commit] svn:boost r62826 - in branches/quickbook-1.5-spirit2: . doc

Subject: [Boost-commit] svn:boost r62826 - in branches/quickbook-1.5-spirit2: . doc
From: daniel_james_at_[hidden]
Date: 2010-06-11 19:26:58

Author: danieljames
Date: 2010-06-11 19:26:57 EDT (Fri, 11 Jun 2010)
New Revision: 62826
URL: http://svn.boost.org/trac/boost/changeset/62826

Log:
Merge quickbook changes from 1.43
Properties modified: 
   branches/quickbook-1.5-spirit2/   (props changed)
Text files modified: 
   branches/quickbook-1.5-spirit2/block_actions.cpp |     3 +--                                     
   branches/quickbook-1.5-spirit2/doc/quickbook.qbk |     4 +++-                                    
   branches/quickbook-1.5-spirit2/utils.cpp         |     6 +++---                                  
   3 files changed, 7 insertions(+), 6 deletions(-)

Modified: branches/quickbook-1.5-spirit2/block_actions.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_actions.cpp	(original)
+++ branches/quickbook-1.5-spirit2/block_actions.cpp	2010-06-11 19:26:57 EDT (Fri, 11 Jun 2010)
@@ -102,8 +102,7 @@
         {
             std::string::size_type const n =
                 state.qualified_section_id.value.find_last_of('.');
-            if(std::string::npos != n)
-                state.qualified_section_id.value.erase(n, std::string::npos);
+            state.qualified_section_id.value.erase(n, std::string::npos);
         }
         
         return end_section2();

Modified: branches/quickbook-1.5-spirit2/doc/quickbook.qbk
==============================================================================
--- branches/quickbook-1.5-spirit2/doc/quickbook.qbk	(original)
+++ branches/quickbook-1.5-spirit2/doc/quickbook.qbk	2010-06-11 19:26:57 EDT (Fri, 11 Jun 2010)
@@ -180,7 +180,7 @@
 * Accept a space between `section:` and the section id.
 * Support table ids.
 
-[h3 Version 1.5.1]
+[h3 Version 1.5.1 - Boost 1.43.0]
 
 * Improve the post processor's list of block elements. `table`, `entry` and
   `varlistentry` are treated as blocks. `replaceable` is treated as an inline
@@ -189,6 +189,8 @@
 * Add unicode escape characters, eg. `\u03B1` for \u03B1.
 * Support UTF-8 files with a unicode byte order mark.
 * Disallow `[` in simple markup. Fixes some errors with mismatched punctuation.
+* Add command line flag to define macros at the command line,
+  e.g. `quickbook "-D__italic_foo__=/foo/"`.
 
 [endsect]
 

Modified: branches/quickbook-1.5-spirit2/utils.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/utils.cpp	(original)
+++ branches/quickbook-1.5-spirit2/utils.cpp	2010-06-11 19:26:57 EDT (Fri, 11 Jun 2010)
@@ -183,9 +183,9 @@
     {
         if(begin == end) return "";
 
-        const char utf8[] = {0xef, 0xbb, 0xbf};
-        const char utf32be[] = {0, 0, 0xfe, 0xff};
-        const char utf32le[] = {0xff, 0xfe, 0, 0};
+        const char* utf8 = "\xef\xbb\xbf";
+        const char* utf32be = "\0\0\xfe\xff";
+        const char* utf32le = "\xff\xfe\0\0";
 
         unsigned char c = *begin;
         switch(c)