metanorma-bipm 2.8.7 → 2.8.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/bipm/bipm.brochure.xsl +151 -11
  3. data/lib/isodoc/bipm/bipm.guide.xsl +151 -11
  4. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +151 -11
  5. data/lib/isodoc/bipm/bipm.rapport.xsl +151 -11
  6. data/lib/isodoc/bipm/html/htmlstyle.css +1 -1
  7. data/lib/isodoc/bipm/html/htmlstyle.scss +1 -1
  8. data/lib/isodoc/bipm/jcgm.standard.xsl +151 -10
  9. data/lib/metanorma/bipm/isodoc.rng +6 -0
  10. data/lib/metanorma/bipm/version.rb +1 -1
  11. data/lib/relaton/render/config.yml +9 -9
  12. metadata +3 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 03730bcd2f7abe0c0040293066fc7c3f43b1683d6dac97d70ff3407ef52bd27e
4
- data.tar.gz: 80b3c931e1234095124aa069a832d87432a3aa3e4d581f39415017ddb905f1ad
3
+ metadata.gz: d5f93ce18263d7cd23547de7791629e3854396c418a98e333b023d1482d0f810
4
+ data.tar.gz: 993d7e81f3a9b6e7a70929064682193f3fc7e7229bab3d9d296ca52fb84d08d6
5
5
  SHA512:
6
- metadata.gz: 88e0bb32a9672ed1a73b778fb7edd59fa23bcddf6d207044c4efbc4fb82ad39597e257fcc90582a0aca76812a9ca2e145dc45fd4ca1ce140d7adcd5db9b07173
7
- data.tar.gz: d3b6c56a3b7a60fee888152d16e462b9b0d46859f4e28f2526e8a707795df6e86c4defbbc36d61cb7d32a0d87262f293abb507c9d9028215d80ddb2298e61021
6
+ metadata.gz: c09c30befb9ccd50eacf497036df1d130154b6065851c0602ae0e3dfe850a703c9e31b44001a2ba4a320bff60c941d4620752ee4f48a163c0096b4b9c0b3af8d
7
+ data.tar.gz: 863a357bdde4b9d778ea55e544b1e8a9f9334714a7586f3f8f03612bb8a6f0297c35ab3a0bc5feb319931e040e8b60dc0b24ffcf10c2a48d9f10a79b99f0263f
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -1904,6 +1904,7 @@
1904
1904
  <!-- <fo:block-container margin-left="-14mm" margin-right="0mm">
1905
1905
  <fo:block-container margin-left="0mm" margin-right="0mm"> -->
1906
1906
  <fo:block xsl:use-attribute-sets="toc-title-style">
1907
+ <xsl:call-template name="refine_toc-title-style"/>
1907
1908
  <fo:inline><xsl:value-of select="//mn:metanorma/mn:bibdata/mn:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
1908
1909
  <fo:inline keep-together.within-line="always">
1909
1910
  <fo:leader leader-pattern="space"/>
@@ -1964,6 +1965,16 @@
1964
1965
  <xsl:call-template name="insertListOf_Item"/>
1965
1966
  </xsl:for-each>
1966
1967
 
1968
+ <!-- List of Examples -->
1969
+ <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:examples/mnx:example">
1970
+ <xsl:if test="position() = 1">
1971
+ <xsl:call-template name="insertListOf_Title">
1972
+ <xsl:with-param name="title" select="$title-list-examples"/>
1973
+ </xsl:call-template>
1974
+ </xsl:if>
1975
+ <xsl:call-template name="insertListOf_Item"/>
1976
+ </xsl:for-each>
1977
+
1967
1978
  </fo:table-body>
1968
1979
  </fo:table>
1969
1980
  </xsl:if>
@@ -3957,6 +3968,16 @@
3957
3968
  </xsl:if>
3958
3969
  </xsl:variable>
3959
3970
 
3971
+ <xsl:variable name="title-list-examples">
3972
+ <xsl:variable name="toc_example_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title"/>
3973
+ <xsl:value-of select="$toc_example_title"/>
3974
+ <xsl:if test="normalize-space($toc_example_title) = ''">
3975
+ <xsl:call-template name="getLocalizedString">
3976
+ <xsl:with-param name="key">toc_examples</xsl:with-param>
3977
+ </xsl:call-template>
3978
+ </xsl:if>
3979
+ </xsl:variable>
3980
+
3960
3981
  <xsl:variable name="title-list-recommendations">
3961
3982
  <xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
3962
3983
  <xsl:value-of select="$toc_requirement_title"/>
@@ -4819,6 +4840,14 @@
4819
4840
 
4820
4841
  <xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
4821
4842
 
4843
+ <xsl:template match="mn:pagebreak" mode="update_xml_step1">
4844
+ <xsl:copy>
4845
+ <xsl:apply-templates select="@*" mode="update_xml_step1"/>
4846
+ <xsl:attribute name="from_source_xml">true</xsl:attribute>
4847
+ <xsl:apply-templates select="node()" mode="update_xml_step1"/>
4848
+ </xsl:copy>
4849
+ </xsl:template>
4850
+
4822
4851
  <!-- END: update new Presentation XML -->
4823
4852
 
4824
4853
  <!-- =========================================================================== -->
@@ -4856,6 +4885,7 @@
4856
4885
  <xsl:for-each select="ancestor-or-self::*[ancestor::mn:preface or ancestor::mn:sections or ancestor-or-self::mn:annex]">
4857
4886
  <xsl:if test="following-sibling::*">false</xsl:if>
4858
4887
  </xsl:for-each>
4888
+ <xsl:if test="@from_source_xml = 'true'">false</xsl:if>
4859
4889
  </xsl:variable>
4860
4890
 
4861
4891
  <xsl:if test="contains($isLast, 'false')">
@@ -5768,6 +5798,7 @@
5768
5798
  </xsl:attribute-set> <!-- sourcecode-style -->
5769
5799
 
5770
5800
  <xsl:template name="refine_sourcecode-style">
5801
+ <xsl:call-template name="setKeepAttributes"/>
5771
5802
  </xsl:template> <!-- refine_sourcecode-style -->
5772
5803
 
5773
5804
  <xsl:attribute-set name="sourcecode-number-style">
@@ -6503,10 +6534,38 @@
6503
6534
  <xsl:template name="refine_strike-style">
6504
6535
  </xsl:template>
6505
6536
 
6537
+ <xsl:attribute-set name="hr-block-style">
6538
+ <xsl:attribute name="font-size">1pt</xsl:attribute>
6539
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
6540
+ <xsl:attribute name="role">SKIP</xsl:attribute>
6541
+ <xsl:attribute name="padding-top">-2pt</xsl:attribute>
6542
+ <xsl:attribute name="space-after">4pt</xsl:attribute>
6543
+ </xsl:attribute-set>
6544
+
6545
+ <xsl:template name="refine_hr-block-style">
6546
+ </xsl:template>
6547
+
6548
+ <xsl:attribute-set name="hr-style">
6549
+ <xsl:attribute name="leader-pattern">rule</xsl:attribute>
6550
+ <xsl:attribute name="leader-length">100%</xsl:attribute>
6551
+ </xsl:attribute-set>
6552
+
6553
+ <xsl:template name="refine_hr-style">
6554
+ </xsl:template>
6555
+
6506
6556
  <xsl:template match="mn:br">
6507
6557
  <xsl:value-of select="$linebreak"/>
6508
6558
  </xsl:template>
6509
6559
 
6560
+ <xsl:template match="mn:hr">
6561
+ <fo:block xsl:use-attribute-sets="hr-block-style">
6562
+ <xsl:call-template name="refine_hr-block-style"/>
6563
+ <fo:leader xsl:use-attribute-sets="hr-style">
6564
+ <xsl:call-template name="refine_hr-style"/>
6565
+ </fo:leader>
6566
+ </fo:block>
6567
+ </xsl:template>
6568
+
6510
6569
  <xsl:template match="mn:em">
6511
6570
  <fo:inline xsl:use-attribute-sets="em-style">
6512
6571
  <xsl:call-template name="refine_em_style"/>
@@ -7724,6 +7783,7 @@
7724
7783
  text line 1
7725
7784
  text line 2
7726
7785
  -->
7786
+ <xsl:variable name="example_display_in"><!-- don't change here, only for override xsl --></xsl:variable> <!-- block or inline -->
7727
7787
  <xsl:template match="mn:example" name="example">
7728
7788
  <xsl:call-template name="setNamedDestination"/>
7729
7789
  <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
@@ -7733,7 +7793,8 @@
7733
7793
  <xsl:call-template name="refine_example-style"/>
7734
7794
 
7735
7795
  <xsl:variable name="fo_element">
7736
- <xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
7796
+ <xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>
7797
+ <xsl:if test="normalize-space($example_display_in) != ''"><xsl:value-of select="$example_display_in"/></xsl:if>block
7737
7798
  </xsl:variable>
7738
7799
 
7739
7800
  <fo:block-container margin-left="0mm" role="SKIP">
@@ -15090,7 +15151,6 @@
15090
15151
  <xsl:attribute name="font-weight">bold</xsl:attribute>
15091
15152
  <xsl:attribute name="text-align-last">justify</xsl:attribute>
15092
15153
  <xsl:attribute name="margin-bottom">82pt</xsl:attribute>
15093
- <xsl:attribute name="role">H1</xsl:attribute>
15094
15154
  </xsl:attribute-set>
15095
15155
 
15096
15156
  <xsl:template name="refine_toc-title-style">
@@ -15161,7 +15221,7 @@
15161
15221
  <xsl:template name="refine_toc-pagenumber-style">
15162
15222
  </xsl:template>
15163
15223
 
15164
- <!-- List of Figures, Tables -->
15224
+ <!-- List of Figures, Tables, Examples -->
15165
15225
  <xsl:attribute-set name="toc-listof-title-style">
15166
15226
  <xsl:attribute name="font-family">Arial</xsl:attribute>
15167
15227
  <xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -15266,6 +15326,9 @@
15266
15326
  <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
15267
15327
  <xsl:call-template name="processFigures_Contents"/>
15268
15328
  </xsl:if>
15329
+ <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
15330
+ <xsl:call-template name="processExamples_Contents"/>
15331
+ </xsl:if>
15269
15332
  </xsl:template>
15270
15333
 
15271
15334
  <xsl:template name="processTables_Contents">
@@ -15312,7 +15375,29 @@
15312
15375
  </mnx:figures>
15313
15376
  </xsl:template>
15314
15377
 
15315
- <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
15378
+ <xsl:template name="processExamples_Contents">
15379
+ <mnx:examples>
15380
+ <xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != '']">
15381
+ <xsl:choose>
15382
+ <xsl:when test="mn:fmt-name">
15383
+ <xsl:variable name="fmt_name">
15384
+ <xsl:apply-templates select="mn:fmt-name" mode="update_xml_step1"/>
15385
+ </xsl:variable>
15386
+ <mnx:example id="{@id}" alt-text="{normalize-space($fmt_name)}">
15387
+ <xsl:copy-of select="$fmt_name"/>
15388
+ </mnx:example>
15389
+ </xsl:when>
15390
+ <xsl:otherwise>
15391
+ <mnx:example id="{@id}" alt-text="{mn:name}">
15392
+ <xsl:copy-of select="mn:name"/>
15393
+ </mnx:example>
15394
+ </xsl:otherwise>
15395
+ </xsl:choose>
15396
+ </xsl:for-each>
15397
+ </mnx:examples>
15398
+ </xsl:template>
15399
+
15400
+ <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:example/mn:name | mnx:example/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
15316
15401
  <xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
15317
15402
  <xsl:apply-templates mode="contents"/>
15318
15403
  <xsl:text> </xsl:text>
@@ -15321,40 +15406,40 @@
15321
15406
 
15322
15407
  <xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
15323
15408
 
15324
- <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
15409
+ <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:example/mn:fmt-name | mnx:example/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
15325
15410
  <xsl:apply-templates mode="contents"/>
15326
15411
  <xsl:text> </xsl:text>
15327
15412
  </xsl:template>
15328
15413
 
15329
- <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name | mn:sourcecode/mn:name" mode="bookmarks">
15414
+ <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:example/mn:name | mnx:example/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name | mn:sourcecode/mn:name" mode="bookmarks">
15330
15415
  <xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
15331
15416
  <xsl:apply-templates mode="bookmarks"/>
15332
15417
  <xsl:text> </xsl:text>
15333
15418
  </xsl:if>
15334
15419
  </xsl:template>
15335
15420
 
15336
- <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
15421
+ <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:example/mn:fmt-name | mnx:example/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
15337
15422
  <xsl:apply-templates mode="bookmarks"/>
15338
15423
  <xsl:text> </xsl:text>
15339
15424
  </xsl:template>
15340
15425
 
15341
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
15426
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
15342
15427
  <xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
15343
15428
  <xsl:value-of select="."/>
15344
15429
  </xsl:if>
15345
15430
  </xsl:template>
15346
15431
 
15347
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
15432
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
15348
15433
  <xsl:value-of select="."/>
15349
15434
  </xsl:template>
15350
15435
 
15351
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
15436
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
15352
15437
  <xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
15353
15438
  <xsl:value-of select="."/>
15354
15439
  </xsl:if>
15355
15440
  </xsl:template>
15356
15441
 
15357
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
15442
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
15358
15443
  <xsl:value-of select="."/>
15359
15444
  </xsl:template>
15360
15445
 
@@ -15587,6 +15672,11 @@
15587
15672
  <xsl:with-param name="lang" select="@lang"/>
15588
15673
  </xsl:call-template>
15589
15674
 
15675
+ <xsl:call-template name="insertExampleBookmarks">
15676
+ <xsl:with-param name="contents" select="mnx:contents"/>
15677
+ <xsl:with-param name="lang" select="@lang"/>
15678
+ </xsl:call-template>
15679
+
15590
15680
  </fo:bookmark>
15591
15681
 
15592
15682
  </xsl:for-each>
@@ -15605,6 +15695,11 @@
15605
15695
  <xsl:with-param name="lang" select="@lang"/>
15606
15696
  </xsl:call-template>
15607
15697
 
15698
+ <xsl:call-template name="insertExampleBookmarks">
15699
+ <xsl:with-param name="contents" select="mnx:contents"/>
15700
+ <xsl:with-param name="lang" select="@lang"/>
15701
+ </xsl:call-template>
15702
+
15608
15703
  </xsl:for-each>
15609
15704
  </xsl:otherwise>
15610
15705
  </xsl:choose>
@@ -15621,6 +15716,11 @@
15621
15716
  <xsl:with-param name="lang" select="@lang"/>
15622
15717
  </xsl:call-template>
15623
15718
 
15719
+ <xsl:call-template name="insertExampleBookmarks">
15720
+ <xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
15721
+ <xsl:with-param name="lang" select="@lang"/>
15722
+ </xsl:call-template>
15723
+
15624
15724
  </xsl:otherwise>
15625
15725
  </xsl:choose>
15626
15726
 
@@ -15701,6 +15801,46 @@
15701
15801
  </fo:bookmark>
15702
15802
  </xsl:if>
15703
15803
  </xsl:template> <!-- insertTableBookmarks -->
15804
+
15805
+ <xsl:template name="insertExampleBookmarks">
15806
+ <xsl:param name="contents"/>
15807
+ <xsl:param name="lang"/>
15808
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
15809
+ <xsl:if test="$contents_nodes/mnx:example">
15810
+ <fo:bookmark internal-destination="{$contents_nodes/mnx:example[1]/@id}" starting-state="hide">
15811
+ <fo:bookmark-title>
15812
+ <xsl:choose>
15813
+ <xsl:when test="$lang = 'fr'">Exemples</xsl:when>
15814
+ <xsl:otherwise>Examples</xsl:otherwise>
15815
+ </xsl:choose>
15816
+ </fo:bookmark-title>
15817
+ <xsl:for-each select="$contents_nodes/mnx:example">
15818
+ <fo:bookmark internal-destination="{@id}">
15819
+ <fo:bookmark-title>
15820
+ <xsl:value-of select="normalize-space(mnx:title)"/>
15821
+ </fo:bookmark-title>
15822
+ </fo:bookmark>
15823
+ </xsl:for-each>
15824
+ </fo:bookmark>
15825
+ </xsl:if>
15826
+ <xsl:if test="$contents_nodes//mnx:examples/mnx:example">
15827
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
15828
+
15829
+ <xsl:variable name="bookmark-title">
15830
+ <xsl:value-of select="$title-list-examples"/>
15831
+ </xsl:variable>
15832
+
15833
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
15834
+
15835
+ <xsl:for-each select="$contents_nodes//mnx:examples/mnx:example">
15836
+ <fo:bookmark internal-destination="{@id}">
15837
+ <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
15838
+ <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
15839
+ </fo:bookmark>
15840
+ </xsl:for-each>
15841
+ </fo:bookmark>
15842
+ </xsl:if>
15843
+ </xsl:template> <!-- insertExampleBookmarks -->
15704
15844
  <!-- End Bookmarks -->
15705
15845
 
15706
15846
  <!-- ============================ -->
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -1904,6 +1904,7 @@
1904
1904
  <!-- <fo:block-container margin-left="-14mm" margin-right="0mm">
1905
1905
  <fo:block-container margin-left="0mm" margin-right="0mm"> -->
1906
1906
  <fo:block xsl:use-attribute-sets="toc-title-style">
1907
+ <xsl:call-template name="refine_toc-title-style"/>
1907
1908
  <fo:inline><xsl:value-of select="//mn:metanorma/mn:bibdata/mn:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
1908
1909
  <fo:inline keep-together.within-line="always">
1909
1910
  <fo:leader leader-pattern="space"/>
@@ -1964,6 +1965,16 @@
1964
1965
  <xsl:call-template name="insertListOf_Item"/>
1965
1966
  </xsl:for-each>
1966
1967
 
1968
+ <!-- List of Examples -->
1969
+ <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:examples/mnx:example">
1970
+ <xsl:if test="position() = 1">
1971
+ <xsl:call-template name="insertListOf_Title">
1972
+ <xsl:with-param name="title" select="$title-list-examples"/>
1973
+ </xsl:call-template>
1974
+ </xsl:if>
1975
+ <xsl:call-template name="insertListOf_Item"/>
1976
+ </xsl:for-each>
1977
+
1967
1978
  </fo:table-body>
1968
1979
  </fo:table>
1969
1980
  </xsl:if>
@@ -3957,6 +3968,16 @@
3957
3968
  </xsl:if>
3958
3969
  </xsl:variable>
3959
3970
 
3971
+ <xsl:variable name="title-list-examples">
3972
+ <xsl:variable name="toc_example_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title"/>
3973
+ <xsl:value-of select="$toc_example_title"/>
3974
+ <xsl:if test="normalize-space($toc_example_title) = ''">
3975
+ <xsl:call-template name="getLocalizedString">
3976
+ <xsl:with-param name="key">toc_examples</xsl:with-param>
3977
+ </xsl:call-template>
3978
+ </xsl:if>
3979
+ </xsl:variable>
3980
+
3960
3981
  <xsl:variable name="title-list-recommendations">
3961
3982
  <xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
3962
3983
  <xsl:value-of select="$toc_requirement_title"/>
@@ -4819,6 +4840,14 @@
4819
4840
 
4820
4841
  <xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
4821
4842
 
4843
+ <xsl:template match="mn:pagebreak" mode="update_xml_step1">
4844
+ <xsl:copy>
4845
+ <xsl:apply-templates select="@*" mode="update_xml_step1"/>
4846
+ <xsl:attribute name="from_source_xml">true</xsl:attribute>
4847
+ <xsl:apply-templates select="node()" mode="update_xml_step1"/>
4848
+ </xsl:copy>
4849
+ </xsl:template>
4850
+
4822
4851
  <!-- END: update new Presentation XML -->
4823
4852
 
4824
4853
  <!-- =========================================================================== -->
@@ -4856,6 +4885,7 @@
4856
4885
  <xsl:for-each select="ancestor-or-self::*[ancestor::mn:preface or ancestor::mn:sections or ancestor-or-self::mn:annex]">
4857
4886
  <xsl:if test="following-sibling::*">false</xsl:if>
4858
4887
  </xsl:for-each>
4888
+ <xsl:if test="@from_source_xml = 'true'">false</xsl:if>
4859
4889
  </xsl:variable>
4860
4890
 
4861
4891
  <xsl:if test="contains($isLast, 'false')">
@@ -5768,6 +5798,7 @@
5768
5798
  </xsl:attribute-set> <!-- sourcecode-style -->
5769
5799
 
5770
5800
  <xsl:template name="refine_sourcecode-style">
5801
+ <xsl:call-template name="setKeepAttributes"/>
5771
5802
  </xsl:template> <!-- refine_sourcecode-style -->
5772
5803
 
5773
5804
  <xsl:attribute-set name="sourcecode-number-style">
@@ -6503,10 +6534,38 @@
6503
6534
  <xsl:template name="refine_strike-style">
6504
6535
  </xsl:template>
6505
6536
 
6537
+ <xsl:attribute-set name="hr-block-style">
6538
+ <xsl:attribute name="font-size">1pt</xsl:attribute>
6539
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
6540
+ <xsl:attribute name="role">SKIP</xsl:attribute>
6541
+ <xsl:attribute name="padding-top">-2pt</xsl:attribute>
6542
+ <xsl:attribute name="space-after">4pt</xsl:attribute>
6543
+ </xsl:attribute-set>
6544
+
6545
+ <xsl:template name="refine_hr-block-style">
6546
+ </xsl:template>
6547
+
6548
+ <xsl:attribute-set name="hr-style">
6549
+ <xsl:attribute name="leader-pattern">rule</xsl:attribute>
6550
+ <xsl:attribute name="leader-length">100%</xsl:attribute>
6551
+ </xsl:attribute-set>
6552
+
6553
+ <xsl:template name="refine_hr-style">
6554
+ </xsl:template>
6555
+
6506
6556
  <xsl:template match="mn:br">
6507
6557
  <xsl:value-of select="$linebreak"/>
6508
6558
  </xsl:template>
6509
6559
 
6560
+ <xsl:template match="mn:hr">
6561
+ <fo:block xsl:use-attribute-sets="hr-block-style">
6562
+ <xsl:call-template name="refine_hr-block-style"/>
6563
+ <fo:leader xsl:use-attribute-sets="hr-style">
6564
+ <xsl:call-template name="refine_hr-style"/>
6565
+ </fo:leader>
6566
+ </fo:block>
6567
+ </xsl:template>
6568
+
6510
6569
  <xsl:template match="mn:em">
6511
6570
  <fo:inline xsl:use-attribute-sets="em-style">
6512
6571
  <xsl:call-template name="refine_em_style"/>
@@ -7724,6 +7783,7 @@
7724
7783
  text line 1
7725
7784
  text line 2
7726
7785
  -->
7786
+ <xsl:variable name="example_display_in"><!-- don't change here, only for override xsl --></xsl:variable> <!-- block or inline -->
7727
7787
  <xsl:template match="mn:example" name="example">
7728
7788
  <xsl:call-template name="setNamedDestination"/>
7729
7789
  <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
@@ -7733,7 +7793,8 @@
7733
7793
  <xsl:call-template name="refine_example-style"/>
7734
7794
 
7735
7795
  <xsl:variable name="fo_element">
7736
- <xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
7796
+ <xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>
7797
+ <xsl:if test="normalize-space($example_display_in) != ''"><xsl:value-of select="$example_display_in"/></xsl:if>block
7737
7798
  </xsl:variable>
7738
7799
 
7739
7800
  <fo:block-container margin-left="0mm" role="SKIP">
@@ -15090,7 +15151,6 @@
15090
15151
  <xsl:attribute name="font-weight">bold</xsl:attribute>
15091
15152
  <xsl:attribute name="text-align-last">justify</xsl:attribute>
15092
15153
  <xsl:attribute name="margin-bottom">82pt</xsl:attribute>
15093
- <xsl:attribute name="role">H1</xsl:attribute>
15094
15154
  </xsl:attribute-set>
15095
15155
 
15096
15156
  <xsl:template name="refine_toc-title-style">
@@ -15161,7 +15221,7 @@
15161
15221
  <xsl:template name="refine_toc-pagenumber-style">
15162
15222
  </xsl:template>
15163
15223
 
15164
- <!-- List of Figures, Tables -->
15224
+ <!-- List of Figures, Tables, Examples -->
15165
15225
  <xsl:attribute-set name="toc-listof-title-style">
15166
15226
  <xsl:attribute name="font-family">Arial</xsl:attribute>
15167
15227
  <xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -15266,6 +15326,9 @@
15266
15326
  <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
15267
15327
  <xsl:call-template name="processFigures_Contents"/>
15268
15328
  </xsl:if>
15329
+ <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
15330
+ <xsl:call-template name="processExamples_Contents"/>
15331
+ </xsl:if>
15269
15332
  </xsl:template>
15270
15333
 
15271
15334
  <xsl:template name="processTables_Contents">
@@ -15312,7 +15375,29 @@
15312
15375
  </mnx:figures>
15313
15376
  </xsl:template>
15314
15377
 
15315
- <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
15378
+ <xsl:template name="processExamples_Contents">
15379
+ <mnx:examples>
15380
+ <xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != '']">
15381
+ <xsl:choose>
15382
+ <xsl:when test="mn:fmt-name">
15383
+ <xsl:variable name="fmt_name">
15384
+ <xsl:apply-templates select="mn:fmt-name" mode="update_xml_step1"/>
15385
+ </xsl:variable>
15386
+ <mnx:example id="{@id}" alt-text="{normalize-space($fmt_name)}">
15387
+ <xsl:copy-of select="$fmt_name"/>
15388
+ </mnx:example>
15389
+ </xsl:when>
15390
+ <xsl:otherwise>
15391
+ <mnx:example id="{@id}" alt-text="{mn:name}">
15392
+ <xsl:copy-of select="mn:name"/>
15393
+ </mnx:example>
15394
+ </xsl:otherwise>
15395
+ </xsl:choose>
15396
+ </xsl:for-each>
15397
+ </mnx:examples>
15398
+ </xsl:template>
15399
+
15400
+ <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:example/mn:name | mnx:example/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
15316
15401
  <xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
15317
15402
  <xsl:apply-templates mode="contents"/>
15318
15403
  <xsl:text> </xsl:text>
@@ -15321,40 +15406,40 @@
15321
15406
 
15322
15407
  <xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
15323
15408
 
15324
- <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
15409
+ <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:example/mn:fmt-name | mnx:example/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
15325
15410
  <xsl:apply-templates mode="contents"/>
15326
15411
  <xsl:text> </xsl:text>
15327
15412
  </xsl:template>
15328
15413
 
15329
- <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name | mn:sourcecode/mn:name" mode="bookmarks">
15414
+ <xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:example/mn:name | mnx:example/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name | mn:sourcecode/mn:name" mode="bookmarks">
15330
15415
  <xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
15331
15416
  <xsl:apply-templates mode="bookmarks"/>
15332
15417
  <xsl:text> </xsl:text>
15333
15418
  </xsl:if>
15334
15419
  </xsl:template>
15335
15420
 
15336
- <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
15421
+ <xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:example/mn:fmt-name | mnx:example/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
15337
15422
  <xsl:apply-templates mode="bookmarks"/>
15338
15423
  <xsl:text> </xsl:text>
15339
15424
  </xsl:template>
15340
15425
 
15341
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
15426
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
15342
15427
  <xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
15343
15428
  <xsl:value-of select="."/>
15344
15429
  </xsl:if>
15345
15430
  </xsl:template>
15346
15431
 
15347
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
15432
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
15348
15433
  <xsl:value-of select="."/>
15349
15434
  </xsl:template>
15350
15435
 
15351
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
15436
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
15352
15437
  <xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
15353
15438
  <xsl:value-of select="."/>
15354
15439
  </xsl:if>
15355
15440
  </xsl:template>
15356
15441
 
15357
- <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
15442
+ <xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
15358
15443
  <xsl:value-of select="."/>
15359
15444
  </xsl:template>
15360
15445
 
@@ -15587,6 +15672,11 @@
15587
15672
  <xsl:with-param name="lang" select="@lang"/>
15588
15673
  </xsl:call-template>
15589
15674
 
15675
+ <xsl:call-template name="insertExampleBookmarks">
15676
+ <xsl:with-param name="contents" select="mnx:contents"/>
15677
+ <xsl:with-param name="lang" select="@lang"/>
15678
+ </xsl:call-template>
15679
+
15590
15680
  </fo:bookmark>
15591
15681
 
15592
15682
  </xsl:for-each>
@@ -15605,6 +15695,11 @@
15605
15695
  <xsl:with-param name="lang" select="@lang"/>
15606
15696
  </xsl:call-template>
15607
15697
 
15698
+ <xsl:call-template name="insertExampleBookmarks">
15699
+ <xsl:with-param name="contents" select="mnx:contents"/>
15700
+ <xsl:with-param name="lang" select="@lang"/>
15701
+ </xsl:call-template>
15702
+
15608
15703
  </xsl:for-each>
15609
15704
  </xsl:otherwise>
15610
15705
  </xsl:choose>
@@ -15621,6 +15716,11 @@
15621
15716
  <xsl:with-param name="lang" select="@lang"/>
15622
15717
  </xsl:call-template>
15623
15718
 
15719
+ <xsl:call-template name="insertExampleBookmarks">
15720
+ <xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
15721
+ <xsl:with-param name="lang" select="@lang"/>
15722
+ </xsl:call-template>
15723
+
15624
15724
  </xsl:otherwise>
15625
15725
  </xsl:choose>
15626
15726
 
@@ -15701,6 +15801,46 @@
15701
15801
  </fo:bookmark>
15702
15802
  </xsl:if>
15703
15803
  </xsl:template> <!-- insertTableBookmarks -->
15804
+
15805
+ <xsl:template name="insertExampleBookmarks">
15806
+ <xsl:param name="contents"/>
15807
+ <xsl:param name="lang"/>
15808
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
15809
+ <xsl:if test="$contents_nodes/mnx:example">
15810
+ <fo:bookmark internal-destination="{$contents_nodes/mnx:example[1]/@id}" starting-state="hide">
15811
+ <fo:bookmark-title>
15812
+ <xsl:choose>
15813
+ <xsl:when test="$lang = 'fr'">Exemples</xsl:when>
15814
+ <xsl:otherwise>Examples</xsl:otherwise>
15815
+ </xsl:choose>
15816
+ </fo:bookmark-title>
15817
+ <xsl:for-each select="$contents_nodes/mnx:example">
15818
+ <fo:bookmark internal-destination="{@id}">
15819
+ <fo:bookmark-title>
15820
+ <xsl:value-of select="normalize-space(mnx:title)"/>
15821
+ </fo:bookmark-title>
15822
+ </fo:bookmark>
15823
+ </xsl:for-each>
15824
+ </fo:bookmark>
15825
+ </xsl:if>
15826
+ <xsl:if test="$contents_nodes//mnx:examples/mnx:example">
15827
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
15828
+
15829
+ <xsl:variable name="bookmark-title">
15830
+ <xsl:value-of select="$title-list-examples"/>
15831
+ </xsl:variable>
15832
+
15833
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
15834
+
15835
+ <xsl:for-each select="$contents_nodes//mnx:examples/mnx:example">
15836
+ <fo:bookmark internal-destination="{@id}">
15837
+ <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
15838
+ <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
15839
+ </fo:bookmark>
15840
+ </xsl:for-each>
15841
+ </fo:bookmark>
15842
+ </xsl:if>
15843
+ </xsl:template> <!-- insertExampleBookmarks -->
15704
15844
  <!-- End Bookmarks -->
15705
15845
 
15706
15846
  <!-- ============================ -->