metanorma-bipm 2.7.1 → 2.7.2

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 (14) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +1 -1
  3. data/lib/isodoc/bipm/bipm.brochure.xsl +129 -85
  4. data/lib/isodoc/bipm/bipm.guide.xsl +129 -85
  5. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +129 -85
  6. data/lib/isodoc/bipm/bipm.rapport.xsl +129 -85
  7. data/lib/isodoc/bipm/jcgm.standard.xsl +12 -3
  8. data/lib/isodoc/bipm/presentation_xml_convert.rb +4 -1
  9. data/lib/metanorma/bipm/basicdoc.rng +1 -1
  10. data/lib/metanorma/bipm/cleanup.rb +6 -4
  11. data/lib/metanorma/bipm/isodoc.rng +1 -59
  12. data/lib/metanorma/bipm/version.rb +1 -1
  13. data/metanorma-bipm.gemspec +1 -1
  14. metadata +3 -3
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -432,7 +432,9 @@
432
432
  </redirect:write>
433
433
  </xsl:if>
434
434
 
435
- <xsl:message>START flatxml_</xsl:message>
435
+ <xsl:if test="$debug = 'true'">
436
+ <xsl:message>START flatxml_</xsl:message>
437
+ </xsl:if>
436
438
  <xsl:variable name="startTime2" select="java:getTime(java:java.util.Date.new())"/>
437
439
  <xsl:variable name="flatxml__">
438
440
  <!-- <xsl:apply-templates select="xalan:nodeset($title_eref)" mode="flatxml"/> -->
@@ -451,16 +453,44 @@
451
453
  <xsl:with-param name="filepath" select="$updated_flatxml_filename"/>
452
454
  </xsl:call-template>
453
455
  <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
456
+ <xsl:if test="$debug = 'true'">
457
+ <xsl:message>DEBUG: processing time <xsl:value-of select="$endTime2 - $startTime2"/> msec.</xsl:message>
458
+ <xsl:message>END flatxml_</xsl:message>
459
+ </xsl:if>
460
+
461
+ <xsl:if test="$debug = 'true'">
462
+ <redirect:write file="flatxml.xml">
463
+ <xsl:copy-of select="xalan:nodeset($flatxml_)"/>
464
+ </redirect:write>
465
+ </xsl:if>
454
466
 
467
+ <xsl:if test="$debug = 'true'">
468
+ <xsl:message>START flatxml</xsl:message>
469
+ </xsl:if>
470
+ <xsl:variable name="startTime3" select="java:getTime(java:java.util.Date.new())"/>
455
471
  <xsl:variable name="flatxml">
456
472
  <xsl:apply-templates select="xalan:nodeset($flatxml_)" mode="pagebreak"/>
457
473
  </xsl:variable>
474
+ <xsl:variable name="endTime3" select="java:getTime(java:java.util.Date.new())"/>
475
+ <xsl:if test="$debug = 'true'">
476
+ <xsl:message>DEBUG: processing time <xsl:value-of select="$endTime3 - $startTime3"/> msec.</xsl:message>
477
+ <xsl:message>END flatxml</xsl:message>
478
+ </xsl:if>
458
479
 
459
480
  <!-- flatxml=<xsl:copy-of select="$flatxml"/> -->
460
481
 
482
+ <xsl:if test="$debug = 'true'">
483
+ <xsl:message>START bipm-standard</xsl:message>
484
+ </xsl:if>
485
+ <xsl:variable name="startTime4" select="java:getTime(java:java.util.Date.new())"/>
461
486
  <xsl:apply-templates select="xalan:nodeset($flatxml)/mn:metanorma" mode="bipm-standard">
462
487
  <xsl:with-param name="curr_docnum" select="$num"/>
463
488
  </xsl:apply-templates>
489
+ <xsl:variable name="endTime4" select="java:getTime(java:java.util.Date.new())"/>
490
+ <xsl:if test="$debug = 'true'">
491
+ <xsl:message>DEBUG: processing time <xsl:value-of select="$endTime4 - $startTime4"/> msec.</xsl:message>
492
+ <xsl:message>END bipm-standard</xsl:message>
493
+ </xsl:if>
464
494
 
465
495
  </xsl:for-each>
466
496
  </xsl:when>
@@ -1025,7 +1055,7 @@
1025
1055
  </xsl:attribute>
1026
1056
  </xsl:if>
1027
1057
 
1028
- <xsl:call-template name="insertFootnoteSeparator"/>
1058
+ <xsl:call-template name="insertFootnoteSeparatorCommon"/>
1029
1059
 
1030
1060
  <xsl:call-template name="insertHeaderDraftWatermark">
1031
1061
  <xsl:with-param name="lang" select="$curr_lang"/>
@@ -1101,7 +1131,7 @@
1101
1131
 
1102
1132
  <xsl:if test="mn:preface/*[not(self::mn:note or self::mn:admonition)]">
1103
1133
  <fo:page-sequence master-reference="document" force-page-count="no-force">
1104
- <xsl:call-template name="insertFootnoteSeparator"/>
1134
+ <xsl:call-template name="insertFootnoteSeparatorCommon"/>
1105
1135
 
1106
1136
  <xsl:variable name="header-title">
1107
1137
  <xsl:choose>
@@ -1130,7 +1160,7 @@
1130
1160
  </xsl:variable>
1131
1161
 
1132
1162
  <fo:page-sequence master-reference="document" force-page-count="no-force">
1133
- <xsl:call-template name="insertFootnoteSeparator"/>
1163
+ <xsl:call-template name="insertFootnoteSeparatorCommon"/>
1134
1164
 
1135
1165
  <xsl:variable name="title-toc">
1136
1166
  <fo:inline>
@@ -1145,74 +1175,10 @@
1145
1175
 
1146
1176
  <fo:flow flow-name="xsl-region-body">
1147
1177
 
1148
- <!-- <fo:block-container margin-left="-14mm" margin-right="0mm">
1149
- <fo:block-container margin-left="0mm" margin-right="0mm"> -->
1150
- <fo:block xsl:use-attribute-sets="toc-title-style">
1151
- <fo:inline><xsl:value-of select="//mn:metanorma/mn:bibdata/mn:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
1152
- <fo:inline keep-together.within-line="always">
1153
- <fo:leader leader-pattern="space"/>
1154
- <fo:inline>
1155
- <xsl:value-of select="$title-toc"/>
1156
- </fo:inline>
1157
- </fo:inline>
1158
- </fo:block>
1159
- <!-- </fo:block-container>
1160
- </fo:block-container> -->
1161
-
1162
- <fo:block-container xsl:use-attribute-sets="toc-style">
1163
- <fo:block role="TOC">
1164
- <!-- <xsl:copy-of select="$contents"/> -->
1165
-
1166
- <xsl:if test="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true']">
1167
- <fo:table table-layout="fixed" width="100%" id="__internal_layout__toc_{generate-id()}" role="SKIP">
1168
- <fo:table-column column-width="127mm"/>
1169
- <fo:table-column column-width="12mm"/>
1170
- <fo:table-body role="SKIP">
1171
- <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
1172
- <xsl:call-template name="insertContentItem"/>
1173
- </xsl:for-each>
1174
- <!-- insert page break between main sections and appendixes in ToC -->
1175
- <!-- <xsl:if test="$doctype ='brochure'">
1176
- <fo:table-row>
1177
- <fo:table-cell number-columns-spanned="2">
1178
- <fo:block break-after="page"/>
1179
- </fo:table-cell>
1180
- </fo:table-row>
1181
- </xsl:if> -->
1182
- <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true' and (@type = 'annex')]"> <!-- or (@level = 2 and @parent = 'annex') -->
1183
- <xsl:call-template name="insertContentItem">
1184
- <xsl:with-param name="keep-with-next">true</xsl:with-param>
1185
- </xsl:call-template>
1186
- </xsl:for-each>
1187
- <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true' and (@type = 'index')]">
1188
- <xsl:call-template name="insertContentItem"/>
1189
- </xsl:for-each>
1190
-
1191
- <!-- List of Tables -->
1192
- <xsl:if test="$contents/mnx:doc[@id = $docid]//mnx:tables/mnx:table">
1193
- <xsl:call-template name="insertListOf_Title">
1194
- <xsl:with-param name="title" select="$title-list-tables"/>
1195
- </xsl:call-template>
1196
- <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:tables/mnx:table">
1197
- <xsl:call-template name="insertListOf_Item"/>
1198
- </xsl:for-each>
1199
- </xsl:if>
1200
-
1201
- <!-- List of Figures -->
1202
- <xsl:if test="$contents/doc[@id = $docid]//mnx:figures/mnx:figure">
1203
- <xsl:call-template name="insertListOf_Title">
1204
- <xsl:with-param name="title" select="$title-list-figures"/>
1205
- </xsl:call-template>
1206
- <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:figures/mnx:figure">
1207
- <xsl:call-template name="insertListOf_Item"/>
1208
- </xsl:for-each>
1209
- </xsl:if>
1210
-
1211
- </fo:table-body>
1212
- </fo:table>
1213
- </xsl:if>
1214
- </fo:block>
1215
- </fo:block-container>
1178
+ <xsl:call-template name="toc">
1179
+ <xsl:with-param name="docid" select="$docid"/>
1180
+ <xsl:with-param name="curr_lang" select="$curr_lang"/>
1181
+ </xsl:call-template>
1216
1182
 
1217
1183
  </fo:flow>
1218
1184
 
@@ -1237,6 +1203,7 @@
1237
1203
  <!-- Document Control -->
1238
1204
  <xsl:apply-templates select="mn:doccontrol | mn:colophon" mode="sections"/>
1239
1205
 
1206
+ <!-- indexes=<xsl:copy-of select="$indexes"/> -->
1240
1207
  <!-- Index -->
1241
1208
  <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//mn:indexsect" mode="index">
1242
1209
  <xsl:with-param name="isDraft" select="normalize-space(//mn:metanorma/mn:bibdata/mn:version/mn:draft or contains(//mn:metanorma/mn:bibdata/mn:status/mn:stage, 'draft') or contains(//mn:metanorma/mn:bibdata/mn:status/mn:stage, 'projet'))"/>
@@ -1894,6 +1861,82 @@
1894
1861
  </xsl:choose>
1895
1862
  </xsl:template>
1896
1863
 
1864
+ <xsl:template name="toc">
1865
+ <xsl:param name="curr_lang"/>
1866
+ <xsl:param name="docid"/>
1867
+
1868
+ <xsl:variable name="title-toc"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">table_of_contents</xsl:with-param></xsl:call-template></xsl:variable>
1869
+
1870
+ <!-- <fo:block-container margin-left="-14mm" margin-right="0mm">
1871
+ <fo:block-container margin-left="0mm" margin-right="0mm"> -->
1872
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1873
+ <fo:inline><xsl:value-of select="//mn:metanorma/mn:bibdata/mn:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
1874
+ <fo:inline keep-together.within-line="always">
1875
+ <fo:leader leader-pattern="space"/>
1876
+ <fo:inline>
1877
+ <xsl:value-of select="$title-toc"/>
1878
+ </fo:inline>
1879
+ </fo:inline>
1880
+ </fo:block>
1881
+ <!-- </fo:block-container>
1882
+ </fo:block-container> -->
1883
+
1884
+ <fo:block-container xsl:use-attribute-sets="toc-style">
1885
+ <fo:block role="TOC">
1886
+ <!-- <xsl:copy-of select="$contents"/> -->
1887
+
1888
+ <xsl:if test="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true']">
1889
+ <fo:table table-layout="fixed" width="100%" id="__internal_layout__toc_{generate-id()}" role="SKIP">
1890
+ <fo:table-column column-width="127mm"/>
1891
+ <fo:table-column column-width="12mm"/>
1892
+ <fo:table-body role="SKIP">
1893
+ <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
1894
+ <xsl:call-template name="insertContentItem"/>
1895
+ </xsl:for-each>
1896
+ <!-- insert page break between main sections and appendixes in ToC -->
1897
+ <!-- <xsl:if test="$doctype ='brochure'">
1898
+ <fo:table-row>
1899
+ <fo:table-cell number-columns-spanned="2">
1900
+ <fo:block break-after="page"/>
1901
+ </fo:table-cell>
1902
+ </fo:table-row>
1903
+ </xsl:if> -->
1904
+ <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true' and (@type = 'annex')]"> <!-- or (@level = 2 and @parent = 'annex') -->
1905
+ <xsl:call-template name="insertContentItem">
1906
+ <xsl:with-param name="keep-with-next">true</xsl:with-param>
1907
+ </xsl:call-template>
1908
+ </xsl:for-each>
1909
+ <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true' and (@type = 'index')]">
1910
+ <xsl:call-template name="insertContentItem"/>
1911
+ </xsl:for-each>
1912
+
1913
+ <!-- List of Tables -->
1914
+ <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:tables/mnx:table">
1915
+ <xsl:if test="position() = 1">
1916
+ <xsl:call-template name="insertListOf_Title">
1917
+ <xsl:with-param name="title" select="$title-list-tables"/>
1918
+ </xsl:call-template>
1919
+ </xsl:if>
1920
+ <xsl:call-template name="insertListOf_Item"/>
1921
+ </xsl:for-each>
1922
+
1923
+ <!-- List of Figures -->
1924
+ <xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:figures/mnx:figure">
1925
+ <xsl:if test="position() = 1">
1926
+ <xsl:call-template name="insertListOf_Title">
1927
+ <xsl:with-param name="title" select="$title-list-figures"/>
1928
+ </xsl:call-template>
1929
+ </xsl:if>
1930
+ <xsl:call-template name="insertListOf_Item"/>
1931
+ </xsl:for-each>
1932
+
1933
+ </fo:table-body>
1934
+ </fo:table>
1935
+ </xsl:if>
1936
+ </fo:block>
1937
+ </fo:block-container>
1938
+ </xsl:template>
1939
+
1897
1940
  <xsl:template name="insertContentItem">
1898
1941
  <xsl:param name="keep-with-next"/>
1899
1942
  <fo:table-row xsl:use-attribute-sets="toc-item-style">
@@ -2114,7 +2157,7 @@
2114
2157
  <xsl:attribute name="master-reference">document-landscape</xsl:attribute>
2115
2158
  </xsl:if>
2116
2159
 
2117
- <xsl:call-template name="insertFootnoteSeparator"/>
2160
+ <xsl:call-template name="insertFootnoteSeparatorCommon"/>
2118
2161
 
2119
2162
  <xsl:variable name="header-title">
2120
2163
  <xsl:choose>
@@ -2171,7 +2214,7 @@
2171
2214
 
2172
2215
  <xsl:template name="sections_appendix">
2173
2216
  <fo:page-sequence master-reference="document" force-page-count="no-force">
2174
- <xsl:call-template name="insertFootnoteSeparator"/>
2217
+ <xsl:call-template name="insertFootnoteSeparatorCommon"/>
2175
2218
 
2176
2219
  <xsl:variable name="curr_lang" select="/mn:metanorma/mn:bibdata/mn:language[@current = 'true']"/>
2177
2220
 
@@ -3620,14 +3663,6 @@
3620
3663
  </xsl:choose>
3621
3664
  </xsl:template>
3622
3665
 
3623
- <xsl:template name="insertFootnoteSeparator">
3624
- <fo:static-content flow-name="xsl-footnote-separator">
3625
- <fo:block>
3626
- <fo:leader leader-pattern="rule" leader-length="30%"/>
3627
- </fo:block>
3628
- </fo:static-content>
3629
- </xsl:template>
3630
-
3631
3666
  <!-- =================== -->
3632
3667
  <!-- Index processing -->
3633
3668
  <!-- =================== -->
@@ -13572,7 +13607,7 @@
13572
13607
 
13573
13608
  <xsl:template name="insertFootnoteSeparatorCommon">
13574
13609
  <xsl:param name="leader_length">30%</xsl:param>
13575
- <fo:static-content flow-name="xsl-footnote-separator">
13610
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
13576
13611
  <fo:block>
13577
13612
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
13578
13613
  </fo:block>
@@ -14467,6 +14502,9 @@
14467
14502
  <xsl:attribute name="role">H1</xsl:attribute>
14468
14503
  </xsl:attribute-set>
14469
14504
 
14505
+ <xsl:template name="refine_toc-title-style">
14506
+ </xsl:template>
14507
+
14470
14508
  <xsl:attribute-set name="toc-title-page-style">
14471
14509
  <xsl:attribute name="text-align">right</xsl:attribute>
14472
14510
  <xsl:attribute name="font-size">9pt</xsl:attribute>
@@ -14474,6 +14512,9 @@
14474
14512
  <xsl:attribute name="role">SKIP</xsl:attribute>
14475
14513
  </xsl:attribute-set> <!-- toc-title-page-style -->
14476
14514
 
14515
+ <xsl:template name="refine_toc-title-page-style">
14516
+ </xsl:template>
14517
+
14477
14518
  <xsl:attribute-set name="toc-item-block-style">
14478
14519
  </xsl:attribute-set>
14479
14520
 
@@ -14531,6 +14572,9 @@
14531
14572
  <xsl:attribute name="padding-bottom">6pt</xsl:attribute>
14532
14573
  </xsl:attribute-set>
14533
14574
 
14575
+ <xsl:template name="refine_toc-listof-title-style">
14576
+ </xsl:template>
14577
+
14534
14578
  <xsl:attribute-set name="toc-listof-item-block-style">
14535
14579
  </xsl:attribute-set>
14536
14580
 
@@ -14877,7 +14921,7 @@
14877
14921
  </xsl:if>
14878
14922
 
14879
14923
  <xsl:for-each select="$contents_nodes/mnx:doc">
14880
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
14924
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
14881
14925
  <xsl:if test="@bundle = 'true'">
14882
14926
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
14883
14927
  </xsl:if>
@@ -14911,7 +14955,7 @@
14911
14955
  </xsl:choose>
14912
14956
  </fo:bookmark-title>
14913
14957
 
14914
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
14958
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
14915
14959
 
14916
14960
  <xsl:call-template name="insertFigureBookmarks">
14917
14961
  <xsl:with-param name="contents" select="mnx:contents"/>
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -11492,7 +11492,7 @@
11492
11492
 
11493
11493
  <xsl:template name="insertFootnoteSeparatorCommon">
11494
11494
  <xsl:param name="leader_length">30%</xsl:param>
11495
- <fo:static-content flow-name="xsl-footnote-separator">
11495
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
11496
11496
  <fo:block>
11497
11497
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
11498
11498
  </fo:block>
@@ -12379,9 +12379,15 @@
12379
12379
  <xsl:attribute name="role">H1</xsl:attribute>
12380
12380
  </xsl:attribute-set>
12381
12381
 
12382
+ <xsl:template name="refine_toc-title-style">
12383
+ </xsl:template>
12384
+
12382
12385
  <xsl:attribute-set name="toc-title-page-style">
12383
12386
  </xsl:attribute-set> <!-- toc-title-page-style -->
12384
12387
 
12388
+ <xsl:template name="refine_toc-title-page-style">
12389
+ </xsl:template>
12390
+
12385
12391
  <xsl:attribute-set name="toc-item-block-style">
12386
12392
  </xsl:attribute-set>
12387
12393
 
@@ -12410,6 +12416,9 @@
12410
12416
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
12411
12417
  </xsl:attribute-set>
12412
12418
 
12419
+ <xsl:template name="refine_toc-listof-title-style">
12420
+ </xsl:template>
12421
+
12413
12422
  <xsl:attribute-set name="toc-listof-item-block-style">
12414
12423
  </xsl:attribute-set>
12415
12424
 
@@ -12756,7 +12765,7 @@
12756
12765
  </xsl:if>
12757
12766
 
12758
12767
  <xsl:for-each select="$contents_nodes/mnx:doc">
12759
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
12768
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
12760
12769
  <xsl:if test="@bundle = 'true'">
12761
12770
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
12762
12771
  </xsl:if>
@@ -12790,7 +12799,7 @@
12790
12799
  </xsl:choose>
12791
12800
  </fo:bookmark-title>
12792
12801
 
12793
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
12802
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
12794
12803
 
12795
12804
  <xsl:call-template name="insertFigureBookmarks">
12796
12805
  <xsl:with-param name="contents" select="mnx:contents"/>
data/lib/isodoc/bipm/presentation_xml_convert.rb CHANGED
@@ -86,10 +86,13 @@ module IsoDoc
86
86
  end
87
87
  end
88
88
 
89
+ BLACKSQUARE =
90
+ '<span style="font-size:130%">&#x25a0;</span>&#xa0;&#xa0;'.freeze
91
+
89
92
  def quoted_title_render(node, elem, variant_title)
90
93
  add_id(variant_title)
91
94
  variant_title.next =
92
- fmt_caption("&#x2580;", elem, variant_title, {}, {})
95
+ fmt_caption(BLACKSQUARE, elem, variant_title, {}, {})
93
96
  if s = variant_title.next.at(ns("./semx[@element='title']"))
94
97
  s["source"] = variant_title["id"]
95
98
  end
data/lib/metanorma/bipm/basicdoc.rng CHANGED
@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
1291
1291
  <ref name="pure_strike"/>
1292
1292
  <ref name="pure_smallcap"/>
1293
1293
  <ref name="br"/>
1294
+ <ref name="stem"/>
1294
1295
  </choice>
1295
1296
  </define>
1296
1297
  <define name="NestedTextElement">
1297
1298
  <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
1298
1299
  <choice>
1299
1300
  <ref name="PureTextElement"/>
1300
- <ref name="stem"/>
1301
1301
  <ref name="eref"/>
1302
1302
  <ref name="xref"/>
1303
1303
  <ref name="hyperlink"/>
data/lib/metanorma/bipm/cleanup.rb CHANGED
@@ -65,10 +65,12 @@ module Metanorma
65
65
 
66
66
  # not language-specific, just space-delimited
67
67
  def bibdata_docidentifier_enhance(id, parts)
68
- ret = %w(appendix annexid part subpart).each_with_object([]) do |w, m|
69
- p = parts[w] and m << p
70
- end
71
- id.children = "#{id.text} #{ret.join(' ')}"
68
+ ret = ""
69
+ p = parts["part"] and ret += "-#{p}"
70
+ p = parts["subpart"] and ret += "-#{p}"
71
+ p = parts["appendix"] and ret += " A#{p}"
72
+ p = parts["annexid"] and ret += ".#{p}"
73
+ id.children = "#{id.text}#{ret}"
72
74
  end
73
75
  end
74
76
  end
data/lib/metanorma/bipm/isodoc.rng CHANGED
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
42
42
  but to `@anchor`, the user-supplied cross-reference</a:documentation>
43
43
  <text/>
44
44
  </define>
45
- <define name="index-primary">
46
- <element name="primary">
47
- <oneOrMore>
48
- <choice>
49
- <ref name="PureTextElement"/>
50
- <ref name="stem"/>
51
- </choice>
52
- </oneOrMore>
53
- </element>
54
- </define>
55
- <define name="index-secondary">
56
- <element name="secondary">
57
- <oneOrMore>
58
- <choice>
59
- <ref name="PureTextElement"/>
60
- <ref name="stem"/>
61
- </choice>
62
- </oneOrMore>
63
- </element>
64
- </define>
65
- <define name="index-tertiary">
66
- <element name="tertiary">
67
- <oneOrMore>
68
- <choice>
69
- <ref name="PureTextElement"/>
70
- <ref name="stem"/>
71
- </choice>
72
- </oneOrMore>
73
- </element>
74
- </define>
75
45
  <define name="review">
76
46
  <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
77
47
  the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
592
562
  </oneOrMore>
593
563
  </element>
594
564
  </define>
595
- <define name="sub">
596
- <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
597
- <element name="sub">
598
- <zeroOrMore>
599
- <choice>
600
- <ref name="PureTextElement"/>
601
- <ref name="stem"/>
602
- </choice>
603
- </zeroOrMore>
604
- </element>
605
- </define>
606
- <define name="sup">
607
- <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
608
- <element name="sup">
609
- <zeroOrMore>
610
- <choice>
611
- <ref name="PureTextElement"/>
612
- <ref name="stem"/>
613
- </choice>
614
- </zeroOrMore>
615
- </element>
616
- </define>
617
565
  <define name="pagebreak">
618
566
  <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
619
567
  <element name="pagebreak">
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
1094
1042
  <zeroOrMore>
1095
1043
  <choice>
1096
1044
  <ref name="PureTextElement"/>
1097
- <ref name="stem"/>
1098
1045
  <ref name="index"/>
1099
1046
  <ref name="index-xref"/>
1100
1047
  </choice>
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
1107
1054
  <zeroOrMore>
1108
1055
  <choice>
1109
1056
  <ref name="PureTextElement"/>
1110
- <ref name="stem"/>
1111
1057
  <ref name="index"/>
1112
1058
  <ref name="index-xref"/>
1113
1059
  </choice>
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
2025
1971
  <element name="name">
2026
1972
  <a:documentation>The symbolic form of the designation</a:documentation>
2027
1973
  <oneOrMore>
2028
- <choice>
2029
- <ref name="PureTextElement"/>
2030
- <ref name="stem"/>
2031
- </choice>
1974
+ <ref name="PureTextElement"/>
2032
1975
  </oneOrMore>
2033
1976
  </element>
2034
1977
  </element>
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
2081
2024
  <zeroOrMore>
2082
2025
  <choice>
2083
2026
  <ref name="PureTextElement"/>
2084
- <ref name="stem"/>
2085
2027
  <ref name="index"/>
2086
2028
  <ref name="index-xref"/>
2087
2029
  </choice>
data/lib/metanorma/bipm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Bipm
3
- VERSION = "2.7.1".freeze
3
+ VERSION = "2.7.2".freeze
4
4
  end
5
5
  end
data/metanorma-bipm.gemspec CHANGED
@@ -42,5 +42,5 @@ spec.add_development_dependency "rubocop-performance"
42
42
  spec.add_development_dependency "simplecov", "~> 0.15"
43
43
  spec.add_development_dependency "timecop", "~> 0.9"
44
44
  spec.add_development_dependency "webmock"
45
- spec.add_development_dependency "xml-c14n"
45
+ spec.add_development_dependency "canon"
46
46
  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.7.1
4
+ version: 2.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-07-21 00:00:00.000000000 Z
11
+ date: 2025-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -207,7 +207,7 @@ dependencies:
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
- name: xml-c14n
210
+ name: canon
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
213
  - - ">="