Skip to content

Commit d157311

Browse files
committed
Replace sed-based customization with XSLT import
fix boostorg/docca#40
1 parent 3a1efd2 commit d157311

File tree

6 files changed

+23
-40
lines changed

6 files changed

+23
-40
lines changed

doc/Jamfile

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,26 +101,13 @@ make common.xsl : $(docca)/include/docca/common.xsl
101101
make stage1.xsl : $(docca)/include/docca/stage1.xsl : @copy_script ;
102102
make base-stage1.xsl : $(docca)/include/docca/base-stage1.xsl : @copy_script ;
103103
make stage2.xsl : $(docca)/include/docca/stage2.xsl : @copy_script ;
104+
make base-stage2.xsl : $(docca)/include/docca/base-stage2.xsl : @copy_script ;
104105
make assemble-quickbook.xsl : $(docca)/include/docca/assemble-quickbook.xsl : @copy_script ;
105106
make emphasized-types.xsl : $(docca)/include/docca/emphasized-types.xsl : @copy_script ;
107+
make base-config.xsl : $(docca)/include/docca/base-config.xsl : @copy_script ;
106108

107-
make config.xsl
108-
:
109-
$(docca)/include/docca/config.xsl
110-
xsl/config.xsl
111-
xsl/class_detail.xsl
112-
xsl/includes.xsl
113-
:
114-
@make_config
115-
;
116-
117-
actions make_config
118-
{
119-
cp $(2[1]) $(1)
120-
sed -i -e "/<!-- CONFIG_TEMPLATE -->/{r $(2[2])" -e "d}" $(1)
121-
sed -i -e "/<!-- CLASS_DETAIL_TEMPLATE -->/{r $(2[3])" -e "d}" $(1)
122-
sed -i -e "/<!-- INCLUDES_TEMPLATE -->/{r $(2[4])" -e "d}" $(1)
123-
}
109+
# Copy the project-specific config XSLT
110+
make custom-overrides.xsl : xsl/custom-overrides.xsl : @copy_script ;
124111

125112
# Make a copy of the given file.
126113
#
@@ -145,7 +132,8 @@ make xml-pages.xml
145132

146133
# Make bjam aware of additional dependencies
147134
base-extract-xml-pages.xsl
148-
config.xsl
135+
base-config.xsl
136+
custom-overrides.xsl
149137
common.xsl
150138
:
151139
saxonhe.saxonhe
@@ -176,7 +164,8 @@ make stage1/results
176164
# additional dependencies
177165
xml-pages.xml
178166
base-stage1.xsl
179-
config.xsl
167+
base-config.xsl
168+
custom-overrides.xsl
180169
common.xsl
181170
:
182171
saxonhe.saxonhe_dir
@@ -189,6 +178,10 @@ make stage2/results
189178

190179
# additional dependencies
191180
emphasized-types.xsl
181+
base-stage2.xsl
182+
base-config.xsl
183+
custom-overrides.xsl
184+
common.xsl
192185
:
193186
saxonhe.saxonhe_dir
194187
;

doc/xsl/class_detail.xsl

Lines changed: 0 additions & 3 deletions
This file was deleted.

doc/xsl/config.xsl

Lines changed: 0 additions & 6 deletions
This file was deleted.

doc/xsl/custom-overrides.xsl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<xsl:stylesheet version="3.0"
2+
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
3+
xmlns:xs="http://www.w3.org/2001/XMLSchema"
4+
exclude-result-prefixes="xs"
5+
expand-text="yes">
6+
7+
<xsl:variable name="doc-ref" select="'static_string.ref'"/>
8+
<xsl:variable name="doc-ns" select="'boost::static_strings'"/>
9+
<xsl:variable name="include-private-members" select="false()"/>
10+
11+
</xsl:stylesheet>

doc/xsl/includes.xsl

Lines changed: 0 additions & 5 deletions
This file was deleted.

doc/xsl/includes_foot.xsl

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)