[Boost-commit] svn:boost r64825 - in trunk/tools/quickbook: detail doc test

Subject: [Boost-commit] svn:boost r64825 - in trunk/tools/quickbook: detail doc test
From: daniel_james_at_[hidden]
Date: 2010-08-15 12:42:06

Author: danieljames
Date: 2010-08-15 12:41:54 EDT (Sun, 15 Aug 2010)
New Revision: 64825
URL: http://svn.boost.org/trac/boost/changeset/64825

Log:
Fix command line macros in quickbook.
Added:
   trunk/tools/quickbook/test/command_line_macro.gold   (contents, props changed)
   trunk/tools/quickbook/test/command_line_macro.quickbook   (contents, props changed)
Text files modified: 
   trunk/tools/quickbook/detail/quickbook.cpp       |     2 +-                                      
   trunk/tools/quickbook/doc/quickbook.qbk          |     4 ++++                                    
   trunk/tools/quickbook/test/Jamfile.v2            |     1 +                                       
   trunk/tools/quickbook/test/quickbook-testing.jam |     5 ++++-                                   
   4 files changed, 10 insertions(+), 2 deletions(-)

Modified: trunk/tools/quickbook/detail/quickbook.cpp
==============================================================================
--- trunk/tools/quickbook/detail/quickbook.cpp	(original)
+++ trunk/tools/quickbook/detail/quickbook.cpp	2010-08-15 12:41:54 EDT (Sun, 15 Aug 2010)
@@ -78,7 +78,7 @@
                     ;
 
                 macro_identifier =
-                    +(anychar_p - (space_p | ']'))
+                    +(anychar_p - (space_p | ']' | '='))
                     ;
 
                 phrase =

Modified: trunk/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- trunk/tools/quickbook/doc/quickbook.qbk	(original)
+++ trunk/tools/quickbook/doc/quickbook.qbk	2010-08-15 12:41:54 EDT (Sun, 15 Aug 2010)
@@ -219,6 +219,10 @@
   * Correctly restore the quickbook version switch after including a file
     with a different version.
 
+[h3 Version 1.5.3 - Boost 1.45.0]
+
+* Fix command line flag for defining macros.
+
 [endsect]
 
 [section:syntax Syntax Summary]

Modified: trunk/tools/quickbook/test/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/test/Jamfile.v2	(original)
+++ trunk/tools/quickbook/test/Jamfile.v2	2010-08-15 12:41:54 EDT (Sun, 15 Aug 2010)
@@ -51,6 +51,7 @@
     [ quickbook-test xml-escape_1_2 ]
     [ quickbook-test xml-escape_1_5 ]
     [ quickbook-test blocks ]
+    [ quickbook-test command_line_macro : : : <quickbook-define>__macro__=*bold* ]
     [ quickbook-fail-test fail-include ]
     [ quickbook-fail-test fail-import ]
     [ quickbook-fail-test fail-template-arguments1 ]

Added: trunk/tools/quickbook/test/command_line_macro.gold
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/command_line_macro.gold	2010-08-15 12:41:54 EDT (Sun, 15 Aug 2010)
@@ -0,0 +1,11 @@
+<?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="command_line_macro" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Command Line Macro</title>
+  <articleinfo>
+  </articleinfo>
+  <para>
+    <emphasis role="bold">bold</emphasis>
+  </para>
+</article>

Added: trunk/tools/quickbook/test/command_line_macro.quickbook
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/command_line_macro.quickbook	2010-08-15 12:41:54 EDT (Sun, 15 Aug 2010)
@@ -0,0 +1,6 @@
+[article Command Line Macro
+]
+
+[/ This test relies on __macro__ being defined at the command line.]
+
+__macro__
\ No newline at end of file

Modified: trunk/tools/quickbook/test/quickbook-testing.jam
==============================================================================
--- trunk/tools/quickbook/test/quickbook-testing.jam	(original)
+++ trunk/tools/quickbook/test/quickbook-testing.jam	2010-08-15 12:41:54 EDT (Sun, 15 Aug 2010)
@@ -16,6 +16,7 @@
 import type ;
 
 feature.feature quickbook-testing.quickbook-command : : free dependency ;
+feature.feature <quickbook-define> : : free ;
 
 type.register QUICKBOOK_INPUT : quickbook ;
 type.register QUICKBOOK_OUTPUT ;
@@ -94,6 +95,8 @@
 
 ################################################################################
 toolset.flags quickbook-testing.process-quickbook quickbook-command <quickbook-testing.quickbook-command> ;
+toolset.flags quickbook-testing.process-quickbook QB-DEFINES        <quickbook-define> ;
+
 rule process-quickbook ( target : source : properties * )
 {
     DEPENDS $(target) : [ on $(target) return $(quickbook-command) ] ;
@@ -101,6 +104,6 @@
 
 actions process-quickbook bind quickbook-command
 {
-    $(quickbook-command) $(>) --output-file=$(<) --debug
+    $(quickbook-command) $(>) --output-file=$(<) --debug -D"$(QB-DEFINES)"
 }