metanorma-iso 1.10.2 → 1.10.3

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 (36) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/basicdoc.rng +1 -11
  3. data/lib/asciidoctor/iso/biblio.rng +0 -2
  4. data/lib/asciidoctor/iso/front.rb +2 -2
  5. data/lib/asciidoctor/iso/isodoc.rng +42 -18
  6. data/lib/asciidoctor/iso/isostandard-amd.rng +1 -1
  7. data/lib/asciidoctor/iso/isostandard.rng +1 -3
  8. data/lib/asciidoctor/iso/reqt.rng +1 -1
  9. data/lib/asciidoctor/iso/section.rb +1 -1
  10. data/lib/asciidoctor/iso/validate.rb +1 -1
  11. data/lib/asciidoctor/iso/validate_section.rb +1 -1
  12. data/lib/isodoc/iso/html/isodoc.css +0 -1
  13. data/lib/isodoc/iso/html/isodoc.scss +0 -1
  14. data/lib/isodoc/iso/html/style-human.css +0 -1
  15. data/lib/isodoc/iso/html/style-human.scss +0 -1
  16. data/lib/isodoc/iso/html/style-iso.css +0 -1
  17. data/lib/isodoc/iso/html/style-iso.scss +0 -1
  18. data/lib/isodoc/iso/iso.amendment.xsl +20 -7
  19. data/lib/isodoc/iso/iso.international-standard.xsl +20 -7
  20. data/lib/isodoc/iso/isosts_convert.rb +6 -2
  21. data/lib/isodoc/iso/presentation_xml_convert.rb +19 -9
  22. data/lib/isodoc/iso/sts_convert.rb +5 -2
  23. data/lib/metanorma/iso/processor.rb +2 -2
  24. data/lib/metanorma/iso/version.rb +1 -1
  25. data/metanorma-iso.gemspec +3 -3
  26. data/spec/asciidoctor/blocks_spec.rb +4 -4
  27. data/spec/asciidoctor/cleanup_spec.rb +15 -12
  28. data/spec/asciidoctor/refs_spec.rb +87 -84
  29. data/spec/isodoc/i18n_spec.rb +7 -7
  30. data/spec/isodoc/inline_spec.rb +4 -4
  31. data/spec/isodoc/section_spec.rb +3 -3
  32. data/spec/isodoc/terms_spec.rb +18 -18
  33. data/spec/isodoc/xref_spec.rb +3 -3
  34. data/spec/metanorma/processor_spec.rb +110 -14
  35. data/spec/vcr_cassettes/docrels.yml +68 -68
  36. metadata +7 -7
@@ -57,7 +57,7 @@ module IsoDoc
57
57
  ret += " 第#{from.text}" if from
58
58
  ret += "–#{upto.text}" if upto
59
59
  loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
60
- ret += " #{loc}" unless subsection && type == "clause" ||
60
+ ret += " #{loc}" unless (subsection && type == "clause") ||
61
61
  type == "list" || target.match(/^IEV$|^IEC 60050-/) ||
62
62
  node["droploc"] == "true"
63
63
  ret += ")" if type == "list"
@@ -73,8 +73,8 @@ module IsoDoc
73
73
  return l10n(eref_localities1_zh(target, type, from, upto, node,
74
74
  delim))
75
75
  ret = eref_delim(delim, type)
76
- ret += eref_locality_populate(type, node) unless subsection &&
77
- type == "clause" || type == "list" ||
76
+ ret += eref_locality_populate(type, node) unless (subsection &&
77
+ type == "clause") || type == "list" ||
78
78
  target.match(/^IEV$|^IEC 60050-/)
79
79
  ret += " #{from.text}" if from
80
80
  ret += "–#{upto.text}" if upto
@@ -163,17 +163,27 @@ module IsoDoc
163
163
  i = display_order_xpath(docxml, "//preface/*", i)
164
164
  i = display_order_at(docxml, "//clause[@type = 'scope']", i)
165
165
  i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
166
- # i = display_order_at(docxml, "//sections/terms | "\
167
- # "//sections/clause[descendant::terms]", i)
168
- # i = display_order_at(docxml, "//sections/definitions", i)
169
- # i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
170
- i = display_order_xpath(docxml, "//sections/clause[not(@type = 'scope')] | "\
171
- "//sections/terms | //sections/definitions", i)
166
+ i = display_order_xpath(docxml,
167
+ "//sections/clause[not(@type = 'scope')] | "\
168
+ "//sections/terms | //sections/definitions", i)
172
169
  i = display_order_xpath(docxml, "//annex", i)
173
170
  i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
174
171
  display_order_xpath(docxml, "//indexsect", i)
175
172
  end
176
173
 
174
+ def termdefinition1(elem)
175
+ prefix_domain_to_definition(elem)
176
+ super
177
+ end
178
+
179
+ def prefix_domain_to_definition(elem)
180
+ ((d = elem.at(ns("./domain"))) &&
181
+ (v = elem.at(ns("./definition/verbal-definition"))) &&
182
+ v.elements.first.name == "p") or return
183
+ v.elements.first.children.first.previous =
184
+ "<#{d.remove.children.to_xml}> "
185
+ end
186
+
177
187
  include Init
178
188
  end
179
189
  end
@@ -19,8 +19,11 @@ module IsoDoc
19
19
  f.path
20
20
  end
21
21
  FileUtils.rm_rf dir
22
- MnConvert.convert(in_fname, out_fname || "#{filename}.#{@suffix}",
23
- MnConvert::InputFormat::MN)
22
+ MnConvert.convert(in_fname,
23
+ {
24
+ input_format: MnConvert::InputFormat::MN,
25
+ output_file: out_fname || "#{filename}.#{@suffix}",
26
+ })
24
27
  end
25
28
  end
26
29
  end
@@ -4,7 +4,7 @@ module Metanorma
4
4
  module Iso
5
5
  class Processor < Metanorma::Processor
6
6
 
7
- def initialize
7
+ def initialize # rubocop:disable Lint/MissingSuper
8
8
  @short = :iso
9
9
  @input_format = :asciidoc
10
10
  @asciidoctor_backend = :iso
@@ -17,7 +17,7 @@ module Metanorma
17
17
  doc: "doc",
18
18
  pdf: "pdf",
19
19
  sts: "sts.xml",
20
- isosts: "iso.sts.xml"
20
+ isosts: "iso.sts.xml",
21
21
  )
22
22
  end
23
23
 
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "1.10.2".freeze
3
+ VERSION = "1.10.3".freeze
4
4
  end
5
5
  end
@@ -30,16 +30,16 @@ Gem::Specification.new do |spec|
30
30
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
31
31
 
32
32
  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
33
- spec.add_dependency "mnconvert", "~> 1.8.0"
33
+ spec.add_dependency "mnconvert", "~> 2.0"
34
34
  spec.add_dependency "ruby-jing"
35
35
  spec.add_dependency "tokenizer", "~> 0.3.0"
36
36
  spec.add_dependency "twitter_cldr"
37
37
 
38
- spec.add_development_dependency "byebug"
38
+ spec.add_development_dependency "debug"
39
39
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
40
40
  spec.add_development_dependency "guard", "~> 2.14"
41
41
  spec.add_development_dependency "guard-rspec", "~> 4.7"
42
- spec.add_development_dependency "iev", "~> 0.2.0"
42
+ spec.add_development_dependency "iev", "~> 0.3.0"
43
43
  spec.add_development_dependency "rake", "~> 13.0"
44
44
  spec.add_development_dependency "rspec", "~> 3.6"
45
45
  spec.add_development_dependency "rubocop", "~> 1.5.2"
@@ -535,9 +535,9 @@ RSpec.describe Asciidoctor::ISO do
535
535
  <term id="term-term1">
536
536
  <preferred><expression><name>Term1</name></expression></preferred>
537
537
  <definition>
538
- <verbaldefinition>
538
+ <verbal-definition>
539
539
  <p id='_'>Definition</p>
540
- </verbaldefinition>
540
+ </verbal-definition>
541
541
  </definition>
542
542
  <termsource status='identical' type='authoritative'>
543
543
  <origin bibitemid="ISO2191" citeas="" type="inline">
@@ -577,9 +577,9 @@ RSpec.describe Asciidoctor::ISO do
577
577
  <term id="term-term1">
578
578
  <preferred><expression><name>Term1</name></expression></preferred>
579
579
  <definition>
580
- <verbaldefinition>
580
+ <verbal-definition>
581
581
  <p id='_'>Definition</p>
582
- </verbaldefinition>
582
+ </verbal-definition>
583
583
  </definition>
584
584
  <termsource status='modified' type='authoritative'>
585
585
  <origin bibitemid="ISO2191" citeas="" type="inline">
@@ -66,9 +66,9 @@ RSpec.describe Asciidoctor::ISO do
66
66
  </stem>
67
67
  </name></letter-symbol>
68
68
  </admitted>
69
- <definition><verbaldefinition>
69
+ <definition><verbal-definition>
70
70
  <p id="_">Time</p>
71
- </verbaldefinition></definition>
71
+ </verbal-definition></definition>
72
72
  </term>
73
73
  </terms>
74
74
  </sections>
@@ -96,8 +96,8 @@ RSpec.describe Asciidoctor::ISO do
96
96
  <term id="term-tempus">
97
97
  <preferred><expression><name>Tempus</name></expression></preferred>
98
98
  <domain>relativity</domain>
99
- <definition><verbaldefinition>
100
- <p id="_">Time</p></verbaldefinition></definition>
99
+ <definition><verbal-definition>
100
+ <p id="_">Time</p></verbal-definition></definition>
101
101
  </term>
102
102
  </terms>
103
103
  </sections>
@@ -121,12 +121,15 @@ RSpec.describe Asciidoctor::ISO do
121
121
 
122
122
  === stem:[t_90]
123
123
 
124
+ [.definition]
125
+ --
124
126
  [stem]
125
127
  ++++
126
128
  t_A
127
129
  ++++
128
130
 
129
131
  This paragraph is extraneous
132
+ --
130
133
  INPUT
131
134
  output = <<~OUTPUT
132
135
  #{BLANK_HDR}
@@ -134,7 +137,7 @@ RSpec.describe Asciidoctor::ISO do
134
137
  <terms id="_" obligation="normative">
135
138
  <title>Terms and definitions</title>
136
139
  #{TERM_BOILERPLATE}
137
- <term id="term-t90">
140
+ <term id="term-_-t90-">
138
141
  <preferred>
139
142
  <letter-symbol><name>
140
143
  <stem type="MathML">
@@ -151,8 +154,7 @@ RSpec.describe Asciidoctor::ISO do
151
154
  </name></letter-symbol>
152
155
  </preferred>
153
156
  <definition>
154
- <verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition>
155
- <nonverbalrepresentation>
157
+ <verbal-definition>
156
158
  <formula id="_">
157
159
  <stem type="MathML">
158
160
  <math xmlns="http://www.w3.org/1998/Math/MathML">
@@ -167,7 +169,8 @@ RSpec.describe Asciidoctor::ISO do
167
169
  </math>
168
170
  </stem>
169
171
  </formula>
170
- </nonverbalrepresentation></definition>
172
+ <p id="_">This paragraph is extraneous</p></verbal-definition>
173
+ </definition>
171
174
  </term>
172
175
  </terms>
173
176
  </sections>
@@ -203,9 +206,9 @@ RSpec.describe Asciidoctor::ISO do
203
206
  </ul>
204
207
  <term id="term-time">
205
208
  <preferred><expression><name>Time</name></expression></preferred>
206
- <definition><verbaldefinition>
209
+ <definition><verbal-definition>
207
210
  <p id="_">This paragraph is extraneous</p>
208
- </verbaldefinition></definition>
211
+ </verbal-definition></definition>
209
212
  </term>
210
213
  </terms>
211
214
  </sections>
@@ -454,9 +457,9 @@ RSpec.describe Asciidoctor::ISO do
454
457
  <term id="term-term1">
455
458
  <preferred><expression><name>Term1</name></expression></preferred>
456
459
  <definition>
457
- <verbaldefinition>
460
+ <verbal-definition>
458
461
  <p id='_'>Definition</p>
459
- </verbaldefinition>
462
+ </verbal-definition>
460
463
  </definition>
461
464
  <termsource status='identical' type='authoritative'>
462
465
  <origin bibitemid="ISO2191" citeas="" type="inline">
@@ -364,95 +364,98 @@ RSpec.describe Asciidoctor::ISO do
364
364
 
365
365
  def mock_fdis
366
366
  expect(RelatonIso::IsoBibliography).to receive(:get)
367
- .with("ISO/FDIS 17664-1", nil, lang: "en", title: "Title", usrlbl: nil) do
368
- RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
369
- <bibitem id="x" type="standard">
370
- <fetched>#{Date.today}</fetched>
371
- <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
372
- <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
373
- <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
374
- <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
375
- <uri type="src">https://www.iso.org/standard/81720.html</uri>
376
- <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
377
- <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
378
- <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
379
- <docnumber>17664</docnumber>
380
- <contributor>
381
- <role type="publisher"/>
367
+ .with("ISO/FDIS 17664-1", nil, code: "ISO/FDIS 17664-1",
368
+ lang: "en", match: anything, ord: anything,
369
+ process: 1, year: nil,
370
+ title: "Title", usrlbl: nil) do
371
+ RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
372
+ <bibitem id="x" type="standard">
373
+ <fetched>#{Date.today}</fetched>
374
+ <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
375
+ <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
376
+ <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
377
+ <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
378
+ <uri type="src">https://www.iso.org/standard/81720.html</uri>
379
+ <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
380
+ <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
381
+ <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
382
+ <docnumber>17664</docnumber>
383
+ <contributor>
384
+ <role type="publisher"/>
385
+ <organization>
386
+ <name>International Organization for Standardization</name>
387
+ <abbreviation>ISO</abbreviation>
388
+ <uri>www.iso.org</uri>
389
+ </organization>
390
+ </contributor>
391
+ <edition>1</edition>
392
+ <language>en</language>
393
+ <language>fr</language>
394
+ <script>Latn</script>
395
+ <status>
396
+ <stage>50</stage>
397
+ <substage>00</substage>
398
+ </status>
399
+ <copyright>
400
+ <from>unknown</from>
401
+ <owner>
382
402
  <organization>
383
- <name>International Organization for Standardization</name>
384
- <abbreviation>ISO</abbreviation>
385
- <uri>www.iso.org</uri>
403
+ <name>ISO/FDIS</name>
386
404
  </organization>
387
- </contributor>
388
- <edition>1</edition>
389
- <language>en</language>
390
- <language>fr</language>
391
- <script>Latn</script>
392
- <status>
393
- <stage>50</stage>
394
- <substage>00</substage>
395
- </status>
396
- <copyright>
397
- <from>unknown</from>
398
- <owner>
405
+ </owner>
406
+ </copyright>
407
+ <relation type="obsoletes">
408
+ <bibitem type="standard">
409
+ <formattedref format="text/plain">ISO 17664:2017</formattedref>
410
+ </bibitem>
411
+ </relation>
412
+ <relation type="instance">
413
+ <bibitem type="standard">
414
+ <fetched>2020-11-03</fetched>
415
+ <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
416
+ <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
417
+ <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
418
+ <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
419
+ <uri type="src">https://www.iso.org/standard/81720.html</uri>
420
+ <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
421
+ <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
422
+ <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
423
+ <docnumber>17664</docnumber>
424
+ <contributor>
425
+ <role type="publisher"/>
399
426
  <organization>
400
- <name>ISO/FDIS</name>
427
+ <name>International Organization for Standardization</name>
428
+ <abbreviation>ISO</abbreviation>
429
+ <uri>www.iso.org</uri>
401
430
  </organization>
402
- </owner>
403
- </copyright>
404
- <relation type="obsoletes">
405
- <bibitem type="standard">
406
- <formattedref format="text/plain">ISO 17664:2017</formattedref>
407
- </bibitem>
408
- </relation>
409
- <relation type="instance">
410
- <bibitem type="standard">
411
- <fetched>2020-11-03</fetched>
412
- <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
413
- <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
414
- <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
415
- <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
416
- <uri type="src">https://www.iso.org/standard/81720.html</uri>
417
- <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
418
- <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
419
- <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
420
- <docnumber>17664</docnumber>
421
- <contributor>
422
- <role type="publisher"/>
431
+ </contributor>
432
+ <edition>1</edition>
433
+ <language>en</language>
434
+ <language>fr</language>
435
+ <script>Latn</script>
436
+ <status>
437
+ <stage>50</stage>
438
+ <substage>00</substage>
439
+ </status>
440
+ <copyright>
441
+ <from>unknown</from>
442
+ <owner>
423
443
  <organization>
424
- <name>International Organization for Standardization</name>
425
- <abbreviation>ISO</abbreviation>
426
- <uri>www.iso.org</uri>
444
+ <name>ISO/FDIS</name>
427
445
  </organization>
428
- </contributor>
429
- <edition>1</edition>
430
- <language>en</language>
431
- <language>fr</language>
432
- <script>Latn</script>
433
- <status>
434
- <stage>50</stage>
435
- <substage>00</substage>
436
- </status>
437
- <copyright>
438
- <from>unknown</from>
439
- <owner>
440
- <organization>
441
- <name>ISO/FDIS</name>
442
- </organization>
443
- </owner>
444
- </copyright>
445
- <relation type="obsoletes">
446
- <bibitem type="standard">
447
- <formattedref format="text/plain">ISO 17664:2017</formattedref>
448
- </bibitem>
449
- </relation>
450
- <place>Geneva</place>
451
- </bibitem>
452
- </relation>
453
- <place>Geneva</place>
454
- </bibitem>
455
- OUTPUT
456
- end
446
+ </owner>
447
+ </copyright>
448
+ <relation type="obsoletes">
449
+ <bibitem type="standard">
450
+ <formattedref format="text/plain">ISO 17664:2017</formattedref>
451
+ </bibitem>
452
+ </relation>
453
+ <place>Geneva</place>
454
+ </bibitem>
455
+ </relation>
456
+ <place>Geneva</place>
457
+ </bibitem>
458
+ OUTPUT
459
+ end
457
460
  end
458
461
  end
@@ -111,7 +111,7 @@ RSpec.describe IsoDoc do
111
111
  <title depth="2">3.1<tab/>Normal Terms</title>
112
112
  <term id="J">
113
113
  <name>3.1.1</name>
114
- <preferred>Term2</preferred>
114
+ <preferred><strong>Term2</strong></preferred>
115
115
  </term>
116
116
  </terms>
117
117
  <definitions id="K" inline-header="true">
@@ -199,7 +199,7 @@ RSpec.describe IsoDoc do
199
199
  <h2>3.1&#160; Normal Terms</h2>
200
200
 
201
201
  <p class="TermNum" id="J">3.1.1</p>
202
- <p class="Terms" style="text-align:left;">Term2</p>
202
+ <p class="Terms" style="text-align:left;"><b>Term2</b></p>
203
203
  </div>
204
204
  <div id="K">
205
205
  <span class="zzMoveToFollowing">
@@ -374,7 +374,7 @@ RSpec.describe IsoDoc do
374
374
  <title depth="2">3.1<tab/>Normal Terms</title>
375
375
  <term id="J">
376
376
  <name>3.1.1</name>
377
- <preferred>Term2</preferred>
377
+ <preferred><strong>Term2</strong></preferred>
378
378
  </term>
379
379
  </terms>
380
380
  <definitions id="K" inline-header="true">
@@ -544,7 +544,7 @@ RSpec.describe IsoDoc do
544
544
  <title depth="2">3.1<tab/>Normal Terms</title>
545
545
  <term id="J">
546
546
  <name>3.1.1</name>
547
- <preferred>Term2</preferred>
547
+ <preferred><strong>Term2</strong></preferred>
548
548
  </term>
549
549
  </terms>
550
550
  <definitions id="K" inline-header="true">
@@ -631,7 +631,7 @@ RSpec.describe IsoDoc do
631
631
  <div id="I">
632
632
  <h2>3.1&#160; Normal Terms</h2>
633
633
  <p class="TermNum" id="J">3.1.1</p>
634
- <p class="Terms" style="text-align:left;">Term2</p>
634
+ <p class="Terms" style="text-align:left;"><b>Term2</b></p>
635
635
  </div>
636
636
  <div id="K">
637
637
  <span class="zzMoveToFollowing">
@@ -841,7 +841,7 @@ RSpec.describe IsoDoc do
841
841
  Normal Terms</title>
842
842
  <term id="J">
843
843
  <name>3.1.1</name>
844
- <preferred>Term2</preferred>
844
+ <preferred><strong>Term2</strong></preferred>
845
845
  </term>
846
846
  </terms>
847
847
  <definitions id="K" inline-header="true">
@@ -952,7 +952,7 @@ RSpec.describe IsoDoc do
952
952
  <h1>3 &#12288; Terms, definitions, symbols and abbreviated terms</h1>
953
953
  <div id="I"><h2>3.1 &#12288; Normal Terms</h2>
954
954
  <p class="TermNum" id="J">3.1.1</p>
955
- <p class="Terms" style="text-align:left;">Term2</p>
955
+ <p class="Terms" style="text-align:left;"><b>Term2</b></p>
956
956
  </div><div id="K">
957
957
  <span class='zzMoveToFollowing'>
958
958
  <b>3.2&#12288;</b>
@@ -503,7 +503,7 @@ RSpec.describe IsoDoc do
503
503
  <terms id="Terms" displayorder="2"><title>2</title>
504
504
  <term id='B'>
505
505
  <name>2.1</name>
506
- <preferred>B</preferred>
506
+ <preferred><strong>B</strong></preferred>
507
507
  <p>
508
508
  <ul>
509
509
  <li>
@@ -615,7 +615,7 @@ RSpec.describe IsoDoc do
615
615
  <div id='Terms'>
616
616
  <h1>2</h1>
617
617
  <p class='TermNum' id='B'>2.1</p>
618
- <p class='Terms' style='text-align:left;'>B</p>
618
+ <p class='Terms' style='text-align:left;'><b>B</b></p>
619
619
  <p>
620
620
  <ul>
621
621
  <li>
@@ -819,7 +819,7 @@ RSpec.describe IsoDoc do
819
819
  <terms id="A" displayorder="2"><title>2</title>
820
820
  <term id='B'>
821
821
  <name>2.1</name>
822
- <preferred>B</preferred>
822
+ <preferred><strong>B</strong></preferred>
823
823
  <p>
824
824
  <ul>
825
825
  <li>
@@ -862,7 +862,7 @@ RSpec.describe IsoDoc do
862
862
  <div id='A'>
863
863
  <h1>2</h1>
864
864
  <p class='TermNum' id='B'>2.1</p>
865
- <p class='Terms' style='text-align:left;'>B</p>
865
+ <p class='Terms' style='text-align:left;'><b>B</b></p>
866
866
  <p>
867
867
  <ul>
868
868
  <li>
@@ -110,7 +110,7 @@ RSpec.describe IsoDoc do
110
110
  <terms id="I" obligation="normative">
111
111
  <title depth="2">3.1<tab/>Normal Terms</title>
112
112
  <term id="J"><name>3.1.1</name>
113
- <preferred>Term2</preferred>
113
+ <preferred><strong>Term2</strong></preferred>
114
114
  </term>
115
115
  </terms>
116
116
  <definitions id="K" inline-header="true"><title>3.2</title>
@@ -196,7 +196,7 @@ RSpec.describe IsoDoc do
196
196
  <div id="I">
197
197
  <h2>3.1&#160; Normal Terms</h2>
198
198
  <p class="TermNum" id="J">3.1.1</p>
199
- <p class="Terms" style="text-align:left;">Term2</p>
199
+ <p class="Terms" style="text-align:left;"><b>Term2</b></p>
200
200
  </div>
201
201
  <div id="K">
202
202
  <span class="zzMoveToFollowing">
@@ -321,7 +321,7 @@ RSpec.describe IsoDoc do
321
321
  <span style="mso-tab-count:1">&#160; </span>
322
322
  Normal Terms</h2>
323
323
  <p class="TermNum" id="J">3.1.1</p>
324
- <p class="Terms" style="text-align:left;">Term2</p>
324
+ <p class="Terms" style="text-align:left;"><b>Term2</b></p>
325
325
  </div>
326
326
  <div id="K">
327
327
  <span class="zzMoveToFollowing">