[Boost-commit] svn:boost r85289 - in trunk/tools/quickbook: src test

Subject: [Boost-commit] svn:boost r85289 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2013-08-10 15:19:02

Author: danieljames
Date: 2013-08-10 15:19:02 EDT (Sat, 10 Aug 2013)
New Revision: 85289
URL: http://svn.boost.org/trac/boost/changeset/85289

Log:
Stop mismatched brackets causing an error with old quickbook.

Mismatched brackets are only an error for quickbook 1.6+.

Added:
   trunk/tools/quickbook/test/mismatched_brackets3-1_1.gold   (contents, props changed)
   trunk/tools/quickbook/test/mismatched_brackets3-1_1.quickbook   (contents, props changed)
Text files modified: 
   trunk/tools/quickbook/src/main_grammar.cpp                    |     3 ++-                                     
   trunk/tools/quickbook/test/Jamfile.v2                         |     1 +                                       
   trunk/tools/quickbook/test/mismatched_brackets3-1_1.gold      |    12 ++++++++++++                            
   trunk/tools/quickbook/test/mismatched_brackets3-1_1.quickbook |     6 ++++++                                  
   4 files changed, 21 insertions(+), 1 deletions(-)

Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp	Sat Aug 10 15:18:25 2013	(r85288)
+++ trunk/tools/quickbook/src/main_grammar.cpp	2013-08-10 15:19:02 EDT (Sat, 10 Aug 2013)	(r85289)
@@ -432,7 +432,8 @@
         block_start =
                 (*eol)                  [start_blocks]
             >>  (   *(  local.top_level
-                    >>  !(  cl::ch_p(']')
+                    >>  !(  qbk_ver(106u)
+                        >>  cl::ch_p(']')
                         >>  cl::eps_p   [error("Mismatched close bracket")]
                         )
                     )

Modified: trunk/tools/quickbook/test/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/test/Jamfile.v2	Sat Aug 10 15:18:25 2013	(r85288)
+++ trunk/tools/quickbook/test/Jamfile.v2	2013-08-10 15:19:02 EDT (Sat, 10 Aug 2013)	(r85289)
@@ -79,6 +79,7 @@
     [ quickbook-error-test mismatched_brackets-1_1-fail ]
     [ quickbook-test mismatched_brackets1-1_1 ]
     [ quickbook-test mismatched_brackets2-1_1 ]
+    [ quickbook-test mismatched_brackets3-1_1 ]
     [ quickbook-test newline-1_1 ]
     [ quickbook-test para_test-1_5 ]
     [ quickbook-error-test post_process-fail ]

Added: trunk/tools/quickbook/test/mismatched_brackets3-1_1.gold
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/tools/quickbook/test/mismatched_brackets3-1_1.gold	2013-08-10 15:19:02 EDT (Sat, 10 Aug 2013)	(r85289)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="mismatched_brackets" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Mismatched brackets</title>
+  <section id="mismatched_brackets.something">
+    <title>Something</title>
+  </section>
+  <para>
+    ]
+  </para>
+</article>

Added: trunk/tools/quickbook/test/mismatched_brackets3-1_1.quickbook
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/tools/quickbook/test/mismatched_brackets3-1_1.quickbook	2013-08-10 15:19:02 EDT (Sat, 10 Aug 2013)	(r85289)
@@ -0,0 +1,6 @@
+[article Mismatched brackets]
+
+[section Something]
+
+[endsect]
+]