Update of /cvsroot/boost/boost/tools/quickbook
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26989/tools/quickbook
Modified Files:
Jamfile.v2 phrase.hpp
Log Message:
ready for prime time
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/Jamfile.v2,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Jamfile.v2 7 Oct 2005 21:59:34 -0000 1.8
+++ Jamfile.v2 5 Jun 2006 01:09:56 -0000 1.9
@@ -12,6 +12,7 @@
:
detail/quickbook.cpp
detail/actions.cpp
+ detail/actions_class.cpp
detail/utils.cpp
detail/post_process.cpp
/boost//program_options
Index: phrase.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/phrase.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- phrase.hpp 3 Jun 2006 04:27:08 -0000 1.12
+++ phrase.hpp 5 Jun 2006 01:09:56 -0000 1.13
@@ -107,17 +107,29 @@
>> actions.macro [actions.do_macro]
;
- template_ =
- (actions.templates >> eps_p)
[push_back_a(actions.template_info)]
- >> !(
- hard_space
- >> template_arg
[push_back_a(actions.template_info)]
- >> *(
- ".." >> template_arg
[push_back_a(actions.template_info)]
- )
+ template_args =
+ template_arg
[push_back_a(actions.template_info)]
+ >> *(
+ ".." >> template_arg
[push_back_a(actions.template_info)]
)
;
+ template_ =
+ (
+ (eps_p(punct_p)
+ >> actions.templates
+ )
[push_back_a(actions.template_info)]
+ >> !template_args
+ )
+ | (
+ (actions.templates
+ >> eps_p
+ )
[push_back_a(actions.template_info)]
+ >> !(hard_space
+ >> template_args)
+ )
+ ;
+
brackets =
'[' >> +template_arg >> ']'
;
@@ -340,7 +352,7 @@
simple_bold, simple_italic, simple_underline,
simple_teletype, source_mode, template_,
template_arg,
quote, code_block, footnote, replaceable, macro,
- brackets;
+ brackets, template_args;
rule<Scanner> const&
start() const { return common; }
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
