Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r72762 - in branches/quickbook-dev/tools: . build/v2 build/v2/engine quickbook quickbook/doc quickbook/src quickbook/test regression/src release
From: dnljms_at_[hidden]
Date: 2011-06-26 07:07:09

Author: danieljames
Date: 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
New Revision: 72762
URL: http://svn.boost.org/trac/boost/changeset/72762

Log:
Quickbook: merge from trunk to dev.
Added:
   branches/quickbook-dev/tools/release/README
      - copied unchanged from r72761, /trunk/tools/release/README
Properties modified:
   branches/quickbook-dev/tools/ (props changed)
   branches/quickbook-dev/tools/build/v2/ (props changed)
   branches/quickbook-dev/tools/build/v2/engine/ (props changed)
   branches/quickbook-dev/tools/quickbook/ (props changed)
   branches/quickbook-dev/tools/regression/src/library_status.cpp (props changed)
Text files modified:
   branches/quickbook-dev/tools/quickbook/doc/change_log.qbk | 4 ++++
   branches/quickbook-dev/tools/quickbook/src/actions.cpp | 14 --------------
   branches/quickbook-dev/tools/quickbook/src/actions.hpp | 16 ----------------
   branches/quickbook-dev/tools/quickbook/src/actions_class.cpp | 1 -
   branches/quickbook-dev/tools/quickbook/src/actions_class.hpp | 1 -
   branches/quickbook-dev/tools/quickbook/src/doc_info_grammar.cpp | 2 +-
   branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp | 2 +-
   branches/quickbook-dev/tools/quickbook/src/quickbook.cpp | 2 +-
   branches/quickbook-dev/tools/quickbook/test/escape.gold | 3 +++
   branches/quickbook-dev/tools/quickbook/test/escape.quickbook | 2 ++
   branches/quickbook-dev/tools/quickbook/test/simple_markup.gold | 2 +-
   branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook | 2 +-
   branches/quickbook-dev/tools/release/snapshot_posix.bat | 2 +-
   13 files changed, 15 insertions(+), 38 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/doc/change_log.qbk
==============================================================================
--- branches/quickbook-dev/tools/quickbook/doc/change_log.qbk (original)
+++ branches/quickbook-dev/tools/quickbook/doc/change_log.qbk 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -246,5 +246,9 @@
`[ordered_list [item1][item2]]` or
`[itemized_list [item1][item2]]`.

+[heading Version 1.5.6 - Boost 1.48]
+
+* Xml encode escaped punctuation (eg. `\<` is correctly encoded to \<).
+

[endsect] [/releases]

Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -674,20 +674,6 @@
         out << "</code>";
     }

- void raw_char_action::operator()(char ch) const
- {
- write_anchors(actions, phrase);
-
- phrase << ch;
- }
-
- void raw_char_action::operator()(iterator first, iterator /*last*/) const
- {
- write_anchors(actions, phrase);
-
- phrase << *first;
- }
-
     void plain_char_action::operator()(char ch) const
     {
         write_anchors(actions, phrase);

Modified: branches/quickbook-dev/tools/quickbook/src/actions.hpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.hpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.hpp 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -253,22 +253,6 @@
         std::string& save;
     };

- struct raw_char_action
- {
- // Prints a single raw (unprocessed) char.
- // Allows '<', '>'... etc.
-
- raw_char_action(collector& phrase, quickbook::actions& actions)
- : phrase(phrase)
- , actions(actions) {}
-
- void operator()(char ch) const;
- void operator()(iterator first, iterator /*last*/) const;
-
- collector& phrase;
- quickbook::actions& actions;
- };
-
     struct plain_char_action
     {
         // Prints a single plain char.

Modified: branches/quickbook-dev/tools/quickbook/src/actions_class.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions_class.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions_class.cpp 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -68,7 +68,6 @@
         , paragraph(*this)
         , space_char(phrase)
         , plain_char(phrase, *this)
- , raw_char(phrase, *this)
         , escape_unicode(phrase, *this)

         , simple_markup(phrase, *this)

Modified: branches/quickbook-dev/tools/quickbook/src/actions_class.hpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions_class.hpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions_class.hpp 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -98,7 +98,6 @@
         paragraph_action paragraph;
         space space_char;
         plain_char_action plain_char;
- raw_char_action raw_char;
         escape_unicode_action escape_unicode;

         simple_phrase_action simple_markup;

Modified: branches/quickbook-dev/tools/quickbook/src/doc_info_grammar.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/doc_info_grammar.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/doc_info_grammar.cpp 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -240,7 +240,7 @@
         local.char_ =
                 cl::str_p("\\n") [actions.break_]
             | "\\ " // ignore an escaped space
- | '\\' >> cl::punct_p [actions.raw_char]
+ | '\\' >> cl::punct_p [actions.plain_char]
             | "\\u" >> cl::repeat_p(4)
                     [cl::chset<>("0-9a-fA-F")]
                                             [actions.escape_unicode]

Modified: branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -458,7 +458,7 @@
         local.escape =
                 cl::str_p("\\n") [actions.break_]
             | cl::str_p("\\ ") // ignore an escaped space
- | '\\' >> cl::punct_p [actions.raw_char]
+ | '\\' >> cl::punct_p [actions.plain_char]
             | "\\u" >> cl::repeat_p(4) [cl::chset<>("0-9a-fA-F")]
                                                 [actions.escape_unicode]
             | "\\U" >> cl::repeat_p(8) [cl::chset<>("0-9a-fA-F")]

Modified: branches/quickbook-dev/tools/quickbook/src/quickbook.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/quickbook.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/quickbook.cpp 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -34,7 +34,7 @@
#pragma warning(disable:4355)
#endif

-#define QUICKBOOK_VERSION "Quickbook Version 1.5.6 alpha"
+#define QUICKBOOK_VERSION "Quickbook Version 1.5.6 (dev)"

namespace quickbook
{

Modified: branches/quickbook-dev/tools/quickbook/test/escape.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/escape.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/escape.gold 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -10,5 +10,8 @@
     <para>
       This letter α should have a space either side of it.
     </para>
+ <para>
+ These should be properly encoded: > < "
+ </para>
   </section>
</article>

Modified: branches/quickbook-dev/tools/quickbook/test/escape.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/escape.quickbook (original)
+++ branches/quickbook-dev/tools/quickbook/test/escape.quickbook 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -9,5 +9,7 @@

This letter '''α''' should have a space either side of it.

+These should be properly encoded: \> \< \"
+
[endsect]

Modified: branches/quickbook-dev/tools/quickbook/test/simple_markup.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/simple_markup.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/simple_markup.gold 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -46,7 +46,7 @@
       <literal>_mac\ ro_</literal>
     </para>
     <para>
- <emphasis>not italic\</emphasis>
+ <emphasis>italic\</emphasis>
     </para>
     <para>
       These shouldn't be interepted as markup: == // **

Modified: branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook (original)
+++ branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -33,7 +33,7 @@

=_mac\ ro_=

-/not italic\/
+/italic\/

These shouldn't be interepted as markup: == // **

Modified: branches/quickbook-dev/tools/release/snapshot_posix.bat
==============================================================================
--- branches/quickbook-dev/tools/release/snapshot_posix.bat (original)
+++ branches/quickbook-dev/tools/release/snapshot_posix.bat 2011-06-26 07:07:04 EDT (Sun, 26 Jun 2011)
@@ -30,7 +30,7 @@
ren posix boost-posix-%SNAPSHOT_DATE%

echo Building .gz file...
-tar cfz posix.tar.gz boost-posix-%SNAPSHOT_DATE%
+tar cfz posix.tar.gz --numeric-owner --group=0 --owner=0 boost-posix-%SNAPSHOT_DATE%
echo Building .bz2 file...
gzip -d -c posix.tar.gz | bzip2 >posix.tar.bz2

Date view	Thread view	Subject view	Author view

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