|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r51884 - in branches/release: . tools/quickbook/detail tools/quickbook/test
From: daniel_james_at_[hidden]
Date: 2009-03-21 12:08:53
Author: danieljames
Date: 2009-03-21 12:08:52 EDT (Sat, 21 Mar 2009)
New Revision: 51884
URL: http://svn.boost.org/trac/boost/changeset/51884
Log:
Merged revisions 51403-51404,51800-51801,51803,51883 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r51404 | danieljames | 2009-02-22 23:49:05 +0000 (Sun, 22 Feb 2009) | 2 lines
Write out error count on failure. Looks a bit odd at the moment but
it'll do. Fixes #1214.
........
r51800 | danieljames | 2009-03-16 20:18:41 +0000 (Mon, 16 Mar 2009) | 1 line
Avoid a gcc warning about initialization order.
........
r51801 | danieljames | 2009-03-16 20:19:00 +0000 (Mon, 16 Mar 2009) | 5 lines
Fix syntax error in tests.
There was a failing test caused by a syntax error in a test. The
solution is probably to improve the syntax in a new version and issue a
warning in older versions.
........
r51803 | danieljames | 2009-03-16 20:21:24 +0000 (Mon, 16 Mar 2009) | 1 line
Detab
........
Properties modified:
branches/release/ (props changed)
Text files modified:
branches/release/tools/quickbook/detail/template_stack.cpp | 4
branches/release/tools/quickbook/test/templates.gold | 5
branches/release/tools/quickbook/test/templates.quickbook | 206 ++++++++++++++++++++--------------------
branches/release/tools/quickbook/test/xinclude.quickbook | 8
4 files changed, 111 insertions(+), 112 deletions(-)
Modified: branches/release/tools/quickbook/detail/template_stack.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/template_stack.cpp (original)
+++ branches/release/tools/quickbook/detail/template_stack.cpp 2009-03-21 12:08:52 EDT (Sat, 21 Mar 2009)
@@ -15,8 +15,8 @@
namespace quickbook
{
template_stack::template_stack()
- : scopes()
- , scope(template_stack::parser(*this))
+ : scope(template_stack::parser(*this))
+ , scopes()
{
scopes.push_front(template_symbols());
}
Modified: branches/release/tools/quickbook/test/templates.gold
==============================================================================
--- branches/release/tools/quickbook/test/templates.gold (original)
+++ branches/release/tools/quickbook/test/templates.gold 2009-03-21 12:08:52 EDT (Sat, 21 Mar 2009)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="templates" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+<article id="templates" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Templates</title>
<articleinfo>
</articleinfo>
@@ -66,7 +65,7 @@
got a banana?
</para>
<para>
- [join2
+ .0 00
</para>
</section>
</article>
Modified: branches/release/tools/quickbook/test/templates.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/templates.quickbook (original)
+++ branches/release/tools/quickbook/test/templates.quickbook 2009-03-21 12:08:52 EDT (Sat, 21 Mar 2009)
@@ -1,103 +1,103 @@
-[article Templates
- [quickbook 1.3]
-]
-
-[section Templates]
-
-[/-------------------------------- nullary arg ]
-
-[template foo0 nullary_arg]
-
-[foo0]
-
-[/-------------------------------- unary arg, phrase syle ]
-
-[template foo1[bar] foo [bar]]
-
-[foo1 baz]
-
-[/-------------------------------- unary arg, block syle ]
-
-[template foo2[bar]
-foo [bar]
-]
-
-[foo2 baz]
-
-[template foo3[bar]
-This is a complete paragraph. [bar] [bar] [bar] [bar] [bar]
-[bar] [bar] [bar] [bar].... blah blah blah......
-]
-
-[foo3 kalamazoo]
-
-[/-------------------------------- unary arg, using punctuation ]
-
-[template ![bar] '''<hey>'''[bar]'''</hey>''']
-
-[!baz]
-
-[/-------------------------------- recursive templates ]
-
-[template foo4[bar]
-[foo3 [bar]]
-]
-
-[foo3 madagascar]
-
-[template foo5[x] zoom [x]]
-[template foo6[x] [x] zoom]
-
-[foo6[foo5 peanut]]
-
-[template kinda_weird[x y] [x] [y]]
-
-[kinda_weird exactly..xanadu]
-
-
-[/-------------------------------- space delimitted args ]
-
-[template simple1[a b] [a][b]]
-
-[simple1 w x]
-
-[template simple2[a b c d] [a][b][c][d]]
-
-[simple2 w x y z][simple2 w x y z trail]
-
-[/-------------------------------- John's templates ]
-
-[template code[x]
- int main()
- {
- std::cout << ``[x]`` << std::endl;
- }
-]
-
-[code "Hello\, World"]
-
-[template alpha '''α''']
-[template pow[a b] [a]'''<superscript>'''[b]'''</superscript>''' ]
-[template super[text]'''<superscript>'''[text]'''</superscript>''' ]
-
-[pow x 2]
-
-[pow [alpha] 2]
-
-x[super 2]
-
-[/-------------------------------- Some more ]
-
-[template banana got a banana?]
-[template plantation[bananarama] [bananarama]]
-
-[plantation [banana]]
-
-[/-------------------------------- Bugs! ]
-
-[template join1[a b] [b][a]]
-[template join2[a b] [a][b]]
-[template test[x] [join1 [join2 0 [x]] 0]]
-[test 0]
-
-[endsect]
+[article Templates
+ [quickbook 1.3]
+]
+
+[section Templates]
+
+[/-------------------------------- nullary arg ]
+
+[template foo0 nullary_arg]
+
+[foo0]
+
+[/-------------------------------- unary arg, phrase syle ]
+
+[template foo1[bar] foo [bar]]
+
+[foo1 baz]
+
+[/-------------------------------- unary arg, block syle ]
+
+[template foo2[bar]
+foo [bar]
+]
+
+[foo2 baz]
+
+[template foo3[bar]
+This is a complete paragraph. [bar] [bar] [bar] [bar] [bar]
+[bar] [bar] [bar] [bar].... blah blah blah......
+]
+
+[foo3 kalamazoo]
+
+[/-------------------------------- unary arg, using punctuation ]
+
+[template ![bar] '''<hey>'''[bar]'''</hey>''']
+
+[!baz]
+
+[/-------------------------------- recursive templates ]
+
+[template foo4[bar]
+[foo3 [bar]]
+]
+
+[foo3 madagascar]
+
+[template foo5[x] zoom [x]]
+[template foo6[x] [x] zoom]
+
+[foo6[foo5 peanut]]
+
+[template kinda_weird[x y] [x] [y]]
+
+[kinda_weird exactly..xanadu]
+
+
+[/-------------------------------- space delimitted args ]
+
+[template simple1[a b] [a][b]]
+
+[simple1 w x]
+
+[template simple2[a b c d] [a][b][c][d]]
+
+[simple2 w x y z][simple2 w x y z trail]
+
+[/-------------------------------- John's templates ]
+
+[template code[x]
+ int main()
+ {
+ std::cout << ``[x]`` << std::endl;
+ }
+]
+
+[code "Hello\, World"]
+
+[template alpha '''α''']
+[template pow[a b] [a]'''<superscript>'''[b]'''</superscript>''' ]
+[template super[text]'''<superscript>'''[text]'''</superscript>''' ]
+
+[pow x 2]
+
+[pow [alpha] 2]
+
+x[super 2]
+
+[/-------------------------------- Some more ]
+
+[template banana got a banana?]
+[template plantation[bananarama] [bananarama]]
+
+[plantation [banana]]
+
+[/-------------------------------- Not a bug (there was a syntax error here) ]
+
+[template join1[a b] [b][a]]
+[template join2[a b] [a][b]]
+[template test[x] [join1 [join2 0 [x]]...0]]
+[test 0]
+
+[endsect]
Modified: branches/release/tools/quickbook/test/xinclude.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/xinclude.quickbook (original)
+++ branches/release/tools/quickbook/test/xinclude.quickbook 2009-03-21 12:08:52 EDT (Sat, 21 Mar 2009)
@@ -1,4 +1,4 @@
-[article Include]
-
-[xinclude stub.xml]
-
+[article Include]
+
+[xinclude stub.xml]
+
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk