metanorma-bipm 2.1.9 → 2.1.10

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 +60 -39
  3. data/lib/isodoc/bipm/bipm.guide.xsl +60 -39
  4. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +60 -39
  5. data/lib/isodoc/bipm/bipm.rapport.xsl +60 -39
  6. data/lib/isodoc/bipm/i18n-en.yaml +4 -0
  7. data/lib/isodoc/bipm/i18n-fr.yaml +4 -0
  8. data/lib/isodoc/bipm/jcgm.standard.xsl +1 -1
  9. data/lib/isodoc/bipm/presentation_xml_convert.rb +45 -7
  10. data/lib/metanorma/bipm/isodoc.rng +9 -0
  11. data/lib/metanorma/bipm/version.rb +1 -1
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cfbdffcf73976366237efc63ba10a8d4f1abce69283275245e5cb6c0e1a227af
4
- data.tar.gz: 19cf95cc971bee861e7027dbca0fe4708d81ab03bc34e603d0ef4d2af2cb5db1
3
+ metadata.gz: 991c0584d9b44a0a713ffe4f48ae94c301000753eb253e8824fad17365c65410
4
+ data.tar.gz: 40fd596a56184bfec825e39ba5a605eed81c6ea4d1e1955e00a8ee5f2d07d98b
5
5
  SHA512:
6
- metadata.gz: b35bb3852d18fed6f2977b2b020ff4c6032d7ae1b7785ce85443f43a7720143e7d9d820749cd0cd70ec93d0051c0b0e17f19cfef1bfbe1215fe2cae655a4cd12
7
- data.tar.gz: aa02636559c9a13fcf1be5dab81e699cca967ec2e72104f8af72eed28a944c88c52a79737f8f029a19c3f80c0a0bb009d9f5b61fa8ba9f90c24d1837e829b7df
6
+ metadata.gz: aa53052fba1a979cc1298b3a557ca1b1b799f11f230889b6751e4c9e661392a0d727210a9721c8e5b6f811c257660b63c98fa330c7fb676e1950329bfd992b05
7
+ data.tar.gz: 8bb577314adcf71b5fb2404e5130521fcdac8cc5dfd3e509b3378ef033636ef72022bd61d10129f81b13e7baed46a2bf42188c1626b518119c1eae9433d3e974
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -1193,10 +1193,10 @@
1193
1193
 
1194
1194
  </fo:block>
1195
1195
 
1196
- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
1197
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
1196
+ <!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
1197
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
1198
1198
  <fo:block role="H2">
1199
- <xsl:if test="$part_num != ''">
1199
+ <!-- <xsl:if test="$part_num != ''">
1200
1200
  <xsl:call-template name="getLocalizedString">
1201
1201
  <xsl:with-param name="key">Part.sg</xsl:with-param>
1202
1202
  <xsl:with-param name="lang" select="$curr_lang"/>
@@ -1204,18 +1204,18 @@
1204
1204
  <xsl:text> </xsl:text>
1205
1205
  <xsl:value-of select="$part_num"/>
1206
1206
  </xsl:if>
1207
- <xsl:text>: </xsl:text>
1208
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
1207
+ <xsl:text>: </xsl:text> -->
1208
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
1209
1209
  </fo:block>
1210
1210
  </xsl:if>
1211
- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
1212
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
1211
+ <!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
1212
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
1213
1213
  <fo:block role="H3">
1214
- <xsl:if test="$subpart_num != ''">
1214
+ <!-- <xsl:if test="$subpart_num != ''">
1215
1215
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
1216
1216
  </xsl:if>
1217
- <xsl:text>: </xsl:text>
1218
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
1217
+ <xsl:text>: </xsl:text> -->
1218
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
1219
1219
  </fo:block>
1220
1220
  </xsl:if>
1221
1221
 
@@ -2927,16 +2927,18 @@
2927
2927
  <xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
2928
2928
  <xsl:choose>
2929
2929
  <xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
2930
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2930
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2931
2931
  <xsl:choose>
2932
2932
  <xsl:when test="$curr_lang = 'fr'">
2933
2933
  <xsl:choose>
2934
- <xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
2935
- <xsl:otherwise>Note : </xsl:otherwise>
2934
+ <xsl:when test="ancestor::bipm:li">Remarque&#xa0;: </xsl:when>
2935
+ <xsl:otherwise>Note&#xa0;: </xsl:otherwise>
2936
2936
  </xsl:choose>
2937
2937
  </xsl:when>
2938
2938
  <xsl:otherwise>Note: </xsl:otherwise>
2939
- </xsl:choose>
2939
+ </xsl:choose> -->
2940
+ <xsl:apply-templates/>
2941
+ <xsl:text> </xsl:text>
2940
2942
  </xsl:when>
2941
2943
  <xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
2942
2944
  <xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
@@ -2968,6 +2970,10 @@
2968
2970
  </xsl:choose>
2969
2971
  </xsl:template>
2970
2972
 
2973
+ <xsl:template match="*[local-name() = 'name']/text()" priority="2">
2974
+ <xsl:value-of select="."/>
2975
+ </xsl:template>
2976
+
2971
2977
  <xsl:template match="*[local-name() = 'sup_fn']">
2972
2978
  <fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
2973
2979
  <xsl:apply-templates/>
@@ -4330,8 +4336,8 @@
4330
4336
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4331
4337
  <xsl:attribute name="text-align">left</xsl:attribute>
4332
4338
  <xsl:attribute name="margin-top">24pt</xsl:attribute>
4333
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4334
- <xsl:attribute name="text-indent">-25mm</xsl:attribute>
4339
+ <!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4340
+ <xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
4335
4341
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4336
4342
 
4337
4343
  </xsl:attribute-set> <!-- table-name-style -->
@@ -5605,25 +5611,38 @@
5605
5611
  <xsl:param name="continued"/>
5606
5612
  <xsl:if test="normalize-space() != ''">
5607
5613
 
5608
- <fo:block xsl:use-attribute-sets="table-name-style">
5609
-
5610
- <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5611
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5612
- </xsl:if>
5613
- <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5614
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5615
- </xsl:if>
5614
+ <fo:list-block xsl:use-attribute-sets="table-name-style">
5616
5615
 
5617
- <xsl:choose>
5618
- <xsl:when test="$continued = 'true'">
5616
+ <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5617
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5618
+ </xsl:if>
5619
+ <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5620
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5621
+ </xsl:if>
5619
5622
 
5620
- </xsl:when>
5621
- <xsl:otherwise>
5622
- <xsl:apply-templates/>
5623
- </xsl:otherwise>
5624
- </xsl:choose>
5623
+ <xsl:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
5625
5624
 
5626
- </fo:block>
5625
+ <fo:list-item>
5626
+ <fo:list-item-label end-indent="label-end()">
5627
+ <fo:block>
5628
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
5629
+ </fo:block>
5630
+ </fo:list-item-label>
5631
+ <fo:list-item-body start-indent="body-start()">
5632
+ <fo:block>
5633
+ <xsl:choose>
5634
+ <xsl:when test="./*[local-name() = 'tab']">
5635
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
5636
+ </xsl:when>
5637
+ <xsl:otherwise>
5638
+ <xsl:apply-templates/>
5639
+ </xsl:otherwise>
5640
+ </xsl:choose>
5641
+ </fo:block>
5642
+ </fo:list-item-body>
5643
+ </fo:list-item>
5644
+ </fo:list-block>
5645
+ <!-- bipm -->
5627
5646
 
5628
5647
  </xsl:if>
5629
5648
  </xsl:template> <!-- table/name -->
@@ -8714,11 +8733,12 @@
8714
8733
  </xsl:when>
8715
8734
  <xsl:otherwise>
8716
8735
 
8717
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8736
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8718
8737
  <xsl:choose>
8719
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8738
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8720
8739
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8721
- </xsl:choose>
8740
+ </xsl:choose> -->
8741
+ <xsl:text> </xsl:text>
8722
8742
 
8723
8743
  </xsl:otherwise>
8724
8744
  </xsl:choose>
@@ -8738,11 +8758,12 @@
8738
8758
  </xsl:when>
8739
8759
  <xsl:otherwise>
8740
8760
 
8741
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8761
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8742
8762
  <xsl:choose>
8743
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8763
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8744
8764
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8745
- </xsl:choose>
8765
+ </xsl:choose> -->
8766
+ <xsl:text> </xsl:text>
8746
8767
 
8747
8768
  </xsl:otherwise>
8748
8769
  </xsl:choose>
@@ -10707,7 +10728,7 @@
10707
10728
  <!-- ====== -->
10708
10729
  <!-- eref -->
10709
10730
  <!-- ====== -->
10710
- <xsl:template match="*[local-name() = 'eref']">
10731
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
10711
10732
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
10712
10733
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
10713
10734
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -1193,10 +1193,10 @@
1193
1193
 
1194
1194
  </fo:block>
1195
1195
 
1196
- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
1197
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
1196
+ <!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
1197
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
1198
1198
  <fo:block role="H2">
1199
- <xsl:if test="$part_num != ''">
1199
+ <!-- <xsl:if test="$part_num != ''">
1200
1200
  <xsl:call-template name="getLocalizedString">
1201
1201
  <xsl:with-param name="key">Part.sg</xsl:with-param>
1202
1202
  <xsl:with-param name="lang" select="$curr_lang"/>
@@ -1204,18 +1204,18 @@
1204
1204
  <xsl:text> </xsl:text>
1205
1205
  <xsl:value-of select="$part_num"/>
1206
1206
  </xsl:if>
1207
- <xsl:text>: </xsl:text>
1208
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
1207
+ <xsl:text>: </xsl:text> -->
1208
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
1209
1209
  </fo:block>
1210
1210
  </xsl:if>
1211
- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
1212
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
1211
+ <!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
1212
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
1213
1213
  <fo:block role="H3">
1214
- <xsl:if test="$subpart_num != ''">
1214
+ <!-- <xsl:if test="$subpart_num != ''">
1215
1215
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
1216
1216
  </xsl:if>
1217
- <xsl:text>: </xsl:text>
1218
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
1217
+ <xsl:text>: </xsl:text> -->
1218
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
1219
1219
  </fo:block>
1220
1220
  </xsl:if>
1221
1221
 
@@ -2927,16 +2927,18 @@
2927
2927
  <xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
2928
2928
  <xsl:choose>
2929
2929
  <xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
2930
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2930
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2931
2931
  <xsl:choose>
2932
2932
  <xsl:when test="$curr_lang = 'fr'">
2933
2933
  <xsl:choose>
2934
- <xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
2935
- <xsl:otherwise>Note : </xsl:otherwise>
2934
+ <xsl:when test="ancestor::bipm:li">Remarque&#xa0;: </xsl:when>
2935
+ <xsl:otherwise>Note&#xa0;: </xsl:otherwise>
2936
2936
  </xsl:choose>
2937
2937
  </xsl:when>
2938
2938
  <xsl:otherwise>Note: </xsl:otherwise>
2939
- </xsl:choose>
2939
+ </xsl:choose> -->
2940
+ <xsl:apply-templates/>
2941
+ <xsl:text> </xsl:text>
2940
2942
  </xsl:when>
2941
2943
  <xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
2942
2944
  <xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
@@ -2968,6 +2970,10 @@
2968
2970
  </xsl:choose>
2969
2971
  </xsl:template>
2970
2972
 
2973
+ <xsl:template match="*[local-name() = 'name']/text()" priority="2">
2974
+ <xsl:value-of select="."/>
2975
+ </xsl:template>
2976
+
2971
2977
  <xsl:template match="*[local-name() = 'sup_fn']">
2972
2978
  <fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
2973
2979
  <xsl:apply-templates/>
@@ -4330,8 +4336,8 @@
4330
4336
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4331
4337
  <xsl:attribute name="text-align">left</xsl:attribute>
4332
4338
  <xsl:attribute name="margin-top">24pt</xsl:attribute>
4333
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4334
- <xsl:attribute name="text-indent">-25mm</xsl:attribute>
4339
+ <!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4340
+ <xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
4335
4341
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4336
4342
 
4337
4343
  </xsl:attribute-set> <!-- table-name-style -->
@@ -5605,25 +5611,38 @@
5605
5611
  <xsl:param name="continued"/>
5606
5612
  <xsl:if test="normalize-space() != ''">
5607
5613
 
5608
- <fo:block xsl:use-attribute-sets="table-name-style">
5609
-
5610
- <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5611
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5612
- </xsl:if>
5613
- <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5614
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5615
- </xsl:if>
5614
+ <fo:list-block xsl:use-attribute-sets="table-name-style">
5616
5615
 
5617
- <xsl:choose>
5618
- <xsl:when test="$continued = 'true'">
5616
+ <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5617
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5618
+ </xsl:if>
5619
+ <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5620
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5621
+ </xsl:if>
5619
5622
 
5620
- </xsl:when>
5621
- <xsl:otherwise>
5622
- <xsl:apply-templates/>
5623
- </xsl:otherwise>
5624
- </xsl:choose>
5623
+ <xsl:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
5625
5624
 
5626
- </fo:block>
5625
+ <fo:list-item>
5626
+ <fo:list-item-label end-indent="label-end()">
5627
+ <fo:block>
5628
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
5629
+ </fo:block>
5630
+ </fo:list-item-label>
5631
+ <fo:list-item-body start-indent="body-start()">
5632
+ <fo:block>
5633
+ <xsl:choose>
5634
+ <xsl:when test="./*[local-name() = 'tab']">
5635
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
5636
+ </xsl:when>
5637
+ <xsl:otherwise>
5638
+ <xsl:apply-templates/>
5639
+ </xsl:otherwise>
5640
+ </xsl:choose>
5641
+ </fo:block>
5642
+ </fo:list-item-body>
5643
+ </fo:list-item>
5644
+ </fo:list-block>
5645
+ <!-- bipm -->
5627
5646
 
5628
5647
  </xsl:if>
5629
5648
  </xsl:template> <!-- table/name -->
@@ -8714,11 +8733,12 @@
8714
8733
  </xsl:when>
8715
8734
  <xsl:otherwise>
8716
8735
 
8717
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8736
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8718
8737
  <xsl:choose>
8719
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8738
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8720
8739
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8721
- </xsl:choose>
8740
+ </xsl:choose> -->
8741
+ <xsl:text> </xsl:text>
8722
8742
 
8723
8743
  </xsl:otherwise>
8724
8744
  </xsl:choose>
@@ -8738,11 +8758,12 @@
8738
8758
  </xsl:when>
8739
8759
  <xsl:otherwise>
8740
8760
 
8741
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8761
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8742
8762
  <xsl:choose>
8743
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8763
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8744
8764
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8745
- </xsl:choose>
8765
+ </xsl:choose> -->
8766
+ <xsl:text> </xsl:text>
8746
8767
 
8747
8768
  </xsl:otherwise>
8748
8769
  </xsl:choose>
@@ -10707,7 +10728,7 @@
10707
10728
  <!-- ====== -->
10708
10729
  <!-- eref -->
10709
10730
  <!-- ====== -->
10710
- <xsl:template match="*[local-name() = 'eref']">
10731
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
10711
10732
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
10712
10733
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
10713
10734
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl CHANGED
@@ -1193,10 +1193,10 @@
1193
1193
 
1194
1194
  </fo:block>
1195
1195
 
1196
- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
1197
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
1196
+ <!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
1197
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
1198
1198
  <fo:block role="H2">
1199
- <xsl:if test="$part_num != ''">
1199
+ <!-- <xsl:if test="$part_num != ''">
1200
1200
  <xsl:call-template name="getLocalizedString">
1201
1201
  <xsl:with-param name="key">Part.sg</xsl:with-param>
1202
1202
  <xsl:with-param name="lang" select="$curr_lang"/>
@@ -1204,18 +1204,18 @@
1204
1204
  <xsl:text> </xsl:text>
1205
1205
  <xsl:value-of select="$part_num"/>
1206
1206
  </xsl:if>
1207
- <xsl:text>: </xsl:text>
1208
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
1207
+ <xsl:text>: </xsl:text> -->
1208
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
1209
1209
  </fo:block>
1210
1210
  </xsl:if>
1211
- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
1212
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
1211
+ <!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
1212
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
1213
1213
  <fo:block role="H3">
1214
- <xsl:if test="$subpart_num != ''">
1214
+ <!-- <xsl:if test="$subpart_num != ''">
1215
1215
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
1216
1216
  </xsl:if>
1217
- <xsl:text>: </xsl:text>
1218
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
1217
+ <xsl:text>: </xsl:text> -->
1218
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
1219
1219
  </fo:block>
1220
1220
  </xsl:if>
1221
1221
 
@@ -2927,16 +2927,18 @@
2927
2927
  <xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
2928
2928
  <xsl:choose>
2929
2929
  <xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
2930
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2930
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2931
2931
  <xsl:choose>
2932
2932
  <xsl:when test="$curr_lang = 'fr'">
2933
2933
  <xsl:choose>
2934
- <xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
2935
- <xsl:otherwise>Note : </xsl:otherwise>
2934
+ <xsl:when test="ancestor::bipm:li">Remarque&#xa0;: </xsl:when>
2935
+ <xsl:otherwise>Note&#xa0;: </xsl:otherwise>
2936
2936
  </xsl:choose>
2937
2937
  </xsl:when>
2938
2938
  <xsl:otherwise>Note: </xsl:otherwise>
2939
- </xsl:choose>
2939
+ </xsl:choose> -->
2940
+ <xsl:apply-templates/>
2941
+ <xsl:text> </xsl:text>
2940
2942
  </xsl:when>
2941
2943
  <xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
2942
2944
  <xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
@@ -2968,6 +2970,10 @@
2968
2970
  </xsl:choose>
2969
2971
  </xsl:template>
2970
2972
 
2973
+ <xsl:template match="*[local-name() = 'name']/text()" priority="2">
2974
+ <xsl:value-of select="."/>
2975
+ </xsl:template>
2976
+
2971
2977
  <xsl:template match="*[local-name() = 'sup_fn']">
2972
2978
  <fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
2973
2979
  <xsl:apply-templates/>
@@ -4330,8 +4336,8 @@
4330
4336
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4331
4337
  <xsl:attribute name="text-align">left</xsl:attribute>
4332
4338
  <xsl:attribute name="margin-top">24pt</xsl:attribute>
4333
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4334
- <xsl:attribute name="text-indent">-25mm</xsl:attribute>
4339
+ <!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4340
+ <xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
4335
4341
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4336
4342
 
4337
4343
  </xsl:attribute-set> <!-- table-name-style -->
@@ -5605,25 +5611,38 @@
5605
5611
  <xsl:param name="continued"/>
5606
5612
  <xsl:if test="normalize-space() != ''">
5607
5613
 
5608
- <fo:block xsl:use-attribute-sets="table-name-style">
5609
-
5610
- <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5611
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5612
- </xsl:if>
5613
- <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5614
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5615
- </xsl:if>
5614
+ <fo:list-block xsl:use-attribute-sets="table-name-style">
5616
5615
 
5617
- <xsl:choose>
5618
- <xsl:when test="$continued = 'true'">
5616
+ <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5617
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5618
+ </xsl:if>
5619
+ <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5620
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5621
+ </xsl:if>
5619
5622
 
5620
- </xsl:when>
5621
- <xsl:otherwise>
5622
- <xsl:apply-templates/>
5623
- </xsl:otherwise>
5624
- </xsl:choose>
5623
+ <xsl:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
5625
5624
 
5626
- </fo:block>
5625
+ <fo:list-item>
5626
+ <fo:list-item-label end-indent="label-end()">
5627
+ <fo:block>
5628
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
5629
+ </fo:block>
5630
+ </fo:list-item-label>
5631
+ <fo:list-item-body start-indent="body-start()">
5632
+ <fo:block>
5633
+ <xsl:choose>
5634
+ <xsl:when test="./*[local-name() = 'tab']">
5635
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
5636
+ </xsl:when>
5637
+ <xsl:otherwise>
5638
+ <xsl:apply-templates/>
5639
+ </xsl:otherwise>
5640
+ </xsl:choose>
5641
+ </fo:block>
5642
+ </fo:list-item-body>
5643
+ </fo:list-item>
5644
+ </fo:list-block>
5645
+ <!-- bipm -->
5627
5646
 
5628
5647
  </xsl:if>
5629
5648
  </xsl:template> <!-- table/name -->
@@ -8714,11 +8733,12 @@
8714
8733
  </xsl:when>
8715
8734
  <xsl:otherwise>
8716
8735
 
8717
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8736
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8718
8737
  <xsl:choose>
8719
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8738
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8720
8739
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8721
- </xsl:choose>
8740
+ </xsl:choose> -->
8741
+ <xsl:text> </xsl:text>
8722
8742
 
8723
8743
  </xsl:otherwise>
8724
8744
  </xsl:choose>
@@ -8738,11 +8758,12 @@
8738
8758
  </xsl:when>
8739
8759
  <xsl:otherwise>
8740
8760
 
8741
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8761
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8742
8762
  <xsl:choose>
8743
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8763
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8744
8764
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8745
- </xsl:choose>
8765
+ </xsl:choose> -->
8766
+ <xsl:text> </xsl:text>
8746
8767
 
8747
8768
  </xsl:otherwise>
8748
8769
  </xsl:choose>
@@ -10707,7 +10728,7 @@
10707
10728
  <!-- ====== -->
10708
10729
  <!-- eref -->
10709
10730
  <!-- ====== -->
10710
- <xsl:template match="*[local-name() = 'eref']">
10731
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
10711
10732
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
10712
10733
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
10713
10734
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -1193,10 +1193,10 @@
1193
1193
 
1194
1194
  </fo:block>
1195
1195
 
1196
- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
1197
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
1196
+ <!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
1197
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
1198
1198
  <fo:block role="H2">
1199
- <xsl:if test="$part_num != ''">
1199
+ <!-- <xsl:if test="$part_num != ''">
1200
1200
  <xsl:call-template name="getLocalizedString">
1201
1201
  <xsl:with-param name="key">Part.sg</xsl:with-param>
1202
1202
  <xsl:with-param name="lang" select="$curr_lang"/>
@@ -1204,18 +1204,18 @@
1204
1204
  <xsl:text> </xsl:text>
1205
1205
  <xsl:value-of select="$part_num"/>
1206
1206
  </xsl:if>
1207
- <xsl:text>: </xsl:text>
1208
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
1207
+ <xsl:text>: </xsl:text> -->
1208
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
1209
1209
  </fo:block>
1210
1210
  </xsl:if>
1211
- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
1212
- <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
1211
+ <!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
1212
+ <xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
1213
1213
  <fo:block role="H3">
1214
- <xsl:if test="$subpart_num != ''">
1214
+ <!-- <xsl:if test="$subpart_num != ''">
1215
1215
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
1216
1216
  </xsl:if>
1217
- <xsl:text>: </xsl:text>
1218
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
1217
+ <xsl:text>: </xsl:text> -->
1218
+ <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
1219
1219
  </fo:block>
1220
1220
  </xsl:if>
1221
1221
 
@@ -2927,16 +2927,18 @@
2927
2927
  <xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
2928
2928
  <xsl:choose>
2929
2929
  <xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
2930
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2930
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
2931
2931
  <xsl:choose>
2932
2932
  <xsl:when test="$curr_lang = 'fr'">
2933
2933
  <xsl:choose>
2934
- <xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
2935
- <xsl:otherwise>Note : </xsl:otherwise>
2934
+ <xsl:when test="ancestor::bipm:li">Remarque&#xa0;: </xsl:when>
2935
+ <xsl:otherwise>Note&#xa0;: </xsl:otherwise>
2936
2936
  </xsl:choose>
2937
2937
  </xsl:when>
2938
2938
  <xsl:otherwise>Note: </xsl:otherwise>
2939
- </xsl:choose>
2939
+ </xsl:choose> -->
2940
+ <xsl:apply-templates/>
2941
+ <xsl:text> </xsl:text>
2940
2942
  </xsl:when>
2941
2943
  <xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
2942
2944
  <xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
@@ -2968,6 +2970,10 @@
2968
2970
  </xsl:choose>
2969
2971
  </xsl:template>
2970
2972
 
2973
+ <xsl:template match="*[local-name() = 'name']/text()" priority="2">
2974
+ <xsl:value-of select="."/>
2975
+ </xsl:template>
2976
+
2971
2977
  <xsl:template match="*[local-name() = 'sup_fn']">
2972
2978
  <fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
2973
2979
  <xsl:apply-templates/>
@@ -4330,8 +4336,8 @@
4330
4336
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4331
4337
  <xsl:attribute name="text-align">left</xsl:attribute>
4332
4338
  <xsl:attribute name="margin-top">24pt</xsl:attribute>
4333
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4334
- <xsl:attribute name="text-indent">-25mm</xsl:attribute>
4339
+ <!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
4340
+ <xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
4335
4341
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4336
4342
 
4337
4343
  </xsl:attribute-set> <!-- table-name-style -->
@@ -5605,25 +5611,38 @@
5605
5611
  <xsl:param name="continued"/>
5606
5612
  <xsl:if test="normalize-space() != ''">
5607
5613
 
5608
- <fo:block xsl:use-attribute-sets="table-name-style">
5609
-
5610
- <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5611
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5612
- </xsl:if>
5613
- <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5614
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
5615
- </xsl:if>
5614
+ <fo:list-block xsl:use-attribute-sets="table-name-style">
5616
5615
 
5617
- <xsl:choose>
5618
- <xsl:when test="$continued = 'true'">
5616
+ <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5617
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5618
+ </xsl:if>
5619
+ <xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
5620
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5621
+ </xsl:if>
5619
5622
 
5620
- </xsl:when>
5621
- <xsl:otherwise>
5622
- <xsl:apply-templates/>
5623
- </xsl:otherwise>
5624
- </xsl:choose>
5623
+ <xsl:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
5625
5624
 
5626
- </fo:block>
5625
+ <fo:list-item>
5626
+ <fo:list-item-label end-indent="label-end()">
5627
+ <fo:block>
5628
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
5629
+ </fo:block>
5630
+ </fo:list-item-label>
5631
+ <fo:list-item-body start-indent="body-start()">
5632
+ <fo:block>
5633
+ <xsl:choose>
5634
+ <xsl:when test="./*[local-name() = 'tab']">
5635
+ <xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
5636
+ </xsl:when>
5637
+ <xsl:otherwise>
5638
+ <xsl:apply-templates/>
5639
+ </xsl:otherwise>
5640
+ </xsl:choose>
5641
+ </fo:block>
5642
+ </fo:list-item-body>
5643
+ </fo:list-item>
5644
+ </fo:list-block>
5645
+ <!-- bipm -->
5627
5646
 
5628
5647
  </xsl:if>
5629
5648
  </xsl:template> <!-- table/name -->
@@ -8714,11 +8733,12 @@
8714
8733
  </xsl:when>
8715
8734
  <xsl:otherwise>
8716
8735
 
8717
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8736
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8718
8737
  <xsl:choose>
8719
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8738
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8720
8739
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8721
- </xsl:choose>
8740
+ </xsl:choose> -->
8741
+ <xsl:text> </xsl:text>
8722
8742
 
8723
8743
  </xsl:otherwise>
8724
8744
  </xsl:choose>
@@ -8738,11 +8758,12 @@
8738
8758
  </xsl:when>
8739
8759
  <xsl:otherwise>
8740
8760
 
8741
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8761
+ <!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
8742
8762
  <xsl:choose>
8743
- <xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
8763
+ <xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
8744
8764
  <xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
8745
- </xsl:choose>
8765
+ </xsl:choose> -->
8766
+ <xsl:text> </xsl:text>
8746
8767
 
8747
8768
  </xsl:otherwise>
8748
8769
  </xsl:choose>
@@ -10707,7 +10728,7 @@
10707
10728
  <!-- ====== -->
10708
10729
  <!-- eref -->
10709
10730
  <!-- ====== -->
10710
- <xsl:template match="*[local-name() = 'eref']">
10731
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
10711
10732
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
10712
10733
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
10713
10734
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
data/lib/isodoc/bipm/i18n-en.yaml CHANGED
@@ -19,3 +19,7 @@ norm_with_refs_pref:
19
19
  all_rights_reserved: All rights reserved
20
20
  table_of_contents: Contents
21
21
  source: Adapted from
22
+ note: "Note:"
23
+ prefacenote: "NOTE:"
24
+ listnote: "Note:"
25
+ termnote: "Note % to entry"
data/lib/isodoc/bipm/i18n-fr.yaml CHANGED
@@ -42,3 +42,7 @@ norm_with_refs_pref:
42
42
  all_rights_reserved: Tous droits réservés
43
43
  table_of_contents: Table des matières
44
44
  source: Adapté de
45
+ note: "Note:"
46
+ prefacenote: "NOTE:"
47
+ listnote: "Remarque:"
48
+ termnote: "Note % à l’article:"
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -8574,7 +8574,7 @@
8574
8574
  <!-- ====== -->
8575
8575
  <!-- eref -->
8576
8576
  <!-- ====== -->
8577
- <xsl:template match="*[local-name() = 'eref']">
8577
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
8578
8578
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
8579
8579
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
8580
8580
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
data/lib/isodoc/bipm/presentation_xml_convert.rb CHANGED
@@ -104,6 +104,7 @@ module IsoDoc
104
104
  def bibdata_i18n(bibdata)
105
105
  super
106
106
  bibdata_dates(bibdata)
107
+ bibdata_titles(bibdata)
107
108
  end
108
109
 
109
110
  def bibdata_dates(bibdata)
@@ -116,6 +117,20 @@ module IsoDoc
116
117
  pubdate.next.children = meta.monthyr(pubdate.text)
117
118
  end
118
119
 
120
+ def bibdata_titles(bibdata)
121
+ return unless app = bibdata.at(ns("//bibdata/ext/"\
122
+ "structuredidentifier/part"))
123
+
124
+ bibdata.xpath(ns("//bibdata/title[@type = 'part']")).each do |t|
125
+ t.previous = t.dup
126
+ t["type"] = "part-with-numbering"
127
+ part = t["language"] == "en" ? "Part" : "Partie"
128
+ # not looking up in YAML
129
+ t.children = l10n("#{part} #{app.text}: #{t.children.to_xml}",
130
+ t["language"])
131
+ end
132
+ end
133
+
119
134
  def eref(docxml)
120
135
  super
121
136
  jcgm_eref(docxml, "//eref")
@@ -148,13 +163,13 @@ module IsoDoc
148
163
  def extract_brackets(node)
149
164
  start = node.at("./text()[1]")
150
165
  finish = node.at("./text()[last()]")
151
- if /^\[/.match?(start.text) && /\]$/.match?(finish.text)
152
- start.replace(start.text[1..-1])
153
- node.previous = "["
154
- finish = node.at("./text()[last()]")
155
- finish.replace(finish.text[0..-2])
156
- node.next = "]"
157
- end
166
+ (/^\[/.match?(start.text) && /\]$/.match?(finish.text)) or return
167
+
168
+ start.replace(start.text[1..-1])
169
+ node.previous = "["
170
+ finish = node.at("./text()[last()]")
171
+ finish.replace(finish.text[0..-2])
172
+ node.next = "]"
158
173
  end
159
174
 
160
175
  def quotedtitles(docxml)
@@ -164,6 +179,29 @@ module IsoDoc
164
179
  end
165
180
  end
166
181
 
182
+ # notes and remarques (list notes) are not numbered
183
+ def note1(elem)
184
+ return if elem.parent.name == "bibitem" || elem["notag"] == "true"
185
+
186
+ # n = @xrefs.get[elem["id"]]
187
+ lbl = l10n(note_label(elem))
188
+ # (n.nil? || n[:label].nil? || n[:label].empty?) or
189
+ # lbl = l10n("#{lbl} #{n[:label]}")
190
+ prefix_name(elem, "", lbl, "name")
191
+ end
192
+
193
+ def note_label(elem)
194
+ if elem.ancestors("preface").empty?
195
+ if elem.ancestors("ul, ol, dl").empty?
196
+ @i18n.note
197
+ else
198
+ @i18n.listnote
199
+ end
200
+ else
201
+ @i18n.prefacenote
202
+ end
203
+ end
204
+
167
205
  def termsource1(elem)
168
206
  while elem&.next_element&.name == "termsource"
169
207
  elem << "; #{elem.next_element.remove.children.to_xml}"
data/lib/metanorma/bipm/isodoc.rng CHANGED
@@ -205,6 +205,15 @@
205
205
  <data type="boolean"/>
206
206
  </attribute>
207
207
  </optional>
208
+ <optional>
209
+ <attribute name="style">
210
+ <choice>
211
+ <value>basic</value>
212
+ <value>full</value>
213
+ <value>short</value>
214
+ </choice>
215
+ </attribute>
216
+ </optional>
208
217
  <ref name="XrefBody"/>
209
218
  </element>
210
219
  </define>
data/lib/metanorma/bipm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "2.1.9".freeze
3
+ VERSION = "2.1.10".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: 2.1.9
4
+ version: 2.1.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-09-26 00:00:00.000000000 Z
11
+ date: 2022-10-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic