metanorma-iso 3.4.6 → 3.4.7

data/lib/isodoc/iso/presentation_origin.rb

@@ -84,15 +84,11 @@ module IsoDoc
         insert_biblio_callout(elem)
       end
 
-      # TODO share with metanorma dir
-      ISO_PUBLISHER_XPATH = <<~XPATH.freeze
-        ./contributor[role/@type = 'publisher']/organization[abbreviation = 'ISO' or abbreviation = 'IEC' or name = 'International Organization for Standardization' or name = 'International Electrotechnical Commission']
-      XPATH
-
       def insert_biblio_callout(elem)
         semx = elem.document.at("//*[@id = '#{elem['source']}']") or return
         if ref = @bibitem_lookup[semx["bibitemid"]]
-          ref.at(ns(ISO_PUBLISHER_XPATH)) and return
+          Metanorma::Iso::PublisherIdentity
+            .iso_iec_publisher?(ref, ns: method(:ns)) and return
           # is this reference cited with a [n],
           # even if it has its own SDO identifier?
           citeas = ref.at(ns("./docidentifier[@type = 'metanorma-ordinal']")) ||

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -16,7 +16,11 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        @iso_class = instance_of?(IsoDoc::Iso::PresentationXMLConvert)
+        # ISO-only (not inheriting flavours, and -- unlike instance_of? --
+        # not tastes that reuse this class): gate on the document publisher.
+        # metanorma/metanorma-oiml#13.
+        @iso_class = Metanorma::Iso::PublisherIdentity
+          .iso_publisher?(docxml.at(ns("//bibdata")), ns: method(:ns))
         if amd?(docxml)
           @oldsuppressheadingnumbers = @suppressheadingnumbers
           @suppressheadingnumbers = true

data/lib/isodoc/iso/word_cleanup.rb

@@ -181,8 +181,7 @@ module IsoDoc
       # do not use in IEC, BSI, where Word does not use list to generate
       # "Annex A"
       def annex_toc(annexid)
-        instance_of?(IsoDoc::Iso::WordConvert) ||
-          instance_of?(WordDISConvert) or return ""
+        @iso_publisher or return ""
         annexid += 1
         x = "#{@i18n.annex} #{('@'.ord + annexid).chr} "
         [x, annexid]

data/lib/isodoc/iso/word_convert.rb

@@ -58,6 +58,17 @@ module IsoDoc
         end
       end
 
+      # word_cleanup (make_WordToC / annex_toc) runs on the generated Word
+      # HTML, which no longer carries <bibdata>; capture the document's
+      # ISO-publisher identity here, off the source presentation XML, and
+      # propagate it via @iso_publisher. ISO-only (not IEC/BSI, and --
+      # unlike instance_of? -- not tastes reusing this class). oiml#13.
+      def convert1(docxml, filename, dir)
+        @iso_publisher = Metanorma::Iso::PublisherIdentity
+          .iso_publisher?(docxml.at(ns("//bibdata")), ns: method(:ns))
+        super
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body(**body_attr) do |body|

data/lib/metanorma/iso/basicdoc.rng

@@ -1902,15 +1902,40 @@ or as the string "auto"</a:documentation>
     <a:documentation>Mathematically formatted text</a:documentation>
     <element name="stem">
       <ref name="StemAttributes"/>
-      <oneOrMore>
-        <choice>
+      <optional>
+        <text>
           <a:documentation>The content of the mathematically formatted text</a:documentation>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
+        </text>
+      </optional>
+      <optional>
+        <ref name="mathml"/>
+      </optional>
+      <optional>
+        <ref name="asciimath"/>
+      </optional>
+      <optional>
+        <ref name="latexmath"/>
+      </optional>
     </element>
   </define>
+  <define name="latexmath">
+    <a:documentation>Encoding of LatexMath</a:documentation>
+    <element name="latexmath">
+      <text/>
+    </element>
+  </define>
+  <define name="asciimath">
+    <a:documentation>Encoding of AsciiMath</a:documentation>
+    <element name="asciimath">
+      <text/>
+    </element>
+  </define>
+  <define name="mathml">
+    <a:documentation>Encoding of MathML: the official W3C MathML 3.0 grammar (namespace
+http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
+grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
+    <externalRef href="metanorma-mathml.rng"/>
+  </define>
   <define name="StemAttributes">
     <attribute name="type">
       <a:documentation>The notation used to mathematically format the text</a:documentation>

data/lib/metanorma/iso/cleanup_biblio.rb

@@ -90,8 +90,34 @@ module Metanorma
 
       def bibitem_cleanup(xmldoc)
         super
-        unpublished_note(xmldoc)
-        withdrawn_note(xmldoc)
+        cutoff = biblio_cutoff_date(xmldoc)
+        unpublished_note(xmldoc, cutoff)
+        withdrawn_note(xmldoc, cutoff)
+      end
+
+      # The citing document's publication date: reference status annotations
+      # (withdrawn/replaced, under-preparation) are rewound to this date, so a
+      # reference is not shown with a status change that only happened *after*
+      # the citing document was published. metanorma/metanorma-standoc#941.
+      def biblio_cutoff_date(xmldoc)
+        bd = xmldoc.at("//bibdata") or return nil
+        dates = bd.xpath("./date[@type = 'published' or @type = 'issued' or " \
+                         "@type = 'circulated']/on").map { |d| iso_date(d.text) }
+        if (y = bd.at("./copyright/from")&.text)&.match?(/^\d{4}$/)
+          dates << Date.new(y.to_i, 12, 31)
+        end
+        dates.compact.max
+      end
+
+      # Complete a partial ISO date to the end of its period, so a status change
+      # anywhere within the citing document's publication year still counts as
+      # having occurred by publication.
+      def iso_date(str)
+        case str.to_s.strip
+        when /^(\d{4})$/ then Date.new($1.to_i, 12, 31)
+        when /^(\d{4})-(\d{2})/ then Date.new($1.to_i, $2.to_i, -1)
+        else Date.parse(str) rescue nil
+        end
       end
 
       def bibitem_note_types(bib)
@@ -100,21 +126,21 @@ module Metanorma
         end.flatten
       end
 
-      def unpublished_note(xmldoc)
+      def unpublished_note(xmldoc, cutoff = nil)
         xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]").each do |b|
           n = bibitem_note_types(b)
-          n.include?("Unpublished-Status") or unpublished_note1(b)
+          n.include?("Unpublished-Status") or unpublished_note1(b, cutoff)
         end
       end
 
-      def unpublished_note1(bibitem)
+      def unpublished_note1(bibitem, cutoff = nil)
         unpublished_ref?(bibitem) and return
         docid = bibitem.at("./docidentifier[@primary = 'true']") ||
           bibitem.at("./docidentifier[@type = 'ISO' or @type = 'IEC']") ||
           bibitem.at("./docidentifier")
         base_pubid, orig = parse_draft_docid(docid, bibitem)
         insert_unpub_note(bibitem, @i18n.under_preparation
-          .sub("%", dated_draft_id(orig, base_pubid)))
+          .sub("%", dated_draft_id(orig, base_pubid, cutoff)))
         draft_biblio_docid(orig, base_pubid, docid)
       end
 
@@ -132,24 +158,24 @@ module Metanorma
         docid.children = new
       end
 
-      def dated_draft_id(orig, base_pubid)
+      def dated_draft_id(orig, base_pubid, cutoff = nil)
         ret = orig.dup
-        ret[:year] = Date.today.year
+        ret[:year] = cutoff&.year || Date.today.year
         base_pubid.create(**ret).to_s
       end
 
       def unpublished_ref?(bibitem)
-        pub_class(bibitem) > 2 and return true
+        PublisherIdentity.iso_iec_publisher?(bibitem) or return true
         ((s = bibitem.at("./status/stage")) && s.text.match?(/\d/) &&
          (s.text.to_i < 60)) or return true
         false
       end
 
-      def withdrawn_note(xmldoc)
+      def withdrawn_note(xmldoc, cutoff = nil)
         xmldoc.xpath("//bibitem").each do |b|
           n = bibitem_note_types(b)
           n.include?("Unpublished-Status") and next
-          withdrawn_ref?(b) or next
+          withdrawn_ref?(b, cutoff) or next
           if id = replacement_standard(b)
             insert_unpub_note(b, @i18n.cancelled_and_replaced.sub("%", id))
           else insert_unpub_note(b, @i18n.withdrawn)
@@ -157,10 +183,23 @@ module Metanorma
         end
       end
 
-      def withdrawn_ref?(bibitem)
-        pub_class(bibitem) > 2 and return false
+      def withdrawn_ref?(bibitem, cutoff = nil)
+        PublisherIdentity.iso_iec_publisher?(bibitem) or return false
         (s = bibitem.at("./status/stage")) && (s.text.to_i == 95) &&
-          (t = bibitem.at("./status/substage")) && (t.text.to_i == 99)
+          (t = bibitem.at("./status/substage")) && (t.text.to_i == 99) or
+          return false
+        # As-of-date: a withdrawal that only happened after the citing document
+        # was published did not apply then. metanorma/metanorma-standoc#941.
+        wd = withdrawal_date(bibitem)
+        !(cutoff && wd && wd > cutoff)
+      end
+
+      # Date the reference was superseded/withdrawn: the earliest published date
+      # of an obsoletedBy/updates successor.
+      def withdrawal_date(bibitem)
+        bibitem.xpath("./relation[@type = 'obsoletedBy' or @type = 'updates']" \
+                      "/bibitem/date[@type = 'published' or @type = 'circulated']" \
+                      "/on").map { |d| iso_date(d.text) }.compact.min
       end
 
       def replacement_standard(biblio)

data/lib/metanorma/iso/isodoc.rng

@@ -852,7 +852,7 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>Width of the figure block in rendering</a:documentation>
       </attribute>
     </optional>
-    <ref name="BlockAttributes"/>
+    <ref name="BlockAttributesCore"/>
   </define>
   <define name="SourceAttributes" combine="interleave">
     <ref name="BlockAttributes"/>
@@ -1283,7 +1283,11 @@ That concept may be defined as a term within the current document, or it may be
           <a:documentation>Class of input form</a:documentation>
         </attribute>
       </optional>
-      <ref name="BlockAttributes"/>
+      <ref name="BlockAttributesCore">
+        <a:documentation>form declares its own class above, so it uses BlockAttributesCore to
+avoid duplicating the custom-class slot in BlockAttributes. Treated like
+figure. See metanorma/metanorma-standoc#1197</a:documentation>
+      </ref>
       <zeroOrMore>
         <!-- Input form contents -->
         <choice>
@@ -2768,7 +2772,11 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
       </oneOrMore>
     </element>
   </define>
-  <define name="BlockAttributes">
+  <define name="BlockAttributesCore">
+    <a:documentation>Block attributes excluding the custom CSS class. Blocks that already carry
+their own `class` attribute (e.g. figure, via basicdoc FigureAttributes)
+include this directly, to avoid a duplicate-attribute collision with the
+`class` added in BlockAttributes. See metanorma/metanorma-standoc#1197</a:documentation>
     <optional>
       <attribute name="keep-with-next">
         <a:documentation>Keep this block on the same page as the following block in paged media</a:documentation>
@@ -2800,6 +2808,17 @@ to span across both columns</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="BlockAttributes">
+    <a:documentation>Universal block attributes, including a custom CSS class (space-separated,
+appended additively to the block's built-in HTML class, HTML output only).
+See metanorma/metanorma-standoc#1197</a:documentation>
+    <ref name="BlockAttributesCore"/>
+    <optional>
+      <attribute name="class">
+        <a:documentation>Custom CSS class(es) for the block in HTML output</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="DisplayDirective">
     <a:documentation>Directive on how to render a block in Presentation XML </a:documentation>
     <optional>

data/lib/metanorma/iso/mathml3-common.rng

@@ -0,0 +1,257 @@
+<?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>