Update of /cvsroot/boost/boost/tools/quickbook
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27100/tools/quickbook_backend
Modified Files:
Tag: QUICKBOOK_BACKEND
block.hpp phrase.hpp
Log Message:
Merge from head.
Index: block.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/block.hpp,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- block.hpp 27 Feb 2007 15:22:15 -0000 1.20
+++ block.hpp 30 Jul 2007 14:47:14 -0000 1.20.2.1
@@ -74,11 +74,11 @@
eol = blank >> eol_p
;
- close_bracket =
+ phrase_end =
']' |
if_p(var(no_eols))
[
- eol_p >> eol_p // Make sure that we
don't go
+ eol >> eol // Make sure that we
don't go
] // past a single
block, except
; // when preformatted.
@@ -321,14 +321,14 @@
"xinclude"
>> hard_space
>> (*(anychar_p -
- close_bracket)) [actions.xinclude]
+ phrase_end)) [actions.xinclude]
;
import =
"import"
>> hard_space
>> (*(anychar_p -
- close_bracket)) [actions.import]
+ phrase_end)) [actions.import]
;
include =
@@ -341,7 +341,7 @@
>> space
)
>> (*(anychar_p -
- close_bracket)) [actions.include]
+ phrase_end)) [actions.include]
;
code =
@@ -380,7 +380,9 @@
paragraph_end_markups =
"section", "endsect", "h1", "h2", "h3", "h4", "h5", "h6",
- "blurb", ":", "pre", "def", "table", "include"
+ "blurb", ":", "pre", "def", "table", "include", "xinclude",
+ "variablelist", "import", "template", "warning", "caution",
+ "important", "note", "tip", ":"
;
paragraph_end =
@@ -400,7 +402,7 @@
*( common
| comment
| (anychar_p -
- close_bracket) [actions.plain_char]
+ phrase_end) [actions.plain_char]
)
;
}
@@ -410,7 +412,7 @@
rule<Scanner> start_, blocks, block_markup, code, code_line,
paragraph, space, blank, comment, headings, h, h1,
h2,
h3, h4, h5, h6, hr, blurb, blockquote, admonition,
- phrase, list, close_bracket, ordered_list,
def_macro,
+ phrase, list, phrase_end, ordered_list, def_macro,
macro_identifier, table, table_row, variablelist,
varlistentry, varlistterm, varlistitem, table_cell,
preformatted, list_item, begin_section,
end_section,
Index: phrase.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/phrase.hpp,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -d -r1.23.2.3 -r1.23.2.4
--- phrase.hpp 10 Jul 2007 03:50:49 -0000 1.23.2.3
+++ phrase.hpp 30 Jul 2007 14:47:14 -0000 1.23.2.4
@@ -80,11 +80,11 @@
eol = blank >> eol_p
;
- close_bracket =
+ phrase_end =
']' |
if_p(var(self.no_eols))
[
- eol_p >> eol_p // Make sure that we
don't go
+ eol >> eol // Make sure that we
don't go
] // past a single
block, except
; // when preformatted.
@@ -194,25 +194,25 @@
;
simple_markup(simple_bold,
- '*', actions.simple_bold, close_bracket);
+ '*', actions.simple_bold, phrase_end);
simple_markup(simple_italic,
- '/', actions.simple_italic, close_bracket);
+ '/', actions.simple_italic, phrase_end);
simple_markup(simple_underline,
- '_', actions.simple_underline, close_bracket);
+ '_', actions.simple_underline, phrase_end);
simple_markup(simple_teletype,
- '=', actions.simple_teletype, close_bracket);
+ '=', actions.simple_teletype, phrase_end);
phrase =
*( common
| comment
- | (anychar_p -
- close_bracket) [actions.plain_char]
+ | (anychar_p - phrase_end) [actions.plain_char]
)
;
phrase_markup =
'['
- >> ( image
+ >> ( cond_phrase
+ | image
| url
| link
| anchor
@@ -249,9 +249,20 @@
)
;
+ macro_identifier =
+ +(anychar_p - (space_p | ']'))
+ ;
+
+ cond_phrase =
+ '?' >> blank
+ >> macro_identifier
[actions.cond_phrase_pre]
+ >> (!phrase)
[actions.cond_phrase_post]
+ ;
+
image =
'$' >> blank
- >> template_args [actions.image]
+ >> (*(anychar_p -
+ phrase_end)) [actions.image]
;
url =
@@ -276,7 +287,7 @@
'#'
>> blank
>> ( *(anychar_p -
- close_bracket)
+ phrase_end)
) [actions.anchor]
;
@@ -392,14 +403,16 @@
}
rule<Scanner> space, blank, comment, phrase, phrase_markup,
image,
- close_bracket, bold, italic, underline, teletype,
+ phrase_end, bold, italic, underline, teletype,
strikethrough, escape, url, common, funcref,
classref, memberref, enumref, macroref, headerref,
conceptref,
anchor, 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, macro,
- brackets, template_args, dummy_block;
+ brackets, template_args, dummy_block, cond_phrase,
+ macro_identifier
+ ;
rule<Scanner> const&
start() const { return common; }
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
