Update of /cvsroot/boost/boost/tools/quickbook
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28405/tools/quickbook
Modified Files:
block.hpp phrase.hpp
Log Message:
Index: block.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/block.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- block.hpp 22 May 2006 09:00:15 -0000 1.12
+++ block.hpp 3 Jun 2006 04:27:07 -0000 1.13
@@ -194,16 +194,21 @@
(alpha_p | '_') >> *(alnum_p | '_')
;
+ template_id =
+ identifier | (punct_p - (ch_p('[') | ']'))
+ ;
+
template_ =
"template"
- >> hard_space >> identifier
[push_back_a(actions.template_info)]
- >> space >> '('
- >> space >> identifier
[push_back_a(actions.template_info)]
- >> *(
- space >> ','
- >> space >> identifier
[push_back_a(actions.template_info)]
- )
- >> space >> ')'
+ >> hard_space >> template_id
[push_back_a(actions.template_info)]
+ >>
+ !(
+ space >> '['
+ >> +(
+ space >> template_id
[push_back_a(actions.template_info)]
+ )
+ >> space >> ']'
+ )
>> template_body [actions.template_body]
;
@@ -392,8 +397,8 @@
varlistentry, varlistterm, varlistitem, table_cell,
preformatted, list_item, begin_section,
end_section,
xinclude, include, hard_space, eol, paragraph_end,
- template_, identifier, template_formal_arg,
- template_body;
+ template_, template_id, template_formal_arg,
+ template_body, identifier;
symbols<> paragraph_end_markups;
Index: phrase.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/phrase.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- phrase.hpp 22 May 2006 09:00:15 -0000 1.11
+++ phrase.hpp 3 Jun 2006 04:27:08 -0000 1.12
@@ -93,7 +93,6 @@
common =
macro
- | template_ [actions.do_template]
| phrase_markup
| code_block
| inline_code
@@ -110,20 +109,21 @@
template_ =
(actions.templates >> eps_p)
[push_back_a(actions.template_info)]
- >> space >> '('
- >> template_arg
[push_back_a(actions.template_info)]
- >> *(
- ',' >> template_arg
[push_back_a(actions.template_info)]
+ >> !(
+ hard_space
+ >> template_arg
[push_back_a(actions.template_info)]
+ >> *(
+ ".." >> template_arg
[push_back_a(actions.template_info)]
+ )
)
- >> space >> ')'
;
-
- template_arg =
- +("\\," | parens | (anychar_p - (ch_p(',') | ')')))
+
+ brackets =
+ '[' >> +template_arg >> ']'
;
-
- parens =
- '(' >> +template_arg >> ')'
+
+ template_arg =
+ +(brackets | (anychar_p - (str_p("..") | ']')))
;
inline_code =
@@ -191,6 +191,7 @@
| quote
| replaceable
| footnote
+ | template_ [actions.do_template]
| str_p("br") [actions.break_]
)
>> ']'
@@ -338,8 +339,8 @@
link, hard_space, eol, inline_code, simple_format,
simple_bold, simple_italic, simple_underline,
simple_teletype, source_mode, template_,
template_arg,
- quote, code_block, footnote, replaceable, parens,
- macro;
+ quote, code_block, footnote, replaceable, macro,
+ brackets;
rule<Scanner> const&
start() const { return common; }
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
