metanorma-iho 0.6.11 → 0.6.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iho/html/htmlstyle.css +6 -0
  3. data/lib/isodoc/iho/html/wordstyle.css +150 -0
  4. data/lib/isodoc/iho/html/wordstyle.scss +144 -0
  5. data/lib/isodoc/iho/i18n-en.yaml +1 -0
  6. data/lib/isodoc/iho/iho.specification.xsl +732 -317
  7. data/lib/isodoc/iho/iho.standard.xsl +732 -317
  8. data/lib/metanorma/iho/biblio.rng +5 -0
  9. data/lib/metanorma/iho/boilerplate.xml +1 -1
  10. data/lib/metanorma/iho/isodoc.rng +47 -13
  11. data/lib/metanorma/iho/processor.rb +1 -0
  12. data/lib/metanorma/iho/version.rb +1 -1
  13. data/metanorma-iho.gemspec +3 -2
  14. metadata +4 -11
  15. data/.github/workflows/automerge.yml +0 -31
  16. data/.github/workflows/rake.yml +0 -15
  17. data/.github/workflows/release.yml +0 -24
  18. data/Rakefile +0 -8
  19. data/bin/console +0 -14
  20. data/bin/rspec +0 -18
  21. data/bin/setup +0 -8
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -6,9 +6,17 @@
6
6
 
7
7
  <xsl:variable name="debug">false</xsl:variable>
8
8
 
9
- <xsl:variable name="title-en" select="/iho:iho-standard/iho:bibdata/iho:title[@language = 'en']"/>
9
+ <xsl:variable name="title-en">
10
+ <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:title[@language = 'en']/node()"/>
11
+ </xsl:variable>
10
12
  <xsl:variable name="docidentifier" select="/iho:iho-standard/iho:bibdata/iho:docidentifier[@type = 'IHO']"/>
11
13
  <xsl:variable name="copyrightText" select="concat('© International Hydrographic Association ', /iho:iho-standard/iho:bibdata/iho:copyright/iho:from ,' – All rights reserved')"/>
14
+ <xsl:variable name="edition">
15
+ <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:edition[normalize-space(@language) = '']"/>
16
+ </xsl:variable>
17
+ <xsl:variable name="month_year">
18
+ <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:date[@type = 'published']"/>
19
+ </xsl:variable>
12
20
 
13
21
  <!-- Example:
14
22
  <item level="1" id="Foreword" display="true">Foreword</item>
@@ -43,42 +51,50 @@
43
51
  <fo:simple-page-master master-name="first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
44
52
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
45
53
  <fo:region-before region-name="header" extent="{$marginTop}mm"/>
46
- <fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/>
54
+ <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
47
55
  <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
48
56
  <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
49
57
  </fo:simple-page-master>
50
58
  <fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
51
59
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
52
60
  <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
53
- <fo:region-after region-name="footer-odd" extent="{$marginBottom}mm"/>
61
+ <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
54
62
  <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
55
63
  <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
56
64
  </fo:simple-page-master>
57
65
  <fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
58
66
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
59
67
  <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
60
- <fo:region-after region-name="footer-odd" extent="{$marginBottom}mm"/>
68
+ <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
61
69
  <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
62
70
  <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
63
71
  </fo:simple-page-master>
64
72
  <fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
65
73
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
66
74
  <fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
67
- <fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/>
75
+ <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
68
76
  <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
69
77
  <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
70
78
  </fo:simple-page-master>
71
79
  <fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
72
80
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
73
81
  <fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
74
- <fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/>
82
+ <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
83
+ <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
84
+ <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
85
+ </fo:simple-page-master>
86
+ <fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
87
+ <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
88
+ <fo:region-before region-name="header-blank" extent="{$marginTop}mm"/>
89
+ <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
75
90
  <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
76
91
  <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
77
92
  </fo:simple-page-master>
78
93
  <!-- Preface pages -->
79
94
  <fo:page-sequence-master master-name="preface">
80
95
  <fo:repeatable-page-master-alternatives>
81
- <fo:conditional-page-master-reference master-reference="first" page-position="first"/>
96
+ <!-- <fo:conditional-page-master-reference master-reference="first" page-position="first"/> -->
97
+ <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
82
98
  <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
83
99
  <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
84
100
  </fo:repeatable-page-master-alternatives>
@@ -86,18 +102,21 @@
86
102
  <!-- Document pages -->
87
103
  <fo:page-sequence-master master-name="document">
88
104
  <fo:repeatable-page-master-alternatives>
105
+ <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
89
106
  <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
90
107
  <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
91
108
  </fo:repeatable-page-master-alternatives>
92
109
  </fo:page-sequence-master>
93
110
  <fo:page-sequence-master master-name="document-portrait">
94
111
  <fo:repeatable-page-master-alternatives>
112
+ <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
95
113
  <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
96
114
  <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
97
115
  </fo:repeatable-page-master-alternatives>
98
116
  </fo:page-sequence-master>
99
117
  <fo:page-sequence-master master-name="document-landscape">
100
118
  <fo:repeatable-page-master-alternatives>
119
+ <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
101
120
  <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
102
121
  <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
103
122
  </fo:repeatable-page-master-alternatives>
@@ -116,20 +135,18 @@
116
135
  <!-- Cover Page -->
117
136
  <fo:page-sequence master-reference="cover">
118
137
  <fo:flow flow-name="xsl-region-body">
119
- <fo:block-container position="absolute" left="14.25mm" top="28.20mm">
138
+ <fo:block-container position="absolute" left="14.25mm" top="12mm" id="__internal_layout__coverpage_{generate-id()}">
120
139
  <fo:table table-layout="fixed" width="181.1mm">
121
140
  <fo:table-column column-width="26mm"/>
122
- <fo:table-column column-width="45.3mm"/>
123
- <fo:table-column column-width="109.8mm"/>
141
+ <fo:table-column column-width="19.4mm"/>
142
+ <fo:table-column column-width="135.7mm"/>
124
143
  <fo:table-body>
125
144
  <fo:table-row>
126
145
  <fo:table-cell><fo:block> </fo:block></fo:table-cell>
127
146
  <fo:table-cell>
128
- <fo:block-container width="45.3mm" height="19.3mm" background-color="rgb(241, 234, 202)" text-align="center" display-align="center" font-weight="bold">
147
+ <fo:block-container width="19.4mm" height="21mm" background-color="rgb(241, 234, 202)" border-bottom="0.05pt solid rgb(0, 21, 50)" text-align="center" display-align="center" font-size="10pt" font-weight="bold">
129
148
  <fo:block>
130
149
  <xsl:value-of select="$docidentifier"/>
131
- <xsl:text> </xsl:text>
132
- <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:edition[normalize-space(@language) = '']"/>
133
150
  </fo:block>
134
151
  </fo:block-container>
135
152
  </fo:table-cell>
@@ -141,11 +158,24 @@
141
158
  <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IHO))}" width="25.9mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IHO"/>
142
159
  </fo:block>
143
160
  </fo:table-cell>
144
- <fo:table-cell number-columns-spanned="2" border="0.5pt solid rgb(0, 21, 50)">
145
- <fo:block-container height="154.4mm" text-align="center" display-align="center">
146
- <fo:block font-size="28pt" font-weight="bold" color="rgb(0, 0, 76)" role="H1">
147
- <xsl:value-of select="$title-en"/>
148
- </fo:block>
161
+ <fo:table-cell number-columns-spanned="2" border="0.5pt solid rgb(0, 21, 50)" font-weight="bold" color="rgb(0, 0, 76)" padding-top="3mm">
162
+ <fo:block-container height="165mm" width="115mm">
163
+ <fo:block-container margin-left="10mm">
164
+ <fo:block-container margin-left="0mm">
165
+ <fo:block-container display-align="center" height="90mm">
166
+ <fo:block font-size="28pt" role="H1" line-height="115%">
167
+ <xsl:copy-of select="$title-en"/>
168
+ </fo:block>
169
+ </fo:block-container>
170
+ <fo:block font-size="14pt">
171
+ <xsl:value-of select="$edition"/>
172
+ <xsl:if test="normalize-space($month_year) != ''">
173
+ <xsl:text> – </xsl:text>
174
+ <xsl:value-of select="$month_year"/>
175
+ </xsl:if>
176
+ </fo:block>
177
+ </fo:block-container>
178
+ </fo:block-container>
149
179
  </fo:block-container>
150
180
  </fo:table-cell>
151
181
  </fo:table-row>
@@ -161,10 +191,12 @@
161
191
  </fo:block>
162
192
  </fo:table-cell>
163
193
  <fo:table-cell>
164
- <fo:block-container width="79.2mm" height="66.3mm" margin-left="30.6mm" background-color="rgb(0, 172, 158)" text-align="right" display-align="after">
165
- <fo:block font-size="8pt" color="white" margin-left="-30mm" margin-right="5mm" margin-bottom="9mm">
166
- <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/iho:feedback-statement"/>
167
- </fo:block>
194
+ <fo:block-container width="79mm" height="72mm" margin-left="56.8mm" background-color="rgb(0, 172, 158)" text-align="right" display-align="after">
195
+ <fo:block-container margin-left="0mm">
196
+ <fo:block font-size="8pt" color="white" margin-right="5mm" margin-bottom="5mm" line-height-shift-adjustment="disregard-shifts">
197
+ <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/iho:feedback-statement"/>
198
+ </fo:block>
199
+ </fo:block-container>
168
200
  </fo:block-container>
169
201
  </fo:table-cell>
170
202
  </fo:table-row>
@@ -188,101 +220,109 @@
188
220
  <xsl:with-param name="font-weight">normal</xsl:with-param>
189
221
  </xsl:call-template>
190
222
  <fo:flow flow-name="xsl-region-body">
191
- <fo:block> </fo:block>
192
- <fo:block break-after="page"/>
193
- <fo:block-container margin-left="7.5mm" margin-right="-2mm">
194
- <fo:block-container margin-left="0mm" margin-right="0mm" border="0.5pt solid black" padding-top="1mm" padding-left="1.8mm" padding-right="1mm">
195
- <fo:block>
196
- <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/*[local-name() != 'feedback-statement']"/>
197
- </fo:block>
223
+
224
+ <fo:block-container margin-left="-1.5mm" margin-right="-1mm">
225
+ <fo:block-container margin-left="0mm" margin-right="0mm" border="0.5pt solid black">
226
+ <fo:block-container margin-top="6.5mm" margin-left="7.5mm" margin-right="8.5mm" margin-bottom="7.5mm">
227
+ <fo:block-container margin="0">
228
+ <fo:block text-align="justify">
229
+ <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/*[local-name() != 'feedback-statement']"/>
230
+ </fo:block>
231
+ </fo:block-container>
232
+ </fo:block-container>
198
233
  </fo:block-container>
199
234
  </fo:block-container>
200
235
 
201
236
  <fo:block break-after="page"/>
202
237
 
203
238
  <!-- Table of Contents -->
204
- <fo:block-container margin-right="-12.7mm">
205
- <fo:block-container margin-right="0mm">
206
- <fo:block role="TOC">
207
- <fo:block color="rgb(14, 36, 133)" margin-bottom="15.5pt" role="H1">
208
- <xsl:variable name="title-toc">
209
- <xsl:call-template name="getTitle">
210
- <xsl:with-param name="name" select="'title-toc'"/>
211
- </xsl:call-template>
212
- </xsl:variable>
213
- <xsl:value-of select="$title-toc"/>
239
+ <fo:block role="TOC">
240
+ <fo:block font-weight="bold" margin-bottom="7.5pt" role="H1" font-size="12pt" margin-top="4pt">
241
+ <fo:block-container width="18.3mm" border-bottom="1.25pt solid black">
242
+ <fo:block line-height="75%">
243
+ <xsl:call-template name="getLocalizedString">
244
+ <xsl:with-param name="key">table_of_contents</xsl:with-param>
245
+ </xsl:call-template>
214
246
  </fo:block>
215
- <xsl:if test="$debug = 'true'">
216
- <xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
217
- DEBUG
218
- contents=<xsl:copy-of select="$contents"/>
219
- <xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
220
- </xsl:if>
221
-
222
- <xsl:for-each select="$contents//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
223
- <fo:block role="TOCI">
224
- <xsl:if test="@level = 1">
225
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
226
- </xsl:if>
227
-
228
- <fo:list-block>
247
+ </fo:block-container>
248
+ </fo:block>
249
+ <xsl:if test="$debug = 'true'">
250
+ <xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
251
+ DEBUG
252
+ contents=<xsl:copy-of select="$contents"/>
253
+ <xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
254
+ </xsl:if>
229
255
 
230
- <xsl:attribute name="provisional-distance-between-starts">
231
- <xsl:choose>
232
- <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
233
- <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
234
- <xsl:when test="@level &gt;= 1 and not(@type = 'annex')">10mm</xsl:when>
235
- <xsl:otherwise>0mm</xsl:otherwise>
236
- </xsl:choose>
237
- </xsl:attribute>
238
- <fo:list-item>
239
- <fo:list-item-label end-indent="label-end()">
240
- <fo:block>
241
- <xsl:if test="@section != '' and not(@type = 'annex')"> <!-- output below -->
242
- <xsl:value-of select="@section"/>
243
- </xsl:if>
256
+ <fo:block line-height="115%">
257
+
258
+ <xsl:for-each select="$contents//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
259
+ <fo:block role="TOCI">
260
+ <!-- <xsl:if test="@level = 1">
261
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
262
+ </xsl:if> -->
263
+
264
+ <fo:list-block>
265
+
266
+ <xsl:attribute name="provisional-distance-between-starts">
267
+ <xsl:choose>
268
+ <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
269
+ <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
270
+ <xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
271
+ <xsl:choose>
272
+ <xsl:when test="$toc_level = 3">12.9mm</xsl:when>
273
+ <xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
274
+ <xsl:otherwise>10mm</xsl:otherwise>
275
+ </xsl:choose>
276
+ </xsl:when>
277
+ <xsl:otherwise>0mm</xsl:otherwise>
278
+ </xsl:choose>
279
+ </xsl:attribute>
280
+ <fo:list-item>
281
+ <fo:list-item-label end-indent="label-end()">
282
+ <fo:block>
283
+ <xsl:if test="@section != '' and not(@type = 'annex')"> <!-- output below -->
284
+ <xsl:value-of select="@section"/>
285
+ </xsl:if>
286
+ </fo:block>
287
+ </fo:list-item-label>
288
+ <fo:list-item-body start-indent="body-start()">
289
+ <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
290
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
291
+ <xsl:apply-templates select="title"/>
292
+ <fo:inline keep-together.within-line="always">
293
+ <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
294
+ <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
295
+ </fo:inline>
296
+ </fo:basic-link>
244
297
  </fo:block>
245
- </fo:list-item-label>
246
- <fo:list-item-body start-indent="body-start()">
247
- <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
248
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
249
- <xsl:apply-templates select="title"/>
250
- <fo:inline keep-together.within-line="always">
251
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
252
- <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
253
- </fo:inline>
254
- </fo:basic-link>
255
- </fo:block>
256
- </fo:list-item-body>
257
- </fo:list-item>
258
- </fo:list-block>
259
- </fo:block>
260
-
261
- </xsl:for-each>
298
+ </fo:list-item-body>
299
+ </fo:list-item>
300
+ </fo:list-block>
301
+ </fo:block>
262
302
 
263
- <!-- List of Tables -->
264
- <xsl:if test="$contents//tables/table">
265
- <xsl:call-template name="insertListOf_Title">
266
- <xsl:with-param name="title" select="$title-list-tables"/>
267
- </xsl:call-template>
268
- <xsl:for-each select="$contents//tables/table">
269
- <xsl:call-template name="insertListOf_Item"/>
270
- </xsl:for-each>
271
- </xsl:if>
303
+ </xsl:for-each>
272
304
 
273
- <!-- List of Figures -->
274
- <xsl:if test="$contents//figures/figure">
275
- <xsl:call-template name="insertListOf_Title">
276
- <xsl:with-param name="title" select="$title-list-figures"/>
277
- </xsl:call-template>
278
- <xsl:for-each select="$contents//figures/figure">
279
- <xsl:call-template name="insertListOf_Item"/>
280
- </xsl:for-each>
281
- </xsl:if>
305
+ <!-- List of Tables -->
306
+ <xsl:if test="$contents//tables/table">
307
+ <xsl:call-template name="insertListOf_Title">
308
+ <xsl:with-param name="title" select="$title-list-tables"/>
309
+ </xsl:call-template>
310
+ <xsl:for-each select="$contents//tables/table">
311
+ <xsl:call-template name="insertListOf_Item"/>
312
+ </xsl:for-each>
313
+ </xsl:if>
282
314
 
283
- </fo:block>
284
- </fo:block-container>
285
- </fo:block-container>
315
+ <!-- List of Figures -->
316
+ <xsl:if test="$contents//figures/figure">
317
+ <xsl:call-template name="insertListOf_Title">
318
+ <xsl:with-param name="title" select="$title-list-figures"/>
319
+ </xsl:call-template>
320
+ <xsl:for-each select="$contents//figures/figure">
321
+ <xsl:call-template name="insertListOf_Item"/>
322
+ </xsl:for-each>
323
+ </xsl:if>
324
+ </fo:block>
325
+ </fo:block>
286
326
 
287
327
  <!-- Foreword, Introduction -->
288
328
  <xsl:call-template name="processPrefaceSectionsDefault"/>
@@ -305,7 +345,7 @@
305
345
  <fo:flow flow-name="xsl-region-body">
306
346
  <fo:block-container>
307
347
 
308
- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block>
348
+ <!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> -->
309
349
 
310
350
  <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
311
351
  <!-- Normative references -->
@@ -360,7 +400,7 @@
360
400
  </fo:root>
361
401
  </xsl:variable>
362
402
 
363
- <xsl:apply-templates select="xalan:nodeset($xslfo)" mode="step2"/>
403
+ <xsl:apply-templates select="xalan:nodeset($xslfo)" mode="landscape_portrait"/>
364
404
 
365
405
  </xsl:template>
366
406
 
@@ -400,6 +440,7 @@
400
440
 
401
441
  <xsl:variable name="display">
402
442
  <xsl:choose>
443
+ <xsl:when test="@id = '_document_history' or iho:title = 'Document History'">false</xsl:when>
403
444
  <xsl:when test="$level &lt;= $toc_level">true</xsl:when>
404
445
  <xsl:otherwise>false</xsl:otherwise>
405
446
  </xsl:choose>
@@ -460,10 +501,23 @@
460
501
  <xsl:apply-templates/>
461
502
  </xsl:template>
462
503
 
504
+ <xsl:template match="/iho:iho-standard/iho:bibdata/iho:date[@type = 'published']">
505
+ <xsl:call-template name="convertDate">
506
+ <xsl:with-param name="date" select="."/>
507
+ <xsl:with-param name="format" select="'short'"/>
508
+ </xsl:call-template>
509
+ </xsl:template>
510
+
463
511
  <xsl:template match="iho:feedback-statement//iho:br" priority="2">
464
512
  <fo:block/>
465
513
  </xsl:template>
466
514
 
515
+ <xsl:template match="iho:feedback-statement//iho:sup" priority="2">
516
+ <fo:inline font-size="62%" baseline-shift="35%">
517
+ <xsl:apply-templates/>
518
+ </fo:inline>
519
+ </xsl:template>
520
+
467
521
  <xsl:template match="node()">
468
522
  <xsl:apply-templates/>
469
523
  </xsl:template>
@@ -473,7 +527,7 @@
473
527
  <!-- ====== -->
474
528
 
475
529
  <xsl:template match="iho:annex/iho:title">
476
- <fo:block font-size="13pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always" role="H1">
530
+ <fo:block font-size="12pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always" role="H1">
477
531
  <xsl:apply-templates/>
478
532
  <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
479
533
  </fo:block>
@@ -485,6 +539,23 @@
485
539
  </fo:block>
486
540
  </xsl:template>
487
541
 
542
+ <xsl:template match="*[local-name() = 'clause']" priority="3">
543
+ <xsl:if test="parent::iho:preface">
544
+ <fo:block break-after="page"/>
545
+ </xsl:if>
546
+ <xsl:choose>
547
+ <xsl:when test="iho:title">
548
+ <xsl:apply-templates/>
549
+ </xsl:when>
550
+ <xsl:otherwise>
551
+ <fo:block>
552
+ <xsl:call-template name="setId"/>
553
+ <xsl:apply-templates/>
554
+ </fo:block>
555
+ </xsl:otherwise>
556
+ </xsl:choose>
557
+ </xsl:template>
558
+
488
559
  <xsl:template match="iho:title" name="title">
489
560
 
490
561
  <xsl:variable name="level">
@@ -493,9 +564,9 @@
493
564
 
494
565
  <xsl:variable name="font-size">
495
566
  <xsl:choose>
496
- <xsl:when test="$level = 1">13pt</xsl:when>
497
- <xsl:when test="$level = 2">12pt</xsl:when>
498
- <xsl:when test="$level &gt;= 3">11pt</xsl:when>
567
+ <xsl:when test="$level = 1">12pt</xsl:when>
568
+ <xsl:when test="$level = 2">11pt</xsl:when>
569
+ <xsl:when test="$level &gt;= 3">10pt</xsl:when>
499
570
  <xsl:otherwise>12pt</xsl:otherwise>
500
571
  </xsl:choose>
501
572
  </xsl:variable>
@@ -508,24 +579,38 @@
508
579
  </xsl:variable>
509
580
 
510
581
  <xsl:element name="{$element-name}">
582
+ <xsl:for-each select="parent::*[local-name() = 'clause']">
583
+ <xsl:call-template name="setId"/>
584
+ </xsl:for-each>
511
585
  <xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
586
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
512
587
  <xsl:attribute name="space-before">
513
588
  <xsl:choose>
514
- <xsl:when test="$level = 1">13.5pt</xsl:when>
515
- <xsl:when test="$level &gt;= 2">3pt</xsl:when>
589
+ <xsl:when test="$level = 1">24pt</xsl:when>
590
+ <xsl:when test="$level = 2 and ../preceding-sibling::*[1][self::iho:title]">10pt</xsl:when>
591
+ <xsl:when test="$level = 2">24pt</xsl:when>
592
+ <xsl:when test="$level &gt;= 3">6pt</xsl:when>
516
593
  <xsl:when test="ancestor::iho:preface">8pt</xsl:when>
517
- <xsl:when test="$level = 2 and ancestor::iho:annex">18pt</xsl:when>
518
- <xsl:when test="$level = 1">18pt</xsl:when>
519
594
  <xsl:when test="$level = ''">6pt</xsl:when><!-- 13.5pt -->
520
595
  <xsl:otherwise>12pt</xsl:otherwise>
521
596
  </xsl:choose>
522
597
  </xsl:attribute>
523
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
598
+ <xsl:attribute name="space-after">
599
+ <xsl:choose>
600
+ <xsl:when test="$level &gt;= 3">6pt</xsl:when>
601
+ <xsl:otherwise>10pt</xsl:otherwise>
602
+ </xsl:choose>
603
+ </xsl:attribute>
604
+ <!-- <xsl:attribute name="margin-bottom">10pt</xsl:attribute> -->
524
605
 
525
606
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
526
607
 
527
608
  <xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
528
609
 
610
+ <xsl:if test="../@id = '_document_history' or . = 'Document History'">
611
+ <xsl:attribute name="text-align">center</xsl:attribute>
612
+ </xsl:if>
613
+
529
614
  <xsl:apply-templates/>
530
615
  <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
531
616
  </xsl:element>
@@ -557,21 +642,36 @@
557
642
  <xsl:choose>
558
643
  <xsl:when test="ancestor::iho:quote">justify</xsl:when>
559
644
  <xsl:when test="ancestor::iho:feedback-statement">right</xsl:when>
645
+ <xsl:when test="ancestor::iho:boilerplate and not(@align)">justify</xsl:when>
560
646
  <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
561
647
  <xsl:when test="ancestor::iho:td/@align"><xsl:value-of select="ancestor::iho:td/@align"/></xsl:when>
562
648
  <xsl:when test="ancestor::iho:th/@align"><xsl:value-of select="ancestor::iho:th/@align"/></xsl:when>
563
- <xsl:otherwise>left</xsl:otherwise>
649
+ <xsl:otherwise>justify</xsl:otherwise>
564
650
  </xsl:choose>
565
651
  </xsl:attribute>
566
- <xsl:attribute name="space-after">12pt</xsl:attribute>
652
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
567
653
  <xsl:if test="parent::iho:dd">
568
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
654
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
569
655
  </xsl:if>
570
656
  <xsl:if test="ancestor::*[2][local-name() = 'license-statement'] and not(following-sibling::iho:p)">
571
657
  <xsl:attribute name="space-after">0pt</xsl:attribute>
572
658
  </xsl:if>
573
659
  <xsl:attribute name="line-height">115%</xsl:attribute>
574
660
  <!-- <xsl:attribute name="border">1pt solid red</xsl:attribute> -->
661
+ <xsl:if test="ancestor::iho:boilerplate and not(ancestor::iho:feedback-statement)">
662
+ <xsl:attribute name="line-height">125%</xsl:attribute>
663
+ <xsl:attribute name="space-after">14pt</xsl:attribute>
664
+ </xsl:if>
665
+ <xsl:if test="following-sibling::*[1][self::iho:ol or self::iho:ul or self::iho:note or self::iho:termnote or self::iho:example or self::iho:dl]">
666
+ <xsl:attribute name="space-after">3pt</xsl:attribute>
667
+ </xsl:if>
668
+ <xsl:if test="following-sibling::*[1][self::iho:dl]">
669
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
670
+ </xsl:if>
671
+ <xsl:if test="ancestor::iho:quote">
672
+ <xsl:attribute name="line-height">130%</xsl:attribute>
673
+ <!-- <xsl:attribute name="margin-bottom">12pt</xsl:attribute> -->
674
+ </xsl:if>
575
675
 
576
676
  <xsl:if test=".//iho:fn">
577
677
  <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
@@ -599,11 +699,11 @@
599
699
  </xsl:template>
600
700
 
601
701
  <!-- note in list item -->
602
- <xsl:template match="iho:ul//iho:note | iho:ol//iho:note" priority="2">
702
+ <!-- <xsl:template match="iho:ul//iho:note | iho:ol//iho:note" priority="2">
603
703
  <fo:block id="{@id}">
604
- <xsl:apply-templates/>
704
+ <xsl:apply-templates />
605
705
  </fo:block>
606
- </xsl:template>
706
+ </xsl:template> -->
607
707
 
608
708
  <xsl:template match="iho:li//iho:p//text()">
609
709
  <xsl:choose>
@@ -616,15 +716,15 @@
616
716
  </xsl:choose>
617
717
  </xsl:template>
618
718
 
619
- <xsl:template match="iho:example/iho:p" priority="2">
719
+ <!-- <xsl:template match="iho:example/iho:p" priority="2">
620
720
  <fo:block-container xsl:use-attribute-sets="example-p-style">
621
721
  <fo:block-container margin-left="0mm">
622
722
  <fo:block>
623
- <xsl:apply-templates/>
723
+ <xsl:apply-templates />
624
724
  </fo:block>
625
725
  </fo:block-container>
626
726
  </fo:block-container>
627
- </xsl:template>
727
+ </xsl:template> -->
628
728
 
629
729
  <xsl:template match="iho:pagebreak" priority="2">
630
730
  <xsl:copy-of select="."/>
@@ -636,108 +736,77 @@
636
736
  <xsl:template name="insertHeaderFooter">
637
737
  <xsl:param name="font-weight" select="'bold'"/>
638
738
  <fo:static-content flow-name="header-odd" role="artifact">
639
- <fo:block-container height="100%">
640
- <fo:block padding-top="12.5mm" text-align="right">
641
- <xsl:value-of select="$docidentifier"/>
739
+ <fo:block-container height="100%" font-size="8pt">
740
+ <fo:block padding-top="12.5mm">
741
+ <fo:table table-layout="fixed" width="100%">
742
+ <fo:table-column column-width="proportional-column-width(1)"/>
743
+ <fo:table-column column-width="proportional-column-width(10)"/>
744
+ <fo:table-column column-width="proportional-column-width(1)"/>
745
+ <fo:table-body>
746
+ <fo:table-row>
747
+ <fo:table-cell><fo:block> </fo:block></fo:table-cell>
748
+ <fo:table-cell text-align="center"><fo:block><xsl:copy-of select="$title-en"/></fo:block></fo:table-cell>
749
+ <fo:table-cell text-align="right"><fo:block><fo:page-number/></fo:block></fo:table-cell>
750
+ </fo:table-row>
751
+ </fo:table-body>
752
+ </fo:table>
642
753
  </fo:block>
643
754
  </fo:block-container>
644
755
  </fo:static-content>
645
- <fo:static-content flow-name="footer-odd" role="artifact">
646
- <fo:block-container height="100%" margin-right="-10mm" display-align="after">
647
- <fo:block-container margin-right="0mm">
648
- <fo:block padding-bottom="17mm" font-size="10pt" text-align-last="justify">
649
- <fo:inline><xsl:value-of select="$copyrightText"/></fo:inline>
650
- <fo:inline keep-together.within-line="always">
651
- <fo:leader leader-pattern="space"/>
652
- <fo:inline font-weight="{$font-weight}"><fo:page-number/></fo:inline>
653
- </fo:inline>
654
- </fo:block>
655
- </fo:block-container>
656
- </fo:block-container>
657
- </fo:static-content>
658
756
  <fo:static-content flow-name="header-even" role="artifact">
659
- <fo:block-container height="100%">
757
+ <fo:block-container height="100%" font-size="8pt">
660
758
  <fo:block padding-top="12.5mm">
661
- <xsl:value-of select="$docidentifier"/>
759
+ <fo:table table-layout="fixed" width="100%">
760
+ <fo:table-column column-width="proportional-column-width(1)"/>
761
+ <fo:table-column column-width="proportional-column-width(10)"/>
762
+ <fo:table-column column-width="proportional-column-width(1)"/>
763
+ <fo:table-body>
764
+ <fo:table-row>
765
+ <fo:table-cell><fo:block><fo:page-number/></fo:block></fo:table-cell>
766
+ <fo:table-cell text-align="center"><fo:block><xsl:copy-of select="$title-en"/></fo:block></fo:table-cell>
767
+ <fo:table-cell><fo:block> </fo:block></fo:table-cell>
768
+ </fo:table-row>
769
+ </fo:table-body>
770
+ </fo:table>
662
771
  </fo:block>
663
772
  </fo:block-container>
664
773
  </fo:static-content>
665
- <fo:static-content flow-name="footer-even" role="artifact">
666
- <fo:block-container height="100%" margin-right="-10mm" display-align="after">
667
- <fo:block-container margin-right="0mm">
668
- <fo:block padding-bottom="17mm" font-size="10pt" text-align-last="justify">
669
- <fo:inline font-weight="{$font-weight}"><fo:page-number/></fo:inline>
670
- <fo:inline keep-together.within-line="always">
671
- <fo:leader leader-pattern="space"/>
672
- <xsl:value-of select="$copyrightText"/>
673
- </fo:inline>
674
- </fo:block>
675
- </fo:block-container>
774
+ <fo:static-content flow-name="header-blank" role="artifact">
775
+ <fo:block-container height="100%" font-size="8pt">
776
+ <fo:block padding-top="12.5mm">
777
+ <fo:table table-layout="fixed" width="100%">
778
+ <fo:table-column column-width="proportional-column-width(1)"/>
779
+ <fo:table-column column-width="proportional-column-width(10)"/>
780
+ <fo:table-column column-width="proportional-column-width(1)"/>
781
+ <fo:table-body>
782
+ <fo:table-row>
783
+ <fo:table-cell><fo:block><fo:page-number/></fo:block></fo:table-cell>
784
+ <fo:table-cell text-align="center"><fo:block><xsl:copy-of select="$title-en"/></fo:block></fo:table-cell>
785
+ <fo:table-cell><fo:block> </fo:block></fo:table-cell>
786
+ </fo:table-row>
787
+ </fo:table-body>
788
+ </fo:table>
789
+ </fo:block>
790
+ </fo:block-container>
791
+ <fo:block-container position="absolute" left="40.5mm" top="130mm" height="4mm" width="79mm" border="0.75pt solid black" text-align="center" display-align="center" line-height="100%">
792
+ <fo:block>Page intentionally left blank</fo:block>
676
793
  </fo:block-container>
677
794
  </fo:static-content>
678
- </xsl:template>
679
-
680
- <xsl:template match="@*|node()" mode="step2">
681
- <xsl:copy>
682
- <xsl:apply-templates select="@*|node()" mode="step2"/>
683
- </xsl:copy>
684
- </xsl:template>
685
-
686
- <xsl:template match="iho:pagebreak" mode="step2">
687
-
688
- <!-- determine pagebreak is last element before </fo:flow> or not -->
689
- <xsl:variable name="isLast">
690
- <xsl:for-each select="ancestor-or-self::*[ancestor::fo:flow]">
691
- <xsl:if test="following-sibling::*">false</xsl:if>
692
- </xsl:for-each>
693
- </xsl:variable>
694
-
695
- <xsl:if test="contains($isLast, 'false')">
696
-
697
- <xsl:variable name="orientation" select="normalize-space(@orientation)"/>
698
- <xsl:variable name="tree">
699
- <xsl:for-each select="ancestor::*[ancestor::fo:flow]">
700
- <element pos="{position()}">
701
- <xsl:value-of select="name()"/>
702
- </element>
703
- </xsl:for-each>
704
- </xsl:variable>
705
-
706
- <!-- close fo:page-sequence (closing preceding fo elements) -->
707
- <xsl:for-each select="xalan:nodeset($tree)//element">
708
- <xsl:sort data-type="number" order="descending" select="@pos"/>
709
- <xsl:text disable-output-escaping="yes">&lt;/</xsl:text>
710
- <xsl:value-of select="."/>
711
- <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
712
- </xsl:for-each>
713
- <xsl:text disable-output-escaping="yes">&lt;/fo:flow&gt;</xsl:text>
714
- <xsl:text disable-output-escaping="yes">&lt;/fo:page-sequence&gt;</xsl:text>
715
-
716
- <!-- <pagebreak/> -->
717
- <!-- create a new fo:page-sequence (opening fo elements) -->
718
-
719
- <xsl:text disable-output-escaping="yes">&lt;fo:page-sequence master-reference="document</xsl:text><xsl:if test="$orientation != ''">-<xsl:value-of select="$orientation"/></xsl:if><xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
720
- <fo:static-content flow-name="xsl-footnote-separator">
721
- <fo:block>
722
- <fo:leader leader-pattern="rule" leader-length="30%"/>
795
+ <fo:static-content flow-name="footer" role="artifact">
796
+ <fo:block-container height="100%" display-align="after">
797
+ <fo:block padding-bottom="12.5mm" font-size="8pt" text-align-last="justify">
798
+ <fo:inline><xsl:value-of select="$docidentifier"/></fo:inline>
799
+ <fo:inline keep-together.within-line="always">
800
+ <fo:leader leader-pattern="space"/>
801
+ <fo:inline>       <xsl:value-of select="$month_year"/></fo:inline>
802
+ </fo:inline>
803
+ <fo:inline keep-together.within-line="always">
804
+ <fo:leader leader-pattern="space"/>
805
+ <fo:inline><xsl:value-of select="$edition"/></fo:inline>
806
+ </fo:inline>
723
807
  </fo:block>
724
- </fo:static-content>
725
- <xsl:call-template name="insertHeaderFooter"/>
726
- <xsl:text disable-output-escaping="yes">&lt;fo:flow flow-name="xsl-region-body"&gt;</xsl:text>
727
-
728
- <xsl:for-each select="xalan:nodeset($tree)//element">
729
- <xsl:text disable-output-escaping="yes">&lt;</xsl:text>
730
- <xsl:value-of select="."/>
731
- <xsl:for-each select="@*[local-name() != 'pos']">
732
- <xsl:text> </xsl:text>
733
- <xsl:value-of select="local-name()"/>
734
- <xsl:text>="</xsl:text>
735
- <xsl:value-of select="."/>
736
- <xsl:text>"</xsl:text>
737
- </xsl:for-each>
738
- <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
739
- </xsl:for-each>
740
- </xsl:if>
808
+ </fo:block-container>
809
+ </fo:static-content>
741
810
  </xsl:template>
742
811
 
743
812
  <xsl:variable name="Image-IHO">
@@ -752,6 +821,8 @@
752
821
  <xsl:text>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</xsl:text>
753
822
  </xsl:variable>
754
823
 
824
+ <xsl:strip-space elements="iho:xref"/>
825
+
755
826
  <!-- external parameters -->
756
827
 
757
828
  <xsl:param name="svg_images"/> <!-- svg images array -->
@@ -863,12 +934,12 @@
863
934
  <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
864
935
  for example, left margin on odd page and right margin on even page -->
865
936
  <xsl:variable name="marginLeftRight1_">
866
- 25.4
937
+ 24.5
867
938
  </xsl:variable>
868
939
  <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
869
940
 
870
941
  <xsl:variable name="marginLeftRight2_">
871
- 25.4
942
+ 25
872
943
  </xsl:variable>
873
944
  <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
874
945
 
@@ -1021,7 +1092,7 @@
1021
1092
 
1022
1093
  <xsl:attribute name="font-family">Arial, Cambria Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
1023
1094
  <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
1024
- <xsl:attribute name="font-size">12pt</xsl:attribute>
1095
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1025
1096
 
1026
1097
  </xsl:attribute-set> <!-- root-style -->
1027
1098
 
@@ -1170,6 +1241,15 @@
1170
1241
 
1171
1242
  </xsl:attribute-set>
1172
1243
 
1244
+ <xsl:attribute-set name="pre-style">
1245
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1246
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1247
+
1248
+ <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1249
+ <xsl:attribute name="line-height">113%</xsl:attribute>
1250
+
1251
+ </xsl:attribute-set>
1252
+
1173
1253
  <xsl:attribute-set name="permission-style">
1174
1254
 
1175
1255
  </xsl:attribute-set>
@@ -1242,9 +1322,10 @@
1242
1322
 
1243
1323
  <xsl:attribute-set name="example-style">
1244
1324
 
1245
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1246
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
1247
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1325
+ <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
1326
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
1327
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1328
+ <xsl:attribute name="text-align">justify</xsl:attribute>
1248
1329
 
1249
1330
  </xsl:attribute-set> <!-- example-style -->
1250
1331
 
@@ -1254,9 +1335,9 @@
1254
1335
 
1255
1336
  <xsl:attribute-set name="example-name-style">
1256
1337
 
1257
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1338
+ <!-- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1258
1339
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1259
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1340
+ <xsl:attribute name="font-weight">bold</xsl:attribute> -->
1260
1341
 
1261
1342
  </xsl:attribute-set> <!-- example-name-style -->
1262
1343
 
@@ -1278,13 +1359,21 @@
1278
1359
  <!-- ========================== -->
1279
1360
  <xsl:variable name="table-border_">
1280
1361
 
1362
+ 0.5pt solid black
1363
+
1281
1364
  </xsl:variable>
1282
1365
  <xsl:variable name="table-border" select="normalize-space($table-border_)"/>
1283
1366
 
1367
+ <xsl:variable name="table-cell-border_">
1368
+
1369
+ </xsl:variable>
1370
+ <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
1371
+
1284
1372
  <xsl:attribute-set name="table-container-style">
1285
1373
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
1286
1374
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
1287
1375
 
1376
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
1288
1377
  <xsl:attribute name="space-after">18pt</xsl:attribute>
1289
1378
 
1290
1379
  </xsl:attribute-set> <!-- table-container-style -->
@@ -1292,8 +1381,8 @@
1292
1381
  <xsl:attribute-set name="table-style">
1293
1382
  <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
1294
1383
  <xsl:attribute name="table-layout">fixed</xsl:attribute>
1295
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
1296
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
1384
+
1385
+ <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
1297
1386
 
1298
1387
  </xsl:attribute-set><!-- table-style -->
1299
1388
 
@@ -1302,19 +1391,23 @@
1302
1391
 
1303
1392
  <xsl:attribute name="text-align">center</xsl:attribute>
1304
1393
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1305
- <xsl:attribute name="font-weight">normal</xsl:attribute>
1306
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1394
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1395
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1307
1396
 
1308
1397
  </xsl:attribute-set> <!-- table-name-style -->
1309
1398
 
1310
1399
  <xsl:attribute-set name="table-row-style">
1311
1400
  <xsl:attribute name="min-height">4mm</xsl:attribute>
1312
1401
 
1402
+ <xsl:attribute name="min-height">3mm</xsl:attribute> <!-- + padding-top + padding-bottom -->
1403
+
1313
1404
  </xsl:attribute-set>
1314
1405
 
1315
1406
  <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
1316
1407
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1317
1408
 
1409
+ <xsl:attribute name="background-color">rgb(217, 217, 217)</xsl:attribute>
1410
+
1318
1411
  </xsl:attribute-set>
1319
1412
 
1320
1413
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
@@ -1332,6 +1425,12 @@
1332
1425
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1333
1426
  <xsl:attribute name="display-align">center</xsl:attribute>
1334
1427
 
1428
+ <xsl:attribute name="padding-top">1.5mm</xsl:attribute>
1429
+ <xsl:attribute name="padding-left">2mm</xsl:attribute>
1430
+ <xsl:attribute name="padding-bottom">1.5mm</xsl:attribute>
1431
+ <xsl:attribute name="padding-right">1.5mm</xsl:attribute>
1432
+ <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
1433
+
1335
1434
  </xsl:attribute-set> <!-- table-header-cell-style -->
1336
1435
 
1337
1436
  <xsl:attribute-set name="table-cell-style">
@@ -1340,7 +1439,11 @@
1340
1439
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
1341
1440
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1342
1441
 
1343
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
1442
+ <xsl:attribute name="padding-top">1.5mm</xsl:attribute>
1443
+ <xsl:attribute name="padding-left">2mm</xsl:attribute>
1444
+ <xsl:attribute name="padding-bottom">1.5mm</xsl:attribute>
1445
+ <xsl:attribute name="padding-right">1.5mm</xsl:attribute>
1446
+ <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
1344
1447
 
1345
1448
  </xsl:attribute-set> <!-- table-cell-style -->
1346
1449
 
@@ -1350,13 +1453,17 @@
1350
1453
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1351
1454
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
1352
1455
 
1456
+ <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
1457
+
1353
1458
  </xsl:attribute-set> <!-- table-footer-cell-style -->
1354
1459
 
1355
1460
  <xsl:attribute-set name="table-note-style">
1356
1461
  <xsl:attribute name="font-size">10pt</xsl:attribute>
1357
1462
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1358
1463
 
1359
- <xsl:attribute name="font-size">12pt</xsl:attribute>
1464
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
1465
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
1466
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
1360
1467
 
1361
1468
  </xsl:attribute-set><!-- table-note-style -->
1362
1469
 
@@ -1412,7 +1519,7 @@
1412
1519
  <xsl:attribute-set name="dt-block-style">
1413
1520
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
1414
1521
 
1415
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1522
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1416
1523
 
1417
1524
  </xsl:attribute-set>
1418
1525
 
@@ -1453,9 +1560,9 @@
1453
1560
 
1454
1561
  <xsl:attribute-set name="note-style">
1455
1562
 
1456
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1457
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
1458
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1563
+ <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
1564
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
1565
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1459
1566
  <xsl:attribute name="text-align">justify</xsl:attribute>
1460
1567
 
1461
1568
  </xsl:attribute-set>
@@ -1465,7 +1572,7 @@
1465
1572
 
1466
1573
  <xsl:attribute-set name="note-name-style">
1467
1574
 
1468
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1575
+ <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
1469
1576
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
1470
1577
 
1471
1578
  </xsl:attribute-set>
@@ -1473,7 +1580,7 @@
1473
1580
  <xsl:attribute-set name="table-note-name-style">
1474
1581
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
1475
1582
 
1476
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1583
+ <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
1477
1584
 
1478
1585
  </xsl:attribute-set>
1479
1586
 
@@ -1505,8 +1612,9 @@
1505
1612
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
1506
1613
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
1507
1614
 
1508
- <xsl:attribute name="margin-left">12.5mm</xsl:attribute>
1509
- <xsl:attribute name="margin-right">14mm</xsl:attribute>
1615
+ <xsl:attribute name="font-family">Calibri</xsl:attribute>
1616
+ <xsl:attribute name="margin-left">4.5mm</xsl:attribute>
1617
+ <xsl:attribute name="margin-right">9mm</xsl:attribute>
1510
1618
 
1511
1619
  </xsl:attribute-set>
1512
1620
 
@@ -1549,10 +1657,10 @@
1549
1657
 
1550
1658
  <xsl:attribute-set name="figure-name-style">
1551
1659
 
1552
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1660
+ <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
1553
1661
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1554
1662
  <xsl:attribute name="text-align">center</xsl:attribute>
1555
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
1663
+ <xsl:attribute name="margin-top">2pt</xsl:attribute>
1556
1664
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1557
1665
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1558
1666
 
@@ -1688,7 +1796,7 @@
1688
1796
 
1689
1797
  <xsl:attribute-set name="list-item-style">
1690
1798
 
1691
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1799
+ <xsl:attribute name="margin-bottom">3pt</xsl:attribute>
1692
1800
 
1693
1801
  </xsl:attribute-set>
1694
1802
 
@@ -1797,7 +1905,8 @@
1797
1905
  <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
1798
1906
  </xsl:if> -->
1799
1907
 
1800
- <xsl:attribute name="line-height">115%</xsl:attribute>
1908
+ <!-- <xsl:attribute name="line-height">115%</xsl:attribute> -->
1909
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1801
1910
 
1802
1911
  </xsl:attribute-set> <!-- bibitem-normative-list-style -->
1803
1912
 
@@ -2139,17 +2248,22 @@
2139
2248
  </xsl:for-each>
2140
2249
  </xsl:template>
2141
2250
 
2251
+ <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2142
2252
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2143
2253
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
2144
2254
  <xsl:template match="text()" name="text">
2145
2255
 
2146
- <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2147
- <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2148
- <xsl:call-template name="replace_fo_inline_tags">
2149
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2150
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2151
- <xsl:with-param name="text" select="$text"/>
2152
- </xsl:call-template>
2256
+ <xsl:choose>
2257
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
2258
+ <xsl:otherwise>
2259
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2260
+ <xsl:call-template name="replace_fo_inline_tags">
2261
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2262
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2263
+ <xsl:with-param name="text" select="$text"/>
2264
+ </xsl:call-template>
2265
+ </xsl:otherwise>
2266
+ </xsl:choose>
2153
2267
 
2154
2268
  </xsl:template>
2155
2269
 
@@ -2405,6 +2519,12 @@
2405
2519
  <xsl:variable name="table_attributes">
2406
2520
 
2407
2521
  <xsl:element name="table_attributes" use-attribute-sets="table-style">
2522
+
2523
+ <xsl:if test="$margin-side != 0">
2524
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2525
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
2526
+ </xsl:if>
2527
+
2408
2528
  <xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
2409
2529
 
2410
2530
  </xsl:element>
@@ -2508,7 +2628,7 @@
2508
2628
 
2509
2629
  <!-- centered table when table name is centered (see table-name-style) -->
2510
2630
 
2511
- <fo:table table-layout="fixed" width="100%">
2631
+ <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
2512
2632
  <fo:table-column column-width="proportional-column-width(1)"/>
2513
2633
  <fo:table-column column-width="{@width}"/>
2514
2634
  <fo:table-column column-width="proportional-column-width(1)"/>
@@ -3161,6 +3281,10 @@
3161
3281
  <xsl:template match="*[local-name()='tr']">
3162
3282
  <fo:table-row xsl:use-attribute-sets="table-body-row-style">
3163
3283
 
3284
+ <xsl:if test="count(*) = count(*[local-name() = 'th'])"> <!-- row contains 'th' only -->
3285
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
3286
+ </xsl:if>
3287
+
3164
3288
  <xsl:call-template name="setTableRowAttributes"/>
3165
3289
  <xsl:apply-templates/>
3166
3290
  </fo:table-row>
@@ -3656,7 +3780,7 @@
3656
3780
  <xsl:if test="$onlyOneComponent = 'false'">
3657
3781
  <fo:block>
3658
3782
 
3659
- <xsl:attribute name="margin-left">7mm</xsl:attribute>
3783
+ <!-- <xsl:attribute name="margin-left">7mm</xsl:attribute> -->
3660
3784
 
3661
3785
  <xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']">
3662
3786
  <xsl:attribute name="margin-top">0</xsl:attribute>
@@ -3664,7 +3788,7 @@
3664
3788
 
3665
3789
  <fo:block>
3666
3790
 
3667
- <xsl:attribute name="margin-left">-3.5mm</xsl:attribute>
3791
+ <!-- <xsl:attribute name="margin-left">-3.5mm</xsl:attribute> -->
3668
3792
 
3669
3793
  <xsl:apply-templates select="*[local-name() = 'name']">
3670
3794
  <xsl:with-param name="process">true</xsl:with-param>
@@ -3689,6 +3813,8 @@
3689
3813
  </xsl:when>
3690
3814
  </xsl:choose>
3691
3815
 
3816
+ <xsl:attribute name="width">100%</xsl:attribute>
3817
+
3692
3818
  <xsl:choose>
3693
3819
  <xsl:when test="$isGenerateTableIF = 'true'">
3694
3820
  <!-- generate IF for table widths -->
@@ -4120,7 +4246,8 @@
4120
4246
  <xsl:copy-of select="node()"/>
4121
4247
  </td>
4122
4248
  <td>
4123
- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
4249
+ <!-- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/> -->
4250
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]" mode="dl_if"/>
4124
4251
  <!-- get paragraphs from nested 'dl' -->
4125
4252
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
4126
4253
  </td>
@@ -4128,6 +4255,53 @@
4128
4255
  </xsl:template>
4129
4256
  <xsl:template match="*[local-name()='dd']" mode="dl_if"/>
4130
4257
 
4258
+ <xsl:template match="*" mode="dl_if">
4259
+ <xsl:copy-of select="."/>
4260
+ </xsl:template>
4261
+
4262
+ <xsl:template match="*[local-name() = 'p']" mode="dl_if">
4263
+ <xsl:param name="indent"/>
4264
+ <p>
4265
+ <xsl:copy-of select="@*"/>
4266
+ <xsl:value-of select="$indent"/>
4267
+ <xsl:copy-of select="node()"/>
4268
+ </p>
4269
+
4270
+ </xsl:template>
4271
+
4272
+ <xsl:template match="*[local-name() = 'ul' or local-name() = 'ol']" mode="dl_if">
4273
+ <xsl:variable name="list_rendered_">
4274
+ <xsl:apply-templates select="."/>
4275
+ </xsl:variable>
4276
+ <xsl:variable name="list_rendered" select="xalan:nodeset($list_rendered_)"/>
4277
+
4278
+ <xsl:variable name="indent">
4279
+ <xsl:for-each select="($list_rendered//fo:block[not(.//fo:block)])[1]">
4280
+ <xsl:apply-templates select="ancestor::*[@provisional-distance-between-starts]/@provisional-distance-between-starts" mode="dl_if"/>
4281
+ </xsl:for-each>
4282
+ </xsl:variable>
4283
+
4284
+ <xsl:apply-templates mode="dl_if">
4285
+ <xsl:with-param name="indent" select="$indent"/>
4286
+ </xsl:apply-templates>
4287
+ </xsl:template>
4288
+
4289
+ <xsl:template match="*[local-name() = 'li']" mode="dl_if">
4290
+ <xsl:param name="indent"/>
4291
+ <xsl:apply-templates mode="dl_if">
4292
+ <xsl:with-param name="indent" select="$indent"/>
4293
+ </xsl:apply-templates>
4294
+ </xsl:template>
4295
+
4296
+ <xsl:template match="@provisional-distance-between-starts" mode="dl_if">
4297
+ <xsl:variable name="value" select="round(substring-before(.,'mm'))"/>
4298
+ <!-- emulate left indent for list item -->
4299
+ <xsl:call-template name="repeat">
4300
+ <xsl:with-param name="char" select="'x'"/>
4301
+ <xsl:with-param name="count" select="$value"/>
4302
+ </xsl:call-template>
4303
+ </xsl:template>
4304
+
4131
4305
  <xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
4132
4306
  <xsl:for-each select="*[local-name() = 'dt']">
4133
4307
  <p>
@@ -4182,7 +4356,7 @@
4182
4356
 
4183
4357
  <xsl:variable name="_font-size">
4184
4358
 
4185
- 10
4359
+ 9.5
4186
4360
  <!-- 10 -->
4187
4361
 
4188
4362
  </xsl:variable>
@@ -4384,6 +4558,75 @@
4384
4558
  <fo:block break-after="page"/>
4385
4559
  </xsl:template>
4386
4560
 
4561
+ <!-- ================================================================ -->
4562
+ <!-- landscape/portrait orientation processing (post-processing step) -->
4563
+ <!-- ================================================================ -->
4564
+ <xsl:template match="@*|node()" mode="landscape_portrait">
4565
+ <xsl:copy>
4566
+ <xsl:apply-templates select="@*|node()" mode="landscape_portrait"/>
4567
+ </xsl:copy>
4568
+ </xsl:template>
4569
+
4570
+ <xsl:template match="*[local-name() = 'pagebreak']" mode="landscape_portrait">
4571
+
4572
+ <!-- determine pagebreak is last element before </fo:flow> or not -->
4573
+ <xsl:variable name="isLast">
4574
+ <xsl:for-each select="ancestor-or-self::*[ancestor::fo:flow]">
4575
+ <xsl:if test="following-sibling::*">false</xsl:if>
4576
+ </xsl:for-each>
4577
+ </xsl:variable>
4578
+
4579
+ <xsl:if test="contains($isLast, 'false')">
4580
+
4581
+ <xsl:variable name="orientation" select="normalize-space(@orientation)"/>
4582
+ <xsl:variable name="tree">
4583
+ <xsl:for-each select="ancestor::*[ancestor::fo:flow]">
4584
+ <element pos="{position()}">
4585
+ <xsl:value-of select="name()"/>
4586
+ </element>
4587
+ </xsl:for-each>
4588
+ </xsl:variable>
4589
+
4590
+ <!-- close fo:page-sequence (closing preceding fo elements) -->
4591
+ <xsl:for-each select="xalan:nodeset($tree)//element">
4592
+ <xsl:sort data-type="number" order="descending" select="@pos"/>
4593
+ <xsl:text disable-output-escaping="yes">&lt;/</xsl:text>
4594
+ <xsl:value-of select="."/>
4595
+ <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
4596
+ </xsl:for-each>
4597
+ <xsl:text disable-output-escaping="yes">&lt;/fo:flow&gt;</xsl:text>
4598
+ <xsl:text disable-output-escaping="yes">&lt;/fo:page-sequence&gt;</xsl:text>
4599
+
4600
+ <!-- <pagebreak/> -->
4601
+ <!-- create a new fo:page-sequence (opening fo elements) -->
4602
+
4603
+ <xsl:text disable-output-escaping="yes">&lt;fo:page-sequence master-reference="document</xsl:text><xsl:if test="$orientation != ''">-<xsl:value-of select="$orientation"/></xsl:if><xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
4604
+ <fo:static-content flow-name="xsl-footnote-separator">
4605
+ <fo:block>
4606
+ <fo:leader leader-pattern="rule" leader-length="30%"/>
4607
+ </fo:block>
4608
+ </fo:static-content>
4609
+ <xsl:call-template name="insertHeaderFooter"/>
4610
+ <xsl:text disable-output-escaping="yes">&lt;fo:flow flow-name="xsl-region-body"&gt;</xsl:text>
4611
+
4612
+ <xsl:for-each select="xalan:nodeset($tree)//element">
4613
+ <xsl:text disable-output-escaping="yes">&lt;</xsl:text>
4614
+ <xsl:value-of select="."/>
4615
+ <xsl:for-each select="@*[local-name() != 'pos']">
4616
+ <xsl:text> </xsl:text>
4617
+ <xsl:value-of select="local-name()"/>
4618
+ <xsl:text>="</xsl:text>
4619
+ <xsl:value-of select="."/>
4620
+ <xsl:text>"</xsl:text>
4621
+ </xsl:for-each>
4622
+ <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
4623
+ </xsl:for-each>
4624
+ </xsl:if>
4625
+ </xsl:template>
4626
+ <!-- ================================================================ -->
4627
+ <!-- END: landscape/portrait orientation processing (post-processing step) -->
4628
+ <!-- ================================================================ -->
4629
+
4387
4630
  <!-- Example: <span style="font-family:&quot;Noto Sans JP&quot;">styled text</span> -->
4388
4631
  <xsl:template match="*[local-name() = 'span'][@style]" priority="2">
4389
4632
  <xsl:variable name="styles__">
@@ -4522,6 +4765,7 @@
4522
4765
  </word>
4523
4766
  <xsl:call-template name="tokenize_with_tags">
4524
4767
  <xsl:with-param name="text" select="substring-after($text, $separator)"/>
4768
+ <xsl:with-param name="tags" select="$tags"/>
4525
4769
  </xsl:call-template>
4526
4770
  </xsl:otherwise>
4527
4771
  </xsl:choose>
@@ -4561,8 +4805,18 @@
4561
4805
 
4562
4806
  <xsl:template name="add-zero-spaces-java">
4563
4807
  <xsl:param name="text" select="."/>
4564
- <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4565
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
4808
+ <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, arrow right -->
4809
+ <xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |→)','$1​')"/>
4810
+ <!-- add zero-width space (#x200B) after characters: 'great than' -->
4811
+ <xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
4812
+ <!-- add zero-width space (#x200B) before characters: 'less than' -->
4813
+ <xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
4814
+ <!-- add zero-width space (#x200B) before character: { -->
4815
+ <xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
4816
+ <!-- add zero-width space (#x200B) after character: , -->
4817
+ <xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
4818
+
4819
+ <xsl:value-of select="$text5"/>
4566
4820
  </xsl:template>
4567
4821
 
4568
4822
  <xsl:template name="add-zero-spaces-link-java">
@@ -4708,7 +4962,7 @@
4708
4962
  </xsl:copy>
4709
4963
  </xsl:template>
4710
4964
 
4711
- <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p'])]" mode="table-without-br">
4965
+ <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br">
4712
4966
  <xsl:copy>
4713
4967
  <xsl:copy-of select="@*"/>
4714
4968
  <p>
@@ -4756,6 +5010,28 @@
4756
5010
  </xsl:for-each>
4757
5011
  </xsl:template>
4758
5012
 
5013
+ <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']" mode="table-without-br">
5014
+ <xsl:apply-templates mode="table-without-br"/>
5015
+ </xsl:template>
5016
+
5017
+ <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']/text()[contains(., '&#13;') or contains(., '&#10;')]" mode="table-without-br">
5018
+
5019
+ <xsl:variable name="sep">###SOURCECODE_NEWLINE###</xsl:variable>
5020
+ <xsl:variable name="sourcecode_text" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', $sep)"/>
5021
+ <xsl:variable name="items">
5022
+ <xsl:call-template name="split">
5023
+ <xsl:with-param name="pText" select="$sourcecode_text"/>
5024
+ <xsl:with-param name="sep" select="$sep"/>
5025
+ <xsl:with-param name="normalize-space">false</xsl:with-param>
5026
+ </xsl:call-template>
5027
+ </xsl:variable>
5028
+ <xsl:for-each select="xalan:nodeset($items)/*">
5029
+ <p>
5030
+ <sourcecode><xsl:copy-of select="node()"/></sourcecode>
5031
+ </p>
5032
+ </xsl:for-each>
5033
+ </xsl:template>
5034
+
4759
5035
  <!-- remove redundant white spaces -->
4760
5036
  <xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br">
4761
5037
  <xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/>
@@ -5066,6 +5342,7 @@
5066
5342
  <xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if>
5067
5343
  <xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if>
5068
5344
  <xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if>
5345
+ <xsl:if test="ancestor::*[local-name() = 'sourcecode']"><tag>sourcecode</tag></xsl:if>
5069
5346
  <xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if>
5070
5347
  </tags>
5071
5348
  </xsl:template>
@@ -5128,6 +5405,9 @@
5128
5405
  <xsl:value-of select="substring($str, 2)"/>
5129
5406
  </xsl:template>
5130
5407
 
5408
+ <!-- ======================================= -->
5409
+ <!-- math -->
5410
+ <!-- ======================================= -->
5131
5411
  <xsl:template match="mathml:math">
5132
5412
  <xsl:variable name="isAdded" select="@added"/>
5133
5413
  <xsl:variable name="isDeleted" select="@deleted"/>
@@ -5178,14 +5458,57 @@
5178
5458
  <xsl:value-of select="$comment_text"/>
5179
5459
  </xsl:template>
5180
5460
 
5461
+ <xsl:template match="*[local-name() = 'asciimath']">
5462
+ <xsl:param name="process" select="'false'"/>
5463
+ <xsl:if test="$process = 'true'">
5464
+ <xsl:apply-templates/>
5465
+ </xsl:if>
5466
+ </xsl:template>
5467
+
5468
+ <xsl:template match="*[local-name() = 'latexmath']"/>
5469
+
5470
+ <xsl:template name="getMathml_asciimath_text">
5471
+ <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
5472
+ <xsl:variable name="latexmath">
5473
+
5474
+ </xsl:variable>
5475
+ <xsl:variable name="asciimath_text_following">
5476
+ <xsl:choose>
5477
+ <xsl:when test="normalize-space($latexmath) != ''">
5478
+ <xsl:value-of select="$latexmath"/>
5479
+ </xsl:when>
5480
+ <xsl:when test="normalize-space($asciimath) != ''">
5481
+ <xsl:value-of select="$asciimath"/>
5482
+ </xsl:when>
5483
+ <xsl:otherwise>
5484
+ <xsl:value-of select="following-sibling::node()[1][self::comment()]"/>
5485
+ </xsl:otherwise>
5486
+ </xsl:choose>
5487
+ </xsl:variable>
5488
+ <xsl:variable name="asciimath_text_">
5489
+ <xsl:choose>
5490
+ <xsl:when test="normalize-space($asciimath_text_following) != ''">
5491
+ <xsl:value-of select="$asciimath_text_following"/>
5492
+ </xsl:when>
5493
+ <xsl:otherwise>
5494
+ <xsl:value-of select="normalize-space(translate(.,' ⁢',' '))"/>
5495
+ </xsl:otherwise>
5496
+ </xsl:choose>
5497
+ </xsl:variable>
5498
+ <xsl:variable name="asciimath_text_2" select="java:org.metanorma.fop.Util.unescape($asciimath_text_)"/>
5499
+ <xsl:variable name="asciimath_text" select="java:trim(java:java.lang.String.new($asciimath_text_2))"/>
5500
+ <xsl:value-of select="$asciimath_text"/>
5501
+ </xsl:template>
5502
+
5181
5503
  <xsl:template name="mathml_instream_object">
5182
- <xsl:param name="comment_text"/>
5504
+ <xsl:param name="asciimath_text"/>
5183
5505
  <xsl:param name="mathml_content"/>
5184
5506
 
5185
- <xsl:variable name="comment_text_">
5507
+ <xsl:variable name="asciimath_text_">
5186
5508
  <xsl:choose>
5187
- <xsl:when test="normalize-space($comment_text) != ''"><xsl:value-of select="$comment_text"/></xsl:when>
5188
- <xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise>
5509
+ <xsl:when test="normalize-space($asciimath_text) != ''"><xsl:value-of select="$asciimath_text"/></xsl:when>
5510
+ <!-- <xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise> -->
5511
+ <xsl:otherwise><xsl:call-template name="getMathml_asciimath_text"/></xsl:otherwise>
5189
5512
  </xsl:choose>
5190
5513
  </xsl:variable>
5191
5514
 
@@ -5202,10 +5525,10 @@
5202
5525
  </xsl:attribute>
5203
5526
 
5204
5527
  <!-- <xsl:if test="$add_math_as_text = 'true'"> -->
5205
- <xsl:if test="normalize-space($comment_text_) != ''">
5528
+ <xsl:if test="normalize-space($asciimath_text_) != ''">
5206
5529
  <!-- put Mathin Alternate Text -->
5207
5530
  <xsl:attribute name="fox:alt-text">
5208
- <xsl:value-of select="$comment_text_"/>
5531
+ <xsl:value-of select="$asciimath_text_"/>
5209
5532
  </xsl:attribute>
5210
5533
  </xsl:if>
5211
5534
  <!-- </xsl:if> -->
@@ -5278,6 +5601,29 @@
5278
5601
  <xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
5279
5602
  </xsl:template>
5280
5603
 
5604
+ <!-- Examples:
5605
+ <stem type="AsciiMath">x = 1</stem>
5606
+ <stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
5607
+ <stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
5608
+ -->
5609
+ <xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3">
5610
+ <fo:inline xsl:use-attribute-sets="mathml-style">
5611
+
5612
+ <xsl:choose>
5613
+ <xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
5614
+ <xsl:otherwise>
5615
+ <xsl:apply-templates>
5616
+ <xsl:with-param name="process">true</xsl:with-param>
5617
+ </xsl:apply-templates>
5618
+ </xsl:otherwise>
5619
+ </xsl:choose>
5620
+
5621
+ </fo:inline>
5622
+ </xsl:template>
5623
+ <!-- ======================================= -->
5624
+ <!-- END: math -->
5625
+ <!-- ======================================= -->
5626
+
5281
5627
  <xsl:template match="*[local-name()='localityStack']"/>
5282
5628
 
5283
5629
  <xsl:template match="*[local-name()='link']" name="link">
@@ -5480,9 +5826,11 @@
5480
5826
 
5481
5827
  <fo:block-container margin-left="0mm">
5482
5828
 
5829
+ <!-- <xsl:if test="$namespace = 'iho'">
5483
5830
  <xsl:if test="ancestor::iho:td">
5484
5831
  <xsl:attribute name="font-size">12pt</xsl:attribute>
5485
5832
  </xsl:if>
5833
+ </xsl:if> -->
5486
5834
 
5487
5835
  <fo:block>
5488
5836
 
@@ -5561,6 +5909,8 @@
5561
5909
  </xsl:when>
5562
5910
  <xsl:otherwise>
5563
5911
 
5912
+ <xsl:text>:</xsl:text>
5913
+
5564
5914
  </xsl:otherwise>
5565
5915
  </xsl:choose>
5566
5916
  </xsl:variable>
@@ -6618,43 +6968,21 @@
6618
6968
  <xsl:apply-templates mode="contents_item"/>
6619
6969
  </xsl:template>
6620
6970
 
6621
- <!-- ====== -->
6622
- <!-- sourcecode -->
6623
- <!-- ====== -->
6971
+ <!-- =============== -->
6972
+ <!-- sourcecode -->
6973
+ <!-- =============== -->
6624
6974
  <xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
6625
6975
 
6626
- <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
6976
+ <xsl:variable name="sourcecode_attributes">
6977
+ <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
6978
+ <xsl:variable name="_font-size">
6627
6979
 
6628
- <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
6629
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
6630
- </xsl:if>
6631
-
6632
- <xsl:if test="ancestor::*[local-name() = 'example']">
6633
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
6634
- </xsl:if>
6980
+ 10
6981
+ <!-- 9 -->
6635
6982
 
6636
- <xsl:copy-of select="@id"/>
6637
-
6638
- <xsl:if test="parent::*[local-name() = 'note']">
6639
- <xsl:attribute name="margin-left">
6640
- <xsl:choose>
6641
- <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
6642
- <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6643
- </xsl:choose>
6644
- </xsl:attribute>
6645
-
6646
- </xsl:if>
6647
- <fo:block-container margin-left="0mm">
6648
-
6649
- <fo:block xsl:use-attribute-sets="sourcecode-style">
6650
- <xsl:variable name="_font-size">
6651
-
6652
- 10
6653
- <!-- 9 -->
6654
-
6655
- <!-- <xsl:if test="$namespace = 'ieee'">
6656
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
6657
- </xsl:if> -->
6983
+ <!-- <xsl:if test="$namespace = 'ieee'">
6984
+ <xsl:if test="$current_template = 'standard'">8</xsl:if>
6985
+ </xsl:if> -->
6658
6986
 
6659
6987
  </xsl:variable>
6660
6988
 
@@ -6669,14 +6997,60 @@
6669
6997
  </xsl:choose>
6670
6998
  </xsl:attribute>
6671
6999
  </xsl:if>
7000
+ </xsl:element>
7001
+ </xsl:variable>
6672
7002
 
7003
+ <xsl:choose>
7004
+ <xsl:when test="$isGenerateTableIF = 'true' and (ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])">
7005
+ <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
7006
+ <xsl:attribute name="{local-name()}">
7007
+ <xsl:value-of select="."/>
7008
+ </xsl:attribute>
7009
+ </xsl:for-each>
6673
7010
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6674
- </fo:block>
7011
+ </xsl:when>
6675
7012
 
6676
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
7013
+ <xsl:otherwise>
7014
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
6677
7015
 
6678
- </fo:block-container>
6679
- </fo:block-container>
7016
+ <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
7017
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
7018
+ </xsl:if>
7019
+
7020
+ <xsl:if test="ancestor::*[local-name() = 'example']">
7021
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
7022
+ </xsl:if>
7023
+
7024
+ <xsl:copy-of select="@id"/>
7025
+
7026
+ <xsl:if test="parent::*[local-name() = 'note']">
7027
+ <xsl:attribute name="margin-left">
7028
+ <xsl:choose>
7029
+ <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
7030
+ <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
7031
+ </xsl:choose>
7032
+ </xsl:attribute>
7033
+
7034
+ </xsl:if>
7035
+ <fo:block-container margin-left="0mm">
7036
+
7037
+ <fo:block xsl:use-attribute-sets="sourcecode-style">
7038
+
7039
+ <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
7040
+ <xsl:attribute name="{local-name()}">
7041
+ <xsl:value-of select="."/>
7042
+ </xsl:attribute>
7043
+ </xsl:for-each>
7044
+
7045
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7046
+ </fo:block>
7047
+
7048
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
7049
+
7050
+ </fo:block-container>
7051
+ </fo:block-container>
7052
+ </xsl:otherwise>
7053
+ </xsl:choose>
6680
7054
  </xsl:template>
6681
7055
 
6682
7056
  <xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -6918,8 +7292,22 @@
6918
7292
  </fo:block>
6919
7293
  </xsl:if>
6920
7294
  </xsl:template>
6921
- <!-- ====== -->
6922
- <!-- ====== -->
7295
+ <!-- =============== -->
7296
+ <!-- END sourcecode -->
7297
+ <!-- =============== -->
7298
+
7299
+ <!-- =============== -->
7300
+ <!-- pre -->
7301
+ <!-- =============== -->
7302
+ <xsl:template match="*[local-name()='pre']" name="pre">
7303
+ <fo:block xsl:use-attribute-sets="pre-style">
7304
+ <xsl:copy-of select="@id"/>
7305
+ <xsl:apply-templates/>
7306
+ </fo:block>
7307
+ </xsl:template>
7308
+ <!-- =============== -->
7309
+ <!-- pre -->
7310
+ <!-- =============== -->
6923
7311
 
6924
7312
  <!-- ========== -->
6925
7313
  <!-- permission -->
@@ -7245,7 +7633,7 @@
7245
7633
 
7246
7634
  <xsl:variable name="fo_element">
7247
7635
  <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
7248
- block
7636
+ inline
7249
7637
  </xsl:variable>
7250
7638
 
7251
7639
  <fo:block-container margin-left="0mm">
@@ -7317,7 +7705,7 @@
7317
7705
  </xsl:when>
7318
7706
  <xsl:otherwise>
7319
7707
  <fo:inline xsl:use-attribute-sets="example-name-style">
7320
- <xsl:apply-templates/>
7708
+ <xsl:apply-templates/>:
7321
7709
  </fo:inline>
7322
7710
  </xsl:otherwise>
7323
7711
  </xsl:choose>
@@ -7796,7 +8184,10 @@
7796
8184
  <!-- ===================================== -->
7797
8185
  <xsl:variable name="ul_labels_">
7798
8186
 
7799
- <label>—</label> <!-- em dash -->
8187
+ <!-- <label>&#x2014;</label> --> <!-- em dash -->
8188
+ <label level="1" font-size="150%" line-height="80%">•</label>
8189
+ <label level="2">—</label><!-- em dash -->
8190
+ <label level="3" font-size="75%">o</label> <!-- white circle -->
7800
8191
 
7801
8192
  </xsl:variable>
7802
8193
  <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
@@ -8336,15 +8727,23 @@
8336
8727
 
8337
8728
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-normative-list-style">
8338
8729
 
8730
+ <xsl:variable name="docidentifier" select="normalize-space(iho:docidentifier[@type != 'metanorma'][1])"/>
8731
+
8732
+ <xsl:attribute name="provisional-distance-between-starts">
8733
+ <xsl:choose>
8734
+ <xsl:when test="string-length($docidentifier) = 0">0mm</xsl:when>
8735
+ <xsl:when test="string-length($docidentifier) &gt; 19">46.5mm</xsl:when>
8736
+ <xsl:when test="string-length($docidentifier) &gt; 10">37mm</xsl:when>
8737
+ <xsl:otherwise>24.5mm</xsl:otherwise>
8738
+ </xsl:choose>
8739
+ </xsl:attribute>
8740
+
8339
8741
  <fo:list-item>
8340
8742
  <fo:list-item-label end-indent="label-end()">
8341
8743
  <fo:block>
8342
8744
  <fo:inline>
8343
8745
 
8344
- <xsl:value-of select="*[local-name() = 'docidentifier'][@type = 'metanorma-ordinal']"/>
8345
- <xsl:if test="not(*[local-name() = 'docidentifier'][@type = 'metanorma-ordinal'])">
8346
- <xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
8347
- </xsl:if>
8746
+ <xsl:value-of select="$docidentifier"/>
8348
8747
 
8349
8748
  </fo:inline>
8350
8749
  </fo:block>
@@ -8847,7 +9246,9 @@
8847
9246
  <!-- ===================================== -->
8848
9247
  <!-- Update xml -->
8849
9248
  <!-- ===================================== -->
9249
+ <!-- =========================================================================== -->
8850
9250
  <!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
9251
+ <!-- =========================================================================== -->
8851
9252
  <xsl:template match="@*|node()" mode="update_xml_step1">
8852
9253
  <xsl:copy>
8853
9254
  <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
@@ -8939,10 +9340,15 @@
8939
9340
  <xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
8940
9341
  <xsl:apply-templates mode="update_xml_step1"/>
8941
9342
  </xsl:template>
8942
-
9343
+ <!-- =========================================================================== -->
8943
9344
  <!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
9345
+ <!-- =========================================================================== -->
8944
9346
 
9347
+ <!-- =========================================================================== -->
8945
9348
  <!-- XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' -->
9349
+ <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
9350
+ <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
9351
+ <!-- =========================================================================== -->
8946
9352
  <!-- Example: <keep-together_within-line>ISO 10303-51</keep-together_within-line> -->
8947
9353
  <xsl:template match="@*|node()" mode="update_xml_enclose_keep-together_within-line">
8948
9354
  <xsl:copy>
@@ -8958,10 +9364,15 @@
8958
9364
  <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
8959
9365
 
8960
9366
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
8961
- <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
8962
9367
  <xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
8963
9368
  <xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
8964
- <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
9369
+ <xsl:variable name="text__" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
9370
+ <xsl:variable name="text_">
9371
+ <xsl:choose>
9372
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
9373
+ <xsl:otherwise><xsl:value-of select="$text__"/></xsl:otherwise>
9374
+ </xsl:choose>
9375
+ </xsl:variable>
8965
9376
  <xsl:variable name="text"><text><xsl:call-template name="replace_text_tags">
8966
9377
  <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/>
8967
9378
  <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/>
@@ -8977,7 +9388,11 @@
8977
9388
  </xsl:variable>
8978
9389
 
8979
9390
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
8980
- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable>
9391
+ <!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) -->
9392
+ <!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> -->
9393
+ <!-- add &lt; and &gt; to \S -->
9394
+ <xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;]</xsl:variable>
9395
+ <xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable>
8981
9396
  <xsl:variable name="text3">
8982
9397
  <text><xsl:for-each select="xalan:nodeset($text2)/text/node()">
8983
9398
  <xsl:choose>
@@ -9041,9 +9456,8 @@
9041
9456
  <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
9042
9457
  </xsl:choose>
9043
9458
  </xsl:template>
9044
-
9045
9459
  <!-- ===================================== -->
9046
- <!-- End Update xml -->
9460
+ <!-- END XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' -->
9047
9461
  <!-- ===================================== -->
9048
9462
 
9049
9463
  <!-- for correct rendering combining chars -->
@@ -9431,13 +9845,14 @@
9431
9845
  </xsl:template>
9432
9846
 
9433
9847
  <xsl:template name="setId">
9848
+ <xsl:param name="prefix"/>
9434
9849
  <xsl:attribute name="id">
9435
9850
  <xsl:choose>
9436
9851
  <xsl:when test="@id">
9437
- <xsl:value-of select="@id"/>
9852
+ <xsl:value-of select="concat($prefix, @id)"/>
9438
9853
  </xsl:when>
9439
9854
  <xsl:otherwise>
9440
- <xsl:value-of select="generate-id()"/>
9855
+ <xsl:value-of select="concat($prefix, generate-id())"/>
9441
9856
  </xsl:otherwise>
9442
9857
  </xsl:choose>
9443
9858
  </xsl:attribute>