metanorma-bipm 1.2.1 → 1.2.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 370d29ed386f2e5c7540d82e0dfcbcafc17a702234c84ee83e6a137da5d87208
4
- data.tar.gz: e3caae791429708ca02269e0a0c3a61ff79e2a44f71900454f173e4a0a6e0478
3
+ metadata.gz: d974105c9bfacaa99b3e88208ce15c2f6d88b5dc9b6bb8c68ed37278172ef2f0
4
+ data.tar.gz: ba1d26792f3c15da831fc94bf505ed1747e19a8f8390d912bdf112130493cd35
5
5
  SHA512:
6
- metadata.gz: 2b36089016db9ee6494a4ccbe5acf9f01dbc4e7b20846e40f283304752bac759a810198a1756ec7c8bda70901f3f23615a7808f14c8a314450848c15e0a8ef4d
7
- data.tar.gz: f57d70b623e8f5a4963d395f510457f423eca6ade6ff6d90993857b5913226ddb3b1a2230487d9707d570b516b5dbc35cba8897de331d3462cfcb4533bb9097e
6
+ metadata.gz: d5afec8786d1aa673c3a7a4a8015b3283fd9b82df7c3d1ea51c42709fce7c1cc72f3d2272f4b9a8d58717ad8860e76a3008df8c18fd31b5aa926d412ce8d4b90
7
+ data.tar.gz: da690ae876f6e53684077c41dc16cfd06dc50cbd5c68b88c9ce46cef50c53048db0a3ff37a111d8c485b6043f992a3129bf73c75b88ba1d5ec75df5fbb900510
@@ -240,7 +240,7 @@ module Asciidoctor
240
240
  def pdf_converter(node)
241
241
  return nil if node.attr("no-pdf")
242
242
 
243
- IsoDoc::BIPM::PdfConvert.new(doc_extract_attributes(node))
243
+ IsoDoc::BIPM::PdfConvert.new(pdf_extract_attributes(node))
244
244
  end
245
245
  end
246
246
  end
@@ -58,7 +58,7 @@
58
58
  <attribute name="alt"/>
59
59
  </optional>
60
60
  <optional>
61
- <attribute name="updatetype">
61
+ <attribute name="update-type">
62
62
  <data type="boolean"/>
63
63
  </attribute>
64
64
  </optional>
@@ -1796,6 +1796,20 @@
1796
1796
  <data type="ID"/>
1797
1797
  </attribute>
1798
1798
  </optional>
1799
+ <optional>
1800
+ <attribute name="language"/>
1801
+ </optional>
1802
+ <optional>
1803
+ <attribute name="script"/>
1804
+ </optional>
1805
+ <optional>
1806
+ <attribute name="tag"/>
1807
+ </optional>
1808
+ <optional>
1809
+ <attribute name="multilingual-rendering">
1810
+ <ref name="MultilingualRenderingType"/>
1811
+ </attribute>
1812
+ </optional>
1799
1813
  <oneOrMore>
1800
1814
  <ref name="preferred"/>
1801
1815
  </oneOrMore>
@@ -1814,9 +1828,6 @@
1814
1828
  <optional>
1815
1829
  <ref name="termsubject"/>
1816
1830
  </optional>
1817
- <optional>
1818
- <ref name="termusage"/>
1819
- </optional>
1820
1831
  <oneOrMore>
1821
1832
  <ref name="termdefinition"/>
1822
1833
  </oneOrMore>
@@ -1880,17 +1891,37 @@
1880
1891
  </attribute>
1881
1892
  </optional>
1882
1893
  <optional>
1883
- <attribute name="geographicArea"/>
1894
+ <attribute name="geographic-area"/>
1884
1895
  </optional>
1885
1896
  <choice>
1886
1897
  <ref name="expression_designation"/>
1887
1898
  <ref name="letter_symbol_designation"/>
1888
1899
  <ref name="graphical_symbol_designation"/>
1889
1900
  </choice>
1901
+ <optional>
1902
+ <ref name="fieldofapplication"/>
1903
+ </optional>
1904
+ <optional>
1905
+ <ref name="usageinfo"/>
1906
+ </optional>
1890
1907
  <zeroOrMore>
1891
1908
  <ref name="termsource"/>
1892
1909
  </zeroOrMore>
1893
1910
  </define>
1911
+ <define name="fieldofapplication">
1912
+ <element name="field-of-application">
1913
+ <oneOrMore>
1914
+ <ref name="PureTextElement"/>
1915
+ </oneOrMore>
1916
+ </element>
1917
+ </define>
1918
+ <define name="usageinfo">
1919
+ <element name="usage-info">
1920
+ <oneOrMore>
1921
+ <ref name="PureTextElement"/>
1922
+ </oneOrMore>
1923
+ </element>
1924
+ </define>
1894
1925
  <define name="letter_symbol_designation">
1895
1926
  <element name="letter-symbol">
1896
1927
  <optional>
@@ -1942,11 +1973,15 @@
1942
1973
  </optional>
1943
1974
  <element name="name">
1944
1975
  <zeroOrMore>
1945
- <ref name="PureTextElement"/>
1976
+ <choice>
1977
+ <ref name="PureTextElement"/>
1978
+ <ref name="stem"/>
1979
+ <ref name="index"/>
1980
+ </choice>
1946
1981
  </zeroOrMore>
1947
1982
  </element>
1948
1983
  <optional>
1949
- <element name="abbreviationType">
1984
+ <element name="abbreviation-type">
1950
1985
  <ref name="AbbreviationType"/>
1951
1986
  </element>
1952
1987
  </optional>
@@ -1956,7 +1991,7 @@
1956
1991
  </element>
1957
1992
  </optional>
1958
1993
  <optional>
1959
- <element name="grammarInfo">
1994
+ <element name="grammar">
1960
1995
  <ref name="Grammar"/>
1961
1996
  </element>
1962
1997
  </optional>
@@ -1983,6 +2018,11 @@
1983
2018
  <ref name="GrammarGender"/>
1984
2019
  </element>
1985
2020
  </zeroOrMore>
2021
+ <zeroOrMore>
2022
+ <element name="number">
2023
+ <ref name="GrammarNumber"/>
2024
+ </element>
2025
+ </zeroOrMore>
1986
2026
  <optional>
1987
2027
  <element name="isPreposition">
1988
2028
  <data type="boolean"/>
@@ -2014,7 +2054,7 @@
2014
2054
  </element>
2015
2055
  </optional>
2016
2056
  <zeroOrMore>
2017
- <element name="grammarvalue">
2057
+ <element name="grammar-value">
2018
2058
  <text/>
2019
2059
  </element>
2020
2060
  </zeroOrMore>
@@ -2027,6 +2067,13 @@
2027
2067
  <value>common</value>
2028
2068
  </choice>
2029
2069
  </define>
2070
+ <define name="GrammarNumber">
2071
+ <choice>
2072
+ <value>singular</value>
2073
+ <value>dual</value>
2074
+ <value>plural</value>
2075
+ </choice>
2076
+ </define>
2030
2077
  <define name="termdomain">
2031
2078
  <element name="domain">
2032
2079
  <oneOrMore>
@@ -2041,13 +2088,6 @@
2041
2088
  </oneOrMore>
2042
2089
  </element>
2043
2090
  </define>
2044
- <define name="termusage">
2045
- <element name="usageinfo">
2046
- <oneOrMore>
2047
- <ref name="BasicBlock"/>
2048
- </oneOrMore>
2049
- </element>
2050
- </define>
2051
2091
  <define name="termdefinition">
2052
2092
  <element name="definition">
2053
2093
  <choice>
@@ -2061,13 +2101,16 @@
2061
2101
  </element>
2062
2102
  </define>
2063
2103
  <define name="verbaldefinition">
2064
- <element name="verbaldefinition">
2104
+ <element name="verbal-definition">
2065
2105
  <oneOrMore>
2066
2106
  <choice>
2067
2107
  <ref name="paragraph"/>
2068
2108
  <ref name="dl"/>
2069
2109
  <ref name="ol"/>
2070
2110
  <ref name="ul"/>
2111
+ <ref name="table"/>
2112
+ <ref name="figure"/>
2113
+ <ref name="formula"/>
2071
2114
  </choice>
2072
2115
  </oneOrMore>
2073
2116
  <zeroOrMore>
@@ -2076,7 +2119,7 @@
2076
2119
  </element>
2077
2120
  </define>
2078
2121
  <define name="nonverbalrep">
2079
- <element name="nonverbalrepresentation">
2122
+ <element name="non-verbal-representation">
2080
2123
  <oneOrMore>
2081
2124
  <choice>
2082
2125
  <ref name="table"/>
@@ -8,7 +8,8 @@ module IsoDoc
8
8
  end
9
9
 
10
10
  def convert1(docxml, filename, dir)
11
- @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))&.value == "JCGM"
11
+ @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
12
+ "@acronym"))&.value == "JCGM"
12
13
  super
13
14
  end
14
15
 
@@ -45,7 +46,7 @@ module IsoDoc
45
46
  identifiers = render_identifier(ids)
46
47
  if biblio then ref_entry_code(ref, ordinal, identifiers, ids)
47
48
  else
48
- ref << identifiers[0] || identifiers[1]
49
+ ref << (identifiers[0] || identifiers[1])
49
50
  ref << " #{identifiers[1]}" if identifiers[0] && identifiers[1]
50
51
  end
51
52
  ref << " " unless biblio && !identifiers[1]
@@ -58,7 +59,7 @@ module IsoDoc
58
59
  identifiers = render_identifier(bibitem_ref_code(bibitem))
59
60
  if biblio then ref_entry_code(ref, ordinal, identifiers, nil)
60
61
  else
61
- ref << identifiers[0] || identifiers[1]
62
+ ref << (identifiers[0] || identifiers[1])
62
63
  ref << " #{identifiers[1]}" if identifiers[0] && identifiers[1]
63
64
  end
64
65
  date_note_process(bibitem, ref)
@@ -71,16 +72,6 @@ module IsoDoc
71
72
  @jcgm ? docxml : super
72
73
  end
73
74
 
74
- def termref_cleanup(docxml)
75
- docxml
76
- .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
77
- l10n(", #{@i18n.modified} [/TERMREF]"))
78
- .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
79
- .gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source} "))
80
- .gsub(%r{\s*\[/TERMREF\]\s*}, l10n("]"))
81
- .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
82
- end
83
-
84
75
  def error_parse(node, out)
85
76
  case node.name
86
77
  when "blacksquare" then blacksquare_parse(node, out)