Quickbook: Merge from trunk to quickbook-dev.

[SVN r73365]
This commit is contained in:
Daniel James
2011-07-25 21:41:36 +00:00
parent 9b1eed66f4
commit a2b3c3aa04
45 changed files with 1065 additions and 274 deletions

View File

@@ -18,10 +18,12 @@ namespace quickbook
{
template_body::template_body(
value const& content,
fs::path const& filename
fs::path const& filename,
content_type type
)
: content(content)
, filename(filename)
, type(type)
{
assert(content.get_tag() == template_tags::block ||
content.get_tag() == template_tags::phrase);
@@ -32,7 +34,6 @@ namespace quickbook
return content.get_tag() == template_tags::block;
}
template_stack::template_stack()
: scope(template_stack::parser(*this))
, scopes()