metanorma-iso 3.5.23 → 3.5.25

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 (63) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/docx/adapter.rb +14 -0
  3. data/lib/isodoc/iso/docx/inline.rb +14 -1
  4. data/lib/isodoc/iso/docx/inline_renderers/stem_renderer.rb +13 -0
  5. data/lib/isodoc/iso/docx/math_conversion.rb +22 -0
  6. data/lib/isodoc/iso/docx/renderers/references_renderer.rb +14 -0
  7. data/lib/metanorma/iso/processor.rb +12 -13
  8. data/lib/metanorma/iso/schematron/iso-sts.sch +899 -0
  9. data/lib/metanorma/iso/sts/cli.rb +89 -0
  10. data/lib/metanorma/iso/sts/html_renderer/assets/oiml-logo-dark.svg +1 -0
  11. data/lib/metanorma/iso/sts/html_renderer/assets/oiml-logo.svg +1 -0
  12. data/lib/metanorma/iso/sts/html_renderer/assets/oiml-smart-logo-dark.svg +1 -0
  13. data/lib/metanorma/iso/sts/html_renderer/assets/oiml-smart-logo.svg +1 -0
  14. data/lib/metanorma/iso/sts/html_renderer/assets/theme.css +8 -14
  15. data/lib/metanorma/iso/sts/html_renderer/ruby.rb +748 -94
  16. data/lib/metanorma/iso/sts/html_renderer/templates/_footer.html.liquid +2 -3
  17. data/lib/metanorma/iso/sts/html_renderer/templates/document.html.liquid +2 -1
  18. data/lib/metanorma/iso/sts/html_renderer.rb +3 -4
  19. data/lib/metanorma/iso/sts/mathml_builder.rb +93 -0
  20. data/lib/metanorma/iso/sts/parity_validator/normaliser.rb +95 -0
  21. data/lib/metanorma/iso/sts/parity_validator/report.rb +137 -0
  22. data/lib/metanorma/iso/sts/parity_validator.rb +23 -0
  23. data/lib/metanorma/iso/sts/transformer/back_transformer.rb +88 -64
  24. data/lib/metanorma/iso/sts/transformer/base.rb +53 -87
  25. data/lib/metanorma/iso/sts/transformer/block_dispatcher.rb +158 -90
  26. data/lib/metanorma/iso/sts/transformer/body_transformer.rb +12 -28
  27. data/lib/metanorma/iso/sts/transformer/content_text.rb +3 -3
  28. data/lib/metanorma/iso/sts/transformer/context.rb +43 -41
  29. data/lib/metanorma/iso/sts/transformer/dl_transformer.rb +109 -0
  30. data/lib/metanorma/iso/sts/transformer/document_transformer.rb +75 -19
  31. data/lib/metanorma/iso/sts/transformer/figure_transformer.rb +55 -30
  32. data/lib/metanorma/iso/sts/transformer/footnote_collector.rb +16 -59
  33. data/lib/metanorma/iso/sts/transformer/formula_transformer.rb +31 -22
  34. data/lib/metanorma/iso/sts/transformer/front_transformer.rb +62 -33
  35. data/lib/metanorma/iso/sts/transformer/id_generator.rb +259 -142
  36. data/lib/metanorma/iso/sts/transformer/inline_transformer.rb +48 -252
  37. data/lib/metanorma/iso/sts/transformer/iso_meta_transformer.rb +55 -35
  38. data/lib/metanorma/iso/sts/transformer/list_transformer.rb +115 -45
  39. data/lib/metanorma/iso/sts/transformer/model_builder.rb +262 -220
  40. data/lib/metanorma/iso/sts/transformer/nbsp_processor.rb +2 -4
  41. data/lib/metanorma/iso/sts/transformer/note_transformer.rb +132 -25
  42. data/lib/metanorma/iso/sts/transformer/paragraph_transformer.rb +648 -14
  43. data/lib/metanorma/iso/sts/transformer/provision_index.rb +108 -0
  44. data/lib/metanorma/iso/sts/transformer/reference_transformer.rb +87 -112
  45. data/lib/metanorma/iso/sts/transformer/rendered_text_extractor.rb +219 -0
  46. data/lib/metanorma/iso/sts/transformer/requirement_transformer.rb +299 -0
  47. data/lib/metanorma/iso/sts/transformer/section_transformer.rb +234 -62
  48. data/lib/metanorma/iso/sts/transformer/source_document.rb +181 -67
  49. data/lib/metanorma/iso/sts/transformer/standard.rb +55 -14
  50. data/lib/metanorma/iso/sts/transformer/table_transformer.rb +404 -67
  51. data/lib/metanorma/iso/sts/transformer/term_transformer.rb +157 -170
  52. data/lib/metanorma/iso/sts/transformer.rb +48 -50
  53. data/lib/metanorma/iso/sts/validation_report.rb +42 -0
  54. data/lib/metanorma/iso/sts/validator.rb +1008 -0
  55. data/lib/metanorma/iso/sts.rb +126 -62
  56. data/lib/metanorma/iso/version.rb +1 -1
  57. data/metanorma-iso.gemspec +2 -2
  58. metadata +24 -13
  59. data/lib/metanorma/iso/sts/html_renderer/handlers.rb +0 -526
  60. data/lib/metanorma/iso/sts/transformer/def_list_transformer.rb +0 -57
  61. data/lib/metanorma/iso/sts/transformer/example_transformer.rb +0 -41
  62. data/lib/metanorma/iso/sts/transformer/quote_transformer.rb +0 -17
  63. data/lib/metanorma/iso/sts/transformer/sourcecode_transformer.rb +0 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4cb19df1ed23c40d1f49351a7db560dadcc1305392ea6dd2962833848e2ebfec
4
- data.tar.gz: 496d0be723e36f00267a197cf8315f118568fc36dcf1d6b0e22e4ed8f8f04134
3
+ metadata.gz: 768bb7c02360bd80725d6a9ce3e175e92766867e032cc5fea7bdec0190eaeb63
4
+ data.tar.gz: 42684cefc453fc51bd23809fa8a942319a471633fd19265dd002e1861d9e52ff
5
5
  SHA512:
6
- metadata.gz: 4e2e4af7d68ed9bb325d1382fd27421fab45c2a0995737ee77d1401a5160210d4600ad24b040503f3e193f1c1d51ef2ca9bfbb1838076d51b24465f36159fb69
7
- data.tar.gz: d9049780c92eae394019a6014d982fcbd510733d1ac8a17c216d5b8f2e5b7036039be406d3edb857bb9646fe08750ca1478d3bcf1a846934cf54cbdce655f74b
6
+ metadata.gz: e008a160695feec182265d2d0d6b3207de9d17d6a5506de4f66c944a0043c8b77d86fd658c8ad03e3269a817a8fcca587d577c92f5244209826ab1b243288463
7
+ data.tar.gz: 1194f4662e705e1069682108c013961130853fc3598aa9f1499897b76db418fb4fca66d1b2dae2a0c92561237e6cdf87c77555a27a1a581891c84e8325e2d83b
@@ -566,9 +566,23 @@ module IsoDoc
566
566
  is_normative = refs_sect.normative.to_s == "true"
567
567
  @context.with_normative(is_normative) do
568
568
  walk_mixed_content(refs_sect, doc)
569
+ render_section_admonitions(refs_sect, doc)
569
570
  end
570
571
  end
571
572
 
573
+ # Admonition children of the references section (e.g. an `[EDITOR]`
574
+ # editorial note following the reference list) render after the
575
+ # walked content — 1.17.0 carried them ("EDITORIAL NOTE — …").
576
+ # The section model is unordered, so the fallback walk cannot place
577
+ # them by document order; they are dispatched explicitly here once
578
+ # the model carries them (StandardReferencesSection admonition
579
+ # mapping, metanorma-iso#1764).
580
+ def render_section_admonitions(refs_sect, doc)
581
+ return unless refs_sect.class.attributes.key?(:admonition)
582
+
583
+ Array(refs_sect.admonition).each { |admonition| dispatch(admonition, doc) }
584
+ end
585
+
572
586
  # ── Block visitors (central dispatch) ──────────────────────────
573
587
  #
574
588
  # Class-keyed dispatch via the Renderers::Registry. Each content
@@ -341,7 +341,20 @@ module IsoDoc
341
341
  text = stem_math_text(element)
342
342
  return text if text && !text.empty?
343
343
 
344
- collect_text(element)
344
+ text = collect_text(element)
345
+ return text if text && !text.empty?
346
+
347
+ # Presentation bare-number stems carry no MathML at all:
348
+ # mnconvert emits the digit as plain text inside the semx
349
+ # wrapper ("0<latexmath>0</latexmath>"), so the text only
350
+ # reachable through the semx child is the stem's content
351
+ # (isodoc#898: stem:[0]/stem:[1] vanished from table cells).
352
+ Array(attribute_value(element, :semx)).each do |child|
353
+ text = collect_text(child)
354
+ return text if text && !text.empty?
355
+ end
356
+
357
+ ""
345
358
  end
346
359
 
347
360
  # AsciiMath is the plain-text form of an inline symbol. The
@@ -16,6 +16,7 @@ module IsoDoc
16
16
  include Base
17
17
 
18
18
  def render(element, para)
19
+ return if render_number_as_text(element, para)
19
20
  return if render_as_omml(element, para)
20
21
 
21
22
  render_as_text(element, para)
@@ -23,6 +24,18 @@ module IsoDoc
23
24
 
24
25
  private
25
26
 
27
+ # 1.17.0 parity: a stem consisting of a bare number renders as
28
+ # a plain text run — an OMML object for a bare digit reads as
29
+ # math styling inside prose and table cells (metanorma-iso#1764).
30
+ # Returns true when the paragraph received the number.
31
+ def render_number_as_text(element, para)
32
+ digits = parent.number_only_stem_text(element)
33
+ return false unless digits
34
+
35
+ parent.add_text(para, digits)
36
+ true
37
+ end
38
+
26
39
  # Append the stem's MathML as inline OMML equation models.
27
40
  # Returns true when the paragraph received the equation.
28
41
  def render_as_omml(element, para)
@@ -67,6 +67,28 @@ module IsoDoc
67
67
  nil
68
68
  end
69
69
 
70
+ # 1.17.0 parity: a stem whose MathML is a bare number renders as
71
+ # plain text, not as an equation object. Returns the digits when
72
+ # the MathML carries exactly one <mn> with a digits-only payload
73
+ # and no other MathML elements beyond the math/semantics/mrow
74
+ # wrappers, nil otherwise.
75
+ def number_only_stem_text(stem)
76
+ mathml = stem_mathml(stem)
77
+ return nil unless mathml.to_s.include?("<mn")
78
+
79
+ digits = mathml.scan(%r{<mn[^>]*>([^<]*)</mn>}).flatten.join.strip
80
+ return nil unless digits.match?(/\A\d+\z/)
81
+ return nil unless mathml.scan(/<mn[\s>]/).length == 1
82
+
83
+ wrappers = mathml.gsub(%r{<mn[^>]*>[^<]*</mn>}, "")
84
+ .scan(/<([a-zA-Z]+)[\s>]/).flatten
85
+ return nil unless wrappers.all? { |tag| %w[math semantics mrow].include?(tag) }
86
+
87
+ digits
88
+ rescue StandardError
89
+ nil
90
+ end
91
+
70
92
  private
71
93
 
72
94
  # Direct :math attribute (semantic stem), then <semx>-wrapped
@@ -24,6 +24,7 @@ module IsoDoc
24
24
  render_heading(section, doc)
25
25
  render_intro(section, doc)
26
26
  render_bibitems(section, doc)
27
+ render_admonitions(section, doc)
27
28
  end
28
29
  end
29
30
  end
@@ -65,6 +66,19 @@ module IsoDoc
65
66
  @walker.dispatch(bib, doc)
66
67
  end
67
68
  end
69
+
70
+ # Admonition children of the references section (e.g. an
71
+ # `[EDITOR]` editorial note following the reference list) render
72
+ # after the entries — 1.17.0 carried them ("EDITORIAL NOTE — …");
73
+ # the model dropped them at ingest until the section gained the
74
+ # admonition mapping (metanorma-iso#1764).
75
+ def render_admonitions(section, doc)
76
+ return unless section.class.attributes.key?(:admonition)
77
+
78
+ Array(section.admonition).each do |admonition|
79
+ @walker.dispatch(admonition, doc)
80
+ end
81
+ end
68
82
  end
69
83
  end
70
84
  end
@@ -38,12 +38,11 @@ module Metanorma
38
38
  }
39
39
  end
40
40
 
41
- # Register the native metanorma-document ISO-STS transformer for the
42
- # +:isosts+ leg. This declaration is inert while the QA gate
43
- # (+Metanorma::Iso::Sts.enabled?+) is off: {#output} intercepts
44
- # +:isosts+ with mnconvert and never reaches the base-class driver.
45
- # NISO +:sts+ is deliberately absent — it has no metanorma-document
46
- # transformer and stays on mnconvert.
41
+ # Register the native metanorma-document STS transformer for the
42
+ # +:isosts+ leg (the OIML engine ported to Metanorma::Iso::Sts).
43
+ # This is the production path; METANORMA_ISO_NATIVE_STS=0 rolls back
44
+ # to mnconvert. NISO +:sts+ stays on mnconvert, whose emission the
45
+ # OutputSanitizer repairs to schema-valid NISO STS.
47
46
  def document_transformers
48
47
  {
49
48
  isosts: {
@@ -51,17 +50,17 @@ module Metanorma
51
50
  transformer: Metanorma::Iso::Sts::Transformer::Standard,
52
51
  strip_default_namespace: true,
53
52
  post_process: lambda do |xml, _transformer, _options|
54
- Metanorma::Iso::Sts::Transformer::NbspProcessor.apply_to_text(xml)
53
+ # processing-meta is valid per the delivery-gate schema
54
+ # (NISO STS extended-1.2 MathML3).
55
+ Metanorma::Iso::Sts.inject_namespaces(xml)
56
+ .then { |x| Metanorma::Iso::Sts.inject_processing_meta(x) }
57
+ .then { |x| Metanorma::Iso::Sts.fix_lang_attribute(x) }
55
58
  end,
56
59
  },
57
60
  }
58
61
  end
59
62
 
60
63
  def use_presentation_xml(ext)
61
- # When the native ISO-STS transformer is enabled it consumes semantic
62
- # XML (matching mnconvert's input_format: MN); while gated off, keep
63
- # the historical presentation-XML routing so mnconvert is unchanged.
64
- return false if ext == :isosts && Metanorma::Iso::Sts.enabled?
65
64
  return false if ext == :sts_html
66
65
  return true if %i[html_alt sts isosts doc docx].include?(ext)
67
66
 
@@ -90,10 +89,10 @@ module Metanorma
90
89
  when :isosts
91
90
  if Metanorma::Iso::Sts.enabled?
92
91
  # native metanorma-document transformer via the base-class
93
- # document_transformers driver (QA gate ON)
92
+ # document_transformers driver (default)
94
93
  super
95
94
  else
96
- # default: mnconvert (QA gate OFF)
95
+ # rollback: mnconvert (METANORMA_ISO_NATIVE_STS=0)
97
96
  IsoDoc::Iso::IsoStsConvert.new(options)
98
97
  .convert(inname, isodoc_node, nil, outname)
99
98
  end