boost/quickbook
2
0
Fork 0
mirror of https://github.com/boostorg/quickbook.git synced 2026-01-26 06:42:27 +00:00
Code Issues Projects Releases Wiki Activity

Quickbook: Match macros in simple markup in the grammar.

Browse Source 
[SVN r72392]
This commit is contained in:
Daniel James
2011-06-04 16:17:51 +00:00
parent 43486c773a
commit 3f3fe90bc6
4 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/actions.cpp
View File

@@ -380,14 +380,7 @@ namespace quickbook
values.finish();
out << markup.pre;
if (std::string const* ptr = find(macro, content.get_quickbook().c_str()))
{
out << *ptr;
}
else
{
out << content.get_boostbook();
}
out << content.get_boostbook();
out << markup.post;
}

3
src/actions.hpp
View File

@@ -124,16 +124,13 @@ namespace quickbook
simple_phrase_action(
collector& out
, string_symbols const& macro
, quickbook::actions& actions)
: out(out)
, macro(macro)
, actions(actions) {}
void operator()(char) const;
collector& out;
string_symbols const& macro;
quickbook::actions& actions;
};

2
src/actions_class.cpp
View File

@@ -75,7 +75,7 @@ namespace quickbook
, raw_char(phrase, *this)
, escape_unicode(phrase, *this)
, simple_markup(phrase, macro, *this)
, simple_markup(phrase, *this)
, break_(phrase, *this)
, do_macro(phrase, *this)

17
src/main_grammar.cpp
View File

@@ -368,10 +368,10 @@ namespace quickbook
;
local.simple_markup =
cl::chset<>("*/_=") [local.simple_markup.mark = ph::arg1]
>> cl::eps_p(cl::graph_p) // graph_p must follow first mark
cl::chset<>("*/_=") [local.simple_markup.mark = ph::arg1]
>> cl::eps_p(cl::graph_p) // graph_p must follow first mark
>> lookback
[ cl::anychar_p
[ cl::anychar_p // skip back over the markup
>> ~cl::eps_p(cl::f_ch_p(local.simple_markup.mark))
// first mark not be preceeded by
// the same character.
@@ -384,11 +384,12 @@ namespace quickbook
[
actions.scoped_output()
[
(+( ~cl::eps_p(local.simple_markup_end)
>> local.nested_char
)) [actions.docinfo_value(ph::arg1, ph::arg2)]
]
>> cl::f_ch_p(local.simple_markup.mark)
( cl::eps_p(actions.macro >> local.simple_markup_end)
>> actions.macro [actions.do_macro]
| +(~cl::eps_p(local.simple_markup_end) >> local.nested_char)
) [actions.docinfo_value(ph::arg1, ph::arg2)]
]
>> cl::f_ch_p(local.simple_markup.mark)
[actions.simple_markup]
]
;