diff --git a/test/doxygen/autodoc.gold b/test/doxygen/autodoc.gold
index 0e70f73..95c8181 100644
--- a/test/doxygen/autodoc.gold
+++ b/test/doxygen/autodoc.gold
@@ -1,12 +1,60 @@
-Example ReferenceDocumentation for class example. intThis type has documentation. intThis type has documentation. longThis type has documentation. long doubleshortdoubleintintconst intintconst intintexample const &example const &
+Example Reference
+
+Documentation for class example. Detailed documentationvoid class_code_sample();
+ int
+
+This type has documentation. int
+This type has documentation. long
+This type has documentation. long double
+short
+double
+int
+int
+const int
+int
+const int
+
+int
+int
+int
+intintdefault_value
+intint(*)()volatile char
+intchar *")"volatile char
+intchar *"("volatile char
+intchar'('volatile char
+intchar')'volatile char
+intint(*)()volatile char
+intchar *")"volatile char
+intchar *"("volatile char
+intchar'('volatile char
+intchar')'volatile char
+void
+void
+void
+void
+void
+void
+void
+void
+void
+void
+int
+
+example const &
+example &example const &
+
+int
+int
+
+
A template parameter
intThis is a non-type template parameter
intThis is a template parameter with a default argument
Test some doxygen markupThis is just an example.
Embedded docbook list:
- 12
- Special Bold Typewriter Italics emphasis parameter
+12
+Special Bold Typewriter Italics emphasis parameter
Arg1 first argument.
Arg2 second argument.
@@ -15,19 +63,37 @@ Embedded docbook list:
Second list item
Line 1
- Line 2 void foo() {}
+ Line 2void foo() {}
- T *A constructor. A destructor. const specialization_test &An assignment operator. intintconst intconst intintintA function parameter intAnother
+ T *
+
+A constructor.
+A destructor.
+unspecifiedconst specialization_test &An assignment operator.
+
+int
+int
+const int
+const int
+voidintParameter description.
+void function_code_sample();
+
+intintA function parameter intAnother
This is a test function. Link to class Link to class template This is a note.
See Also:example::example and example_template
-i > jThe answer void
+i > jThe answer
+void
A template parameter
intThis is a non-type template parameter
Testing a function template.
-Documentation for macro example.
+
+
+Documentation for macro example.
+
+
\ No newline at end of file
diff --git a/test/doxygen/boost/example.hpp b/test/doxygen/boost/example.hpp
index acceb69..629a6d9 100644
--- a/test/doxygen/boost/example.hpp
+++ b/test/doxygen/boost/example.hpp
@@ -7,6 +7,12 @@
\class example::example
\brief Documentation for class example
+
+ Detailed documentation
+
+ \code{.cpp}
+ void class_code_sample();
+ \endcode
*/
/*!
@@ -23,6 +29,16 @@ enum global_enum { enumerator1 = 1, enumerator2 };
namespace example
{
+ /*!
+
+ \param x Parameter description.
+
+ \code{.cpp}
+ void function_code_sample();
+ \endcode
+ */
+ void free_function(int x);
+
int namespace_integer;
static int namespace_static_integer;
const int namespace_const_integer = 1;
@@ -34,6 +50,39 @@ namespace example
public:
example(example const&) = default;
example& operator=(example const&) = delete;
+ virtual int virtual_method();
+ virtual int virtual_abstract_method() = 0;
+ virtual int virtual_const_method() const;
+ int method_with_default_value(int = default_value);
+
+ int method_with_fp(int (*fp)(), volatile char);
+ int method_with_string_default1(char* = ")", volatile char);
+ int method_with_string_default2(char* = "(", volatile char);
+ int method_with_char_default1(char = '(', volatile char);
+ int method_with_char_default2(char = ')', volatile char);
+
+ int volatile_method_with_fp(int (*fp)(), volatile char) volatile;
+ int volatile_method_with_string_default1(char* = ")", volatile char) volatile;
+ int volatile_method_with_string_default2(char* = "(", volatile char) volatile;
+ int volatile_method_with_char_default1(char = '(', volatile char) volatile;
+ int volatile_method_with_char_default2(char = ')', volatile char) volatile;
+
+ void const_method() const;
+ void volatile_method() volatile;
+
+ void trad_noexcept() noexcept;
+ void trad_noexcept_if() noexcept(a == b && (c || d));
+ void boost_noexcept() BOOST_NOEXCEPT;
+ void boost_noexcept_if() BOOST_NOEXCEPT_IF(a == b && (c || d));
+
+ void trad_constexpr() constexpr;
+ void boost_constexpr() BOOST_CONSTEXPR;
+ void boost_constexpr_or_const() BOOST_CONSTEXPR_OR_CONST;
+
+ void constexpr_noexcept() constexpr noexcept;
+
+ static int static_method();
+ static int static_constexpr() constexpr;
int integer;
static int static_integer;
@@ -149,7 +198,7 @@ namespace example
/** A destructor. */
~specialization_test();
/** An assignment operator. */
- specialization_test& operator=(const specialization_test&);
+ detail::unspecified& operator=(const specialization_test&);
};
}
diff --git a/test/more/tests/syntax-highlight/language-attribute.gold b/test/more/tests/syntax-highlight/language-attribute.gold
new file mode 100644
index 0000000..9722d10
--- /dev/null
+++ b/test/more/tests/syntax-highlight/language-attribute.gold
@@ -0,0 +1,13 @@
+
+
+ Test language attribute
+ plain text
+ void main() {}
+ actions something ;
+
+
+ plain text
+ void main() {}
+ actions something ;
+
+
\ No newline at end of file
diff --git a/test/more/tests/syntax-highlight/language-attribute.xml b/test/more/tests/syntax-highlight/language-attribute.xml
new file mode 100644
index 0000000..e5891b4
--- /dev/null
+++ b/test/more/tests/syntax-highlight/language-attribute.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ Test language attribute
+ plain text
+ void main() {}
+ actions something ;
+
+
+ plain text
+ void main() {}
+ actions something ;
+
+
+
diff --git a/xsl/annotation.xsl b/xsl/annotation.xsl
index 93acd7c..1d9b79e 100644
--- a/xsl/annotation.xsl
+++ b/xsl/annotation.xsl
@@ -400,6 +400,14 @@
+
+
+
+
+
+
+
+
diff --git a/xsl/docbook.xsl b/xsl/docbook.xsl
index d7a1db7..12bef90 100644
--- a/xsl/docbook.xsl
+++ b/xsl/docbook.xsl
@@ -398,6 +398,10 @@ Error: XSL template 'link-or-anchor' called with invalid link-type '
+
+
+
+
@@ -454,6 +458,10 @@ Error: XSL template 'link-or-anchor' called with invalid link-type '
+
+
+
+
diff --git a/xsl/doxygen/doxygen2boostbook.xsl b/xsl/doxygen/doxygen2boostbook.xsl
index bb79f27..d3a21cf 100644
--- a/xsl/doxygen/doxygen2boostbook.xsl
+++ b/xsl/doxygen/doxygen2boostbook.xsl
@@ -202,6 +202,7 @@
+
+
@@ -301,6 +303,7 @@
+
@@ -387,6 +390,7 @@
+
@@ -400,6 +404,7 @@
+
@@ -518,6 +523,7 @@
+
@@ -717,29 +723,35 @@
+
+
+
+
+
+
@@ -750,21 +762,25 @@
+
+
+
+
@@ -776,22 +792,26 @@
+
+
+
+
@@ -968,6 +988,7 @@
+
@@ -1038,6 +1059,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1125,6 +1302,7 @@
+
@@ -1164,20 +1342,10 @@
explicit
-
-
-
-
-
- = delete
-
-
- = default
-
-
-
+
+
@@ -1185,41 +1353,21 @@
+
-
-
-
-
- const
-
-
-
-
-
- volatile
-
-
-
-
-
-
- = delete
-
-
-
-
-
- = default
-
-
-
+
+
+
+
+
+
@@ -1228,32 +1376,7 @@
conversion-operator
-
-
-
-
-
- const
-
-
-
-
-
- volatile
-
-
-
-
-
-
- = delete
-
-
-
-
-
- explicit
-
+
@@ -1262,6 +1385,7 @@
+
@@ -1270,45 +1394,16 @@
-
-
-
-
-
- const
-
-
-
-
-
- volatile
-
-
-
-
-
-
- = default
-
-
-
+
-
-
- static
-
-
-
- virtual
-
-
+
@@ -1336,6 +1431,7 @@
+
@@ -1612,7 +1708,7 @@
-
+
diff --git a/xsl/fo.xsl b/xsl/fo.xsl
index 422811c..7a036b9 100644
--- a/xsl/fo.xsl
+++ b/xsl/fo.xsl
@@ -216,13 +216,105 @@
-
+ text-align
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- January
- February
- March
- April
- May
- June
- July
- August
- September
- October
- November
- December
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- January
- February
- March
- April
- May
- June
- July
- August
- September
- October
- November
- December
-
-
-
-
-
-
-
-
-