metanorma-bipm 1.1.9 → 1.2.1

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: df8f742d2d6c42afa7521168765ce2ab2be0bc9d3a4a942fb184bae97aefeb75
4
- data.tar.gz: fbb7b975f0f7b114fb3228ea824f9dd689f76dfb22310f2d450ad82c1bd7da53
3
+ metadata.gz: 370d29ed386f2e5c7540d82e0dfcbcafc17a702234c84ee83e6a137da5d87208
4
+ data.tar.gz: e3caae791429708ca02269e0a0c3a61ff79e2a44f71900454f173e4a0a6e0478
5
5
  SHA512:
6
- metadata.gz: 886074989dcf59abbfb155eec67d66e44439bd556600666f8385e86c58222c7884d2418bf0c9b87e19f982c9473bc86de9943f388d8820dbab84ebac3db8b93b
7
- data.tar.gz: 322113649ffa804792b6872e6e99004d27d2c128c12cfb4f71cd1c72a7e71dc2c7ce96b8ffb9e036f045f8475e833657770d74496ad96027862d234861ad534e
6
+ metadata.gz: 2b36089016db9ee6494a4ccbe5acf9f01dbc4e7b20846e40f283304752bac759a810198a1756ec7c8bda70901f3f23615a7808f14c8a314450848c15e0a8ef4d
7
+ data.tar.gz: f57d70b623e8f5a4963d395f510457f423eca6ade6ff6d90993857b5913226ddb3b1a2230487d9707d570b516b5dbc35cba8897de331d3462cfcb4533bb9097e
@@ -624,6 +624,9 @@
624
624
  <choice>
625
625
  <ref name="PureTextElement"/>
626
626
  <ref name="stem"/>
627
+ <ref name="eref"/>
628
+ <ref name="xref"/>
629
+ <ref name="hyperlink"/>
627
630
  </choice>
628
631
  </zeroOrMore>
629
632
  </element>
@@ -634,6 +637,9 @@
634
637
  <choice>
635
638
  <ref name="PureTextElement"/>
636
639
  <ref name="stem"/>
640
+ <ref name="eref"/>
641
+ <ref name="xref"/>
642
+ <ref name="hyperlink"/>
637
643
  </choice>
638
644
  </zeroOrMore>
639
645
  </element>
@@ -641,7 +647,12 @@
641
647
  <define name="tt">
642
648
  <element name="tt">
643
649
  <zeroOrMore>
644
- <ref name="PureTextElement"/>
650
+ <choice>
651
+ <ref name="PureTextElement"/>
652
+ <ref name="eref"/>
653
+ <ref name="xref"/>
654
+ <ref name="hyperlink"/>
655
+ </choice>
645
656
  </zeroOrMore>
646
657
  </element>
647
658
  </define>
@@ -822,7 +833,9 @@
822
833
  <attribute name="alt"/>
823
834
  </optional>
824
835
  <ref name="CitationType"/>
825
- <text/>
836
+ <oneOrMore>
837
+ <ref name="PureTextElement"/>
838
+ </oneOrMore>
826
839
  </define>
827
840
  <define name="hyperlink">
828
841
  <element name="link">
@@ -835,7 +848,9 @@
835
848
  <optional>
836
849
  <attribute name="alt"/>
837
850
  </optional>
838
- <text/>
851
+ <oneOrMore>
852
+ <ref name="PureTextElement"/>
853
+ </oneOrMore>
839
854
  </element>
840
855
  </define>
841
856
  <define name="xref">
@@ -849,7 +864,9 @@
849
864
  <optional>
850
865
  <attribute name="alt"/>
851
866
  </optional>
852
- <text/>
867
+ <oneOrMore>
868
+ <ref name="PureTextElement"/>
869
+ </oneOrMore>
853
870
  </element>
854
871
  </define>
855
872
  <define name="fn">
@@ -16,6 +16,13 @@
16
16
  <param name="pattern">\i\c*|\c+#\c+</param>
17
17
  </data>
18
18
  </attribute>
19
+ <optional>
20
+ <attribute name="to">
21
+ <data type="string">
22
+ <param name="pattern">\i\c*|\c+#\c+</param>
23
+ </data>
24
+ </attribute>
25
+ </optional>
19
26
  <optional>
20
27
  <attribute name="type">
21
28
  <ref name="ReferenceFormat"/>
@@ -93,14 +100,9 @@
93
100
  </optional>
94
101
  <group>
95
102
  <choice>
96
- <group>
97
- <zeroOrMore>
98
- <ref name="BasicBlock"/>
99
- </zeroOrMore>
100
- <zeroOrMore>
101
- <ref name="note"/>
102
- </zeroOrMore>
103
- </group>
103
+ <zeroOrMore>
104
+ <ref name="BasicBlock"/>
105
+ </zeroOrMore>
104
106
  <ref name="amend"/>
105
107
  </choice>
106
108
  <zeroOrMore>
@@ -146,14 +148,9 @@
146
148
  <ref name="section-title"/>
147
149
  </optional>
148
150
  <group>
149
- <group>
150
- <zeroOrMore>
151
- <ref name="BasicBlock"/>
152
- </zeroOrMore>
153
- <zeroOrMore>
154
- <ref name="note"/>
155
- </zeroOrMore>
156
- </group>
151
+ <zeroOrMore>
152
+ <ref name="BasicBlock"/>
153
+ </zeroOrMore>
157
154
  <zeroOrMore>
158
155
  <choice>
159
156
  <ref name="annex-subsection"/>
@@ -179,6 +176,14 @@
179
176
  <data type="boolean"/>
180
177
  </attribute>
181
178
  </optional>
179
+ <optional>
180
+ <attribute name="tag"/>
181
+ </optional>
182
+ <optional>
183
+ <attribute name="multilingual-rendering">
184
+ <ref name="MultilingualRenderingType"/>
185
+ </attribute>
186
+ </optional>
182
187
  <attribute name="type">
183
188
  <choice>
184
189
  <value>roman</value>