RubyGems - metanorma-standoc - Versions diffs - 3.4.8 → 3.4.9 - Mend

metanorma-standoc 3.4.8 → 3.4.9

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 (26) hide show

checksums.yaml +4 -4
data/.rubocop.yml +9 -0
data/Gemfile +6 -1
data/lib/isodoc/html/htmlstyle.css +5 -0
data/lib/metanorma/cleanup/bibdata.rb +11 -3
data/lib/metanorma/cleanup/cleanup.rb +1 -1
data/lib/metanorma/cleanup/ref.rb +71 -0
data/lib/metanorma/cleanup/term_lookup.rb +1 -0
data/lib/metanorma/converter/converter.rb +2 -1
data/lib/metanorma/converter/init.rb +29 -4
data/lib/metanorma/converter/lists.rb +1 -0
data/lib/metanorma/converter/macros.rb +13 -6
data/lib/metanorma/standoc/version.rb +1 -1
data/lib/metanorma/validate/basicdoc.rng +1 -1
data/lib/metanorma/validate/{mathml3-content.rng → mathml4-content.rng} +104 -80
data/lib/metanorma/validate/mathml4-core.rng +1041 -0
data/lib/metanorma/validate/{mathml3-presentation.rng → mathml4-presentation.rng} +184 -1060
data/lib/metanorma/validate/{mathml3-strict-content.rng → mathml4-strict-content.rng} +92 -8
data/lib/metanorma/validate/mathml4.rng +30 -0
data/lib/metanorma/validate/metanorma-mathml.rng +22 -8
data/lib/metanorma/validate/validate.rb +1 -1
data/metanorma-standoc.gemspec +1 -1
metadata +8 -9
data/.hound.yml +0 -5
data/lib/metanorma/validate/mathml3-common.rng +0 -257
data/lib/metanorma/validate/mathml3.rng +0 -23

data/lib/metanorma/validate/{mathml3-strict-content.rng → mathml4-strict-content.rng} RENAMED Viewed

@@ -1,16 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-      This is the Mathematical Markup Language (MathML) 3.0, an XML
-      application for describing mathematical notation and capturing
-      both its structure and content.
-      Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
+  MathML 4 (Strict Content)
+  #########################
+-->
+<!--
+      Copyright 1998-2026 W3C (MIT, ERCIM, Keio, Beihang)
       Use and distribution of this code are permitted under the terms
       W3C Software Notice and License
       http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 -->
 <grammar ns="http://www.w3.org/1998/Math/MathML" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <start combine="choice">
+    <ref name="math.strict"/>
+  </start>
+  <define name="CommonAtt">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="xref"/>
+    </optional>
+  </define>
+  <define name="math.strict">
+    <element name="math">
+      <ref name="math.attributes"/>
+      <zeroOrMore>
+        <ref name="ContExp"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <!--
+    METANORMA MODIFICATION (basicdoc-models#39): upstream combines CommonAtt
+    (id, xref) into math.attributes here; in the full-MathML composition the
+    math element already carries `id` via MathMLPGlobalAttributes
+    (mathml4-core.rnc) and `xref` via the presentation augmentation
+    (mathml4-presentation.rnc), so RELAX NG's duplicate-attribute restriction
+    rejects the composed grammar (jing: 'duplicate attribute "id"').
+    Upstream text was:
+      math.attributes &= CommonAtt
+  -->
   <define name="ContExp">
     <choice>
       <ref name="semantics-contexp"/>
@@ -47,7 +78,7 @@
   </define>
   <define name="semantics-ci">
     <element name="semantics">
-      <ref name="semantics.attributes"/>
+      <ref name="CommonAtt"/>
       <choice>
         <ref name="ci"/>
         <ref name="semantics-ci"/>
@@ -62,8 +93,8 @@
   </define>
   <define name="semantics-contexp">
     <element name="semantics">
-      <ref name="semantics.attributes"/>
-      <ref name="ContExp"/>
+      <ref name="CommonAtt"/>
+      <ref name="MathExpression"/>
       <zeroOrMore>
         <choice>
           <ref name="annotation"/>
@@ -72,6 +103,42 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="annotation" combine="choice">
+    <element name="annotation">
+      <ref name="CommonAtt"/>
+      <text/>
+    </element>
+  </define>
+  <!--
+    METANORMA MODIFICATION (basicdoc-models#39): upstream re-opens
+    `anyElement` and `annotation-xml` here with combine=choice (|=). RELAX NG
+    permits only one combine method per name, which blocks the metanorma
+    wrapper's `&= notAllowed` bans (metanorma-mathml.rnc) of these foreign
+    markup escape hatches. The re-opens are dropped: the base definitions in
+    mathml4-core.rnc remain, and the wrapper forbids them outright anyway.
+    Upstream text was:
+      anyElement |=  element (* - m:*) {(attribute * {text}|text| anyElement)*}
+      annotation-xml |= element annotation-xml {annotation-xml.attributes,
+                                               (MathExpression*|anyElement*)}
+  -->
+  <define name="annotation-xml.attributes" combine="interleave">
+    <ref name="CommonAtt"/>
+    <optional>
+      <ref name="cd"/>
+    </optional>
+    <optional>
+      <ref name="encoding"/>
+    </optional>
+  </define>
+  <!--
+    METANORMA MODIFICATION (basicdoc-models#39): upstream combines a second
+    `attribute encoding` into the `encoding` define (already defined in
+    mathml4-core.rnc); the interleave yields the same attribute twice wherever
+    the define is used, which RELAX NG forbids (jing: 'duplicate attribute
+    "encoding"').
+    Upstream text was:
+      encoding &= attribute encoding {xsd:string}
+  -->
   <define name="ci">
     <element name="ci">
       <ref name="ci.attributes"/>
@@ -121,6 +188,23 @@
   <define name="csymbol.content">
     <ref name="SymbolName"/>
   </define>
+  <define name="cd">
+    <attribute name="cd">
+      <data type="NCName"/>
+    </attribute>
+  </define>
+  <define name="name">
+    <attribute name="name">
+      <data type="NCName"/>
+    </attribute>
+  </define>
+  <define name="src">
+    <optional>
+      <attribute name="src">
+        <data type="anyURI"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="BvarQ">
     <zeroOrMore>
       <ref name="bvar"/>

data/lib/metanorma/validate/mathml4.rng ADDED Viewed

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  MathML 4 (full)
+  ##############
+-->
+<!--
+      Copyright 1998-2026 W3C (MIT, ERCIM, Keio)
+      Use and distribution of this code are permitted under the terms
+      W3C Software Notice and License
+      http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+-->
+<grammar ns="http://www.w3.org/1998/Math/MathML" xmlns="http://relaxng.org/ns/structure/1.0">
+  <!--
+    Presentation MathML
+    METANORMA MODIFICATION (basicdoc-models#39): upstream overrides
+    `anyElement` inside this include, but `anyElement` is defined in
+    mathml4-core.rnc, i.e. an include nested below mathml4-presentation.rnc;
+    libxml2's RELAX NG cannot override a define from a nested include (the
+    same constraint documented in metanorma-mathml.rnc). The override is
+    redundant for metanorma, whose wrapper bans anyElement outright.
+    Upstream text was:
+      include "mathml4-presentation.rnc"  {
+      anyElement =  element (* - m:*) {(attribute * {text}|text| anyElement)*}
+      }
+  -->
+  <include href="mathml4-presentation.rng"/>
+  <!-- Content  MathML -->
+  <include href="mathml4-content.rng"/>
+</grammar>

data/lib/metanorma/validate/metanorma-mathml.rng CHANGED Viewed

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
-    Metanorma wrapper around the vendored W3C MathML 3.0 RelaxNG grammar.
-    Includes the unmodified W3C grammar (start = math) and augments it with
+    Metanorma wrapper around the vendored W3C MathML 4 RelaxNG grammar
+    (vendored with marked modifications - - see README.adoc).
+    Includes the W3C grammar (start = math) and augments it with
     metanorma's owned extension attributes. Referenced from basicdoc.rnc via:
       mathml = external "mathml/metanorma-mathml.rnc"
     Authoritative param list for data-metanorma-numberformat lives in plurimath
     (Formatter::Standard::DEFAULT_OPTIONS); see metanorma/basicdoc-models#35.
+    MathML 3 -> 4 migration: metanorma/basicdoc-models#39 /
+    metanorma/metanorma#585.
   -->
-  <include href="mathml3.rng"/>
+  <include href="mathml4.rng"/>
   <!--
     metanorma number-formatting hint on <mn>; opaque comma-separated option
     string parsed at presentation time (no-namespace data- attribute, which
-    the W3C CommonAtt/NonMathMLAtt does not otherwise permit).
+    the W3C MathMLPGlobalAttributes/NonMathMLAtt does not otherwise permit).
   -->
   <define name="mn.attributes" combine="interleave">
     <optional>
@@ -24,13 +27,14 @@
     serialiser emits no foreign markup, so the W3C annotation-xml escape hatch
     (and its anyElement wildcard) is forbidden in the MathML we process. This
     also removes the untyped `id` attribute the wildcard permits, which clashes
-    with xsd:ID under RELAX NG ID-type consistency (the callout-annotation error).
-    metanorma only emits presentation MathML; pre-empting the escape hatch before
-    semantic MathML is ever wired. Text-only <annotation> is retained.
+    with xsd:ID under RELAX NG ID-type consistency (the callout-annotation
+    error). metanorma only emits presentation MathML; pre-empting the escape
+    hatch before semantic MathML is ever wired. Text-only <annotation> is
+    retained.
     Expressed via `combine` (interleave with notAllowed) rather than an
     include-override: annotation-xml/anyElement are defined in the transitively
-    included mathml3-common, and libxml2's RelaxNG (used by Nokogiri for fragment
+    included mathml4-core, and libxml2's RelaxNG (used by Nokogiri for fragment
     / passthrough validation) cannot override a define from a nested include - -
     it demands the combine attribute and otherwise fails to compile the whole
     grammar (every passthrough then wrongly reports "Invalid passthrough
@@ -43,3 +47,13 @@
     <notAllowed/>
   </define>
 </grammar>
+<!--
+  NOTE on MathML 4's token content model: upstream `textorHTML`
+  (mathml4-core.rnc) admits embedded XHTML/SVG inside token elements
+  (mi/mn/mo/mtext/ms). That loosening is removed as a marked modification in
+  the vendored core file itself: libxml2's RELAX NG rejects the compiled svg
+  branch outright (breaking all passthrough validation), and metanorma's
+  serialiser never emits embedded HTML/SVG in math tokens. See the
+  METANORMA MODIFICATION comment in mathml4-core.rnc and
+  metanorma/basicdoc-models#39.
+-->

data/lib/metanorma/validate/validate.rb CHANGED Viewed

@@ -25,7 +25,7 @@ module Metanorma
       # Instance variables to copy from converter
       def copied_instance_variables
         %i[localdir dataurimaxsize svg_conform_profile no_isobib iev_globalname
-           iev_localname c lang script locale i18n doctype]
+           iev_localname c lang script locale i18n doctype docstage_valid]
       end
       def initialize(converter)

data/metanorma-standoc.gemspec CHANGED Viewed

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   # spec.add_dependency "iev", "~> 0.3.5"
-  spec.add_dependency "isodoc", "~> 3.6.0"
+  spec.add_dependency "isodoc", "~> 3.7.0"
   spec.add_dependency "metanorma-core", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.31"

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.4.9
 platform: ruby
 authors:
 - Ribose Inc.
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-core
   requirement: !ruby/object:Gem::Requirement
@@ -427,7 +427,6 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".gitignore"
-- ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.yml"
 - ".tex"
@@ -530,11 +529,11 @@ files:
 - lib/metanorma/validate/image.rb
 - lib/metanorma/validate/isodoc-compile.rng
 - lib/metanorma/validate/isodoc.rng
-- lib/metanorma/validate/mathml3-common.rng
-- lib/metanorma/validate/mathml3-content.rng
-- lib/metanorma/validate/mathml3-presentation.rng
-- lib/metanorma/validate/mathml3-strict-content.rng
-- lib/metanorma/validate/mathml3.rng
+- lib/metanorma/validate/mathml4-content.rng
+- lib/metanorma/validate/mathml4-core.rng
+- lib/metanorma/validate/mathml4-presentation.rng
+- lib/metanorma/validate/mathml4-strict-content.rng
+- lib/metanorma/validate/mathml4.rng
 - lib/metanorma/validate/metanorma-mathml.rng
 - lib/metanorma/validate/reqt.rng
 - lib/metanorma/validate/schema.rb

data/.hound.yml DELETED Viewed

@@ -1,5 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-ruby:
-  enabled: true
-  config_file: .rubocop.yml

data/lib/metanorma/validate/mathml3-common.rng DELETED Viewed

@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-      This is the Mathematical Markup Language (MathML) 3.0, an XML
-      application for describing mathematical notation and capturing
-      both its structure and content.
-      Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-      Use and distribution of this code are permitted under the terms
-      W3C Software Notice and License
-      http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
--->
-<grammar ns="http://www.w3.org/1998/Math/MathML" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <start>
-    <ref name="math"/>
-  </start>
-  <define name="math">
-    <element name="math">
-      <ref name="math.attributes"/>
-      <zeroOrMore>
-        <ref name="MathExpression"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="MathExpression">
-    <ref name="semantics"/>
-  </define>
-  <define name="NonMathMLAtt">
-    <attribute>
-      <anyName>
-        <except>
-          <nsName ns=""/>
-          <nsName/>
-        </except>
-      </anyName>
-      <data type="string"/>
-    </attribute>
-  </define>
-  <define name="CommonDeprecatedAtt">
-    <optional>
-      <attribute name="other"/>
-    </optional>
-  </define>
-  <define name="CommonAtt">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="xref"/>
-    </optional>
-    <optional>
-      <attribute name="class">
-        <data type="NMTOKENS"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="style">
-        <data type="string"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="href">
-        <data type="anyURI"/>
-      </attribute>
-    </optional>
-    <ref name="CommonDeprecatedAtt"/>
-    <zeroOrMore>
-      <ref name="NonMathMLAtt"/>
-    </zeroOrMore>
-  </define>
-  <define name="math.attributes">
-    <ref name="CommonAtt"/>
-    <optional>
-      <attribute name="display">
-        <choice>
-          <value>block</value>
-          <value>inline</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="maxwidth">
-        <ref name="length"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="overflow">
-        <choice>
-          <value>linebreak</value>
-          <value>scroll</value>
-          <value>elide</value>
-          <value>truncate</value>
-          <value>scale</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="altimg">
-        <data type="anyURI"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="altimg-width">
-        <ref name="length"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="altimg-height">
-        <ref name="length"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="altimg-valign">
-        <choice>
-          <ref name="length"/>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="alttext"/>
-    </optional>
-    <optional>
-      <attribute name="cdgroup">
-        <data type="anyURI"/>
-      </attribute>
-    </optional>
-    <ref name="math.deprecatedattributes"/>
-  </define>
-  <!--
-    the mathml3-presentation schema  adds additional attributes
-    to the math element, all those valid on mstyle
-  -->
-  <define name="math.deprecatedattributes">
-    <optional>
-      <attribute name="mode">
-        <data type="string"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="macros">
-        <data type="string"/>
-      </attribute>
-    </optional>
-  </define>
-  <define name="name">
-    <attribute name="name">
-      <data type="NCName"/>
-    </attribute>
-  </define>
-  <define name="cd">
-    <attribute name="cd">
-      <data type="NCName"/>
-    </attribute>
-  </define>
-  <define name="src">
-    <optional>
-      <attribute name="src">
-        <data type="anyURI"/>
-      </attribute>
-    </optional>
-  </define>
-  <define name="annotation">
-    <element name="annotation">
-      <ref name="annotation.attributes"/>
-      <text/>
-    </element>
-  </define>
-  <define name="annotation-xml.model">
-    <zeroOrMore>
-      <choice>
-        <ref name="MathExpression"/>
-        <ref name="anyElement"/>
-      </choice>
-    </zeroOrMore>
-  </define>
-  <define name="anyElement">
-    <element>
-      <anyName>
-        <except>
-          <nsName/>
-        </except>
-      </anyName>
-      <zeroOrMore>
-        <choice>
-          <attribute>
-            <anyName/>
-          </attribute>
-          <text/>
-          <ref name="anyElement"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="annotation-xml">
-    <element name="annotation-xml">
-      <ref name="annotation.attributes"/>
-      <ref name="annotation-xml.model"/>
-    </element>
-  </define>
-  <define name="annotation.attributes">
-    <ref name="CommonAtt"/>
-    <optional>
-      <ref name="cd"/>
-    </optional>
-    <optional>
-      <ref name="name"/>
-    </optional>
-    <ref name="DefEncAtt"/>
-    <optional>
-      <ref name="src"/>
-    </optional>
-  </define>
-  <define name="DefEncAtt">
-    <optional>
-      <attribute name="encoding">
-        <data type="string"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="definitionURL">
-        <data type="anyURI"/>
-      </attribute>
-    </optional>
-  </define>
-  <define name="semantics">
-    <element name="semantics">
-      <ref name="semantics.attributes"/>
-      <ref name="MathExpression"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="annotation"/>
-          <ref name="annotation-xml"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="semantics.attributes">
-    <ref name="CommonAtt"/>
-    <ref name="DefEncAtt"/>
-    <optional>
-      <ref name="cd"/>
-    </optional>
-    <optional>
-      <ref name="name"/>
-    </optional>
-  </define>
-  <define name="length">
-    <data type="string">
-      <param name="pattern">\s*((-?[0-9]*([0-9]\.?|\.[0-9])[0-9]*(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*</param>
-    </data>
-  </define>
-</grammar>

data/lib/metanorma/validate/mathml3.rng DELETED Viewed

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-      This is the Mathematical Markup Language (MathML) 3.0, an XML
-      application for describing mathematical notation and capturing
-      both its structure and content.
-      Copyright 1998-2010 W3C (MIT, ERCIM, Keio)
-      Use and distribution of this code are permitted under the terms
-      W3C Software Notice and License
-      http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
--->
-<grammar ns="http://www.w3.org/1998/Math/MathML" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns="http://relaxng.org/ns/structure/1.0">
-  <include href="mathml3-content.rng">
-    <a:documentation>Content  MathML</a:documentation>
-  </include>
-  <include href="mathml3-presentation.rng">
-    <a:documentation>Presentation MathML</a:documentation>
-  </include>
-  <include href="mathml3-common.rng">
-    <a:documentation>math and semantics common to both Content and Presentation</a:documentation>
-  </include>
-</grammar>