isodoc 1.8.0 → 1.8.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/isodoc.gemspec +1 -1
- data/lib/isodoc/class_utils.rb +1 -1
- data/lib/isodoc/convert.rb +8 -0
- data/lib/isodoc/function/inline.rb +3 -5
- data/lib/isodoc/html_function/html.rb +1 -0
- data/lib/isodoc/html_function/postprocess.rb +4 -6
- data/lib/isodoc/metadata_date.rb +13 -11
- data/lib/isodoc/presentation_function/bibdata.rb +2 -2
- data/lib/isodoc/presentation_function/terms.rb +74 -30
- data/lib/isodoc/presentation_xml_convert.rb +1 -1
- data/lib/isodoc/version.rb +1 -1
- data/lib/isodoc/word_function/body.rb +24 -14
- data/lib/isodoc/word_function/comments.rb +0 -4
- data/lib/isodoc/xref/xref_gen.rb +18 -22
- data/lib/isodoc/xref/xref_gen_seq.rb +10 -16
- data/lib/isodoc-yaml/i18n-ar.yaml +3 -0
- data/lib/isodoc-yaml/i18n-de.yaml +3 -0
- data/lib/isodoc-yaml/i18n-en.yaml +8 -5
- data/lib/isodoc-yaml/i18n-es.yaml +3 -0
- data/lib/isodoc-yaml/i18n-fr.yaml +3 -0
- data/lib/isodoc-yaml/i18n-ru.yaml +3 -0
- data/lib/isodoc-yaml/i18n-zh-Hans.yaml +3 -0
- data/spec/isodoc/blocks_spec.rb +14 -8
- data/spec/isodoc/i18n_spec.rb +15 -10
- data/spec/isodoc/inline_spec.rb +33 -43
- data/spec/isodoc/lists_spec.rb +344 -222
- data/spec/isodoc/section_spec.rb +12 -12
- data/spec/isodoc/table_spec.rb +71 -73
- data/spec/isodoc/terms_spec.rb +266 -212
- data/spec/isodoc/xref_numbering_spec.rb +347 -0
- data/spec/isodoc/xref_spec.rb +271 -350
- data/spec/spec_helper.rb +1 -1
- metadata +8 -7
data/spec/isodoc/terms_spec.rb
CHANGED
|
@@ -8,6 +8,8 @@ RSpec.describe IsoDoc do
|
|
|
8
8
|
<terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
|
|
9
9
|
<p>For the purposes of this document, the following terms and definitions apply.</p>
|
|
10
10
|
<term id="paddy1"><preferred><expression><name>paddy</name></expression>
|
|
11
|
+
<field-of-application>in agriculture</field-of-application>
|
|
12
|
+
<usage-info>dated</usage-info>
|
|
11
13
|
<termsource status="modified">
|
|
12
14
|
<origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
|
|
13
15
|
<modification>
|
|
@@ -16,7 +18,7 @@ RSpec.describe IsoDoc do
|
|
|
16
18
|
</termsource>
|
|
17
19
|
</preferred>
|
|
18
20
|
<domain>rice</domain>
|
|
19
|
-
<definition><
|
|
21
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
20
22
|
<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" keep-with-next="true" keep-lines-together="true">
|
|
21
23
|
<p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
|
|
22
24
|
<ul>
|
|
@@ -43,10 +45,12 @@ RSpec.describe IsoDoc do
|
|
|
43
45
|
</termsource>
|
|
44
46
|
</term>
|
|
45
47
|
<term id="paddy"><preferred><expression><name>paddy</name></expression></preferred>
|
|
46
|
-
<admitted><letter-symbol><name>paddy rice</name></letter-symbol
|
|
48
|
+
<admitted><letter-symbol><name>paddy rice</name></letter-symbol>
|
|
49
|
+
<field-of-application>in agriculture</field-of-application>
|
|
50
|
+
</admitted>
|
|
47
51
|
<admitted><expression><name>rough rice</name></expression></admitted>
|
|
48
52
|
<deprecates><expression><name>cargo rice</name></expression></deprecates>
|
|
49
|
-
<definition><
|
|
53
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
50
54
|
<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
|
|
51
55
|
<ul>
|
|
52
56
|
<li>A</li>
|
|
@@ -69,115 +73,105 @@ RSpec.describe IsoDoc do
|
|
|
69
73
|
INPUT
|
|
70
74
|
|
|
71
75
|
presxml = <<~"PRESXML"
|
|
72
|
-
|
|
73
|
-
<
|
|
74
|
-
<
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
<
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
</
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
<
|
|
121
|
-
|
|
122
|
-
</
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
<name>
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
</
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
<ul>
|
|
149
|
-
<li>A</li>
|
|
150
|
-
</ul>
|
|
151
|
-
<p id='_19830f33-e46c-42cc-94ca-a5ef101132d5'>
|
|
152
|
-
The starch of waxy rice consists almost entirely of amylopectin. The
|
|
153
|
-
kernels have a tendency to stick together after cooking.
|
|
154
|
-
</p>
|
|
155
|
-
</termnote>
|
|
156
|
-
<termsource status='identical'>
|
|
157
|
-
<origin bibitemid='ISO7301' type='inline' droploc='true' citeas='ISO 7301:2011'><locality type='clause'>
|
|
158
|
-
<referenceFrom>3.1</referenceFrom>
|
|
159
|
-
</locality>ISO 7301:2011, 3.1</origin>
|
|
160
|
-
<origin bibitemid='ISO7301' type='inline' case='lowercase' citeas='ISO 7301:2011'><locality type='clause'>
|
|
76
|
+
<?xml version='1.0'?>
|
|
77
|
+
<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
|
|
78
|
+
<sections>
|
|
79
|
+
<terms id='_terms_and_definitions' obligation='normative' displayorder="1">
|
|
80
|
+
<title depth='1'>1.<tab/>Terms and Definitions</title>
|
|
81
|
+
<p>For the purposes of this document, the following terms and definitions apply.</p>
|
|
82
|
+
<term id='paddy1'><name>1.1.</name>
|
|
83
|
+
<preferred><strong>paddy, <in agriculture, dated></strong></preferred>
|
|
84
|
+
<termsource status='modified'>
|
|
85
|
+
<origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'>
|
|
86
|
+
<referenceFrom>3.1</referenceFrom>
|
|
87
|
+
</locality>ISO 7301:2011, Clause 3.1</origin>
|
|
88
|
+
<modification>
|
|
89
|
+
<p id='_e73a417d-ad39-417d-a4c8-20e4e2529489'>The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
|
|
90
|
+
</modification>
|
|
91
|
+
</termsource>
|
|
92
|
+
<domain>rice</domain>
|
|
93
|
+
<definition>
|
|
94
|
+
<p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
|
|
95
|
+
</definition>
|
|
96
|
+
<termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f892' keep-with-next='true' keep-lines-together='true'>
|
|
97
|
+
<name>EXAMPLE 1</name>
|
|
98
|
+
<p id='_65c9a509-9a89-4b54-a890-274126aeb55c'>Foreign seeds, husks, bran, sand, dust.</p>
|
|
99
|
+
<ul>
|
|
100
|
+
<li>A</li>
|
|
101
|
+
</ul>
|
|
102
|
+
</termexample>
|
|
103
|
+
<termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f894'>
|
|
104
|
+
<name>EXAMPLE 2</name>
|
|
105
|
+
<ul>
|
|
106
|
+
<li>A</li>
|
|
107
|
+
</ul>
|
|
108
|
+
</termexample>
|
|
109
|
+
<termsource status='identical'>
|
|
110
|
+
<origin citeas=''>
|
|
111
|
+
<termref base='IEV' target='xyz'>t1</termref>
|
|
112
|
+
</origin>
|
|
113
|
+
</termsource>
|
|
114
|
+
<termsource status='modified'>
|
|
115
|
+
<origin citeas=''>
|
|
116
|
+
<termref base='IEV' target='xyz'/>
|
|
117
|
+
</origin>
|
|
118
|
+
<modification>
|
|
119
|
+
<p id='_'>with adjustments</p>
|
|
120
|
+
</modification>
|
|
121
|
+
</termsource>
|
|
122
|
+
</term>
|
|
123
|
+
<term id='paddy'><name>1.2.</name>
|
|
124
|
+
<preferred><strong>paddy</strong></preferred>
|
|
125
|
+
<admitted>paddy rice, <in agriculture></admitted>
|
|
126
|
+
<admitted>rough rice</admitted>
|
|
127
|
+
<deprecates>cargo rice</deprecates>
|
|
128
|
+
<definition>
|
|
129
|
+
<p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
|
|
130
|
+
</definition>
|
|
131
|
+
<termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f893'>
|
|
132
|
+
<name>EXAMPLE</name>
|
|
133
|
+
<ul>
|
|
134
|
+
<li>A</li>
|
|
135
|
+
</ul>
|
|
136
|
+
</termexample>
|
|
137
|
+
<termnote id='_671a1994-4783-40d0-bc81-987d06ffb74e' keep-with-next='true' keep-lines-together='true'>
|
|
138
|
+
<name>Note 1 to entry</name>
|
|
139
|
+
<p id='_19830f33-e46c-42cc-94ca-a5ef101132d5'>The starch of waxy rice consists almost entirely of amylopectin. The
|
|
140
|
+
kernels have a tendency to stick together after cooking.</p>
|
|
141
|
+
</termnote>
|
|
142
|
+
<termnote id='_671a1994-4783-40d0-bc81-987d06ffb74f'>
|
|
143
|
+
<name>Note 2 to entry</name>
|
|
144
|
+
<ul>
|
|
145
|
+
<li>A</li>
|
|
146
|
+
</ul>
|
|
147
|
+
<p id='_19830f33-e46c-42cc-94ca-a5ef101132d5'>The starch of waxy rice consists almost entirely of amylopectin. The
|
|
148
|
+
kernels have a tendency to stick together after cooking.</p>
|
|
149
|
+
</termnote>
|
|
150
|
+
<termsource status='identical'>
|
|
151
|
+
<origin bibitemid='ISO7301' type='inline' droploc='true' citeas='ISO 7301:2011'><locality type='clause'>
|
|
161
152
|
<referenceFrom>3.1</referenceFrom>
|
|
162
|
-
</locality>ISO 7301:2011,
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
153
|
+
</locality>ISO 7301:2011, 3.1</origin>
|
|
154
|
+
<origin bibitemid='ISO7301' type='inline' case='lowercase' citeas='ISO 7301:2011'><locality type='clause'>
|
|
155
|
+
<referenceFrom>3.1</referenceFrom>
|
|
156
|
+
</locality>ISO 7301:2011, clause 3.1</origin>
|
|
157
|
+
</termsource>
|
|
158
|
+
</term>
|
|
159
|
+
</terms>
|
|
160
|
+
</sections>
|
|
161
|
+
</iso-standard>
|
|
168
162
|
PRESXML
|
|
169
163
|
|
|
170
164
|
html = <<~"OUTPUT"
|
|
171
165
|
#{HTML_HDR}
|
|
172
166
|
<p class="zzSTDTitle1"/>
|
|
173
167
|
<div id="_terms_and_definitions">
|
|
174
|
-
<h1>
|
|
168
|
+
<h1>1.  Terms and Definitions</h1>
|
|
175
169
|
<p>For the purposes of this document,
|
|
176
170
|
the following terms and definitions apply.</p>
|
|
177
|
-
<p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy
|
|
171
|
+
<p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;"><b>paddy, <in agriculture, dated></b></p>
|
|
178
172
|
<p>[TERMREF]
|
|
179
173
|
<a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
|
|
180
|
-
[MODIFICATION]
|
|
174
|
+
[MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
|
|
181
175
|
[/TERMREF]</p>
|
|
182
176
|
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"><rice> rice retaining its husk after threshing</p>
|
|
183
177
|
<div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" style='page-break-after: avoid;page-break-inside: avoid;'><p class="example-title">EXAMPLE 1</p>
|
|
@@ -193,7 +187,8 @@ RSpec.describe IsoDoc do
|
|
|
193
187
|
</div>
|
|
194
188
|
<p>[TERMREF] t1 [/TERMREF]</p>
|
|
195
189
|
<p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
|
|
196
|
-
<p class="TermNum" id="paddy">1.2.</p
|
|
190
|
+
<p class="TermNum" id="paddy">1.2.</p>
|
|
191
|
+
<p class="Terms" style="text-align:left;"><b>paddy</b></p><p class="AltTerms" style="text-align:left;">paddy rice, <in agriculture></p>
|
|
197
192
|
<p class="AltTerms" style="text-align:left;">rough rice</p>
|
|
198
193
|
<p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
|
|
199
194
|
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
|
|
@@ -218,10 +213,10 @@ RSpec.describe IsoDoc do
|
|
|
218
213
|
<p class="zzSTDTitle1"/>
|
|
219
214
|
<div id="_terms_and_definitions"><h1>1.<span style="mso-tab-count:1">  </span>Terms and Definitions</h1><p>For the purposes of this document,
|
|
220
215
|
the following terms and definitions apply.</p>
|
|
221
|
-
<p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy
|
|
216
|
+
<p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;"><b>paddy, <in agriculture, dated></b></p>
|
|
222
217
|
<p>[TERMREF]
|
|
223
218
|
<a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
|
|
224
|
-
[MODIFICATION]
|
|
219
|
+
[MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
|
|
225
220
|
[/TERMREF]</p>
|
|
226
221
|
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"><rice> rice retaining its husk after threshing</p>
|
|
227
222
|
<div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" style='page-break-after: avoid;page-break-inside: avoid;'><p class="example-title">EXAMPLE 1</p>
|
|
@@ -237,7 +232,8 @@ RSpec.describe IsoDoc do
|
|
|
237
232
|
</div>
|
|
238
233
|
<p>[TERMREF] t1 [/TERMREF]</p>
|
|
239
234
|
<p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
|
|
240
|
-
<p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;"
|
|
235
|
+
<p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;"><b>paddy</b></p>
|
|
236
|
+
<p class="AltTerms" style="text-align:left;">paddy rice, <in agriculture></p>
|
|
241
237
|
<p class="AltTerms" style="text-align:left;">rough rice</p>
|
|
242
238
|
<p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
|
|
243
239
|
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
|
|
@@ -272,15 +268,15 @@ RSpec.describe IsoDoc do
|
|
|
272
268
|
<p>For the purposes of this document, the following terms and definitions apply.</p>
|
|
273
269
|
<term id="paddy1"><preferred><expression><name>paddy</name></expression></preferred>
|
|
274
270
|
<domain>rice</domain>
|
|
275
|
-
<definition><
|
|
276
|
-
<definition><
|
|
271
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
272
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747e">rice retaining its husk after threshing, mark 2</p>
|
|
277
273
|
<termsource status="modified">
|
|
278
274
|
<origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
|
|
279
275
|
<modification>
|
|
280
276
|
<p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
|
|
281
277
|
</modification>
|
|
282
278
|
</termsource>
|
|
283
|
-
</
|
|
279
|
+
</verbal-definition>
|
|
284
280
|
</definition>
|
|
285
281
|
<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" keep-with-next="true" keep-lines-together="true">
|
|
286
282
|
<p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
|
|
@@ -320,7 +316,7 @@ RSpec.describe IsoDoc do
|
|
|
320
316
|
<p>For the purposes of this document, the following terms and definitions apply.</p>
|
|
321
317
|
<term id='paddy1'>
|
|
322
318
|
<name>1.1.</name>
|
|
323
|
-
<preferred>paddy</preferred>
|
|
319
|
+
<preferred><strong>paddy</strong></preferred>
|
|
324
320
|
<domain>rice</domain>
|
|
325
321
|
<definition>
|
|
326
322
|
<ol>
|
|
@@ -390,7 +386,25 @@ RSpec.describe IsoDoc do
|
|
|
390
386
|
<preferred><expression><name>paddy</name></expression></preferred>
|
|
391
387
|
<preferred><expression><name>muddy rice</name></expression></preferred>
|
|
392
388
|
<domain>rice</domain>
|
|
393
|
-
<definition><
|
|
389
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
390
|
+
</term>
|
|
391
|
+
<term id="paddy2">
|
|
392
|
+
<preferred><expression><name language="eng">paddy</name></expression></preferred>
|
|
393
|
+
<preferred><expression><name language="eng">muddy rice</name></expression></preferred>
|
|
394
|
+
<domain>rice</domain>
|
|
395
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747a">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
396
|
+
</term>
|
|
397
|
+
<term id="paddy3">
|
|
398
|
+
<preferred geographic-area="US"><expression><name>paddy</name></expression></preferred>
|
|
399
|
+
<preferred><expression><name>muddy rice</name></expression></preferred>
|
|
400
|
+
<domain>rice</domain>
|
|
401
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747b">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
402
|
+
</term>
|
|
403
|
+
<term id="paddy4">
|
|
404
|
+
<preferred><expression language="eng"><name>paddy</name></expression></preferred>
|
|
405
|
+
<preferred><expression language="fra"><name>muddy rice</name></expression></preferred>
|
|
406
|
+
<domain>rice</domain>
|
|
407
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747c">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
394
408
|
</term>
|
|
395
409
|
</terms>
|
|
396
410
|
</sections>
|
|
@@ -407,12 +421,48 @@ RSpec.describe IsoDoc do
|
|
|
407
421
|
</title>
|
|
408
422
|
<term id='paddy1'>
|
|
409
423
|
<name>1.1.</name>
|
|
410
|
-
<preferred>paddy; muddy rice</preferred>
|
|
424
|
+
<preferred><strong>paddy; muddy rice</strong></preferred>
|
|
411
425
|
<domain>rice</domain>
|
|
412
426
|
<definition>
|
|
413
427
|
<p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
|
|
414
428
|
</definition>
|
|
415
429
|
</term>
|
|
430
|
+
<term id='paddy2'>
|
|
431
|
+
<name>1.2.</name>
|
|
432
|
+
<preferred>
|
|
433
|
+
<strong>paddy; muddy rice</strong>
|
|
434
|
+
</preferred>
|
|
435
|
+
<domain>rice</domain>
|
|
436
|
+
<definition>
|
|
437
|
+
<p id='_eb29b35e-123e-4d1c-b50b-2714d41e747a'>rice retaining its husk after threshing</p>
|
|
438
|
+
</definition>
|
|
439
|
+
</term>
|
|
440
|
+
<term id='paddy3'>
|
|
441
|
+
<name>1.3.</name>
|
|
442
|
+
<preferred geographic-area="US">
|
|
443
|
+
<strong>paddy</strong>, US
|
|
444
|
+
</preferred>
|
|
445
|
+
<preferred>
|
|
446
|
+
<strong>muddy rice</strong>
|
|
447
|
+
</preferred>
|
|
448
|
+
<domain>rice</domain>
|
|
449
|
+
<definition>
|
|
450
|
+
<p id='_eb29b35e-123e-4d1c-b50b-2714d41e747b'>rice retaining its husk after threshing</p>
|
|
451
|
+
</definition>
|
|
452
|
+
</term>
|
|
453
|
+
<term id='paddy4'>
|
|
454
|
+
<name>1.4.</name>
|
|
455
|
+
<preferred>
|
|
456
|
+
<strong>paddy</strong>, eng
|
|
457
|
+
</preferred>
|
|
458
|
+
<preferred>
|
|
459
|
+
<strong>muddy rice</strong>, fra
|
|
460
|
+
</preferred>
|
|
461
|
+
<domain>rice</domain>
|
|
462
|
+
<definition>
|
|
463
|
+
<p id='_eb29b35e-123e-4d1c-b50b-2714d41e747c'>rice retaining its husk after threshing</p>
|
|
464
|
+
</definition>
|
|
465
|
+
</term>
|
|
416
466
|
</terms>
|
|
417
467
|
</sections>
|
|
418
468
|
</iso-standard>
|
|
@@ -427,24 +477,26 @@ RSpec.describe IsoDoc do
|
|
|
427
477
|
<sections>
|
|
428
478
|
<terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
|
|
429
479
|
<term id="paddy1">
|
|
430
|
-
<preferred><expression><name>paddy</name>
|
|
480
|
+
<preferred geographic-area="US"><expression language="en" script="Latn"><name>paddy</name>
|
|
481
|
+
<pronunciation>pædiː</pronunciation>
|
|
431
482
|
<grammar>
|
|
432
483
|
<gender>masculine</gender>
|
|
433
484
|
<gender>feminine</gender>
|
|
485
|
+
<number>singular</number>
|
|
434
486
|
<isPreposition>false</isPreposition>
|
|
435
487
|
<isNoun>true</isNoun>
|
|
436
|
-
<
|
|
488
|
+
<grammar-value>irregular declension</grammar-value>
|
|
437
489
|
</grammar>
|
|
438
490
|
</expression></preferred>
|
|
439
491
|
<preferred><expression><name>muddy rice</name>
|
|
440
492
|
<grammar>
|
|
441
493
|
<gender>neuter</gender>
|
|
442
494
|
<isNoun>true</isNoun>
|
|
443
|
-
<
|
|
495
|
+
<grammar-value>irregular declension</grammar-value>
|
|
444
496
|
</grammar>
|
|
445
497
|
</expression></preferred>
|
|
446
498
|
<domain>rice</domain>
|
|
447
|
-
<definition><
|
|
499
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
448
500
|
</term>
|
|
449
501
|
</terms>
|
|
450
502
|
</sections>
|
|
@@ -461,7 +513,8 @@ RSpec.describe IsoDoc do
|
|
|
461
513
|
</title>
|
|
462
514
|
<term id='paddy1'>
|
|
463
515
|
<name>1.1.</name>
|
|
464
|
-
<preferred>paddy
|
|
516
|
+
<preferred geographic-area='US'><strong>paddy</strong>, m, f, sg, noun, en Latn US, /pædiː/</preferred>
|
|
517
|
+
<preferred><strong>muddy rice</strong>, n, noun</preferred>
|
|
465
518
|
<domain>rice</domain>
|
|
466
519
|
<definition>
|
|
467
520
|
<p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
|
|
@@ -486,7 +539,7 @@ RSpec.describe IsoDoc do
|
|
|
486
539
|
</graphical-symbol>
|
|
487
540
|
</preferred>
|
|
488
541
|
<domain>rice</domain>
|
|
489
|
-
<definition><
|
|
542
|
+
<definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
|
|
490
543
|
</term>
|
|
491
544
|
</terms>
|
|
492
545
|
</sections>
|
|
@@ -500,9 +553,10 @@ RSpec.describe IsoDoc do
|
|
|
500
553
|
<title depth='1'>1.<tab/>Terms and Definitions</title>
|
|
501
554
|
<term id='paddy1'>
|
|
502
555
|
<name>1.1.</name>
|
|
503
|
-
<preferred
|
|
556
|
+
<preferred><strong/></preferred>
|
|
557
|
+
<preferred isInternational='true'><figure id='_'>
|
|
504
558
|
<name>Figure 1</name>
|
|
505
|
-
<pre id='_'
|
|
559
|
+
<pre id='_'><LITERAL> FIGURATIVE</pre>
|
|
506
560
|
</figure>
|
|
507
561
|
</preferred>
|
|
508
562
|
<domain>rice</domain>
|
|
@@ -532,7 +586,7 @@ RSpec.describe IsoDoc do
|
|
|
532
586
|
</expression>
|
|
533
587
|
</preferred>
|
|
534
588
|
<definition>
|
|
535
|
-
<
|
|
589
|
+
<verbal-definition>
|
|
536
590
|
<p id='C'>Definition</p>
|
|
537
591
|
<termsource status='identical' type='authoritative'>
|
|
538
592
|
<origin bibitemid='ISO2191' type='inline' citeas=''>
|
|
@@ -543,8 +597,8 @@ RSpec.describe IsoDoc do
|
|
|
543
597
|
</localityStack>
|
|
544
598
|
</origin>
|
|
545
599
|
</termsource>
|
|
546
|
-
</
|
|
547
|
-
<
|
|
600
|
+
</verbal-definition>
|
|
601
|
+
<non-verbal-representation>
|
|
548
602
|
<table id='D'>
|
|
549
603
|
<thead>
|
|
550
604
|
<tr>
|
|
@@ -559,7 +613,7 @@ RSpec.describe IsoDoc do
|
|
|
559
613
|
</tr>
|
|
560
614
|
</tbody>
|
|
561
615
|
</table>
|
|
562
|
-
</
|
|
616
|
+
</non-verbal-representation>
|
|
563
617
|
</definition>
|
|
564
618
|
<termsource status='identical' type='authoritative'>
|
|
565
619
|
<origin bibitemid='ISO2191' type='inline' citeas=''>
|
|
@@ -578,7 +632,7 @@ RSpec.describe IsoDoc do
|
|
|
578
632
|
</expression>
|
|
579
633
|
</preferred>
|
|
580
634
|
<definition>
|
|
581
|
-
<
|
|
635
|
+
<non-verbal-representation>
|
|
582
636
|
<figure id='E'>
|
|
583
637
|
<pre id='F'>Literal</pre>
|
|
584
638
|
</figure>
|
|
@@ -600,100 +654,100 @@ RSpec.describe IsoDoc do
|
|
|
600
654
|
</localityStack>
|
|
601
655
|
</origin>
|
|
602
656
|
</termsource>
|
|
603
|
-
</
|
|
657
|
+
</non-verbal-representation>
|
|
604
658
|
</definition>
|
|
605
659
|
</term>
|
|
606
660
|
</terms>
|
|
607
661
|
</sections>
|
|
608
662
|
</iso-standard>
|
|
609
663
|
INPUT
|
|
610
|
-
presxml = <<~PRESXML
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
PRESXML
|
|
664
|
+
presxml = <<~PRESXML
|
|
665
|
+
<iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
|
|
666
|
+
<sections>
|
|
667
|
+
<terms id='A' obligation='normative' displayorder='1'>
|
|
668
|
+
<title depth='1'>
|
|
669
|
+
1.
|
|
670
|
+
<tab/>
|
|
671
|
+
Terms and definitions
|
|
672
|
+
</title>
|
|
673
|
+
<p id='B'>For the purposes of this document, the following terms and definitions apply.</p>
|
|
674
|
+
<term id='term-term'>
|
|
675
|
+
<name>1.1.</name>
|
|
676
|
+
<preferred><strong>Term</strong></preferred>
|
|
677
|
+
<definition>
|
|
678
|
+
<p id='C'>Definition</p>
|
|
679
|
+
<termsource status='identical' type='authoritative'>
|
|
680
|
+
<origin bibitemid='ISO2191' type='inline' citeas=''>
|
|
681
|
+
<localityStack>
|
|
682
|
+
<locality type='section'>
|
|
683
|
+
<referenceFrom>1</referenceFrom>
|
|
684
|
+
</locality>
|
|
685
|
+
</localityStack>
|
|
686
|
+
, Section 1
|
|
687
|
+
</origin>
|
|
688
|
+
</termsource>
|
|
689
|
+
<table id='D'>
|
|
690
|
+
<name>Table 1</name>
|
|
691
|
+
<thead>
|
|
692
|
+
<tr>
|
|
693
|
+
<th valign='top' align='left'>A</th>
|
|
694
|
+
<th valign='top' align='left'>B</th>
|
|
695
|
+
</tr>
|
|
696
|
+
</thead>
|
|
697
|
+
<tbody>
|
|
698
|
+
<tr>
|
|
699
|
+
<td valign='top' align='left'>C</td>
|
|
700
|
+
<td valign='top' align='left'>D</td>
|
|
701
|
+
</tr>
|
|
702
|
+
</tbody>
|
|
703
|
+
</table>
|
|
704
|
+
</definition>
|
|
705
|
+
<termsource status='identical' type='authoritative'>
|
|
706
|
+
<origin bibitemid='ISO2191' type='inline' citeas=''>
|
|
707
|
+
<localityStack>
|
|
708
|
+
<locality type='section'>
|
|
709
|
+
<referenceFrom>2</referenceFrom>
|
|
710
|
+
</locality>
|
|
711
|
+
</localityStack>
|
|
712
|
+
, Section 2
|
|
713
|
+
</origin>
|
|
714
|
+
</termsource>
|
|
715
|
+
</term>
|
|
716
|
+
<term id='term-term-2'>
|
|
717
|
+
<name>1.2.</name>
|
|
718
|
+
<preferred><strong>Term 2</strong></preferred>
|
|
719
|
+
<definition>
|
|
720
|
+
<figure id='E'>
|
|
721
|
+
<name>Figure 1</name>
|
|
722
|
+
<pre id='F'>Literal</pre>
|
|
723
|
+
</figure>
|
|
724
|
+
<formula id='G'>
|
|
725
|
+
<name>1</name>
|
|
726
|
+
<stem type='MathML'>
|
|
727
|
+
<math xmlns='http://www.w3.org/1998/Math/MathML'>
|
|
728
|
+
<mi>x</mi>
|
|
729
|
+
<mo>=</mo>
|
|
730
|
+
<mi>y</mi>
|
|
731
|
+
</math>
|
|
732
|
+
<!-- x = y -->
|
|
733
|
+
</stem>
|
|
734
|
+
</formula>
|
|
735
|
+
<termsource status='identical' type='authoritative'>
|
|
736
|
+
<origin bibitemid='ISO2191' type='inline' citeas=''>
|
|
737
|
+
<localityStack>
|
|
738
|
+
<locality type='section'>
|
|
739
|
+
<referenceFrom>3</referenceFrom>
|
|
740
|
+
</locality>
|
|
741
|
+
</localityStack>
|
|
742
|
+
, Section 3
|
|
743
|
+
</origin>
|
|
744
|
+
</termsource>
|
|
745
|
+
</definition>
|
|
746
|
+
</term>
|
|
747
|
+
</terms>
|
|
748
|
+
</sections>
|
|
749
|
+
</iso-standard>
|
|
750
|
+
PRESXML
|
|
697
751
|
expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
|
|
698
752
|
.convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
|
|
699
753
|
end
|