metanorma-bipm 1.2.2 → 1.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/bipm/isodoc.rng +42 -17
- data/lib/isodoc/bipm/base_convert.rb +4 -3
- data/lib/isodoc/bipm/bipm.brochure.xsl +164 -22
- data/lib/isodoc/bipm/bipm.guide.xsl +164 -22
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +164 -22
- data/lib/isodoc/bipm/bipm.rapport.xsl +164 -22
- data/lib/isodoc/bipm/html/htmlstyle.css +4 -2
- data/lib/isodoc/bipm/html/htmlstyle.scss +4 -1
- data/lib/isodoc/bipm/jcgm.standard.xsl +82 -9
- data/lib/metanorma/bipm/version.rb +1 -1
- data/metanorma-bipm.gemspec +1 -1
- metadata +7 -7
|
@@ -247,33 +247,68 @@
|
|
|
247
247
|
<xsl:template match="/">
|
|
248
248
|
<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
|
|
249
249
|
<fo:layout-master-set>
|
|
250
|
+
|
|
251
|
+
<!-- blank page -->
|
|
252
|
+
<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
253
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
254
|
+
<fo:region-before region-name="header-blank" extent="{$marginTop}mm"/>
|
|
255
|
+
<fo:region-after region-name="footer-blank" extent="{$marginBottom}mm"/>
|
|
256
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
257
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
258
|
+
</fo:simple-page-master>
|
|
259
|
+
|
|
250
260
|
<!-- Cover page -->
|
|
251
|
-
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
261
|
+
<fo:simple-page-master master-name="simple-cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
252
262
|
<fo:region-body margin-top="36mm" margin-bottom="43mm" margin-left="49mm" margin-right="48mm"/>
|
|
253
|
-
<fo:region-before extent="36mm"/>
|
|
263
|
+
<fo:region-before region-name="header" extent="36mm"/>
|
|
254
264
|
<fo:region-after extent="43mm"/>
|
|
255
265
|
<fo:region-start extent="49mm"/>
|
|
256
266
|
<fo:region-end extent="48mm"/>
|
|
257
267
|
</fo:simple-page-master>
|
|
258
268
|
|
|
269
|
+
<fo:page-sequence-master master-name="cover-page">
|
|
270
|
+
<fo:repeatable-page-master-alternatives>
|
|
271
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
272
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="odd"/>
|
|
273
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="even"/>
|
|
274
|
+
</fo:repeatable-page-master-alternatives>
|
|
275
|
+
</fo:page-sequence-master>
|
|
276
|
+
|
|
259
277
|
<!-- Cover page -->
|
|
260
|
-
<fo:simple-page-master master-name="cover-page-appendix" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
278
|
+
<fo:simple-page-master master-name="simple-cover-page-appendix" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
261
279
|
<fo:region-body margin-top="90mm" margin-bottom="40mm" margin-left="12.5mm" margin-right="53mm"/>
|
|
262
|
-
<fo:region-before extent="60mm"/>
|
|
280
|
+
<fo:region-before region-name="header" extent="60mm"/>
|
|
263
281
|
<fo:region-after extent="40mm"/>
|
|
264
282
|
<fo:region-start extent="12.5mm"/>
|
|
265
283
|
<fo:region-end extent="53mm"/>
|
|
266
284
|
</fo:simple-page-master>
|
|
267
285
|
|
|
286
|
+
<fo:page-sequence-master master-name="cover-page-appendix">
|
|
287
|
+
<fo:repeatable-page-master-alternatives>
|
|
288
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
289
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="odd"/>
|
|
290
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="even"/>
|
|
291
|
+
</fo:repeatable-page-master-alternatives>
|
|
292
|
+
</fo:page-sequence-master>
|
|
293
|
+
|
|
294
|
+
|
|
268
295
|
<!-- Title page -->
|
|
269
|
-
<fo:simple-page-master master-name="title-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
296
|
+
<fo:simple-page-master master-name="simple-title-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
270
297
|
<fo:region-body margin-top="38mm" margin-bottom="25mm" margin-left="95mm" margin-right="12mm"/>
|
|
271
|
-
<fo:region-before extent="38mm"/>
|
|
298
|
+
<fo:region-before region-name="header" extent="38mm"/>
|
|
272
299
|
<fo:region-after extent="25mm"/>
|
|
273
300
|
<fo:region-start extent="95mm"/>
|
|
274
301
|
<fo:region-end extent="12mm"/>
|
|
275
302
|
</fo:simple-page-master>
|
|
276
303
|
|
|
304
|
+
<fo:page-sequence-master master-name="title-page">
|
|
305
|
+
<fo:repeatable-page-master-alternatives>
|
|
306
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
307
|
+
<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="odd"/>
|
|
308
|
+
<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="even"/>
|
|
309
|
+
</fo:repeatable-page-master-alternatives>
|
|
310
|
+
</fo:page-sequence-master>
|
|
311
|
+
|
|
277
312
|
<!-- Document pages -->
|
|
278
313
|
<fo:simple-page-master master-name="document-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
279
314
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
@@ -291,6 +326,7 @@
|
|
|
291
326
|
</fo:simple-page-master>
|
|
292
327
|
<fo:page-sequence-master master-name="document">
|
|
293
328
|
<fo:repeatable-page-master-alternatives>
|
|
329
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
294
330
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-even"/>
|
|
295
331
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-odd"/>
|
|
296
332
|
</fo:repeatable-page-master-alternatives>
|
|
@@ -312,7 +348,8 @@
|
|
|
312
348
|
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
313
349
|
</fo:simple-page-master>
|
|
314
350
|
<fo:page-sequence-master master-name="document-landscape">
|
|
315
|
-
<fo:repeatable-page-master-alternatives>
|
|
351
|
+
<fo:repeatable-page-master-alternatives>
|
|
352
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
316
353
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-landscape-even"/>
|
|
317
354
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-landscape-odd"/>
|
|
318
355
|
</fo:repeatable-page-master-alternatives>
|
|
@@ -334,7 +371,8 @@
|
|
|
334
371
|
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
335
372
|
</fo:simple-page-master>
|
|
336
373
|
<fo:page-sequence-master master-name="index">
|
|
337
|
-
<fo:repeatable-page-master-alternatives>
|
|
374
|
+
<fo:repeatable-page-master-alternatives>
|
|
375
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
338
376
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="index-even"/>
|
|
339
377
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="index-odd"/>
|
|
340
378
|
</fo:repeatable-page-master-alternatives>
|
|
@@ -1106,6 +1144,9 @@
|
|
|
1106
1144
|
</xsl:if>
|
|
1107
1145
|
|
|
1108
1146
|
<xsl:call-template name="insertFootnoteSeparator"/>
|
|
1147
|
+
|
|
1148
|
+
<xsl:call-template name="insertHeaderDraftWatermark"/>
|
|
1149
|
+
|
|
1109
1150
|
<fo:flow flow-name="xsl-region-body" font-family="Arial">
|
|
1110
1151
|
|
|
1111
1152
|
<fo:block-container font-size="12pt" font-weight="bold" border-top="1pt solid black" width="82mm" margin-top="2mm" padding-top="2mm">
|
|
@@ -1303,7 +1344,9 @@
|
|
|
1303
1344
|
|
|
1304
1345
|
<!-- Index -->
|
|
1305
1346
|
<!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
|
|
1306
|
-
<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"
|
|
1347
|
+
<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
|
|
1348
|
+
<xsl:with-param name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
|
|
1349
|
+
</xsl:apply-templates>
|
|
1307
1350
|
|
|
1308
1351
|
<!-- End Document Pages -->
|
|
1309
1352
|
|
|
@@ -1322,6 +1365,8 @@
|
|
|
1322
1365
|
|
|
1323
1366
|
<fo:page-sequence master-reference="document" force-page-count="no-force">
|
|
1324
1367
|
|
|
1368
|
+
<xsl:call-template name="insertHeaderDraftWatermark"/>
|
|
1369
|
+
|
|
1325
1370
|
<fo:flow flow-name="xsl-region-body" font-family="Arial">
|
|
1326
1371
|
|
|
1327
1372
|
<fo:block-container font-size="12pt" font-weight="bold" border-top="1pt solid black" width="82mm" margin-top="2mm" padding-top="2mm">
|
|
@@ -1471,7 +1516,9 @@
|
|
|
1471
1516
|
|
|
1472
1517
|
<!-- Index -->
|
|
1473
1518
|
<!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
|
|
1474
|
-
<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"
|
|
1519
|
+
<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
|
|
1520
|
+
<xsl:with-param name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
|
|
1521
|
+
</xsl:apply-templates>
|
|
1475
1522
|
|
|
1476
1523
|
</xsl:otherwise>
|
|
1477
1524
|
</xsl:choose>
|
|
@@ -1485,6 +1532,8 @@
|
|
|
1485
1532
|
|
|
1486
1533
|
<fo:page-sequence master-reference="cover-page" force-page-count="even">
|
|
1487
1534
|
|
|
1535
|
+
<xsl:call-template name="insertHeaderDraftWatermark"/>
|
|
1536
|
+
|
|
1488
1537
|
<fo:flow flow-name="xsl-region-body">
|
|
1489
1538
|
|
|
1490
1539
|
<xsl:call-template name="insertCoverPageCommon"/>
|
|
@@ -1820,6 +1869,8 @@
|
|
|
1820
1869
|
</fo:block>
|
|
1821
1870
|
</fo:block-container>
|
|
1822
1871
|
|
|
1872
|
+
<xsl:call-template name="insertDraftWatermark"/>
|
|
1873
|
+
|
|
1823
1874
|
<!-- BIPM logo -->
|
|
1824
1875
|
<fo:block-container absolute-position="fixed" left="12.8mm" top="12.2mm">
|
|
1825
1876
|
<fo:block>
|
|
@@ -1844,6 +1895,8 @@
|
|
|
1844
1895
|
|
|
1845
1896
|
<fo:page-sequence master-reference="title-page" format="1" initial-page-number="1" force-page-count="even">
|
|
1846
1897
|
|
|
1898
|
+
<xsl:call-template name="insertHeaderDraftWatermark"/>
|
|
1899
|
+
|
|
1847
1900
|
<fo:flow flow-name="xsl-region-body" font-family="Arial">
|
|
1848
1901
|
|
|
1849
1902
|
<xsl:variable name="languages">
|
|
@@ -3326,11 +3379,12 @@
|
|
|
3326
3379
|
|
|
3327
3380
|
<xsl:template match="bipm:preferred">
|
|
3328
3381
|
<fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
|
|
3382
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
3329
3383
|
<xsl:if test="ancestor::bipm:term[1]/bipm:name">
|
|
3330
3384
|
<xsl:variable name="level">
|
|
3331
3385
|
<xsl:call-template name="getLevelTermName"/>
|
|
3332
3386
|
</xsl:variable>
|
|
3333
|
-
<fo:inline role="H{$level}">
|
|
3387
|
+
<fo:inline role="H{$level}" font-weight="bold">
|
|
3334
3388
|
<xsl:attribute name="padding-right">2mm</xsl:attribute>
|
|
3335
3389
|
<xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name" mode="presentation"/>
|
|
3336
3390
|
</fo:inline>
|
|
@@ -3908,7 +3962,11 @@
|
|
|
3908
3962
|
<xsl:template name="insertHeaderFooter">
|
|
3909
3963
|
<xsl:param name="header-title"/>
|
|
3910
3964
|
<xsl:param name="orientation"/>
|
|
3965
|
+
<xsl:param name="isDraft"/>
|
|
3911
3966
|
<fo:static-content flow-name="header-odd" role="artifact">
|
|
3967
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
3968
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
3969
|
+
</xsl:call-template>
|
|
3912
3970
|
<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
|
|
3913
3971
|
<fo:block text-align="right">
|
|
3914
3972
|
<xsl:copy-of select="$header-title"/>
|
|
@@ -3929,6 +3987,9 @@
|
|
|
3929
3987
|
</fo:block-container>
|
|
3930
3988
|
</fo:static-content>
|
|
3931
3989
|
<fo:static-content flow-name="header-even" role="artifact">
|
|
3990
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
3991
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
3992
|
+
</xsl:call-template>
|
|
3932
3993
|
<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
|
|
3933
3994
|
<fo:block>
|
|
3934
3995
|
<fo:inline font-weight="bold"><fo:page-number/></fo:inline>
|
|
@@ -3944,7 +4005,74 @@
|
|
|
3944
4005
|
<fo:block> </fo:block>
|
|
3945
4006
|
</fo:block-container>
|
|
3946
4007
|
</fo:block-container>
|
|
3947
|
-
</fo:static-content>
|
|
4008
|
+
</fo:static-content>
|
|
4009
|
+
<fo:static-content flow-name="header-blank" role="artifact">
|
|
4010
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
4011
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
4012
|
+
</xsl:call-template>
|
|
4013
|
+
<fo:block/>
|
|
4014
|
+
</fo:static-content>
|
|
4015
|
+
</xsl:template>
|
|
4016
|
+
|
|
4017
|
+
<xsl:template name="insertDraftWatermark">
|
|
4018
|
+
<xsl:param name="isDraft"/>
|
|
4019
|
+
<xsl:if test="$isDraft = 'true' or normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet')) = 'true'">
|
|
4020
|
+
<!-- DRAFT -->
|
|
4021
|
+
<xsl:variable name="draft_label">
|
|
4022
|
+
<xsl:call-template name="getLocalizedString">
|
|
4023
|
+
<xsl:with-param name="key">draft_label</xsl:with-param>
|
|
4024
|
+
</xsl:call-template>
|
|
4025
|
+
</xsl:variable>
|
|
4026
|
+
<fo:block-container absolute-position="fixed" left="0mm" top="30mm">
|
|
4027
|
+
<fo:block line-height="0">
|
|
4028
|
+
<fo:instream-foreign-object fox:alt-text="DRAFT">
|
|
4029
|
+
<svg:svg xmlns:svg="http://www.w3.org/2000/svg" width="200mm" height="250mm">
|
|
4030
|
+
<svg:g transform="rotate(-45) scale(0.6, 1)">
|
|
4031
|
+
<xsl:variable name="font-size">
|
|
4032
|
+
<xsl:choose>
|
|
4033
|
+
<xsl:when test="string-length($draft_label) > 5">150</xsl:when>
|
|
4034
|
+
<xsl:otherwise>260</xsl:otherwise>
|
|
4035
|
+
</xsl:choose>
|
|
4036
|
+
</xsl:variable>
|
|
4037
|
+
<svg:text x="-175mm" y="205mm" style="font-family:Arial;font-size:{$font-size}pt;font-weight:normal;fill:rgb(223, 223, 223);">
|
|
4038
|
+
<xsl:if test="string-length($draft_label) > 5">
|
|
4039
|
+
<xsl:attribute name="x">-175mm</xsl:attribute>
|
|
4040
|
+
<xsl:attribute name="y">180mm</xsl:attribute>
|
|
4041
|
+
</xsl:if>
|
|
4042
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($draft_label))"/>
|
|
4043
|
+
</svg:text>
|
|
4044
|
+
</svg:g>
|
|
4045
|
+
</svg:svg>
|
|
4046
|
+
</fo:instream-foreign-object>
|
|
4047
|
+
</fo:block>
|
|
4048
|
+
</fo:block-container>
|
|
4049
|
+
</xsl:if>
|
|
4050
|
+
</xsl:template>
|
|
4051
|
+
|
|
4052
|
+
<xsl:template name="insertHeaderDraftWatermark">
|
|
4053
|
+
<xsl:variable name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
|
|
4054
|
+
<xsl:if test="$isDraft = 'true'">
|
|
4055
|
+
<fo:static-content flow-name="header-blank" role="artifact">
|
|
4056
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
4057
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
4058
|
+
</xsl:call-template>
|
|
4059
|
+
</fo:static-content>
|
|
4060
|
+
<fo:static-content flow-name="header" role="artifact">
|
|
4061
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
4062
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
4063
|
+
</xsl:call-template>
|
|
4064
|
+
</fo:static-content>
|
|
4065
|
+
<fo:static-content flow-name="header-odd" role="artifact">
|
|
4066
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
4067
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
4068
|
+
</xsl:call-template>
|
|
4069
|
+
</fo:static-content>
|
|
4070
|
+
<fo:static-content flow-name="header-even" role="artifact">
|
|
4071
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
4072
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
4073
|
+
</xsl:call-template>
|
|
4074
|
+
</fo:static-content>
|
|
4075
|
+
</xsl:if>
|
|
3948
4076
|
</xsl:template>
|
|
3949
4077
|
|
|
3950
4078
|
<!-- <xsl:template name="insertHeaderFooterAppendix">
|
|
@@ -4089,6 +4217,7 @@
|
|
|
4089
4217
|
<!-- <xsl:template match="bipm:clause[@type = 'index']" mode="index"> -->
|
|
4090
4218
|
<xsl:template match="bipm:indexsect"/>
|
|
4091
4219
|
<xsl:template match="bipm:indexsect" mode="index">
|
|
4220
|
+
<xsl:param name="isDraft"/>
|
|
4092
4221
|
|
|
4093
4222
|
<fo:page-sequence master-reference="index" force-page-count="no-force">
|
|
4094
4223
|
<xsl:variable name="header-title">
|
|
@@ -4103,6 +4232,7 @@
|
|
|
4103
4232
|
</xsl:variable>
|
|
4104
4233
|
<xsl:call-template name="insertHeaderFooter">
|
|
4105
4234
|
<xsl:with-param name="header-title" select="$header-title"/>
|
|
4235
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
4106
4236
|
</xsl:call-template>
|
|
4107
4237
|
|
|
4108
4238
|
<fo:flow flow-name="xsl-region-body">
|
|
@@ -5104,7 +5234,8 @@
|
|
|
5104
5234
|
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
|
|
5105
5235
|
|
|
5106
5236
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
5107
|
-
|
|
5237
|
+
|
|
5238
|
+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
|
|
5108
5239
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
5109
5240
|
<xsl:apply-templates select="." mode="contents"/>
|
|
5110
5241
|
</xsl:for-each>
|
|
@@ -5114,7 +5245,7 @@
|
|
|
5114
5245
|
<xsl:apply-templates select="." mode="contents"/>
|
|
5115
5246
|
</xsl:for-each>
|
|
5116
5247
|
|
|
5117
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
5248
|
+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
5118
5249
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
5119
5250
|
<xsl:apply-templates select="." mode="contents"/>
|
|
5120
5251
|
</xsl:for-each>
|
|
@@ -7951,12 +8082,12 @@
|
|
|
7951
8082
|
</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
|
7952
8083
|
<xsl:apply-templates mode="contents"/>
|
|
7953
8084
|
<xsl:text> </xsl:text>
|
|
7954
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
|
|
8085
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
|
|
7955
8086
|
<xsl:apply-templates mode="bookmarks"/>
|
|
7956
8087
|
<xsl:text> </xsl:text>
|
|
7957
8088
|
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
|
|
7958
8089
|
<xsl:value-of select="."/>
|
|
7959
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
|
|
8090
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
|
|
7960
8091
|
<xsl:value-of select="."/>
|
|
7961
8092
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
7962
8093
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -8240,6 +8371,8 @@
|
|
|
8240
8371
|
|
|
8241
8372
|
|
|
8242
8373
|
|
|
8374
|
+
|
|
8375
|
+
|
|
8243
8376
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
8244
8377
|
<xsl:variable name="_font-size">
|
|
8245
8378
|
|
|
@@ -8273,13 +8406,17 @@
|
|
|
8273
8406
|
|
|
8274
8407
|
|
|
8275
8408
|
|
|
8409
|
+
|
|
8410
|
+
|
|
8276
8411
|
<xsl:apply-templates/>
|
|
8277
8412
|
</fo:block>
|
|
8278
|
-
|
|
8413
|
+
|
|
8279
8414
|
|
|
8280
8415
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
8281
8416
|
|
|
8282
8417
|
|
|
8418
|
+
|
|
8419
|
+
|
|
8283
8420
|
</fo:block-container>
|
|
8284
8421
|
</fo:block-container>
|
|
8285
8422
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -8870,24 +9007,29 @@
|
|
|
8870
9007
|
</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
|
|
8871
9008
|
<xsl:variable name="title-deprecated">
|
|
8872
9009
|
|
|
8873
|
-
|
|
8874
|
-
|
|
8875
|
-
<xsl:with-param name="name" select="'title-deprecated'"/>
|
|
9010
|
+
<xsl:call-template name="getLocalizedString">
|
|
9011
|
+
<xsl:with-param name="key">deprecated</xsl:with-param>
|
|
8876
9012
|
</xsl:call-template>
|
|
8877
9013
|
|
|
9014
|
+
|
|
8878
9015
|
</xsl:variable>
|
|
8879
9016
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
8880
9017
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
8881
9018
|
</fo:block>
|
|
9019
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
9020
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
9021
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
9022
|
+
</xsl:if>
|
|
8882
9023
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
8883
9024
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
8884
9025
|
<xsl:apply-templates/>
|
|
8885
9026
|
</fo:block>
|
|
8886
9027
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
8887
9028
|
<xsl:apply-templates/>
|
|
8888
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
9029
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
8889
9030
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
8890
|
-
<fo:block
|
|
9031
|
+
<!-- <fo:block> </fo:block> -->
|
|
9032
|
+
<fo:block/>
|
|
8891
9033
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
8892
9034
|
|
|
8893
9035
|
<fo:block>
|
|
@@ -495,10 +495,12 @@ h3 {
|
|
|
495
495
|
font-size: 1.1em;
|
|
496
496
|
font-weight: 100; }
|
|
497
497
|
|
|
498
|
-
.TermNum
|
|
499
|
-
color: #6C734A;
|
|
498
|
+
.TermNum {
|
|
500
499
|
font-weight: 100; }
|
|
501
500
|
|
|
501
|
+
.TermNum, .Terms, .AltTerms {
|
|
502
|
+
color: #6C734A; }
|
|
503
|
+
|
|
502
504
|
h2.TermNum {
|
|
503
505
|
margin-bottom: 0; }
|
|
504
506
|
|
|
@@ -185,12 +185,21 @@
|
|
|
185
185
|
<!-- internal cover page -->
|
|
186
186
|
<fo:simple-page-master master-name="internal-cover-page-jcgm" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
187
187
|
<fo:region-body margin-top="11mm" margin-bottom="21mm" margin-left="25mm" margin-right="19mm"/>
|
|
188
|
-
<fo:region-before extent="11mm"/>
|
|
188
|
+
<fo:region-before region-name="header" extent="11mm"/>
|
|
189
189
|
<fo:region-after region-name="internal-cover-page-jcgm-footer" extent="21mm"/>
|
|
190
190
|
<fo:region-start extent="25mm"/>
|
|
191
191
|
<fo:region-end extent="19mm"/>
|
|
192
192
|
</fo:simple-page-master>
|
|
193
193
|
|
|
194
|
+
<!-- blank page -->
|
|
195
|
+
<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
196
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
197
|
+
<fo:region-before region-name="header-blank" extent="{$marginTop}mm"/>
|
|
198
|
+
<fo:region-after region-name="footer-blank" extent="{$marginBottom}mm"/>
|
|
199
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
200
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
201
|
+
</fo:simple-page-master>
|
|
202
|
+
|
|
194
203
|
<fo:simple-page-master master-name="odd-jcgm" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
195
204
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
196
205
|
<fo:region-before region-name="header-odd-jcgm" extent="{$marginTop}mm"/> <!-- display-align="center" -->
|
|
@@ -207,6 +216,7 @@
|
|
|
207
216
|
</fo:simple-page-master>
|
|
208
217
|
<fo:page-sequence-master master-name="document-jcgm">
|
|
209
218
|
<fo:repeatable-page-master-alternatives>
|
|
219
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
210
220
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-jcgm"/>
|
|
211
221
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-jcgm"/>
|
|
212
222
|
</fo:repeatable-page-master-alternatives>
|
|
@@ -241,6 +251,7 @@
|
|
|
241
251
|
</fo:static-content>
|
|
242
252
|
<fo:flow flow-name="xsl-region-body">
|
|
243
253
|
<xsl:call-template name="insert_Logo-BIPM-Metro"/>
|
|
254
|
+
<xsl:call-template name="insertDraftWatermark"/>
|
|
244
255
|
<fo:block-container font-weight="bold">
|
|
245
256
|
<fo:block font-size="16.5pt">
|
|
246
257
|
<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:ext/jcgm:editorialgroup/jcgm:committee/@acronym"/>
|
|
@@ -286,6 +297,7 @@
|
|
|
286
297
|
</fo:block>
|
|
287
298
|
</fo:static-content>
|
|
288
299
|
<fo:flow flow-name="xsl-region-body">
|
|
300
|
+
<xsl:call-template name="insertDraftWatermark"/>
|
|
289
301
|
<fo:table table-layout="fixed" width="100%" font-size="13pt">
|
|
290
302
|
<fo:table-column column-width="134mm"/>
|
|
291
303
|
<fo:table-column column-width="30mm"/>
|
|
@@ -930,6 +942,7 @@
|
|
|
930
942
|
<xsl:apply-templates select="ancestor::*[local-name()='term'][1]/*[local-name()='name']" mode="presentation"/>
|
|
931
943
|
</fo:block>
|
|
932
944
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
945
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
933
946
|
<xsl:apply-templates/>
|
|
934
947
|
</fo:block>
|
|
935
948
|
</fo:block>
|
|
@@ -944,6 +957,7 @@
|
|
|
944
957
|
<xsl:apply-templates select="preceding-sibling::*[local-name()='term_name'][1]" mode="presentation"/>
|
|
945
958
|
</fo:block>
|
|
946
959
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
960
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
947
961
|
<xsl:apply-templates/>
|
|
948
962
|
</fo:block>
|
|
949
963
|
</fo:block>
|
|
@@ -1268,7 +1282,11 @@
|
|
|
1268
1282
|
</xsl:variable>
|
|
1269
1283
|
|
|
1270
1284
|
<xsl:template name="insertHeaderFooter">
|
|
1285
|
+
<xsl:param name="isDraft"/>
|
|
1271
1286
|
<fo:static-content flow-name="header-even-jcgm" role="artifact">
|
|
1287
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
1288
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
1289
|
+
</xsl:call-template>
|
|
1272
1290
|
<fo:block-container height="98%">
|
|
1273
1291
|
<fo:block font-size="13pt" font-weight="bold" padding-top="12mm">
|
|
1274
1292
|
<xsl:value-of select="$header_text"/>
|
|
@@ -1287,6 +1305,9 @@
|
|
|
1287
1305
|
</fo:block-container>
|
|
1288
1306
|
</fo:static-content>
|
|
1289
1307
|
<fo:static-content flow-name="header-odd-jcgm" role="artifact">
|
|
1308
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
1309
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
1310
|
+
</xsl:call-template>
|
|
1290
1311
|
<fo:block-container height="98%">
|
|
1291
1312
|
<fo:block font-size="13pt" font-weight="bold" text-align="right" padding-top="12mm">
|
|
1292
1313
|
<xsl:value-of select="$header_text"/>
|
|
@@ -1302,9 +1323,49 @@
|
|
|
1302
1323
|
<fo:inline font-size="12pt" font-weight="bold"><fo:page-number/></fo:inline>
|
|
1303
1324
|
</fo:inline>
|
|
1304
1325
|
</fo:block>
|
|
1305
|
-
|
|
1306
1326
|
</fo:block-container>
|
|
1307
1327
|
</fo:static-content>
|
|
1328
|
+
<fo:static-content flow-name="header-blank" role="artifact">
|
|
1329
|
+
<xsl:call-template name="insertDraftWatermark">
|
|
1330
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
|
1331
|
+
</xsl:call-template>
|
|
1332
|
+
<fo:block/>
|
|
1333
|
+
</fo:static-content>
|
|
1334
|
+
</xsl:template>
|
|
1335
|
+
|
|
1336
|
+
<xsl:template name="insertDraftWatermark">
|
|
1337
|
+
<xsl:param name="isDraft"/>
|
|
1338
|
+
<xsl:if test="$isDraft = 'true' or normalize-space(//jcgm:bipm-standard/jcgm:bibdata/jcgm:version/jcgm:draft or contains(//jcgm:bipm-standard/jcgm:bibdata/jcgm:status/jcgm:stage, 'draft') or contains(//jcgm:bipm-standard/jcgm:bibdata/jcgm:status/jcgm:stage, 'projet')) = 'true'">
|
|
1339
|
+
<!-- DRAFT -->
|
|
1340
|
+
<xsl:variable name="draft_label">
|
|
1341
|
+
<xsl:call-template name="getLocalizedString">
|
|
1342
|
+
<xsl:with-param name="key">draft_label</xsl:with-param>
|
|
1343
|
+
</xsl:call-template>
|
|
1344
|
+
</xsl:variable>
|
|
1345
|
+
<fo:block-container absolute-position="fixed" left="0mm" top="30mm">
|
|
1346
|
+
<fo:block line-height="0">
|
|
1347
|
+
<fo:instream-foreign-object fox:alt-text="DRAFT">
|
|
1348
|
+
<svg:svg xmlns:svg="http://www.w3.org/2000/svg" width="200mm" height="250mm">
|
|
1349
|
+
<svg:g transform="rotate(-45) scale(0.6, 1)">
|
|
1350
|
+
<xsl:variable name="font-size">
|
|
1351
|
+
<xsl:choose>
|
|
1352
|
+
<xsl:when test="string-length($draft_label) > 5">150</xsl:when>
|
|
1353
|
+
<xsl:otherwise>260</xsl:otherwise>
|
|
1354
|
+
</xsl:choose>
|
|
1355
|
+
</xsl:variable>
|
|
1356
|
+
<svg:text x="-175mm" y="205mm" style="font-family:Arial;font-size:{$font-size}pt;font-weight:normal;fill:rgb(223, 223, 223);">
|
|
1357
|
+
<xsl:if test="string-length($draft_label) > 5">
|
|
1358
|
+
<xsl:attribute name="x">-175mm</xsl:attribute>
|
|
1359
|
+
<xsl:attribute name="y">180mm</xsl:attribute>
|
|
1360
|
+
</xsl:if>
|
|
1361
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($draft_label))"/>
|
|
1362
|
+
</svg:text>
|
|
1363
|
+
</svg:g>
|
|
1364
|
+
</svg:svg>
|
|
1365
|
+
</fo:instream-foreign-object>
|
|
1366
|
+
</fo:block>
|
|
1367
|
+
</fo:block-container>
|
|
1368
|
+
</xsl:if>
|
|
1308
1369
|
</xsl:template>
|
|
1309
1370
|
|
|
1310
1371
|
<xsl:template match="jcgm:title">
|
|
@@ -2624,7 +2685,8 @@
|
|
|
2624
2685
|
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
|
|
2625
2686
|
|
|
2626
2687
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
2627
|
-
|
|
2688
|
+
|
|
2689
|
+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
|
|
2628
2690
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2629
2691
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2630
2692
|
</xsl:for-each>
|
|
@@ -2634,7 +2696,7 @@
|
|
|
2634
2696
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2635
2697
|
</xsl:for-each>
|
|
2636
2698
|
|
|
2637
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
2699
|
+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
2638
2700
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2639
2701
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2640
2702
|
</xsl:for-each>
|
|
@@ -5428,12 +5490,12 @@
|
|
|
5428
5490
|
</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
|
5429
5491
|
<xsl:apply-templates mode="contents"/>
|
|
5430
5492
|
<xsl:text> </xsl:text>
|
|
5431
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
|
|
5493
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
|
|
5432
5494
|
<xsl:apply-templates mode="bookmarks"/>
|
|
5433
5495
|
<xsl:text> </xsl:text>
|
|
5434
5496
|
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
|
|
5435
5497
|
<xsl:value-of select="."/>
|
|
5436
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
|
|
5498
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
|
|
5437
5499
|
<xsl:value-of select="."/>
|
|
5438
5500
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
5439
5501
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -5703,6 +5765,8 @@
|
|
|
5703
5765
|
|
|
5704
5766
|
|
|
5705
5767
|
|
|
5768
|
+
|
|
5769
|
+
|
|
5706
5770
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
5707
5771
|
<xsl:variable name="_font-size">
|
|
5708
5772
|
|
|
@@ -5736,13 +5800,17 @@
|
|
|
5736
5800
|
|
|
5737
5801
|
|
|
5738
5802
|
|
|
5803
|
+
|
|
5804
|
+
|
|
5739
5805
|
<xsl:apply-templates/>
|
|
5740
5806
|
</fo:block>
|
|
5741
|
-
|
|
5807
|
+
|
|
5742
5808
|
|
|
5743
5809
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
5744
5810
|
|
|
5745
5811
|
|
|
5812
|
+
|
|
5813
|
+
|
|
5746
5814
|
</fo:block-container>
|
|
5747
5815
|
</fo:block-container>
|
|
5748
5816
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -6348,15 +6416,20 @@
|
|
|
6348
6416
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
6349
6417
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
6350
6418
|
</fo:block>
|
|
6419
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
6420
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
6421
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
6422
|
+
</xsl:if>
|
|
6351
6423
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
6352
6424
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
6353
6425
|
<xsl:apply-templates/>
|
|
6354
6426
|
</fo:block>
|
|
6355
6427
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
6356
6428
|
<xsl:apply-templates/>
|
|
6357
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
6429
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
6358
6430
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
6359
|
-
<fo:block
|
|
6431
|
+
<!-- <fo:block> </fo:block> -->
|
|
6432
|
+
<fo:block/>
|
|
6360
6433
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
6361
6434
|
|
|
6362
6435
|
<fo:block>
|