diff --git a/example/Jamfile b/example/Jamfile
index e63b853..f0ffae7 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -99,25 +99,13 @@ make common.xsl : $(docca)/include/docca/common.xsl
make stage1.xsl : $(docca)/include/docca/stage1.xsl : @copy_script ;
make base-stage1.xsl : $(docca)/include/docca/base-stage1.xsl : @copy_script ;
make stage2.xsl : $(docca)/include/docca/stage2.xsl : @copy_script ;
+make base-stage2.xsl : $(docca)/include/docca/base-stage2.xsl : @copy_script ;
make assemble-quickbook.xsl : $(docca)/include/docca/assemble-quickbook.xsl : @copy_script ;
make emphasized-types.xsl : $(docca)/include/docca/emphasized-types.xsl : @copy_script ;
+make base-config.xsl : $(docca)/include/docca/base-config.xsl : @copy_script ;
-make config.xsl
- :
- $(docca)/include/docca/config.xsl
- xsl/config.xsl
- xsl/class_detail.xsl
- xsl/includes.xsl
- :
- @make_config
- ;
-
-actions make_config
-{
- cp $(2[1]) $(1)
- sed -i -e "//{r $(2[2])" -e "d}" $(1)
- sed -i -e "//{r $(2[4])" -e "d}" $(1)
-}
+# Copy the project-specific config XSLT
+make custom-overrides.xsl : xsl/custom-overrides.xsl : @copy_script ;
# Make a copy of the given file.
#
@@ -142,7 +130,8 @@ make xml-pages.xml
# Make bjam aware of additional dependencies
base-extract-xml-pages.xsl
- config.xsl
+ base-config.xsl
+ custom-overrides.xsl
common.xsl
:
saxonhe.saxonhe
@@ -173,7 +162,8 @@ make stage1/results
# additional dependencies
xml-pages.xml
base-stage1.xsl
- config.xsl
+ base-config.xsl
+ custom-overrides.xsl
common.xsl
:
saxonhe.saxonhe_dir
@@ -186,6 +176,10 @@ make stage2/results
# additional dependencies
emphasized-types.xsl
+ base-stage2.xsl
+ base-config.xsl
+ custom-overrides.xsl
+ common.xsl
:
saxonhe.saxonhe_dir
;
@@ -308,4 +302,4 @@ alias boostdoc ;
explicit boostdoc ;
alias boostrelease : json ;
-explicit boostrelease ;
\ No newline at end of file
+explicit boostrelease ;
diff --git a/example/xsl/class_detail.xsl b/example/xsl/class_detail.xsl
deleted file mode 100644
index a1c626b..0000000
--- a/example/xsl/class_detail.xsl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-__Allocator__
-__InputIterator__
-__ConstBufferSequence__
-__MutableBufferSequence__
-
diff --git a/example/xsl/config.xsl b/example/xsl/config.xsl
deleted file mode 100644
index 45119a6..0000000
--- a/example/xsl/config.xsl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/example/xsl/includes.xsl b/example/xsl/custom-overrides.xsl
similarity index 62%
rename from example/xsl/includes.xsl
rename to example/xsl/custom-overrides.xsl
index ea779b8..7f1a4d1 100644
--- a/example/xsl/includes.xsl
+++ b/example/xsl/custom-overrides.xsl
@@ -1,4 +1,13 @@
-
+
+
+
+
+
+
@@ -12,4 +21,5 @@
json.hpp
-
+
+
diff --git a/include/docca/config.xsl b/include/docca/base-config.xsl
similarity index 85%
rename from include/docca/config.xsl
rename to include/docca/base-config.xsl
index 8350e04..b45f5bd 100644
--- a/include/docca/config.xsl
+++ b/include/docca/base-config.xsl
@@ -5,7 +5,11 @@
exclude-result-prefixes="xs d"
expand-text="yes">
-
+
+
+
+
+
@@ -20,8 +24,6 @@
>Defined in header [include_file {substring-after(@file, 'include/')}]
-
-
diff --git a/include/docca/base-stage2.xsl b/include/docca/base-stage2.xsl
new file mode 100644
index 0000000..2f9a178
--- /dev/null
+++ b/include/docca/base-stage2.xsl
@@ -0,0 +1,236 @@
+
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {$nl}
+ [section:{tokenize(@id,'\.')[last()]} {d:qb-escape(title)}]
+
+
+
+
+ {$nl}[indexterm1 {d:qb-escape(@primary-index-term)}]{$nl}
+ {$nl}[indexterm2 {d:qb-escape(@primary-index-term)}..{
+ d:qb-escape(@secondary-index-term)}]{$nl}
+
+
+
+
+ {$nl}[heading {.}]
+
+
+
+
+
+
+
+
+
+ {$nl}```{$nl}
+ {$nl}```{$nl}
+
+
+
+ {$nl}{$nl}
+
+ {$nl}
+
+ ;
+
+
+ ;{$nl}
+
+ '''»''' [more...]
+
+ ``
+
+ ``
+
+
+ ``[link {$doc-ref}.{@d:refid} {d:qb-escape(.)}]``
+ [link {$doc-ref}.{@d:refid} {d:qb-escape(.)}]
+ [link {$doc-ref}.{@d:refid} `{d:qb-escape(.)}`]
+
+ `
+ `
+
+ enum
+
+ using
+ =
+ ;
+
+ ``['implementation-defined]``
+ ``['see-below]``
+ ``__deduced__``
+
+ {' '}
+ ;
+
+ {' '}
+
+ :{$nl}
+ {$nl}
+ ,
+
+ {' '}
+
+ template<
+ >{$nl}
+
+ {$nl}
+ ,
+
+ {' '}
+
+
+ (
+ )
+
+ __{translate(.,'_','')}__
+
+ =
+
+ {' '}
+
+
+ {$nl}
+
+
+ [role red error.{@message}]
+
+ {$nl}[table
+ {$nl}]
+
+
+ [
+ ]
+
+ {$nl} [
+ {$nl} ]
+
+ {$nl} [
+ {$nl} ]
+
+ [*
+ ]
+
+ ['
+ ]
+
+ [role {@class}
+ ]
+
+ [@{@url}
+ ]
+
+ {$nl}
+
+
+ {$nl}
+
+
+
+
+
+
+
+
+ {ancestor::listitem ! (1 to $list-indent-width) ! ' '}
+
+ *
+ #
+
+
+
+ ['
+ [role red \[Page type: [*{/*/@type}]\]]
+ [role green \[[@../../doc/html/{translate($doc-ref,'.','/')}/{
+ translate(/page/@id,'.','/')}.html [role green doc_build_html]]\]]
+ [@../build/xml-pages/{/page/@id}.xml [role blue [*\[doxygen_page_xml\]]]]
+ [@../build/stage1_visualized/visualized/{/page/@id}.html [role magenta ---stage1_visualized-->]]
+ [@../build/stage1_visualized/results/{ /page/@id}.xml [role blue [*\[docca_page_xml\]]]]
+ [@../build/stage2_visualized/visualized/{/page/@id}.html [role magenta ---stage2_visualized-->]]
+ [@../build/stage2_visualized/results/{ /page/@id}.txt [role blue [*\[quickbook_result\]]]]
+ ]
+
+
+
+ {$nl}
+
+ {' '}
+
+ {$nl}{$nl}
+
+ [br]
+
+ {$nl}```{$nl}
+ ```{$nl}
+
+ {$nl}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/include/docca/extract-xml-pages.xsl b/include/docca/extract-xml-pages.xsl
index cb6d149..6a3721d 100644
--- a/include/docca/extract-xml-pages.xsl
+++ b/include/docca/extract-xml-pages.xsl
@@ -5,8 +5,9 @@
exclude-result-prefixes="xs d">
+
-
-
+
+
diff --git a/include/docca/stage1.xsl b/include/docca/stage1.xsl
index ac44de5..b1331ca 100644
--- a/include/docca/stage1.xsl
+++ b/include/docca/stage1.xsl
@@ -5,7 +5,9 @@
expand-text="yes">
+
-
+
+
diff --git a/include/docca/stage2.xsl b/include/docca/stage2.xsl
index 405cdb2..6bd01b3 100644
--- a/include/docca/stage2.xsl
+++ b/include/docca/stage2.xsl
@@ -1,237 +1,12 @@
-
-]>
+ exclude-result-prefixes="xs">
-
+
+
-
-
-
-
-
-
-
-
-
-
- {$nl}
- [section:{tokenize(@id,'\.')[last()]} {d:qb-escape(title)}]
-
-
-
-
- {$nl}[indexterm1 {d:qb-escape(@primary-index-term)}]{$nl}
- {$nl}[indexterm2 {d:qb-escape(@primary-index-term)}..{
- d:qb-escape(@secondary-index-term)}]{$nl}
-
-
-
-
- {$nl}[heading {.}]
-
-
-
-
-
-
-
-
-
- {$nl}```{$nl}
- {$nl}```{$nl}
-
-
-
- {$nl}{$nl}
-
- {$nl}
-
- ;
-
-
- ;{$nl}
-
- '''»''' [more...]
-
- ``
-
- ``
-
-
- ``[link {$doc-ref}.{@d:refid} {d:qb-escape(.)}]``
- [link {$doc-ref}.{@d:refid} {d:qb-escape(.)}]
- [link {$doc-ref}.{@d:refid} `{d:qb-escape(.)}`]
-
- `
- `
-
- enum
-
- using
- =
- ;
-
- ``['implementation-defined]``
- ``['see-below]``
- ``__deduced__``
-
- {' '}
- ;
-
- {' '}
-
- :{$nl}
- {$nl}
- ,
-
- {' '}
-
- template<
- >{$nl}
-
- {$nl}
- ,
-
- {' '}
-
-
- (
- )
-
- __{translate(.,'_','')}__
-
- =
-
- {' '}
-
-
- {$nl}
-
-
- [role red error.{@message}]
-
- {$nl}[table
- {$nl}]
-
-
- [
- ]
-
- {$nl} [
- {$nl} ]
-
- {$nl} [
- {$nl} ]
-
- [*
- ]
-
- ['
- ]
-
- [role {@class}
- ]
-
- [@{@url}
- ]
-
- {$nl}
-
-
- {$nl}
-
-
-
-
-
-
-
-
- {ancestor::listitem ! (1 to $list-indent-width) ! ' '}
-
- *
- #
-
-
-
- ['
- [role red \[Page type: [*{/*/@type}]\]]
- [role green \[[@../../doc/html/{translate($doc-ref,'.','/')}/{
- translate(/page/@id,'.','/')}.html [role green doc_build_html]]\]]
- [@../build/xml-pages/{/page/@id}.xml [role blue [*\[doxygen_page_xml\]]]]
- [@../build/stage1_visualized/visualized/{/page/@id}.html [role magenta ---stage1_visualized-->]]
- [@../build/stage1_visualized/results/{ /page/@id}.xml [role blue [*\[docca_page_xml\]]]]
- [@../build/stage2_visualized/visualized/{/page/@id}.html [role magenta ---stage2_visualized-->]]
- [@../build/stage2_visualized/results/{ /page/@id}.txt [role blue [*\[quickbook_result\]]]]
- ]
-
-
-
- {$nl}
-
- {' '}
-
- {$nl}{$nl}
-
- [br]
-
- {$nl}```{$nl}
- ```{$nl}
-
- {$nl}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+