metanorma-standoc 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ebe9c752511841d783fa0d9820ee7bd26448703e6990bbd406ae0d92ab35417
-  data.tar.gz: b6e82ef1d270969216902f745314145917cbdc376fe92fe11b76964cdd8bb6f1
+  metadata.gz: a7f6a1a5d54bb2ad0e64f98ebe39c519bea34a6252781a294bacae9342072c13
+  data.tar.gz: a3f32b49f251c6555799c53dcc1d00b08edaf5500a267bd9e459faff33d364c0
 SHA512:
-  metadata.gz: 7b35e03b90cf332d1c100003d1e5bd72a524ffb085eb3b85428ebaac975f51d69562404e31f761894b22d51a9245be804f27a6e230299ed904ab497ebfc1d3c5
-  data.tar.gz: 29a42e39bbc67f18b07d557f32da4dbd3a6747f913108b4cfa2a74f610484cfd114d127e78fe8b21e4bf45ef255de955947967402f78d4f4cf3bfb07b77a6694
+  metadata.gz: 58d985cce5eb147eb952d9494e1a64207d95a35f054f9aec84378562bb6bdedfd0073306df23ee9214631c6ba73201cd4e98a3abcea8fd56d968235724885202
+  data.tar.gz: 87a87b2e41d1e763c8bdff7254a64d6c2bd7710b33c6f81909313bd889feba22c932ddc70c725fa0bc40434a404872ffdc80884c1cd9d6f16da4f42828c2fd39

data/lib/isodoc/html/htmlstyle.css

@@ -319,6 +319,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/isodoc/{pdf_convert.rb → standoc/pdf_convert.rb}

@@ -7,7 +7,7 @@ module IsoDoc
     #
     class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
-        @libdir = File.dirname(__FILE__)
+        @libdir = File.dirname(__FILE__, 2)
         super
       end
 

data/lib/metanorma/cleanup/amend.rb

@@ -58,7 +58,7 @@ module Metanorma
       end
 
       def move_attrs_to_amend(clause, amend)
-        %w(change path path_end title).each do |e|
+        %w(change path path_end title position).each do |e|
           clause[e] or next
           amend[e] = clause[e]
           clause.delete(e)

data/lib/metanorma/cleanup/image.rb

@@ -55,38 +55,95 @@ module Metanorma
       end
 
       def img_cleanup(xmldoc)
-        if @datauriimage
-          xmldoc.xpath("//image").each do |i|
-            # do not datauri encode SVG, we need to deduplicate its IDs
-            unless read_in_if_svg(i, @localdir)
-              i["src"] = Vectory::Utils::datauri(i["src"], @localdir)
-            end
-          end
-        end
+        altmedia_cleanup(xmldoc)
+        @datauriimage and datauri_image(xmldoc)
         svg_cleanup(xmldoc)
         xmldoc
       end
 
+      def datauri_image(xmldoc)
+        xmldoc.xpath("//image | //altsource").each do |i|
+          # do not datauri encode SVG, we need to deduplicate its IDs
+          unless read_in_if_svg?(i, @localdir)
+            i["src"] &&= Vectory::Utils::datauri(i["src"], @localdir)
+          end
+        end
+      end
+
+      def altmedia_cleanup(xmldoc)
+        xmldoc.xpath("//image[@altmedia]").each do |i|
+          altmedia_root_cleanup(i)
+          d = altmedia_prep(i)
+          d or next
+          altsource_populate(i, d)
+        end
+      end
+
+      def altsource_populate(img, dlist)
+        dlist.each do |e|
+          e[:dd].nil? and next
+          img << "<altsource tag='#{e[:dt]}'/>"
+          image_attr_copy(e[:dd], img.elements.last)
+          altsource_attr_copy(e[:dd], img.elements.last, img)
+        end
+      end
+
+      def image_attr_copy(src, dest)
+        %w(src mimetype filename alt).each do |k|
+          src[k] and dest[k] = src[k]
+        end
+      end
+
+      def altsource_attr_copy(src, dest, img)
+        %w(media).each do |k|
+          src[k] and dest[k] = src[k]
+        end
+        %w(height width).each do |k|
+          dest[k] = img[k]
+          src[k] or next
+          src[k] == "auto" and next
+          dest[k] = src[k]
+        end
+      end
+
+      def altmedia_root_cleanup(img)
+        %w(altmedia src filename mimetype).each do |k|
+          img.delete(k)
+        end
+      end
+
+      def altmedia_prep(img)
+        dl = img.at("./dl") or return
+        d = extract_symbols_list(dl.remove).map do |e|
+          { dt: e[:dt].text, dd: e[:dd].at(".//image") }
+        end
+        unless d.detect { |e| e[:dt] == "default" }
+          d << d.first.dup
+          d[-1][:dt] = "default"
+        end
+        d
+      end
+
       def svg_cleanup(xmldoc)
         svg_uniqueids(xmldoc)
         svg_classupdate(xmldoc)
       end
 
-      def read_in_if_svg(img, localdir)
+      def read_in_if_svg?(img, localdir)
         img["src"] or return false
         path = Vectory::Utils.svgmap_rewrite0_path(img["src"], localdir)
         File.file?(path) or return false
         types = MIME::Types.type_for(path) or return false
         types.first == "image/svg+xml" or return false
         svg = File.read(path, encoding: "utf-8") or return false
-        img.children = (Nokogiri::XML(svg).root)
+        img.add_first_child Nokogiri::XML(svg).root
         true
       end
 
       def svg_classupdate(xmldoc)
         xmldoc.xpath("//m:svg[m:style]", "m" => SVG_NS)
           .each_with_index do |s, i|
-            svg_classupdate1(s, s.at("./m:style", "m" => SVG_NS), i)
+          svg_classupdate1(s, s.at("./m:style", "m" => SVG_NS), i)
         end
       end
 
@@ -101,7 +158,7 @@ module Metanorma
       end
 
       def svg_suffix_css_style(node, idx)
-        node[:node] == :style_rule && /\./.match?(node[:selector][:value]) or
+        (node[:node] == :style_rule && /\./.match?(node[:selector][:value])) or
           return
         v = node[:selector][:value]
           .gsub(/([^.\s]*\.\S+)/, "\\1_inject_#{idx}")
@@ -149,7 +206,7 @@ module Metanorma
         svg_uniqueids2(svg, iri_properties, idx, ids)
         new_ids = id_elems.map { |x| x["id"] }
           .map { |x| x + (ids[x] ? "_inject_#{idx}" : "") }
-        ids.merge(new_ids.each.map { |value| [value, true] }.to_h)
+        ids.merge(new_ids.each.to_h { |value| [value, true] })
       end
 
       def svg_uniqueids2(svg, iri_properties, idx, ids)

data/lib/metanorma/cleanup/text.rb

@@ -3,7 +3,7 @@ module Metanorma
     module Text
       def ancestor_include?(elem, ancestors)
         path = elem.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
-        !path.intersection(ancestors).empty?
+        path.intersect?(ancestors)
       end
 
       # process example/p, example/sourcecode, not example on its own:
@@ -30,29 +30,41 @@ module Metanorma
       end
 
       def lines_strip_textspan(span, nextspan)
-        lines = span[:text].lines[0..-2].map(&:rstrip) <<
-          span[:text].lines[-1]&.sub(/\n$/, "")
+        #AAA
+        lines = []
+        span[:text] and
+          lines = span[:text].lines[0..-2].map(&:rstrip) <<
+            span[:text].lines[-1]&.sub(/\n$/, "")
+        #lines = span[:text].lines[0..-2].map(&:rstrip) <<
+  #span[:text].lines[-1]&.sub(/\n$/, "")
         # no final line rstrip: can be space linking to next line
         span[:last] or lines << nextspan[:text].lines.first # next token context
         lines
       end
 
-      # TODO: we are not counting empty xref, eref here
       def gather_text_for_linebreak_cleanup(block)
-        x = block.xpath(".//text()").map do |e|
-          { elem: e, text: e.text, stem: ancestor_include?(e, %w(stem)),
-            skip: ancestor_include?(e, PRESERVE_LINEBREAK_ELEMENTS) }
-        end
+        x = gather_text_for_linebreak_cleanup1(block)
         x.empty? and return x
-        x.each { |e| e[:skip] ||= !e[:text].include?("\n") }
         x.each_with_index do |e, i|
+          e[:skip] ||= !e[:text].include?("\n")
           # do not treat stem linebreaks as meaningful
           e[:skip] ||= x[i + 1]&.dig(:stem)
+          e[:skip] ||= !e[:elem].text?
         end
         x[-1][:last] = true
         x
       end
 
+      def gather_text_for_linebreak_cleanup1(block)
+        block.xpath(".//text() | .//eref[not(text())] |  " \
+                        ".//xref[not(text())] | .//termref[not(text())] | " \
+                        ".//link[not(text())] ").map do |e|
+                          #x = block.xpath(".//text()").map do |e|
+          { elem: e, text: e.text, stem: ancestor_include?(e, %w(stem)),
+            skip: ancestor_include?(e, PRESERVE_LINEBREAK_ELEMENTS) }
+        end
+      end
+
       def smartquotes_cleanup(xmldoc)
         xmldoc.xpath("//date").each { |d| Metanorma::Utils::endash_date(d) }
         if @smartquotes then smartquotes_cleanup1(xmldoc)
@@ -79,14 +91,16 @@ module Metanorma
         end
       end
 
-      # "abc<tag/>", def => "abc",<tag/> def
-      # TODO?
-      def uninterrupt_quotes_around_xml1(xmldoc)
-        xmldoc.xpath("//text()[preceding-sibling::*[1]]").each do |n|
-          uninterrupt_quotes_around_xml_skip(n) and next
-          uninterrupt_quotes_around_xml1(n.previous)
-        end
-      end
+#AAA
+# "abc<tag/>", def => "abc",<tag/> def
+# TODO?
+#def uninterrupt_quotes_around_xml1(xmldoc)
+  #xmldoc.xpath("//text()[preceding-sibling::*[1]]").each do |n|
+    #uninterrupt_quotes_around_xml_skip(n) and next
+    #uninterrupt_quotes_around_xml1(n.previous)
+  #end
+#end
+
 
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
@@ -111,6 +125,7 @@ module Metanorma
            ignoretext?(elem.previous)))
       end
 
+      # "abc<tag/>", def => "abc",<tag/> def
       def uninterrupt_quotes_around_xml1(elem)
         prev = elem.at(".//preceding::text()[1]") or return
         /\S\Z/.match?(prev.text) or return

data/lib/metanorma/converter/blocks.rb

@@ -1,6 +1,7 @@
 require "uri"
-require_relative "./blocks_notes_examples"
-require_relative "./blocks_image"
+require_relative "blocks_notes"
+require_relative "blocks_examples"
+require_relative "blocks_image"
 
 module Metanorma
   module Standoc
@@ -42,6 +43,7 @@ module Metanorma
         role == "definition" and return termdefinition(node)
         role == "boilerplate" and return boilerplate_note(node)
         role == "key" and return key_block(node)
+        role == "altmedia" and return altmedia_block(node)
         open1(node)
       end
 

data/lib/metanorma/converter/blocks_image.rb

@@ -28,6 +28,7 @@ module Metanorma
       def figure_attrs(node)
         attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
           .merge(class: node.attr("class"),
+                 height: node.attr("height"),
                  width: node.attr("width")))
       end
 
@@ -39,6 +40,17 @@ module Metanorma
           end
         end
       end
+
+      def altmedia_block(node)
+        noko do |xml|
+          xml.figure **figure_attrs(node) do |f|
+            block_title(node, f)
+            f.image **image_attributes(node, src: false, altmedia: true) do |i|
+              i << node.content
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/metanorma/converter/{blocks_notes_examples.rb → blocks_notes.rb}

@@ -120,66 +120,6 @@ module Metanorma
         node.attr("name") == "todo" and return todo(node)
         nil
       end
-
-      def term_example(node)
-        noko do |xml|
-          xml.termexample **attr_code(id_attr(node)
-            .merge(keepasterm: node.option?("termexample") || nil)) do |ex|
-            wrap_in_para(node, ex)
-          end
-        end
-      end
-
-      def example(node)
-        role = node.role || node.attr("style")
-        ret = example_to_requirement(node, role) ||
-          example_by_role(node, role) and return ret
-        (in_terms? || node.option?("termexample")) and return term_example(node)
-        reqt_subpart?(role) and return requirement_subpart(node)
-        example_proper(node)
-      end
-
-      def example_by_role(node, role)
-        case role
-        when "pseudocode" then pseudocode_example(node)
-        when "svgmap" then svgmap_example(node)
-        when "form" then form(node)
-        when "definition" then termdefinition(node)
-        when "figure" then figure_example(node)
-        end
-      end
-
-      def example_to_requirement(node, role)
-        @reqt_models.requirement_roles.key?(role&.to_sym) or return
-        # need to call here for proper recursion ordering
-        select_requirement_model(node)
-        requirement(node,
-                    @reqt_models.requirement_roles[role.to_sym], role)
-      end
-
-      # prevent A's and other subs inappropriate for pseudocode
-      def pseudocode_example(node)
-        node.blocks.each { |b| b.remove_sub(:replacements) }
-        noko do |xml|
-          xml.figure **example_attrs(node).merge(class: "pseudocode") do |ex|
-            block_title(node, ex)
-            wrap_in_para(node, ex)
-          end
-        end
-      end
-
-      def example_attrs(node)
-        attr_code(id_unnum_attrs(node).merge(keep_attrs(node)))
-      end
-
-      def example_proper(node)
-        noko do |xml|
-          xml.example **example_attrs(node) do |ex|
-            block_title(node, xml)
-            wrap_in_para(node, ex)
-          end
-        end
-      end
     end
   end
 end

data/lib/metanorma/converter/init.rb

@@ -196,7 +196,8 @@ module Metanorma
       def biblio_cutoff(node)
         dates = %w(revdate published-date accessed-date created-date
                    implemented-date confirmed-date updated-date issued-date
-                   circulated-date unchanged-date).each_with_object([]) do |k, m|
+                   circulated-date unchanged-date copyright-year)
+          .each_with_object([]) do |k, m|
           date = node.attr(k) or next
           m << date
         end

data/lib/metanorma/converter/inline.rb

@@ -44,13 +44,13 @@ module Metanorma
         attrs, text = stem_attrs(node, text)
         if /<([^:>&]+:)?math(\s+[^>&]+)?> |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
-          xml.stem **attrs.merge(type: "MathML") do |s|
+          xml.stem **attrs, type: "MathML" do |s|
             s << xml_encode(text)
           end
         elsif style == :latexmath then latex_parse(text, xml, attrs)
         else
           xml.stem text&.gsub("&amp;#", "&#") || "",
-                   **attrs.merge(type: "AsciiMath")
+                   **attrs, type: "AsciiMath"
         end
       end
 
@@ -69,8 +69,8 @@ module Metanorma
 
       def latex_parse(text, xml, attr)
         latex = latex_parse1(text, attr[:block]) or
-          return xml.stem **attr.merge(type: "MathML")
-        xml.stem **attr.merge(type: "MathML") do |s|
+          return xml.stem **attr, type: "MathML"
+        xml.stem **attr, type: "MathML" do |s|
           math = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, ""))
             .elements[0]
           math.delete("alttext")
@@ -138,12 +138,14 @@ module Metanorma
         types.first.to_s
       end
 
-      def image_attributes(node)
-        sourceuri = image_src_uri(node)
-        uri = sourceuri
-        type = image_mimetype(uri)
-        uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
-        image_attributes1(node, uri, sourceuri, type)
+      def image_attributes(node, src: true, altmedia: nil)
+        if src
+          sourceuri = image_src_uri(node)
+          uri = sourceuri
+          type = image_mimetype(uri)
+          uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
+        end
+        image_attributes1(node, uri, sourceuri, type, altmedia)
       end
 
       def image_src_uri(node)
@@ -158,7 +160,7 @@ module Metanorma
         uri
       end
 
-      def image_attributes1(node, uri, sourceuri, type)
+      def image_attributes1(node, uri, sourceuri, type, altmedia)
         /^data:/.match?(sourceuri) and sourceuri = nil
         attr_code(id_attr(node)
           .merge(src: uri, mimetype: type,
@@ -166,6 +168,8 @@ module Metanorma
                  width: node.attr("width") || "auto",
                  filename: node.attr("filename") || sourceuri,
                  title: node.attr("titleattr"),
+                 media: node.attr("media"),
+                 altmedia: altmedia,
                  alt: node.alt == node.attr("default-alt") ? nil : node.alt))
       end
 

data/lib/metanorma/converter/section.rb

@@ -28,6 +28,7 @@ module Metanorma
         ret.merge(change: node.attributes["change"],
                   path: node.attributes["path"],
                   path_end: node.attributes["path_end"],
+                  position: node.attributes["position"],
                   title: node.attributes["title"])
       end
 

data/lib/metanorma/converter/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.3.1".freeze
+    VERSION = "3.3.2".freeze
   end
 end

data/lib/metanorma/validate/biblio.rng

@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/validate/image.rb

@@ -15,7 +15,7 @@ module Metanorma
         end
 
         def image_exists(doc)
-          doc.xpath("//image").each do |i|
+          doc.xpath("//image[@src] | //altmedia[@src]").each do |i|
             Vectory::Utils::url?(i["src"]) and next
             Vectory::Utils::datauri?(i["src"]) and next
             expand_path(i["src"]) and next
@@ -31,7 +31,7 @@ module Metanorma
         end
 
         def png_validate(doc)
-          doc.xpath("//image[@mimetype = 'image/png']").each do |i|
+          doc.xpath("//image[@mimetype = 'image/png'][@src]").each do |i|
             Vectory::Utils::url?(i["src"]) and next
             uri = Vectory::Utils::datauri?(i["src"])
             path = uri ? save_dataimage(i["src"]) : expand_path(i["src"])
@@ -55,7 +55,7 @@ module Metanorma
 
         def image_toobig(doc)
           @dataurimaxsize.zero? and return
-          doc.xpath("//image").each do |i|
+          doc.xpath("//image[@src]").each do |i|
             i["src"].size > @dataurimaxsize and
               @log.add("STANDOC_46", i.parent)
           end

data/lib/metanorma/validate/isodoc.rng

@@ -641,8 +641,85 @@ This is done if the footnote reference is already presented in some other form,
         </ref>
       </zeroOrMore>
     </define>
+    <define name="altsource">
+      <a:documentation>Alternative file to use as media</a:documentation>
+      <element name="altsource">
+        <ref name="MediaAttributes"/>
+        <optional>
+          <attribute name="tag">
+            <a:documentation>Comma-delimited tag to indicate when the alternate file is to be used, 
+at minimum allows contain `html`, `doc`, `pdf` as the main target formats of Metanorma,
+and `default` for the fallback. The presence of an altsource tagged `default` is required</a:documentation>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="media">
+            <a:documentation>CSS media query to indicate when the alternate file is to be used</a:documentation>
+          </attribute>
+        </optional>
+      </element>
+    </define>
+    <define name="image">
+      <a:documentation>Container for image content</a:documentation>
+      <choice>
+        <element name="image">
+          <ref name="RequiredId"/>
+          <ref name="ImageAttributes">
+            <a:documentation>When specified along with altsource, ImageAttributes give the default image to be rendered</a:documentation>
+          </ref>
+          <ref name="ImageBody"/>
+        </element>
+        <element name="svg">
+          <a:documentation>Add svg mark up to image</a:documentation>
+          <oneOrMore>
+            <choice>
+              <text/>
+              <ref name="AnyElement"/>
+            </choice>
+          </oneOrMore>
+        </element>
+      </choice>
+    </define>
+    <define name="ImageAttributes">
+      <optional>
+        <ref name="MediaAttributes">
+          <a:documentation>If the image contains altsource, the media attributes are given on each of the altsource elements instead of the root node</a:documentation>
+        </ref>
+      </optional>
+      <ref name="MediaAccessibilityAttributes"/>
+      <optional>
+        <attribute name="width">
+          <a:documentation>Height of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <a:documentation>Width of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="ImageBody">
+    <optional>
+      <element name="svg">
+        <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="altsource">
+        <a:documentation>Alternative files to use as media</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="key">
     <a:documentation>Key to a table, figure, or formula</a:documentation>
     <element name="key">
@@ -930,34 +1007,6 @@ titlecase, or lowercase</a:documentation>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
-  <define name="image" combine="choice">
-    <choice>
-      <element name="image">
-        <ref name="RequiredId"/>
-        <ref name="ImageAttributes"/>
-        <optional>
-          <element name="svg">
-            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
-            <oneOrMore>
-              <choice>
-                <text/>
-                <ref name="AnyElement"/>
-              </choice>
-            </oneOrMore>
-          </element>
-        </optional>
-      </element>
-      <element name="svg">
-        <a:documentation>Add svg mark up to image</a:documentation>
-        <oneOrMore>
-          <choice>
-            <text/>
-            <ref name="AnyElement"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </choice>
-  </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">
       <a:documentation>Bibliographic source for the information in the paragraph

data/lib/metanorma/validate/validate.rb

@@ -1,4 +1,4 @@
-require "metanorma/converter/utils"
+require_relative "../converter/utils"
 require_relative "image"
 require_relative "section"
 require_relative "table"

data/lib/metanorma-standoc.rb

@@ -1,5 +1,5 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
-require_relative "isodoc/pdf_convert"
+require_relative "isodoc/standoc/pdf_convert"
 require_relative "metanorma/converter/converter"
 require_relative "metanorma/converter/version"
 require "asciidoctor/extensions"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -465,57 +465,12 @@ files:
 - LICENSE
 - Makefile
 - README.adoc
-- lib/asciidoctor/standoc/base.rb
-- lib/asciidoctor/standoc/blocks.rb
-- lib/asciidoctor/standoc/blocks_notes.rb
-- lib/asciidoctor/standoc/cleanup.rb
-- lib/asciidoctor/standoc/cleanup_amend.rb
-- lib/asciidoctor/standoc/cleanup_block.rb
-- lib/asciidoctor/standoc/cleanup_boilerplate.rb
-- lib/asciidoctor/standoc/cleanup_footnotes.rb
-- lib/asciidoctor/standoc/cleanup_image.rb
-- lib/asciidoctor/standoc/cleanup_inline.rb
-- lib/asciidoctor/standoc/cleanup_maths.rb
-- lib/asciidoctor/standoc/cleanup_ref.rb
-- lib/asciidoctor/standoc/cleanup_ref_dl.rb
-- lib/asciidoctor/standoc/cleanup_reqt.rb
-- lib/asciidoctor/standoc/cleanup_section.rb
-- lib/asciidoctor/standoc/cleanup_section_names.rb
-- lib/asciidoctor/standoc/cleanup_symbols.rb
-- lib/asciidoctor/standoc/cleanup_table.rb
-- lib/asciidoctor/standoc/cleanup_terms.rb
-- lib/asciidoctor/standoc/cleanup_terms_designations.rb
-- lib/asciidoctor/standoc/cleanup_text.rb
-- lib/asciidoctor/standoc/cleanup_toc.rb
-- lib/asciidoctor/standoc/cleanup_xref.rb
-- lib/asciidoctor/standoc/converter.rb
-- lib/asciidoctor/standoc/deprecated.rb
-- lib/asciidoctor/standoc/front.rb
-- lib/asciidoctor/standoc/front_contributor.rb
-- lib/asciidoctor/standoc/inline.rb
-- lib/asciidoctor/standoc/lists.rb
-- lib/asciidoctor/standoc/macros.rb
-- lib/asciidoctor/standoc/macros_form.rb
-- lib/asciidoctor/standoc/macros_note.rb
-- lib/asciidoctor/standoc/macros_terms.rb
-- lib/asciidoctor/standoc/ref.rb
-- lib/asciidoctor/standoc/ref_sect.rb
-- lib/asciidoctor/standoc/ref_utility.rb
-- lib/asciidoctor/standoc/render.rb
-- lib/asciidoctor/standoc/reqt.rb
-- lib/asciidoctor/standoc/section.rb
-- lib/asciidoctor/standoc/table.rb
-- lib/asciidoctor/standoc/term_lookup_cleanup.rb
-- lib/asciidoctor/standoc/terms.rb
-- lib/asciidoctor/standoc/utils.rb
-- lib/asciidoctor/standoc/validate.rb
-- lib/asciidoctor/standoc/validate_section.rb
 - lib/isodoc/base.standard.xsl
 - lib/isodoc/html/html_titlepage.html
 - lib/isodoc/html/htmlstyle.css
 - lib/isodoc/html/htmlstyle.scss
 - lib/isodoc/html/scripts.html
-- lib/isodoc/pdf_convert.rb
+- lib/isodoc/standoc/pdf_convert.rb
 - lib/metanorma-standoc.rb
 - lib/metanorma/cleanup/amend.rb
 - lib/metanorma/cleanup/asciibib.rb
@@ -558,7 +513,7 @@ files:
 - lib/metanorma/converter/blocks.rb
 - lib/metanorma/converter/blocks_examples.rb
 - lib/metanorma/converter/blocks_image.rb
-- lib/metanorma/converter/blocks_notes_examples.rb
+- lib/metanorma/converter/blocks_notes.rb
 - lib/metanorma/converter/converter.rb
 - lib/metanorma/converter/date_utils.rb
 - lib/metanorma/converter/front.rb

data/lib/asciidoctor/standoc/base.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/base"

data/lib/asciidoctor/standoc/blocks.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/blocks"

data/lib/asciidoctor/standoc/blocks_notes.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/blocks_notes"

data/lib/asciidoctor/standoc/cleanup.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup"

data/lib/asciidoctor/standoc/cleanup_amend.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_amend"

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_block"

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_boilerplate"

data/lib/asciidoctor/standoc/cleanup_footnotes.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_footnotes"

data/lib/asciidoctor/standoc/cleanup_image.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_image"

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_inline"

data/lib/asciidoctor/standoc/cleanup_maths.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_maths"

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_ref"

data/lib/asciidoctor/standoc/cleanup_ref_dl.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_ref_dl"

data/lib/asciidoctor/standoc/cleanup_reqt.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_reqt"

data/lib/asciidoctor/standoc/cleanup_section.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_section"

data/lib/asciidoctor/standoc/cleanup_section_names.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_section_names"

data/lib/asciidoctor/standoc/cleanup_symbols.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_symbols"

data/lib/asciidoctor/standoc/cleanup_table.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_table"

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_terms"

data/lib/asciidoctor/standoc/cleanup_terms_designations.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_terms_designations"

data/lib/asciidoctor/standoc/cleanup_text.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_text"

data/lib/asciidoctor/standoc/cleanup_toc.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_toc"

data/lib/asciidoctor/standoc/cleanup_xref.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/cleanup_xref"

data/lib/asciidoctor/standoc/converter.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/converter"

data/lib/asciidoctor/standoc/deprecated.rb

@@ -1,7 +0,0 @@
-warn "Please replace your references to Asciidoctor::Standoc with "\
-     "Metanorma::Standoc and your instances of require 'asciidoctor/standoc' "\
-     "with require 'metanorma/standoc'"
-
-exit 127 if ENV["METANORMA_DEPRECATION_FAIL"]
-
-Asciidoctor::Standoc = Metanorma::Standoc unless defined? Asciidoctor::Standoc

data/lib/asciidoctor/standoc/front.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/front"

data/lib/asciidoctor/standoc/front_contributor.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/front_contributor"

data/lib/asciidoctor/standoc/inline.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/inline"

data/lib/asciidoctor/standoc/lists.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/lists"

data/lib/asciidoctor/standoc/macros.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/macros"

data/lib/asciidoctor/standoc/macros_form.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/macros_form"

data/lib/asciidoctor/standoc/macros_note.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/macros_note"

data/lib/asciidoctor/standoc/macros_terms.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/macros_terms"

data/lib/asciidoctor/standoc/ref.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/ref"

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/ref_sect"

data/lib/asciidoctor/standoc/ref_utility.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/ref_utility"

data/lib/asciidoctor/standoc/render.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/render"

data/lib/asciidoctor/standoc/reqt.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/reqt"

data/lib/asciidoctor/standoc/section.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/section"

data/lib/asciidoctor/standoc/table.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/table"

data/lib/asciidoctor/standoc/term_lookup_cleanup.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/term_lookup_cleanup"

data/lib/asciidoctor/standoc/terms.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/terms"

data/lib/asciidoctor/standoc/utils.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/utils"

data/lib/asciidoctor/standoc/validate.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/validate"

data/lib/asciidoctor/standoc/validate_section.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/standoc/deprecated"
-require "metanorma/standoc/validate_section"