metanorma-bipm 1.2.0 → 1.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/bipm/isodoc.rng +12 -1
  3. data/lib/isodoc/bipm/bipm.brochure.xsl +26 -10
  4. data/lib/isodoc/bipm/bipm.guide.xsl +26 -10
  5. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +26 -10
  6. data/lib/isodoc/bipm/bipm.rapport.xsl +26 -10
  7. data/lib/isodoc/bipm/jcgm.standard.xsl +25 -9
  8. data/lib/metanorma/bipm/version.rb +1 -1
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7a64c1f0428fdd961b33b791976e15f340eafd5f4e4a917f20cb43c5c6441338
4
- data.tar.gz: 30990cca266ae702579aa863c639ee7098c245dc6e262a1a3cace5c5bff013f9
3
+ metadata.gz: 370d29ed386f2e5c7540d82e0dfcbcafc17a702234c84ee83e6a137da5d87208
4
+ data.tar.gz: e3caae791429708ca02269e0a0c3a61ff79e2a44f71900454f173e4a0a6e0478
5
5
  SHA512:
6
- metadata.gz: 3a1ab4a1fd26f8200b7db0374f7b077aac27f561159d5816e4a768400006b8e137d01378ca5904b5a4c89dd31f50b623141354fbd94c0df0c71748b0bea86e60
7
- data.tar.gz: 2ce37ad144dd33dcd2cdfd06e323a79f4ee619b5563c16ab10ee18cdcc74ceb3b92f50148576850928150480bbd7d1375b25244b270a0aa8a852f9afefa7f36b
6
+ metadata.gz: 2b36089016db9ee6494a4ccbe5acf9f01dbc4e7b20846e40f283304752bac759a810198a1756ec7c8bda70901f3f23615a7808f14c8a314450848c15e0a8ef4d
7
+ data.tar.gz: f57d70b623e8f5a4963d395f510457f423eca6ade6ff6d90993857b5913226ddb3b1a2230487d9707d570b516b5dbc35cba8897de331d3462cfcb4533bb9097e
data/lib/asciidoctor/bipm/isodoc.rng CHANGED
@@ -2063,7 +2063,12 @@
2063
2063
  <define name="verbaldefinition">
2064
2064
  <element name="verbaldefinition">
2065
2065
  <oneOrMore>
2066
- <ref name="paragraph"/>
2066
+ <choice>
2067
+ <ref name="paragraph"/>
2068
+ <ref name="dl"/>
2069
+ <ref name="ol"/>
2070
+ <ref name="ul"/>
2071
+ </choice>
2067
2072
  </oneOrMore>
2068
2073
  <zeroOrMore>
2069
2074
  <ref name="termsource"/>
@@ -2163,6 +2168,12 @@
2163
2168
  <value>modified</value>
2164
2169
  </choice>
2165
2170
  </attribute>
2171
+ <attribute name="type">
2172
+ <choice>
2173
+ <value>authoritative</value>
2174
+ <value>lineage</value>
2175
+ </choice>
2176
+ </attribute>
2166
2177
  <ref name="origin"/>
2167
2178
  <optional>
2168
2179
  <ref name="modification"/>
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -3326,13 +3326,13 @@
3326
3326
 
3327
3327
  <xsl:template match="bipm:preferred">
3328
3328
  <fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
3329
- <xsl:if test="ancestor::bipm:term/bipm:name">
3329
+ <xsl:if test="ancestor::bipm:term[1]/bipm:name">
3330
3330
  <xsl:variable name="level">
3331
3331
  <xsl:call-template name="getLevelTermName"/>
3332
3332
  </xsl:variable>
3333
3333
  <fo:inline role="H{$level}">
3334
3334
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
3335
- <xsl:apply-templates select="ancestor::bipm:term/bipm:name" mode="presentation"/>
3335
+ <xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name" mode="presentation"/>
3336
3336
  </fo:inline>
3337
3337
  </xsl:if>
3338
3338
  <xsl:apply-templates/>
@@ -6629,6 +6629,7 @@
6629
6629
  <fo:table-cell>
6630
6630
 
6631
6631
  <fo:block margin-top="6pt">
6632
+ <xsl:copy-of select="@id"/>
6632
6633
 
6633
6634
 
6634
6635
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -7511,14 +7512,18 @@
7511
7512
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
7512
7513
  <fo:inline><xsl:apply-templates/></fo:inline>
7513
7514
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
7515
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
7514
7516
  <fo:block id="{@id}">
7515
7517
  <xsl:apply-templates/>
7516
7518
  </fo:block>
7517
7519
  </xsl:template><xsl:template match="*[local-name() = 'term']">
7520
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
7518
7521
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
7519
7522
 
7520
7523
 
7521
-
7524
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
7525
+
7526
+ </xsl:if>
7522
7527
  <xsl:apply-templates/>
7523
7528
  </fo:block>
7524
7529
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -8510,7 +8515,8 @@
8510
8515
  </fo:block>
8511
8516
  </fo:table-cell>
8512
8517
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
8513
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
8518
+ <fo:block font-size="11pt">
8519
+
8514
8520
  <xsl:apply-templates/>
8515
8521
  </fo:block>
8516
8522
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -8626,13 +8632,15 @@
8626
8632
  <!-- <xsl:apply-templates /> -->
8627
8633
  <xsl:copy-of select="$termsource_text"/>
8628
8634
  </xsl:when>
8629
- <xsl:otherwise>
8635
+ <xsl:otherwise>
8636
+
8630
8637
 
8631
8638
  <xsl:text>[</xsl:text>
8632
8639
 
8633
8640
  <!-- <xsl:apply-templates /> -->
8634
8641
  <xsl:copy-of select="$termsource_text"/>
8635
8642
 
8643
+
8636
8644
  <xsl:text>]</xsl:text>
8637
8645
 
8638
8646
  </xsl:otherwise>
@@ -8714,12 +8722,20 @@
8714
8722
  </xsl:template><xsl:template match="*[local-name() = 'author']">
8715
8723
  <xsl:text>— </xsl:text>
8716
8724
  <xsl:apply-templates/>
8717
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
8725
+ </xsl:template><xsl:variable name="bibitem_hidden_">
8726
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
8727
+ <xsl:copy-of select="."/>
8728
+ </xsl:for-each>
8729
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
8730
+ <xsl:copy-of select="."/>
8731
+ </xsl:for-each>
8732
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
8718
8733
 
8719
8734
  <xsl:variable name="bibitemid">
8720
8735
  <xsl:choose>
8721
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
8722
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8736
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
8737
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
8738
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8723
8739
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
8724
8740
  </xsl:choose>
8725
8741
  </xsl:variable>
@@ -8817,10 +8833,10 @@
8817
8833
  </xsl:choose>
8818
8834
  </xsl:variable>
8819
8835
 
8820
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
8836
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
8821
8837
 
8822
8838
  <xsl:choose>
8823
- <xsl:when test="$language = 'zh'">
8839
+ <xsl:when test="$lang = 'zh'">
8824
8840
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
8825
8841
  </xsl:when>
8826
8842
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -3326,13 +3326,13 @@
3326
3326
 
3327
3327
  <xsl:template match="bipm:preferred">
3328
3328
  <fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
3329
- <xsl:if test="ancestor::bipm:term/bipm:name">
3329
+ <xsl:if test="ancestor::bipm:term[1]/bipm:name">
3330
3330
  <xsl:variable name="level">
3331
3331
  <xsl:call-template name="getLevelTermName"/>
3332
3332
  </xsl:variable>
3333
3333
  <fo:inline role="H{$level}">
3334
3334
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
3335
- <xsl:apply-templates select="ancestor::bipm:term/bipm:name" mode="presentation"/>
3335
+ <xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name" mode="presentation"/>
3336
3336
  </fo:inline>
3337
3337
  </xsl:if>
3338
3338
  <xsl:apply-templates/>
@@ -6629,6 +6629,7 @@
6629
6629
  <fo:table-cell>
6630
6630
 
6631
6631
  <fo:block margin-top="6pt">
6632
+ <xsl:copy-of select="@id"/>
6632
6633
 
6633
6634
 
6634
6635
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -7511,14 +7512,18 @@
7511
7512
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
7512
7513
  <fo:inline><xsl:apply-templates/></fo:inline>
7513
7514
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
7515
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
7514
7516
  <fo:block id="{@id}">
7515
7517
  <xsl:apply-templates/>
7516
7518
  </fo:block>
7517
7519
  </xsl:template><xsl:template match="*[local-name() = 'term']">
7520
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
7518
7521
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
7519
7522
 
7520
7523
 
7521
-
7524
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
7525
+
7526
+ </xsl:if>
7522
7527
  <xsl:apply-templates/>
7523
7528
  </fo:block>
7524
7529
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -8510,7 +8515,8 @@
8510
8515
  </fo:block>
8511
8516
  </fo:table-cell>
8512
8517
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
8513
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
8518
+ <fo:block font-size="11pt">
8519
+
8514
8520
  <xsl:apply-templates/>
8515
8521
  </fo:block>
8516
8522
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -8626,13 +8632,15 @@
8626
8632
  <!-- <xsl:apply-templates /> -->
8627
8633
  <xsl:copy-of select="$termsource_text"/>
8628
8634
  </xsl:when>
8629
- <xsl:otherwise>
8635
+ <xsl:otherwise>
8636
+
8630
8637
 
8631
8638
  <xsl:text>[</xsl:text>
8632
8639
 
8633
8640
  <!-- <xsl:apply-templates /> -->
8634
8641
  <xsl:copy-of select="$termsource_text"/>
8635
8642
 
8643
+
8636
8644
  <xsl:text>]</xsl:text>
8637
8645
 
8638
8646
  </xsl:otherwise>
@@ -8714,12 +8722,20 @@
8714
8722
  </xsl:template><xsl:template match="*[local-name() = 'author']">
8715
8723
  <xsl:text>— </xsl:text>
8716
8724
  <xsl:apply-templates/>
8717
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
8725
+ </xsl:template><xsl:variable name="bibitem_hidden_">
8726
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
8727
+ <xsl:copy-of select="."/>
8728
+ </xsl:for-each>
8729
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
8730
+ <xsl:copy-of select="."/>
8731
+ </xsl:for-each>
8732
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
8718
8733
 
8719
8734
  <xsl:variable name="bibitemid">
8720
8735
  <xsl:choose>
8721
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
8722
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8736
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
8737
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
8738
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8723
8739
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
8724
8740
  </xsl:choose>
8725
8741
  </xsl:variable>
@@ -8817,10 +8833,10 @@
8817
8833
  </xsl:choose>
8818
8834
  </xsl:variable>
8819
8835
 
8820
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
8836
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
8821
8837
 
8822
8838
  <xsl:choose>
8823
- <xsl:when test="$language = 'zh'">
8839
+ <xsl:when test="$lang = 'zh'">
8824
8840
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
8825
8841
  </xsl:when>
8826
8842
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl CHANGED
@@ -3326,13 +3326,13 @@
3326
3326
 
3327
3327
  <xsl:template match="bipm:preferred">
3328
3328
  <fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
3329
- <xsl:if test="ancestor::bipm:term/bipm:name">
3329
+ <xsl:if test="ancestor::bipm:term[1]/bipm:name">
3330
3330
  <xsl:variable name="level">
3331
3331
  <xsl:call-template name="getLevelTermName"/>
3332
3332
  </xsl:variable>
3333
3333
  <fo:inline role="H{$level}">
3334
3334
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
3335
- <xsl:apply-templates select="ancestor::bipm:term/bipm:name" mode="presentation"/>
3335
+ <xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name" mode="presentation"/>
3336
3336
  </fo:inline>
3337
3337
  </xsl:if>
3338
3338
  <xsl:apply-templates/>
@@ -6629,6 +6629,7 @@
6629
6629
  <fo:table-cell>
6630
6630
 
6631
6631
  <fo:block margin-top="6pt">
6632
+ <xsl:copy-of select="@id"/>
6632
6633
 
6633
6634
 
6634
6635
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -7511,14 +7512,18 @@
7511
7512
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
7512
7513
  <fo:inline><xsl:apply-templates/></fo:inline>
7513
7514
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
7515
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
7514
7516
  <fo:block id="{@id}">
7515
7517
  <xsl:apply-templates/>
7516
7518
  </fo:block>
7517
7519
  </xsl:template><xsl:template match="*[local-name() = 'term']">
7520
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
7518
7521
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
7519
7522
 
7520
7523
 
7521
-
7524
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
7525
+
7526
+ </xsl:if>
7522
7527
  <xsl:apply-templates/>
7523
7528
  </fo:block>
7524
7529
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -8510,7 +8515,8 @@
8510
8515
  </fo:block>
8511
8516
  </fo:table-cell>
8512
8517
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
8513
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
8518
+ <fo:block font-size="11pt">
8519
+
8514
8520
  <xsl:apply-templates/>
8515
8521
  </fo:block>
8516
8522
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -8626,13 +8632,15 @@
8626
8632
  <!-- <xsl:apply-templates /> -->
8627
8633
  <xsl:copy-of select="$termsource_text"/>
8628
8634
  </xsl:when>
8629
- <xsl:otherwise>
8635
+ <xsl:otherwise>
8636
+
8630
8637
 
8631
8638
  <xsl:text>[</xsl:text>
8632
8639
 
8633
8640
  <!-- <xsl:apply-templates /> -->
8634
8641
  <xsl:copy-of select="$termsource_text"/>
8635
8642
 
8643
+
8636
8644
  <xsl:text>]</xsl:text>
8637
8645
 
8638
8646
  </xsl:otherwise>
@@ -8714,12 +8722,20 @@
8714
8722
  </xsl:template><xsl:template match="*[local-name() = 'author']">
8715
8723
  <xsl:text>— </xsl:text>
8716
8724
  <xsl:apply-templates/>
8717
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
8725
+ </xsl:template><xsl:variable name="bibitem_hidden_">
8726
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
8727
+ <xsl:copy-of select="."/>
8728
+ </xsl:for-each>
8729
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
8730
+ <xsl:copy-of select="."/>
8731
+ </xsl:for-each>
8732
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
8718
8733
 
8719
8734
  <xsl:variable name="bibitemid">
8720
8735
  <xsl:choose>
8721
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
8722
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8736
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
8737
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
8738
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8723
8739
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
8724
8740
  </xsl:choose>
8725
8741
  </xsl:variable>
@@ -8817,10 +8833,10 @@
8817
8833
  </xsl:choose>
8818
8834
  </xsl:variable>
8819
8835
 
8820
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
8836
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
8821
8837
 
8822
8838
  <xsl:choose>
8823
- <xsl:when test="$language = 'zh'">
8839
+ <xsl:when test="$lang = 'zh'">
8824
8840
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
8825
8841
  </xsl:when>
8826
8842
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -3326,13 +3326,13 @@
3326
3326
 
3327
3327
  <xsl:template match="bipm:preferred">
3328
3328
  <fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
3329
- <xsl:if test="ancestor::bipm:term/bipm:name">
3329
+ <xsl:if test="ancestor::bipm:term[1]/bipm:name">
3330
3330
  <xsl:variable name="level">
3331
3331
  <xsl:call-template name="getLevelTermName"/>
3332
3332
  </xsl:variable>
3333
3333
  <fo:inline role="H{$level}">
3334
3334
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
3335
- <xsl:apply-templates select="ancestor::bipm:term/bipm:name" mode="presentation"/>
3335
+ <xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name" mode="presentation"/>
3336
3336
  </fo:inline>
3337
3337
  </xsl:if>
3338
3338
  <xsl:apply-templates/>
@@ -6629,6 +6629,7 @@
6629
6629
  <fo:table-cell>
6630
6630
 
6631
6631
  <fo:block margin-top="6pt">
6632
+ <xsl:copy-of select="@id"/>
6632
6633
 
6633
6634
 
6634
6635
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -7511,14 +7512,18 @@
7511
7512
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
7512
7513
  <fo:inline><xsl:apply-templates/></fo:inline>
7513
7514
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
7515
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
7514
7516
  <fo:block id="{@id}">
7515
7517
  <xsl:apply-templates/>
7516
7518
  </fo:block>
7517
7519
  </xsl:template><xsl:template match="*[local-name() = 'term']">
7520
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
7518
7521
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
7519
7522
 
7520
7523
 
7521
-
7524
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
7525
+
7526
+ </xsl:if>
7522
7527
  <xsl:apply-templates/>
7523
7528
  </fo:block>
7524
7529
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -8510,7 +8515,8 @@
8510
8515
  </fo:block>
8511
8516
  </fo:table-cell>
8512
8517
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
8513
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
8518
+ <fo:block font-size="11pt">
8519
+
8514
8520
  <xsl:apply-templates/>
8515
8521
  </fo:block>
8516
8522
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -8626,13 +8632,15 @@
8626
8632
  <!-- <xsl:apply-templates /> -->
8627
8633
  <xsl:copy-of select="$termsource_text"/>
8628
8634
  </xsl:when>
8629
- <xsl:otherwise>
8635
+ <xsl:otherwise>
8636
+
8630
8637
 
8631
8638
  <xsl:text>[</xsl:text>
8632
8639
 
8633
8640
  <!-- <xsl:apply-templates /> -->
8634
8641
  <xsl:copy-of select="$termsource_text"/>
8635
8642
 
8643
+
8636
8644
  <xsl:text>]</xsl:text>
8637
8645
 
8638
8646
  </xsl:otherwise>
@@ -8714,12 +8722,20 @@
8714
8722
  </xsl:template><xsl:template match="*[local-name() = 'author']">
8715
8723
  <xsl:text>— </xsl:text>
8716
8724
  <xsl:apply-templates/>
8717
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
8725
+ </xsl:template><xsl:variable name="bibitem_hidden_">
8726
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
8727
+ <xsl:copy-of select="."/>
8728
+ </xsl:for-each>
8729
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
8730
+ <xsl:copy-of select="."/>
8731
+ </xsl:for-each>
8732
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
8718
8733
 
8719
8734
  <xsl:variable name="bibitemid">
8720
8735
  <xsl:choose>
8721
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
8722
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8736
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
8737
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
8738
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
8723
8739
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
8724
8740
  </xsl:choose>
8725
8741
  </xsl:variable>
@@ -8817,10 +8833,10 @@
8817
8833
  </xsl:choose>
8818
8834
  </xsl:variable>
8819
8835
 
8820
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
8836
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
8821
8837
 
8822
8838
  <xsl:choose>
8823
- <xsl:when test="$language = 'zh'">
8839
+ <xsl:when test="$lang = 'zh'">
8824
8840
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
8825
8841
  </xsl:when>
8826
8842
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -927,7 +927,7 @@
927
927
  </xsl:variable>
928
928
  <fo:block line-height="1.1" role="H{$level}">
929
929
  <fo:block font-weight="bold" keep-with-next="always">
930
- <xsl:apply-templates select="ancestor::*[local-name()='term']/*[local-name()='name']" mode="presentation"/>
930
+ <xsl:apply-templates select="ancestor::*[local-name()='term'][1]/*[local-name()='name']" mode="presentation"/>
931
931
  </fo:block>
932
932
  <fo:block font-weight="bold" keep-with-next="always">
933
933
  <xsl:apply-templates/>
@@ -4153,6 +4153,7 @@
4153
4153
  <fo:table-cell>
4154
4154
 
4155
4155
  <fo:block margin-top="6pt">
4156
+ <xsl:copy-of select="@id"/>
4156
4157
 
4157
4158
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
4158
4159
 
@@ -4992,14 +4993,18 @@
4992
4993
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
4993
4994
  <fo:inline><xsl:apply-templates/></fo:inline>
4994
4995
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
4996
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
4995
4997
  <fo:block id="{@id}">
4996
4998
  <xsl:apply-templates/>
4997
4999
  </fo:block>
4998
5000
  </xsl:template><xsl:template match="*[local-name() = 'term']">
5001
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
4999
5002
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
5000
5003
 
5001
5004
 
5002
-
5005
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
5006
+
5007
+ </xsl:if>
5003
5008
  <xsl:apply-templates/>
5004
5009
  </fo:block>
5005
5010
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -5973,7 +5978,8 @@
5973
5978
  </fo:block>
5974
5979
  </fo:table-cell>
5975
5980
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
5976
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
5981
+ <fo:block font-size="11pt">
5982
+
5977
5983
  <xsl:apply-templates/>
5978
5984
  </fo:block>
5979
5985
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -6094,13 +6100,15 @@
6094
6100
  <!-- <xsl:apply-templates /> -->
6095
6101
  <xsl:copy-of select="$termsource_text"/>
6096
6102
  </xsl:when>
6097
- <xsl:otherwise>
6103
+ <xsl:otherwise>
6104
+
6098
6105
 
6099
6106
  <xsl:text>[</xsl:text>
6100
6107
 
6101
6108
  <!-- <xsl:apply-templates /> -->
6102
6109
  <xsl:copy-of select="$termsource_text"/>
6103
6110
 
6111
+
6104
6112
  <xsl:text>]</xsl:text>
6105
6113
 
6106
6114
  </xsl:otherwise>
@@ -6192,12 +6200,20 @@
6192
6200
  </xsl:template><xsl:template match="*[local-name() = 'author']">
6193
6201
  <xsl:text>— </xsl:text>
6194
6202
  <xsl:apply-templates/>
6195
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
6203
+ </xsl:template><xsl:variable name="bibitem_hidden_">
6204
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
6205
+ <xsl:copy-of select="."/>
6206
+ </xsl:for-each>
6207
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
6208
+ <xsl:copy-of select="."/>
6209
+ </xsl:for-each>
6210
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
6196
6211
 
6197
6212
  <xsl:variable name="bibitemid">
6198
6213
  <xsl:choose>
6199
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
6200
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
6214
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
6215
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
6216
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
6201
6217
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
6202
6218
  </xsl:choose>
6203
6219
  </xsl:variable>
@@ -6286,10 +6302,10 @@
6286
6302
  </xsl:choose>
6287
6303
  </xsl:variable>
6288
6304
 
6289
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
6305
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
6290
6306
 
6291
6307
  <xsl:choose>
6292
- <xsl:when test="$language = 'zh'">
6308
+ <xsl:when test="$lang = 'zh'">
6293
6309
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
6294
6310
  </xsl:when>
6295
6311
  <xsl:when test="../../@inline-header = 'true'">
data/lib/metanorma/bipm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "1.2.0".freeze
3
+ VERSION = "1.2.1".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-bipm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-10-25 00:00:00.000000000 Z
11
+ date: 2021-11-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic