metanorma-bipm 1.1.7 → 1.1.8
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 +23 -9
- data/lib/isodoc/bipm/bipm.brochure.xsl +351 -52
- data/lib/isodoc/bipm/bipm.guide.xsl +351 -52
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +351 -52
- data/lib/isodoc/bipm/bipm.rapport.xsl +351 -52
- data/lib/isodoc/bipm/jcgm.standard.xsl +188 -62
- data/lib/metanorma/bipm/version.rb +1 -1
- metadata +2 -2
@@ -244,7 +244,7 @@
|
|
244
244
|
<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@type = 'provenance']"/>
|
245
245
|
</fo:block>
|
246
246
|
<fo:block border-bottom="1pt solid black"> </fo:block>
|
247
|
-
<fo:block font-size="16.5pt" margin-left="-0.5mm" padding-top="3.5mm" space-after="7mm" margin-right="7mm" line-height="105%">
|
247
|
+
<fo:block font-size="16.5pt" margin-left="-0.5mm" padding-top="3.5mm" space-after="7mm" margin-right="7mm" line-height="105%" role="H1">
|
248
248
|
<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'main']" mode="title"/>
|
249
249
|
<xsl:variable name="title_part">
|
250
250
|
<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'part']" mode="title"/>
|
@@ -254,7 +254,7 @@
|
|
254
254
|
<xsl:copy-of select="$title_part"/>
|
255
255
|
</xsl:if>
|
256
256
|
</fo:block>
|
257
|
-
<fo:block font-size="12pt" font-style="italic" line-height="140%">
|
257
|
+
<fo:block font-size="12pt" font-style="italic" line-height="140%" role="H1">
|
258
258
|
<xsl:variable name="secondLang" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title/@language[. != $lang]"/>
|
259
259
|
<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'main']" mode="title"/>
|
260
260
|
<xsl:variable name="title_part">
|
@@ -293,7 +293,7 @@
|
|
293
293
|
</fo:table-row>
|
294
294
|
</fo:table-body>
|
295
295
|
</fo:table>
|
296
|
-
<fo:block font-size="18pt" space-before="70mm">
|
296
|
+
<fo:block font-size="18pt" space-before="70mm" role="H1">
|
297
297
|
<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'main']" mode="title"/>
|
298
298
|
<xsl:variable name="title_part">
|
299
299
|
<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'part']" mode="title"/>
|
@@ -303,7 +303,7 @@
|
|
303
303
|
<xsl:copy-of select="$title_part"/>
|
304
304
|
</xsl:if>
|
305
305
|
</fo:block>
|
306
|
-
<fo:block font-size="13pt" space-before="35mm">
|
306
|
+
<fo:block font-size="13pt" space-before="35mm" role="H1">
|
307
307
|
<xsl:variable name="secondLang" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title/@language[. != $lang]"/>
|
308
308
|
<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'main']" mode="title"/>
|
309
309
|
<xsl:variable name="title_part">
|
@@ -346,41 +346,43 @@
|
|
346
346
|
|
347
347
|
<!-- Table of Contents -->
|
348
348
|
<fo:block-container>
|
349
|
-
<fo:block
|
350
|
-
<fo:
|
351
|
-
<
|
352
|
-
<xsl:
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
<fo:
|
349
|
+
<fo:block role="TOC">
|
350
|
+
<fo:block text-align-last="justify">
|
351
|
+
<fo:inline font-size="15pt" font-weight="bold" role="H1">
|
352
|
+
<xsl:call-template name="getLocalizedString">
|
353
|
+
<xsl:with-param name="key">table_of_contents</xsl:with-param>
|
354
|
+
</xsl:call-template>
|
355
|
+
</fo:inline>
|
356
|
+
<fo:inline keep-together.within-line="always">
|
357
|
+
<fo:leader leader-pattern="space"/>
|
358
|
+
<xsl:call-template name="getLocalizedString">
|
359
|
+
<xsl:with-param name="key">Page.sg</xsl:with-param>
|
360
|
+
</xsl:call-template>
|
361
|
+
</fo:inline>
|
362
|
+
</fo:block>
|
363
|
+
|
364
|
+
<xsl:if test="$debug = 'true'">
|
365
|
+
<xsl:text disable-output-escaping="yes"><!--</xsl:text>
|
366
|
+
DEBUG
|
367
|
+
contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
|
368
|
+
<xsl:text disable-output-escaping="yes">--></xsl:text>
|
369
|
+
</xsl:if>
|
370
|
+
|
371
|
+
<xsl:variable name="annexes_title">
|
357
372
|
<xsl:call-template name="getLocalizedString">
|
358
|
-
<xsl:with-param name="key">
|
373
|
+
<xsl:with-param name="key">Annex.pl</xsl:with-param>
|
359
374
|
</xsl:call-template>
|
360
|
-
</
|
375
|
+
</xsl:variable>
|
376
|
+
|
377
|
+
<xsl:for-each select="xalan:nodeset($contents)/doc[@id=$docid]//item[@display = 'true']"> <!-- and not (@type = 'annex') and not (@type = 'references') -->
|
378
|
+
<xsl:if test="@type = 'annex' and not(preceding-sibling::item[@display = 'true' and @type = 'annex'])">
|
379
|
+
<fo:block font-size="12pt" space-before="16pt" font-weight="bold" role="TOCI">
|
380
|
+
<xsl:value-of select="$annexes_title"/>
|
381
|
+
</fo:block>
|
382
|
+
</xsl:if>
|
383
|
+
<xsl:call-template name="print_JCGN_toc_item"/>
|
384
|
+
</xsl:for-each>
|
361
385
|
</fo:block>
|
362
|
-
|
363
|
-
<xsl:if test="$debug = 'true'">
|
364
|
-
<xsl:text disable-output-escaping="yes"><!--</xsl:text>
|
365
|
-
DEBUG
|
366
|
-
contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
|
367
|
-
<xsl:text disable-output-escaping="yes">--></xsl:text>
|
368
|
-
</xsl:if>
|
369
|
-
|
370
|
-
<xsl:variable name="annexes_title">
|
371
|
-
<xsl:call-template name="getLocalizedString">
|
372
|
-
<xsl:with-param name="key">Annex.pl</xsl:with-param>
|
373
|
-
</xsl:call-template>
|
374
|
-
</xsl:variable>
|
375
|
-
|
376
|
-
<xsl:for-each select="xalan:nodeset($contents)/doc[@id=$docid]//item[@display = 'true']"> <!-- and not (@type = 'annex') and not (@type = 'references') -->
|
377
|
-
<xsl:if test="@type = 'annex' and not(preceding-sibling::item[@display = 'true' and @type = 'annex'])">
|
378
|
-
<fo:block font-size="12pt" space-before="16pt" font-weight="bold">
|
379
|
-
<xsl:value-of select="$annexes_title"/>
|
380
|
-
</fo:block>
|
381
|
-
</xsl:if>
|
382
|
-
<xsl:call-template name="print_JCGN_toc_item"/>
|
383
|
-
</xsl:for-each>
|
384
386
|
</fo:block-container>
|
385
387
|
|
386
388
|
</xsl:for-each>
|
@@ -445,7 +447,7 @@
|
|
445
447
|
<xsl:apply-templates select="./*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = $curr_lang and @type = 'part']" mode="title"/>
|
446
448
|
</xsl:variable>
|
447
449
|
|
448
|
-
<fo:block>
|
450
|
+
<fo:block role="H1">
|
449
451
|
<xsl:copy-of select="$title-main"/>
|
450
452
|
<xsl:if test="normalize-space($title-main) != '' and normalize-space($title-part) != ''">
|
451
453
|
<xsl:text> — </xsl:text>
|
@@ -910,8 +912,11 @@
|
|
910
912
|
<xsl:call-template name="note"/>
|
911
913
|
</xsl:template>
|
912
914
|
|
913
|
-
<xsl:template match="*[local-name()='preferred']">
|
914
|
-
<
|
915
|
+
<xsl:template match="*[local-name()='preferred']">
|
916
|
+
<xsl:variable name="level">
|
917
|
+
<xsl:call-template name="getLevel"/>
|
918
|
+
</xsl:variable>
|
919
|
+
<fo:block line-height="1.1" role="H{$level}">
|
915
920
|
<fo:block font-weight="bold" keep-with-next="always">
|
916
921
|
<xsl:apply-templates select="ancestor::*[local-name()='term']/*[local-name()='name']" mode="presentation"/>
|
917
922
|
</fo:block>
|
@@ -922,7 +927,10 @@
|
|
922
927
|
</xsl:template>
|
923
928
|
|
924
929
|
<xsl:template match="*[local-name()='preferred'][not(parent::*[local-name()='term'])]">
|
925
|
-
<
|
930
|
+
<xsl:variable name="levelTerm">
|
931
|
+
<xsl:call-template name="getLevelTermName"/>
|
932
|
+
</xsl:variable>
|
933
|
+
<fo:block line-height="1.1" role="H{$levelTerm}">
|
926
934
|
<fo:block font-weight="bold" keep-with-next="always">
|
927
935
|
<xsl:apply-templates select="preceding-sibling::*[local-name()='term_name'][1]" mode="presentation"/>
|
928
936
|
</fo:block>
|
@@ -1251,14 +1259,14 @@
|
|
1251
1259
|
</xsl:variable>
|
1252
1260
|
|
1253
1261
|
<xsl:template name="insertHeaderFooter">
|
1254
|
-
<fo:static-content flow-name="header-even-jcgm">
|
1262
|
+
<fo:static-content flow-name="header-even-jcgm" role="artifact">
|
1255
1263
|
<fo:block-container height="98%">
|
1256
1264
|
<fo:block font-size="13pt" font-weight="bold" padding-top="12mm">
|
1257
1265
|
<xsl:value-of select="$header_text"/>
|
1258
1266
|
</fo:block>
|
1259
1267
|
</fo:block-container>
|
1260
1268
|
</fo:static-content>
|
1261
|
-
<fo:static-content flow-name="footer-even-jcgm">
|
1269
|
+
<fo:static-content flow-name="footer-even-jcgm" role="artifact">
|
1262
1270
|
<fo:block-container height="98%">
|
1263
1271
|
<fo:block text-align-last="justify">
|
1264
1272
|
<fo:inline font-size="12pt" font-weight="bold"><fo:page-number/></fo:inline>
|
@@ -1269,14 +1277,14 @@
|
|
1269
1277
|
</fo:block>
|
1270
1278
|
</fo:block-container>
|
1271
1279
|
</fo:static-content>
|
1272
|
-
<fo:static-content flow-name="header-odd-jcgm">
|
1280
|
+
<fo:static-content flow-name="header-odd-jcgm" role="artifact">
|
1273
1281
|
<fo:block-container height="98%">
|
1274
1282
|
<fo:block font-size="13pt" font-weight="bold" text-align="right" padding-top="12mm">
|
1275
1283
|
<xsl:value-of select="$header_text"/>
|
1276
1284
|
</fo:block>
|
1277
1285
|
</fo:block-container>
|
1278
1286
|
</fo:static-content>
|
1279
|
-
<fo:static-content flow-name="footer-odd-jcgm">
|
1287
|
+
<fo:static-content flow-name="footer-odd-jcgm" role="artifact">
|
1280
1288
|
<fo:block-container height="98%">
|
1281
1289
|
<fo:block text-align-last="justify">
|
1282
1290
|
<fo:inline font-size="10pt"><xsl:value-of select="$copyrightText"/></fo:inline>
|
@@ -1350,7 +1358,9 @@
|
|
1350
1358
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
1351
1359
|
<xsl:attribute name="line-height">130%</xsl:attribute>
|
1352
1360
|
</xsl:if>
|
1361
|
+
<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
|
1353
1362
|
<xsl:apply-templates/>
|
1363
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
1354
1364
|
</xsl:element>
|
1355
1365
|
|
1356
1366
|
<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::jcgm:p)">
|
@@ -1433,7 +1443,7 @@
|
|
1433
1443
|
<fo:block id="{@id}" span="all">
|
1434
1444
|
<xsl:apply-templates select="jcgm:title"/>
|
1435
1445
|
</fo:block>
|
1436
|
-
<fo:block>
|
1446
|
+
<fo:block role="Index">
|
1437
1447
|
<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
|
1438
1448
|
</fo:block>
|
1439
1449
|
</fo:flow>
|
@@ -1442,7 +1452,7 @@
|
|
1442
1452
|
|
1443
1453
|
<!-- <xsl:template match="jcgm:clause[@type = 'index']/jcgm:title" priority="4"> -->
|
1444
1454
|
<xsl:template match="jcgm:indexsect/jcgm:title" priority="4">
|
1445
|
-
<fo:block font-weight="bold" span="all">
|
1455
|
+
<fo:block font-weight="bold" span="all" role="H1">
|
1446
1456
|
<!-- Index -->
|
1447
1457
|
<xsl:apply-templates/>
|
1448
1458
|
</fo:block>
|
@@ -2177,6 +2187,7 @@
|
|
2177
2187
|
</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
|
2178
2188
|
<xsl:attribute name="white-space">pre</xsl:attribute>
|
2179
2189
|
<xsl:attribute name="wrap-option">wrap</xsl:attribute>
|
2190
|
+
<xsl:attribute name="role">Code</xsl:attribute>
|
2180
2191
|
|
2181
2192
|
<xsl:attribute name="font-family">Courier New</xsl:attribute>
|
2182
2193
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
@@ -2201,8 +2212,13 @@
|
|
2201
2212
|
|
2202
2213
|
</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
|
2203
2214
|
|
2204
|
-
</xsl:attribute-set><xsl:attribute-set name="
|
2205
|
-
</xsl:attribute-set><xsl:attribute-set name="
|
2215
|
+
</xsl:attribute-set><xsl:attribute-set name="subject-style">
|
2216
|
+
</xsl:attribute-set><xsl:attribute-set name="inherit-style">
|
2217
|
+
</xsl:attribute-set><xsl:attribute-set name="description-style">
|
2218
|
+
</xsl:attribute-set><xsl:attribute-set name="specification-style">
|
2219
|
+
</xsl:attribute-set><xsl:attribute-set name="measurement-target-style">
|
2220
|
+
</xsl:attribute-set><xsl:attribute-set name="verification-style">
|
2221
|
+
</xsl:attribute-set><xsl:attribute-set name="import-style">
|
2206
2222
|
</xsl:attribute-set><xsl:attribute-set name="recommendation-style">
|
2207
2223
|
|
2208
2224
|
|
@@ -2425,7 +2441,8 @@
|
|
2425
2441
|
|
2426
2442
|
|
2427
2443
|
|
2428
|
-
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
2444
|
+
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
2445
|
+
<xsl:attribute name="role">BlockQuote</xsl:attribute>
|
2429
2446
|
|
2430
2447
|
|
2431
2448
|
|
@@ -2629,7 +2646,9 @@
|
|
2629
2646
|
<!-- Display table's name before table as standalone block -->
|
2630
2647
|
<!-- $namespace = 'iso' or -->
|
2631
2648
|
|
2632
|
-
|
2649
|
+
|
2650
|
+
|
2651
|
+
|
2633
2652
|
|
2634
2653
|
|
2635
2654
|
|
@@ -4615,16 +4634,68 @@
|
|
4615
4634
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
4616
4635
|
</xsl:call-template>
|
4617
4636
|
|
4637
|
+
|
4638
|
+
|
4618
4639
|
<xsl:variable name="mathml">
|
4619
4640
|
<xsl:apply-templates select="." mode="mathml"/>
|
4620
4641
|
</xsl:variable>
|
4621
4642
|
<fo:instream-foreign-object fox:alt-text="Math">
|
4622
4643
|
|
4623
4644
|
|
4645
|
+
<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
|
4646
|
+
<xsl:variable name="comment_text_">
|
4647
|
+
<xsl:choose>
|
4648
|
+
<xsl:when test="normalize-space($comment_text_following) != ''">
|
4649
|
+
<xsl:value-of select="$comment_text_following"/>
|
4650
|
+
</xsl:when>
|
4651
|
+
<xsl:otherwise>
|
4652
|
+
<xsl:value-of select="normalize-space(translate(.,' ',' '))"/>
|
4653
|
+
</xsl:otherwise>
|
4654
|
+
</xsl:choose>
|
4655
|
+
</xsl:variable>
|
4656
|
+
<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
|
4657
|
+
|
4658
|
+
<xsl:if test="normalize-space($comment_text) != ''">
|
4659
|
+
<!-- put Mathin Alternate Text -->
|
4660
|
+
<xsl:attribute name="fox:alt-text">
|
4661
|
+
<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
|
4662
|
+
</xsl:attribute>
|
4663
|
+
</xsl:if>
|
4664
|
+
|
4665
|
+
<xsl:variable name="mathml_content">
|
4666
|
+
<xsl:apply-templates select="." mode="mathml_actual_text"/>
|
4667
|
+
</xsl:variable>
|
4668
|
+
<!-- put MathML in Actual Text -->
|
4669
|
+
<xsl:attribute name="fox:actual-text">
|
4670
|
+
<xsl:value-of select="$mathml_content"/>
|
4671
|
+
</xsl:attribute>
|
4672
|
+
|
4673
|
+
|
4624
4674
|
<!-- <xsl:copy-of select="."/> -->
|
4625
4675
|
<xsl:copy-of select="xalan:nodeset($mathml)"/>
|
4626
4676
|
</fo:instream-foreign-object>
|
4627
4677
|
</fo:inline>
|
4678
|
+
</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
|
4679
|
+
<!-- <xsl:text>a+b</xsl:text> -->
|
4680
|
+
<xsl:text><</xsl:text>
|
4681
|
+
<xsl:value-of select="local-name()"/>
|
4682
|
+
<xsl:if test="local-name() = 'math'">
|
4683
|
+
<xsl:text> xmlns="http://www.w3.org/1998/Math/MathML"</xsl:text>
|
4684
|
+
</xsl:if>
|
4685
|
+
<xsl:for-each select="@*">
|
4686
|
+
<xsl:text> </xsl:text>
|
4687
|
+
<xsl:value-of select="local-name()"/>
|
4688
|
+
<xsl:text>="</xsl:text>
|
4689
|
+
<xsl:value-of select="."/>
|
4690
|
+
<xsl:text>"</xsl:text>
|
4691
|
+
</xsl:for-each>
|
4692
|
+
<xsl:text>></xsl:text>
|
4693
|
+
<xsl:apply-templates mode="mathml_actual_text"/>
|
4694
|
+
<xsl:text></</xsl:text>
|
4695
|
+
<xsl:value-of select="local-name()"/>
|
4696
|
+
<xsl:text>></xsl:text>
|
4697
|
+
</xsl:template><xsl:template match="text()" mode="mathml_actual_text">
|
4698
|
+
<xsl:value-of select="normalize-space()"/>
|
4628
4699
|
</xsl:template><xsl:template match="@*|node()" mode="mathml">
|
4629
4700
|
<xsl:copy>
|
4630
4701
|
<xsl:apply-templates select="@*|node()" mode="mathml"/>
|
@@ -4686,7 +4757,10 @@
|
|
4686
4757
|
</fo:block>
|
4687
4758
|
<xsl:apply-templates/>
|
4688
4759
|
</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
|
4689
|
-
<
|
4760
|
+
<xsl:variable name="level">
|
4761
|
+
<xsl:call-template name="getLevel"/>
|
4762
|
+
</xsl:variable>
|
4763
|
+
<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
|
4690
4764
|
</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
|
4691
4765
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
|
4692
4766
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
@@ -4721,9 +4795,10 @@
|
|
4721
4795
|
|
4722
4796
|
</xsl:variable>
|
4723
4797
|
|
4798
|
+
<xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
|
4724
4799
|
<xsl:choose>
|
4725
|
-
<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
|
4726
|
-
<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
|
4800
|
+
<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
|
4801
|
+
<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
|
4727
4802
|
</xsl:choose>
|
4728
4803
|
<xsl:apply-templates/>
|
4729
4804
|
</xsl:template><xsl:template match="*[local-name() = 'xref']">
|
@@ -4869,7 +4944,10 @@
|
|
4869
4944
|
</fo:block>
|
4870
4945
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
4871
4946
|
<xsl:if test="normalize-space() != ''">
|
4872
|
-
<
|
4947
|
+
<xsl:variable name="level">
|
4948
|
+
<xsl:call-template name="getLevelTermName"/>
|
4949
|
+
</xsl:variable>
|
4950
|
+
<fo:inline role="H{$level}">
|
4873
4951
|
<xsl:apply-templates/>
|
4874
4952
|
<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
|
4875
4953
|
<xsl:text>.</xsl:text>
|
@@ -5500,6 +5578,7 @@
|
|
5500
5578
|
</xsl:when>
|
5501
5579
|
<xsl:otherwise>
|
5502
5580
|
<xsl:apply-templates/>
|
5581
|
+
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
5503
5582
|
</xsl:otherwise>
|
5504
5583
|
</xsl:choose>
|
5505
5584
|
</fo:block>
|
@@ -5640,14 +5719,6 @@
|
|
5640
5719
|
<fo:block>
|
5641
5720
|
<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
|
5642
5721
|
</fo:block>
|
5643
|
-
</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
|
5644
|
-
<fo:block xsl:use-attribute-sets="requirement-subject-style">
|
5645
|
-
<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
|
5646
|
-
</fo:block>
|
5647
|
-
</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'inherit']">
|
5648
|
-
<fo:block xsl:use-attribute-sets="requirement-inherit-style">
|
5649
|
-
<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
|
5650
|
-
</fo:block>
|
5651
5722
|
</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
|
5652
5723
|
<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
|
5653
5724
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
@@ -5664,6 +5735,38 @@
|
|
5664
5735
|
<fo:block xsl:use-attribute-sets="recommendation-label-style">
|
5665
5736
|
<xsl:apply-templates/>
|
5666
5737
|
</fo:block>
|
5738
|
+
</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
|
5739
|
+
<fo:block xsl:use-attribute-sets="subject-style">
|
5740
|
+
<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
|
5741
|
+
</fo:block>
|
5742
|
+
</xsl:template><xsl:template match="*[local-name() = 'subject']">
|
5743
|
+
<fo:block xsl:use-attribute-sets="subject-style">
|
5744
|
+
<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
|
5745
|
+
</fo:block>
|
5746
|
+
</xsl:template><xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
|
5747
|
+
<fo:block xsl:use-attribute-sets="inherit-style">
|
5748
|
+
<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
|
5749
|
+
</fo:block>
|
5750
|
+
</xsl:template><xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
|
5751
|
+
<fo:block xsl:use-attribute-sets="description-style">
|
5752
|
+
<xsl:apply-templates/>
|
5753
|
+
</fo:block>
|
5754
|
+
</xsl:template><xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
|
5755
|
+
<fo:block xsl:use-attribute-sets="specification-style">
|
5756
|
+
<xsl:apply-templates/>
|
5757
|
+
</fo:block>
|
5758
|
+
</xsl:template><xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
|
5759
|
+
<fo:block xsl:use-attribute-sets="measurement-target-style">
|
5760
|
+
<xsl:apply-templates/>
|
5761
|
+
</fo:block>
|
5762
|
+
</xsl:template><xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
|
5763
|
+
<fo:block xsl:use-attribute-sets="verification-style">
|
5764
|
+
<xsl:apply-templates/>
|
5765
|
+
</fo:block>
|
5766
|
+
</xsl:template><xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
|
5767
|
+
<fo:block xsl:use-attribute-sets="import-style">
|
5768
|
+
<xsl:apply-templates/>
|
5769
|
+
</fo:block>
|
5667
5770
|
</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
5668
5771
|
<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
|
5669
5772
|
<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
|
@@ -6556,6 +6659,9 @@
|
|
6556
6659
|
<fo:block-container border="1pt solid black" width="50%">
|
6557
6660
|
<fo:block> </fo:block>
|
6558
6661
|
</fo:block-container>
|
6662
|
+
</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
|
6663
|
+
<fo:inline padding-right="5mm"> </fo:inline>
|
6664
|
+
<fo:inline><xsl:apply-templates/></fo:inline>
|
6559
6665
|
</xsl:template><xsl:template name="convertDate">
|
6560
6666
|
<xsl:param name="date"/>
|
6561
6667
|
<xsl:param name="format" select="'short'"/>
|
@@ -6791,6 +6897,26 @@
|
|
6791
6897
|
<xsl:value-of select="$level"/>
|
6792
6898
|
</xsl:otherwise>
|
6793
6899
|
</xsl:choose>
|
6900
|
+
</xsl:template><xsl:template name="getLevelTermName">
|
6901
|
+
<xsl:choose>
|
6902
|
+
<xsl:when test="normalize-space(../@depth) != ''">
|
6903
|
+
<xsl:value-of select="../@depth"/>
|
6904
|
+
</xsl:when>
|
6905
|
+
<xsl:otherwise>
|
6906
|
+
<xsl:variable name="title_level_">
|
6907
|
+
<xsl:for-each select="../preceding-sibling::*[local-name() = 'title'][1]">
|
6908
|
+
<xsl:call-template name="getLevel"/>
|
6909
|
+
</xsl:for-each>
|
6910
|
+
</xsl:variable>
|
6911
|
+
<xsl:variable name="title_level" select="normalize-space($title_level_)"/>
|
6912
|
+
<xsl:choose>
|
6913
|
+
<xsl:when test="$title_level != ''"><xsl:value-of select="$title_level + 1"/></xsl:when>
|
6914
|
+
<xsl:otherwise>
|
6915
|
+
<xsl:call-template name="getLevel"/>
|
6916
|
+
</xsl:otherwise>
|
6917
|
+
</xsl:choose>
|
6918
|
+
</xsl:otherwise>
|
6919
|
+
</xsl:choose>
|
6794
6920
|
</xsl:template><xsl:template name="split">
|
6795
6921
|
<xsl:param name="pText" select="."/>
|
6796
6922
|
<xsl:param name="sep" select="','"/>
|