boost/quickbook
2
0
Fork 0
mirror of https://github.com/boostorg/quickbook.git synced 2026-01-31 08:22:18 +00:00
Code Issues Projects Releases Wiki Activity

Smarter use of paragraphs with templates.

Browse Source 
Use the new paragraph output system to avoid expanding block templates
inside paragraphs. Refs #4302

[SVN r63162]
This commit is contained in:
Daniel James
2010-06-20 20:30:32 +00:00
parent 0083abffe5
commit 01850ea92b
9 changed files with 197 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
template.cpp
View File

@@ -354,6 +354,7 @@ namespace quickbook
++first; // skip initial newlines
r = boost::spirit::qi::parse(first, last, g.block) && first == last;
state.paragraph_output();
state.block.swap(result);
}
@@ -361,7 +362,7 @@ namespace quickbook
}
}
std::string process(quickbook::state& state, call_template const& x)
nothing process(quickbook::state& state, call_template const& x)
{
++state.template_depth;
if (state.template_depth > state.max_template_depth)
@@ -370,7 +371,7 @@ namespace quickbook
<< "Infinite loop detected" << std::endl;
--state.template_depth;
++state.error_count;
return "";
return nothing();
}
// The template arguments should have the scope that the template was
@@ -403,7 +404,7 @@ namespace quickbook
state.pop(); // restore the state
--state.template_depth;
++state.error_count;
return "";
return nothing();
}
///////////////////////////////////
@@ -418,7 +419,7 @@ namespace quickbook
{
state.pop(); // restore the state
--state.template_depth;
return "";
return nothing();
}
///////////////////////////////////
@@ -436,7 +437,7 @@ namespace quickbook
state.pop(); // restore the state
--state.template_depth;
++state.error_count;
return "";
return nothing();
}
if (state.section_level != state.min_section_level)
@@ -446,7 +447,7 @@ namespace quickbook
state.pop(); // restore the actions' states
--state.template_depth;
++state.error_count;
return "";
return nothing();
}
}
@@ -470,7 +471,7 @@ namespace quickbook
<< "Error expanding callout."
<< std::endl;
++state.error_count;
return "";
return nothing();
}
list.push_back(item);
@@ -484,8 +485,16 @@ namespace quickbook
result += state.block.str();
state.pop();
}
return result;
if(x.symbol->is_block) {
state.paragraph_output();
state.block << result;
}
else {
state.phrase << result;
}
return nothing();
}
}