[Boost-commit] svn:boost r86690 - trunk/tools/quickbook/src

Subject: [Boost-commit] svn:boost r86690 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2013-11-13 16:50:30

Author: danieljames
Date: 2013-11-13 16:50:29 EST (Wed, 13 Nov 2013)
New Revision: 86690
URL: http://svn.boost.org/trac/boost/changeset/86690

Log:
Inline element id version checks.

Text files modified: 
   trunk/tools/quickbook/src/block_element_grammar.cpp |    12 +++---------                            
   1 files changed, 3 insertions(+), 9 deletions(-)

Modified: trunk/tools/quickbook/src/block_element_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/block_element_grammar.cpp	Wed Nov 13 16:50:08 2013	(r86689)
+++ trunk/tools/quickbook/src/block_element_grammar.cpp	2013-11-13 16:50:29 EST (Wed, 13 Nov 2013)	(r86690)
@@ -35,7 +35,7 @@
                         xinclude, include, include_filename,
                         template_, template_id, template_formal_arg,
                         template_body, identifier, import,
-                        element_id, element_id_1_5, element_id_1_6,
+                        element_id,
                         same_line;
     };
 
@@ -60,12 +60,6 @@
             )
             ;
         
-        local.element_id_1_5 =
-                !(qbk_ver(105u) >> local.element_id);
-
-        local.element_id_1_6 =
-                !(qbk_ver(106u) >> local.element_id);
-
         elements.add
             ("section", element_info(element_info::section_block, &local.begin_section, block_tags::begin_section))
             ("endsect", element_info(element_info::section_block, &local.end_section, block_tags::end_section))
@@ -84,7 +78,7 @@
 
         local.heading
             =   space
-            >>  local.element_id_1_6
+            >>  !(qbk_ver(106u) >> local.element_id)
             >>  space
             >>  local.inner_phrase
             ;
@@ -223,7 +217,7 @@
 
         local.table =
                 local.same_line
-            >>  local.element_id_1_5
+            >>  !(qbk_ver(105u) >> local.element_id)
             >>  local.same_line
             >>  local.table_title
             >>  *local.table_row