diff --git a/test/more/run-tests.py b/test/more/run-tests.py
index 2a56795..01c377a 100755
--- a/test/more/run-tests.py
+++ b/test/more/run-tests.py
@@ -73,7 +73,7 @@ def main(argv):
gold_text = file.read()
finally:
file.close()
- compare_xml(filename, doc_text, gold_text)
+ compare_xml(src_path, doc_text, gold_text)
def run_boostbook(parser, boostbook_xsl, file):
doc = boostbook_xsl(etree.parse(file, parser))
@@ -90,7 +90,7 @@ def normalize_boostbook_ids(doc):
if(id in ids):
print 'Duplicate id: ' + id
- match = re.match("(id|.+_id)(\d+)((?:-bb)?)", id)
+ match = re.match("(id|.+_id)([mp]?\d+)((?:-bb)?)", id)
if(match):
count = 1
if(match.group(1) in id_bases):
@@ -117,6 +117,8 @@ def compare_xml(file, doc_text, gold_text):
doc_text.splitlines(True)
)
)
+ print
+ print
if __name__ == "__main__":
- main(sys.argv[1:])
\ No newline at end of file
+ main(sys.argv[1:])
diff --git a/test/more/tests/libs/hash-ref.gold b/test/more/tests/libs/hash-ref.gold
index be82263..6404700 100644
--- a/test/more/tests/libs/hash-ref.gold
+++ b/test/more/tests/libs/hash-ref.gold
@@ -15,22 +15,22 @@
template<> struct hash<bool>;
template<> struct hash<char>;
- template<> struct hash<signed char>;
- template<> struct hash<unsigned char>;
+ template<> struct hash<signed char>;
+ template<> struct hash<unsigned char>;
template<> struct hash<wchar_t>;
template<> struct hash<short>;
- template<> struct hash<unsigned short>;
+ template<> struct hash<unsigned short>;
template<> struct hash<int>;
- template<> struct hash<unsigned int>;
+ template<> struct hash<unsigned int>;
template<> struct hash<long>;
- template<> struct hash<unsigned long>;
+ template<> struct hash<unsigned long>;
template<> struct hash<long long>;
- template<> struct hash<unsigned long long>;
+ template<> struct hash<unsigned long long>;
template<> struct hash<float>;
template<> struct hash<double>;
- template<> struct hash<long double>;
- template<> struct hash<std::string>;
- template<> struct hash<std::wstring>;
+ template<> struct hash<long double>;
+ template<> struct hash<std::string>;
+ template<> struct hash<std::wstring>;
template<typename T> struct hash<T*>;
// Support functions (Boost extension).
@@ -273,17 +273,17 @@
std::size_t operator()(char) const;
};Descriptionstd::size_t operator()(char val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<signed char>3boost::hash<signed char>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<signed char>3boost::hash<signed char>// In header: <boost/functional/hash.hpp>
-struct hash<signed char> {
+struct hash<signed char> {
std::size_t operator()(signed char) const;
};Descriptionstd::size_t operator()(signed char val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned char>3boost::hash<unsigned char>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned char>3boost::hash<unsigned char>// In header: <boost/functional/hash.hpp>
-struct hash<unsigned char> {
+struct hash<unsigned char> {
std::size_t operator()(unsigned char) const;
};Descriptionstd::size_t operator()(unsigned char val) const;std::size_t operator()(short) const;
};Descriptionstd::size_t operator()(short val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned short>3boost::hash<unsigned short>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned short>3boost::hash<unsigned short>// In header: <boost/functional/hash.hpp>
-struct hash<unsigned short> {
+struct hash<unsigned short> {
std::size_t operator()(unsigned short) const;
};Descriptionstd::size_t operator()(unsigned short val) const;std::size_t operator()(int) const;
};Descriptionstd::size_t operator()(int val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned int>3boost::hash<unsigned int>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned int>3boost::hash<unsigned int>// In header: <boost/functional/hash.hpp>
-struct hash<unsigned int> {
+struct hash<unsigned int> {
std::size_t operator()(unsigned int) const;
};Descriptionstd::size_t operator()(unsigned int val) const;std::size_t operator()(long) const;
};Descriptionstd::size_t operator()(long val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned long>3boost::hash<unsigned long>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned long>3boost::hash<unsigned long>// In header: <boost/functional/hash.hpp>
-struct hash<unsigned long> {
+struct hash<unsigned long> {
std::size_t operator()(unsigned long) const;
};Descriptionstd::size_t operator()(unsigned long val) const;std::size_t operator()(long long) const;
};Descriptionstd::size_t operator()(long long val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned long long>3boost::hash<unsigned long long>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<unsigned long long>3boost::hash<unsigned long long>// In header: <boost/functional/hash.hpp>
-struct hash<unsigned long long> {
+struct hash<unsigned long long> {
std::size_t operator()(unsigned long long) const;
};Descriptionstd::size_t operator()(unsigned long long val) const;std::size_t operator()(double) const;
};Descriptionstd::size_t operator()(double val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<long double>3boost::hash<long double>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<long double>3boost::hash<long double>// In header: <boost/functional/hash.hpp>
-struct hash<long double> {
+struct hash<long double> {
std::size_t operator()(long double) const;
};Descriptionstd::size_t operator()(long double val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<std::string>3boost::hash<std::string>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<std::string>3boost::hash<std::string>// In header: <boost/functional/hash.hpp>
-struct hash<std::string> {
+struct hash<std::string> {
std::size_t operator()(std::string const&) const;
};Descriptionstd::size_t operator()(std::string const& val) const;Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<std::wstring>3boost::hash<std::wstring>// In header: <boost/functional/hash.hpp>
+ ?>Returns:Unspecified in TR1, except that equal arguments yield the same result.hash_value(val) in Boost.Throws:Doesn't throwStruct hash<std::wstring>3boost::hash<std::wstring>// In header: <boost/functional/hash.hpp>
-struct hash<std::wstring> {
+struct hash<std::wstring> {
std::size_t operator()(std::wstring const&) const;
};Descriptionstd::size_t operator()(std::wstring const& val) const;
-
-
-
-
-
+
diff --git a/xsl/docbook.xsl b/xsl/docbook.xsl
index c4d50c5..d7a1db7 100644
--- a/xsl/docbook.xsl
+++ b/xsl/docbook.xsl
@@ -431,12 +431,7 @@ Error: XSL template 'link-or-anchor' called with invalid link-type '
-
-
-
-
-
-
+
@@ -490,11 +485,7 @@ Error: XSL template 'link-or-anchor' called with invalid link-type '
-
-
-
-
-
+
@@ -503,11 +494,7 @@ Error: XSL template 'link-or-anchor' called with invalid link-type '
diff --git a/xsl/source-highlight.xsl b/xsl/source-highlight.xsl
index 4945e38..e38e462 100644
--- a/xsl/source-highlight.xsl
+++ b/xsl/source-highlight.xsl
@@ -542,9 +542,7 @@
-
-
-
+