metanorma-bipm 2.3.1 → 2.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +0 -1
  3. data/lib/isodoc/bipm/base_convert.rb +1 -2
  4. data/lib/isodoc/bipm/bipm.brochure.xsl +11 -2
  5. data/lib/isodoc/bipm/bipm.guide.xsl +11 -2
  6. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +11 -2
  7. data/lib/isodoc/bipm/bipm.rapport.xsl +11 -2
  8. data/lib/isodoc/bipm/jcgm.standard.xsl +11 -2
  9. data/lib/isodoc/bipm/pdf_convert.rb +1 -1
  10. data/lib/isodoc/bipm/xref.rb +8 -12
  11. data/lib/metanorma/bipm/basicdoc.rng +56 -37
  12. data/lib/metanorma/bipm/biblio.rng +10 -1
  13. data/lib/metanorma/bipm/converter.rb +3 -1
  14. data/lib/metanorma/bipm/isodoc.rng +52 -1
  15. data/lib/metanorma/bipm/processor.rb +1 -0
  16. data/lib/metanorma/bipm/version.rb +1 -1
  17. data/metanorma-bipm.gemspec +2 -2
  18. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dc14d497173a941f36ed2190583ad2aa327cf205b3c4dc12cd71638804523472
4
- data.tar.gz: 6d3bb20478eacb30ae5141a2d5366dacef224393a51ccc9f1c413693e6c20b14
3
+ metadata.gz: 6e86acd17d4afc8d0c5e82dc6b17926a1eb108ff43c034db565986d71f5449b1
4
+ data.tar.gz: 96696fbe1571b1d1ae037615521cbbfd5ae3ca9ef14a0c2c9e5c76eac16246d8
5
5
  SHA512:
6
- metadata.gz: fd4a51b12df8205cad882ea3c989109cba33302a75c6e35a694ec1e5359544ffe946254e47406ba9c2405a6fedf5ab17f12d5262f84e69a2f08561d43a67ce1a
7
- data.tar.gz: a6288f12b640596488700982457eb7a9d92186afff22b0c43ee37163ffaf1429050d0dc5ee778149ce16358450b381215201afd19d17f630b2af8d22ab6a1dc4
6
+ metadata.gz: 63638c49a461cc643e9fdf7c1078b352f684b2f5bc15fbcde9c6568bef6c25df1bdb93d1f5e2f2cba8a919d89f00dcf1826983f049b738c4fde9ab6b593df451
7
+ data.tar.gz: 2f92c603f71569b59fc4157f5ae22ef8e3d3b6191d6852f2c9b514f853431ba54827388ba506b2c44fce3068ac31de3d8a88cebdb441fb2ef663b1bf7c03bb3f
data/.gitignore CHANGED
@@ -2,5 +2,4 @@
2
2
  /.byebug_history
3
3
  /.rspec_status
4
4
  /coverage/
5
- /Gemfile.devel
6
5
  /Gemfile.lock
data/lib/isodoc/bipm/base_convert.rb CHANGED
@@ -36,8 +36,7 @@ module IsoDoc
36
36
 
37
37
  def implicit_reference(bib)
38
38
  b = bib.at(ns("./docidentifier[@primary = 'true'][@type = 'BIPM']"))
39
- doctype = bib.at(ns("//bibdata/ext/doctype"))&.text
40
- return true if doctype == "brochure" && /^(CGPM|CIPM|CCDS|CCTF)[  ]
39
+ return true if @doctype == "brochure" && /^(CGPM|CIPM|CCDS|CCTF)[  ]
41
40
  (Resolution|Recommendation|Declaration|Decision|Recommendation|Meeting)/x
42
41
  .match?(b&.text)
43
42
 
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -8215,8 +8215,17 @@
8215
8215
  <xsl:variable name="styles_">
8216
8216
  <xsl:for-each select="xalan:nodeset($styles__)/item">
8217
8217
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8218
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
- <xsl:if test="$key = 'font-family' or $key = 'color'">
8218
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
+ <xsl:variable name="value">
8220
+ <xsl:choose>
8221
+ <!-- if font-size is digits only -->
8222
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
8223
+ <xsl:otherwise>
8224
+ <xsl:value-of select="$value_"/>
8225
+ </xsl:otherwise>
8226
+ </xsl:choose>
8227
+ </xsl:variable>
8228
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
8220
8229
  <style name="{$key}"><xsl:value-of select="$value"/></style>
8221
8230
  </xsl:if>
8222
8231
  </xsl:for-each>
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -8215,8 +8215,17 @@
8215
8215
  <xsl:variable name="styles_">
8216
8216
  <xsl:for-each select="xalan:nodeset($styles__)/item">
8217
8217
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8218
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
- <xsl:if test="$key = 'font-family' or $key = 'color'">
8218
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
+ <xsl:variable name="value">
8220
+ <xsl:choose>
8221
+ <!-- if font-size is digits only -->
8222
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
8223
+ <xsl:otherwise>
8224
+ <xsl:value-of select="$value_"/>
8225
+ </xsl:otherwise>
8226
+ </xsl:choose>
8227
+ </xsl:variable>
8228
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
8220
8229
  <style name="{$key}"><xsl:value-of select="$value"/></style>
8221
8230
  </xsl:if>
8222
8231
  </xsl:for-each>
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl CHANGED
@@ -8215,8 +8215,17 @@
8215
8215
  <xsl:variable name="styles_">
8216
8216
  <xsl:for-each select="xalan:nodeset($styles__)/item">
8217
8217
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8218
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
- <xsl:if test="$key = 'font-family' or $key = 'color'">
8218
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
+ <xsl:variable name="value">
8220
+ <xsl:choose>
8221
+ <!-- if font-size is digits only -->
8222
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
8223
+ <xsl:otherwise>
8224
+ <xsl:value-of select="$value_"/>
8225
+ </xsl:otherwise>
8226
+ </xsl:choose>
8227
+ </xsl:variable>
8228
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
8220
8229
  <style name="{$key}"><xsl:value-of select="$value"/></style>
8221
8230
  </xsl:if>
8222
8231
  </xsl:for-each>
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -8215,8 +8215,17 @@
8215
8215
  <xsl:variable name="styles_">
8216
8216
  <xsl:for-each select="xalan:nodeset($styles__)/item">
8217
8217
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8218
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
- <xsl:if test="$key = 'font-family' or $key = 'color'">
8218
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8219
+ <xsl:variable name="value">
8220
+ <xsl:choose>
8221
+ <!-- if font-size is digits only -->
8222
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
8223
+ <xsl:otherwise>
8224
+ <xsl:value-of select="$value_"/>
8225
+ </xsl:otherwise>
8226
+ </xsl:choose>
8227
+ </xsl:variable>
8228
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
8220
8229
  <style name="{$key}"><xsl:value-of select="$value"/></style>
8221
8230
  </xsl:if>
8222
8231
  </xsl:for-each>
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -6079,8 +6079,17 @@
6079
6079
  <xsl:variable name="styles_">
6080
6080
  <xsl:for-each select="xalan:nodeset($styles__)/item">
6081
6081
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
6082
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
6083
- <xsl:if test="$key = 'font-family' or $key = 'color'">
6082
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
6083
+ <xsl:variable name="value">
6084
+ <xsl:choose>
6085
+ <!-- if font-size is digits only -->
6086
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
6087
+ <xsl:otherwise>
6088
+ <xsl:value-of select="$value_"/>
6089
+ </xsl:otherwise>
6090
+ </xsl:choose>
6091
+ </xsl:variable>
6092
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
6084
6093
  <style name="{$key}"><xsl:value-of select="$value"/></style>
6085
6094
  </xsl:if>
6086
6095
  </xsl:for-each>
data/lib/isodoc/bipm/pdf_convert.rb CHANGED
@@ -19,7 +19,7 @@ module IsoDoc
19
19
  &.value == "JCGM" and
20
20
  return "jcgm.standard.xsl"
21
21
 
22
- doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
22
+ doctype = @doctype
23
23
  doctype = "brochure" unless %w(guide mise-en-pratique rapport)
24
24
  .include? doctype
25
25
  "bipm.#{doctype}.xsl"
data/lib/isodoc/bipm/xref.rb CHANGED
@@ -80,10 +80,9 @@ module IsoDoc
80
80
  clause.nil? and return num
81
81
  num.increment(clause)
82
82
  @anchors[clause["id"]] = section_name_anchors(clause, num, lvl)
83
- i = Counter.new
83
+ i = Counter.new(0, prefix: "#{num.print}.")
84
84
  clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
85
- i.increment(c)
86
- section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
85
+ section_names1(c, i.increment(c).print, lvl + 1)
87
86
  end
88
87
  clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
89
88
  unnumbered_section_names1(c, lvl + 1)
@@ -110,10 +109,9 @@ module IsoDoc
110
109
 
111
110
  def section_names1(clause, num, level)
112
111
  @anchors[clause["id"]] = section_name1_anchors(clause, num, level)
113
- i = Counter.new
112
+ i = Counter.new(0, prefix: "#{num}.")
114
113
  clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
115
- i.increment(c)
116
- section_names1(c, "#{num}.#{i.print}", level + 1)
114
+ section_names1(c, i.increment(c).print, level + 1)
117
115
  end
118
116
  clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
119
117
  unnumbered_section_names1(c, lvl + 1)
@@ -158,11 +156,10 @@ module IsoDoc
158
156
  annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
159
157
  num.to_s, 1)
160
158
  else
161
- i = Counter.new
162
159
  prefix = @jcgm ? "" : "A"
160
+ i = Counter.new(0, prefix: "#{prefix}#{num}.")
163
161
  clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
164
- i.increment(c)
165
- annex_names1(c, "#{prefix}#{num}.#{i.print}", 2)
162
+ annex_names1(c, i.increment(c).print, 2)
166
163
  end
167
164
  clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
168
165
  .each { |c| unnumbered_annex_names1(c, 2) }
@@ -196,10 +193,9 @@ module IsoDoc
196
193
 
197
194
  def annex_names1(clause, num, level)
198
195
  @anchors[clause["id"]] = annex_names1_anchors(num, level)
199
- i = Counter.new
196
+ i = Counter.new(0, prefix: "#{num}.")
200
197
  clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
201
- i.increment(c)
202
- annex_names1(c, "#{num}.#{i.print}", level + 1)
198
+ annex_names1(c, i.increment(c).print, level + 1)
203
199
  end
204
200
  clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
205
201
  .each { |c| unnumbered_annex_names1(c, level + 1) }
data/lib/metanorma/bipm/basicdoc.rng CHANGED
@@ -346,6 +346,8 @@
346
346
  <ref name="keyword"/>
347
347
  <ref name="xref"/>
348
348
  <ref name="hyperlink"/>
349
+ <ref name="index"/>
350
+ <ref name="index-xref"/>
349
351
  </choice>
350
352
  </oneOrMore>
351
353
  </element>
@@ -623,6 +625,8 @@
623
625
  <ref name="eref"/>
624
626
  <ref name="xref"/>
625
627
  <ref name="hyperlink"/>
628
+ <ref name="index"/>
629
+ <ref name="index-xref"/>
626
630
  </choice>
627
631
  </zeroOrMore>
628
632
  </element>
@@ -636,6 +640,8 @@
636
640
  <ref name="eref"/>
637
641
  <ref name="xref"/>
638
642
  <ref name="hyperlink"/>
643
+ <ref name="index"/>
644
+ <ref name="index-xref"/>
639
645
  </choice>
640
646
  </zeroOrMore>
641
647
  </element>
@@ -648,6 +654,8 @@
648
654
  <ref name="eref"/>
649
655
  <ref name="xref"/>
650
656
  <ref name="hyperlink"/>
657
+ <ref name="index"/>
658
+ <ref name="index-xref"/>
651
659
  </choice>
652
660
  </zeroOrMore>
653
661
  </element>
@@ -655,7 +663,11 @@
655
663
  <define name="keyword">
656
664
  <element name="keyword">
657
665
  <zeroOrMore>
658
- <ref name="PureTextElement"/>
666
+ <choice>
667
+ <ref name="PureTextElement"/>
668
+ <ref name="index"/>
669
+ <ref name="index-xref"/>
670
+ </choice>
659
671
  </zeroOrMore>
660
672
  </element>
661
673
  </define>
@@ -676,7 +688,11 @@
676
688
  <define name="strike">
677
689
  <element name="strike">
678
690
  <zeroOrMore>
679
- <ref name="PureTextElement"/>
691
+ <choice>
692
+ <ref name="PureTextElement"/>
693
+ <ref name="index"/>
694
+ <ref name="index-xref"/>
695
+ </choice>
680
696
  </zeroOrMore>
681
697
  </element>
682
698
  </define>
@@ -898,44 +914,47 @@
898
914
  -->
899
915
  <define name="image">
900
916
  <element name="image">
901
- <attribute name="id">
902
- <data type="ID"/>
917
+ <ref name="Image"/>
918
+ </element>
919
+ </define>
920
+ <define name="Image">
921
+ <attribute name="id">
922
+ <data type="ID"/>
923
+ </attribute>
924
+ <attribute name="src">
925
+ <data type="anyURI"/>
926
+ </attribute>
927
+ <attribute name="mimetype"/>
928
+ <optional>
929
+ <attribute name="filename"/>
930
+ </optional>
931
+ <optional>
932
+ <attribute name="width">
933
+ <choice>
934
+ <data type="int"/>
935
+ <value>auto</value>
936
+ </choice>
903
937
  </attribute>
904
- <attribute name="src">
938
+ </optional>
939
+ <optional>
940
+ <attribute name="height">
941
+ <choice>
942
+ <data type="int"/>
943
+ <value>auto</value>
944
+ </choice>
945
+ </attribute>
946
+ </optional>
947
+ <optional>
948
+ <attribute name="alt"/>
949
+ </optional>
950
+ <optional>
951
+ <attribute name="title"/>
952
+ </optional>
953
+ <optional>
954
+ <attribute name="longdesc">
905
955
  <data type="anyURI"/>
906
956
  </attribute>
907
- <attribute name="mimetype"/>
908
- <optional>
909
- <attribute name="filename"/>
910
- </optional>
911
- <optional>
912
- <attribute name="width">
913
- <choice>
914
- <data type="int"/>
915
- <value>auto</value>
916
- </choice>
917
- </attribute>
918
- </optional>
919
- <optional>
920
- <attribute name="height">
921
- <choice>
922
- <data type="int"/>
923
- <value>auto</value>
924
- </choice>
925
- </attribute>
926
- </optional>
927
- <optional>
928
- <attribute name="alt"/>
929
- </optional>
930
- <optional>
931
- <attribute name="title"/>
932
- </optional>
933
- <optional>
934
- <attribute name="longdesc">
935
- <data type="anyURI"/>
936
- </attribute>
937
- </optional>
938
- </element>
957
+ </optional>
939
958
  </define>
940
959
  <define name="video">
941
960
  <element name="video">
data/lib/metanorma/bipm/biblio.rng CHANGED
@@ -348,6 +348,9 @@
348
348
  <zeroOrMore>
349
349
  <ref name="contact"/>
350
350
  </zeroOrMore>
351
+ <optional>
352
+ <ref name="logo"/>
353
+ </optional>
351
354
  </element>
352
355
  </define>
353
356
  <define name="orgname">
@@ -366,6 +369,11 @@
366
369
  </choice>
367
370
  </element>
368
371
  </define>
372
+ <define name="logo">
373
+ <element name="logo">
374
+ <ref name="image"/>
375
+ </element>
376
+ </define>
369
377
  <define name="NameWithVariants">
370
378
  <element name="primary">
371
379
  <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
942
950
  <value>obsoleted</value>
943
951
  <value>confirmed</value>
944
952
  <value>updated</value>
953
+ <value>corrected</value>
945
954
  <value>issued</value>
946
955
  <value>transmitted</value>
947
956
  <value>copied</value>
@@ -1283,7 +1292,7 @@
1283
1292
  <value>mergedInto</value>
1284
1293
  <value>splits</value>
1285
1294
  <value>splitInto</value>
1286
- <value>instance</value>
1295
+ <value>instanceOf</value>
1287
1296
  <value>hasInstance</value>
1288
1297
  <value>exemplarOf</value>
1289
1298
  <value>hasExemplar</value>
data/lib/metanorma/bipm/converter.rb CHANGED
@@ -154,7 +154,9 @@ module Metanorma
154
154
  end
155
155
 
156
156
  def presentation_xml_converter(node)
157
- IsoDoc::BIPM::PresentationXMLConvert.new(html_extract_attributes(node))
157
+ IsoDoc::BIPM::PresentationXMLConvert
158
+ .new(html_extract_attributes(node)
159
+ .merge(output_formats: ::Metanorma::BIPM::Processor.new.output_formats))
158
160
  end
159
161
 
160
162
  def pdf_converter(node)
data/lib/metanorma/bipm/isodoc.rng CHANGED
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.4 -->
20
+ <!-- VERSION v1.2.8 -->
21
21
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -485,6 +485,8 @@
485
485
  <choice>
486
486
  <text/>
487
487
  <ref name="callout"/>
488
+ <ref name="xref"/>
489
+ <ref name="eref"/>
488
490
  </choice>
489
491
  </oneOrMore>
490
492
  <zeroOrMore>
@@ -865,6 +867,7 @@
865
867
  <ref name="PureTextElement"/>
866
868
  <ref name="stem"/>
867
869
  <ref name="index"/>
870
+ <ref name="index-xref"/>
868
871
  <ref name="eref"/>
869
872
  <ref name="erefstack"/>
870
873
  <ref name="xref"/>
@@ -880,6 +883,7 @@
880
883
  <ref name="PureTextElement"/>
881
884
  <ref name="stem"/>
882
885
  <ref name="index"/>
886
+ <ref name="index-xref"/>
883
887
  <ref name="eref"/>
884
888
  <ref name="erefstack"/>
885
889
  <ref name="xref"/>
@@ -894,6 +898,7 @@
894
898
  <choice>
895
899
  <ref name="PureTextElement"/>
896
900
  <ref name="index"/>
901
+ <ref name="index-xref"/>
897
902
  <ref name="eref"/>
898
903
  <ref name="erefstack"/>
899
904
  <ref name="xref"/>
@@ -908,6 +913,7 @@
908
913
  <choice>
909
914
  <ref name="PureTextElement"/>
910
915
  <ref name="index"/>
916
+ <ref name="index-xref"/>
911
917
  </choice>
912
918
  </zeroOrMore>
913
919
  </element>
@@ -918,6 +924,7 @@
918
924
  <choice>
919
925
  <ref name="PureTextElement"/>
920
926
  <ref name="index"/>
927
+ <ref name="index-xref"/>
921
928
  </choice>
922
929
  </zeroOrMore>
923
930
  </element>
@@ -928,6 +935,7 @@
928
935
  <choice>
929
936
  <ref name="PureTextElement"/>
930
937
  <ref name="index"/>
938
+ <ref name="index-xref"/>
931
939
  </choice>
932
940
  </zeroOrMore>
933
941
  </element>
@@ -938,6 +946,7 @@
938
946
  <choice>
939
947
  <ref name="PureTextElement"/>
940
948
  <ref name="index"/>
949
+ <ref name="index-xref"/>
941
950
  </choice>
942
951
  </zeroOrMore>
943
952
  </element>
@@ -1004,6 +1013,14 @@
1004
1013
  </oneOrMore>
1005
1014
  </element>
1006
1015
  </define>
1016
+ <define name="BasicBlock" combine="choice">
1017
+ <ref name="columnbreak"/>
1018
+ </define>
1019
+ <define name="columnbreak">
1020
+ <element name="columnbreak">
1021
+ <empty/>
1022
+ </element>
1023
+ </define>
1007
1024
  <define name="MultilingualRenderingType">
1008
1025
  <choice>
1009
1026
  <value>common</value>
@@ -1037,6 +1054,17 @@
1037
1054
  <ref name="date_inline"/>
1038
1055
  </choice>
1039
1056
  </define>
1057
+ <define name="PureTextElement" combine="choice">
1058
+ <ref name="passthrough_inline"/>
1059
+ </define>
1060
+ <define name="passthrough_inline">
1061
+ <element name="passthrough">
1062
+ <optional>
1063
+ <attribute name="formats"/>
1064
+ </optional>
1065
+ <text/>
1066
+ </element>
1067
+ </define>
1040
1068
  <define name="add">
1041
1069
  <element name="add">
1042
1070
  <choice>
@@ -1047,6 +1075,8 @@
1047
1075
  <ref name="keyword"/>
1048
1076
  <ref name="xref"/>
1049
1077
  <ref name="hyperlink"/>
1078
+ <ref name="index"/>
1079
+ <ref name="index-xref"/>
1050
1080
  </choice>
1051
1081
  </element>
1052
1082
  </define>
@@ -1060,6 +1090,8 @@
1060
1090
  <ref name="keyword"/>
1061
1091
  <ref name="xref"/>
1062
1092
  <ref name="hyperlink"/>
1093
+ <ref name="index"/>
1094
+ <ref name="index-xref"/>
1063
1095
  </choice>
1064
1096
  </element>
1065
1097
  </define>
@@ -1071,6 +1103,9 @@
1071
1103
  <optional>
1072
1104
  <attribute name="style"/>
1073
1105
  </optional>
1106
+ <optional>
1107
+ <attribute name="custom-charset"/>
1108
+ </optional>
1074
1109
  <oneOrMore>
1075
1110
  <ref name="TextElement"/>
1076
1111
  </oneOrMore>
@@ -1126,6 +1161,8 @@
1126
1161
  <choice>
1127
1162
  <ref name="PureTextElement"/>
1128
1163
  <ref name="stem"/>
1164
+ <ref name="index"/>
1165
+ <ref name="index-xref"/>
1129
1166
  </choice>
1130
1167
  </zeroOrMore>
1131
1168
  </element>
@@ -1136,6 +1173,8 @@
1136
1173
  <choice>
1137
1174
  <ref name="PureTextElement"/>
1138
1175
  <ref name="stem"/>
1176
+ <ref name="index"/>
1177
+ <ref name="index-xref"/>
1139
1178
  </choice>
1140
1179
  </zeroOrMore>
1141
1180
  </element>
@@ -1369,6 +1408,9 @@
1369
1408
  <optional>
1370
1409
  <attribute name="number"/>
1371
1410
  </optional>
1411
+ <optional>
1412
+ <attribute name="branch-number"/>
1413
+ </optional>
1372
1414
  <optional>
1373
1415
  <attribute name="obligation">
1374
1416
  <choice>
@@ -1592,6 +1634,9 @@
1592
1634
  <optional>
1593
1635
  <attribute name="number"/>
1594
1636
  </optional>
1637
+ <optional>
1638
+ <attribute name="branch-number"/>
1639
+ </optional>
1595
1640
  <optional>
1596
1641
  <attribute name="type"/>
1597
1642
  </optional>
@@ -1643,6 +1688,9 @@
1643
1688
  <optional>
1644
1689
  <attribute name="number"/>
1645
1690
  </optional>
1691
+ <optional>
1692
+ <attribute name="branch-number"/>
1693
+ </optional>
1646
1694
  <optional>
1647
1695
  <ref name="section-title"/>
1648
1696
  </optional>
@@ -1740,6 +1788,9 @@
1740
1788
  <optional>
1741
1789
  <attribute name="number"/>
1742
1790
  </optional>
1791
+ <optional>
1792
+ <attribute name="branch-number"/>
1793
+ </optional>
1743
1794
  <optional>
1744
1795
  <attribute name="obligation">
1745
1796
  <choice>
data/lib/metanorma/bipm/processor.rb CHANGED
@@ -38,6 +38,7 @@ module Metanorma
38
38
  end
39
39
 
40
40
  def output(isodoc_node, inname, outname, format, options = {})
41
+ options_preprocess(options)
41
42
  case format
42
43
  when :html
43
44
  IsoDoc::BIPM::HtmlConvert.new(options)
data/lib/metanorma/bipm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "2.3.1".freeze
3
+ VERSION = "2.3.3".freeze
4
4
  end
5
5
  end
data/metanorma-bipm.gemspec CHANGED
@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
27
27
  spec.require_paths = ["lib"]
28
28
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
29
29
 
30
- spec.add_dependency "metanorma-generic", "~> 2.5.1"
31
- spec.add_dependency "metanorma-iso", "~> 2.5.1"
30
+ spec.add_dependency "metanorma-generic", "~> 2.5.3"
31
+ spec.add_dependency "metanorma-iso", "~> 2.5.4"
32
32
 
33
33
  spec.add_development_dependency "debug"
34
34
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
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.3.1
4
+ version: 2.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-08-28 00:00:00.000000000 Z
11
+ date: 2023-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.5.1
19
+ version: 2.5.3
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.5.1
26
+ version: 2.5.3
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: metanorma-iso
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.5.1
33
+ version: 2.5.4
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.5.1
40
+ version: 2.5.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: debug
43
43
  requirement: !ruby/object:Gem::Requirement