metanorma-standoc 2.10.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11972c007dd10b95b91d8598f5dce3843e59f7867e53768f43f03d04c63bf321
-  data.tar.gz: c22fd5262f6024f145c23d9f88471a9d8d061d51e7346fdac3535701715c36e5
+  metadata.gz: 35f94b1c019edeb4422907e08dea706e5aa5f1ebfda48b2c6f0d518b66beec9c
+  data.tar.gz: eb5f4dc2f20109119d5d562fc08ce9e425fe4c0b0353ed8283a5b8887bc293ef
 SHA512:
-  metadata.gz: 2f39425e1441e9b6d251669be2e3fd02967cd41a1f4f5bd65c71e9546a4e510bcf42ab89203eade13afa4e755847b4b3557c0be3c2a9839efd5a64ec013b5d36
-  data.tar.gz: bf360c1ce44587d5c7244e0edbb759109db93bd71c7c852c94bd3b020ca70fc4d981582891f98588492a923ee87e5224b2ed33617dd4cd37edf7480cc1e24955
+  metadata.gz: 197988a7da6707a851cd24b584436825c3130e74ce2b792ad24cb8a86d0fc92c168f9eb0b494798d4119c94e0a915a5537c91d9a4d2de1880873fecbc64fc102
+  data.tar.gz: e7688aaecf8a901914588538d39b52d21bd7b871692c0bf889ab3147f325cd6586fee88210a1aaba50fef05c70d5a37bbb7d5a867013000c7e8eea3a3904b009

data/lib/metanorma/standoc/base.rb

@@ -14,18 +14,20 @@ require "mn-requirements"
 module Metanorma
   module Standoc
     module Base
-      XML_ROOT_TAG = "standard-document".freeze
-      XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
+      #XML_ROOT_TAG = "standard-document".freeze
+      #XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
       FONTS_MANIFEST = "fonts-manifest".freeze
 
       attr_accessor :log
 
       def xml_root_tag
-        self.class::XML_ROOT_TAG
+        #self.class::XML_ROOT_TAG
+        "metanorma"
       end
 
       def xml_namespace
-        self.class::XML_NAMESPACE
+        #self.class::XML_NAMESPACE
+        "https://www.metanorma.org/ns/standoc"
       end
 
       def document(node)
@@ -87,7 +89,8 @@ module Metanorma
       def makexml1(node)
         result = ["<?xml version='1.0' encoding='UTF-8'?>",
                   "<#{xml_root_tag} type='semantic' version='#{version}' " \
-                  "schema-version='#{schema_version}'>"]
+                  "schema-version='#{schema_version}' " \
+                  "flavor='#{processor.new.asciidoctor_backend}'>"]
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</#{xml_root_tag}>"

data/lib/metanorma/standoc/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>
@@ -941,6 +947,8 @@ May be electronic (e.g. Twitter direct message, email) or voice (e.g. a remark m
 typically cited as "personal communication")</a:documentation>
       <value>conversation</value>
       <a:documentation>An exchange of messages between two or more persons. May be electronic (e.g. web chat) or voice (e.g. phone call)</a:documentation>
+      <value>collection</value>
+      <a:documentation>A compound resource consisting of other resources, which are themselves presupposed to have their type specified..</a:documentation>
       <value>misc</value>
       <a:documentation>Bibliographic type not adequately described in the foregoing</a:documentation>
     </choice>
@@ -1271,17 +1279,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -132,7 +132,7 @@ module Metanorma
           bibdata = bibdata.at("./relation[@type = 'derivedFrom']/bibitem")
           ident = bibdata.at("./docidentifier[@primary = 'true']") ||
             bibdata.at("./docidentifier")
-          xmldoc.xpath("//xref[@target = '#{d}'][normalize-space(text()) = '']")
+          xmldoc.xpath("//xref[@target = '#{d}'][normalize-space(.//text()) = '']")
             .each { |x| x << ident.text }
         end
       end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -46,7 +46,7 @@ module Metanorma
         xmldoc.at("//metanorma-extension/semantic-metadata/" \
                   "headless[text() = 'true']") and return nil
         x = xmldoc.dup
-        x.root.add_namespace(nil, self.class::XML_NAMESPACE)
+        x.root.add_namespace(nil, xml_namespace)
         xml = Nokogiri::XML(x.to_xml)
         @isodoc ||= isodoc(@lang, @script, @locale)
         @isodoc.info(xml, nil)

data/lib/metanorma/standoc/cleanup_toc.rb

@@ -56,7 +56,7 @@ module Metanorma
         elsif depth < entry[:depth]
           ret += "<li><ul>" * (entry[:depth] - depth)
         end
-        ret + "<li><xref target='#{entry[:target]}'>#{entry[:text]}</xref></li>"
+        ret + "<li><xref target='#{entry[:target]}'><display-text>#{entry[:text]}</display-text></xref></li>"
       end
 
       def toc_cleanup_clause(xmldoc)
@@ -70,10 +70,10 @@ module Metanorma
       end
 
       def toc_cleanup_clause_entry(xmldoc, list)
-        list.xpath(".//xref[not(text())]").each do |x|
+        list.xpath(".//xref[not(text())][not(display-text)]").each do |x|
           c1 = xmldoc.at("//*[@id = '#{x['target']}']")
           t = c1.at("./variant-title[@type = 'toc']") || c1.at("./title")
-          x << t.dup.children
+          x << "<display-text>#{to_xml(t.dup.children)}</display-text>"
         end
       end
 

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -35,11 +35,12 @@ module Metanorma
       def extract_localities(elem)
         elem.children.empty? and return
         f = elem.children.first
-        f.text? or return
+        f.text? or return xref_display_text(elem, elem.children.remove)
         head = f.remove.text
         tail = elem.children.remove
-        extract_localities1(elem, head)
-        tail and elem << tail
+        d = extract_localities1(elem, head)
+        tail and d << tail
+        d.children.empty? and d.remove
       end
 
       LOCALITY_REGEX_STR_TRIPLEDASH = <<~REGEXP.freeze
@@ -69,7 +70,13 @@ module Metanorma
           b = elem.add_child("<localityStack/>").first if m[:punct] == ";"
         end
         fill_in_eref_connectives(elem)
-        elem.add_child(text) if text
+        xref_display_text(elem, text)
+      end
+
+      def xref_display_text(elem, text)
+        d = elem.add_child("<display-text></display-text>").first
+        d.add_child(text) if text
+        d
       end
 
       # clause=3;and!5 => clause=3;and!clause=5
@@ -135,6 +142,9 @@ module Metanorma
       end
 
       def eref_stack(xmldoc)
+        xmldoc.xpath("//eref/display-text[eref]").each do |e|
+          e.replace(e.children)
+        end
         xmldoc.xpath("//eref[eref]").each do |e|
           e.name = "erefstack"
           e.delete("bibitemid")
@@ -196,6 +206,11 @@ module Metanorma
         xmldoc.xpath("//xref//xref").each do |x|
           x.name = "location"
         end
+        xmldoc.xpath("//xref[not(./display-text)]").each do |x|
+          c = x.xpath("./*[not(self::locality or self::localityStack or self::location)] | ./text()")
+          c.empty? and next
+          xref_display_text(x, c.remove)
+        end
       end
 
       def xref_cleanup1(xmldoc)

data/lib/metanorma/standoc/converter.rb

@@ -23,10 +23,8 @@ module Metanorma
       Asciidoctor::Extensions.register do
         preprocessor Metanorma::Standoc::ResolveIncludePreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlPreprocessor
-        preprocessor Metanorma::Plugin::Lutaml::LutamlUmlAttributesTablePreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlUmlDatamodelDescriptionPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlEaXmiPreprocessor
-        preprocessor Metanorma::Plugin::Lutaml::LutamlUmlClassPreprocessor
         inline_macro Metanorma::Plugin::Lutaml::LutamlFigureInlineMacro
         inline_macro Metanorma::Plugin::Lutaml::LutamlTableInlineMacro
         block_macro Metanorma::Plugin::Lutaml::LutamlDiagramBlockMacro

data/lib/metanorma/standoc/init.rb

@@ -6,7 +6,7 @@ module Metanorma
       def init(node)
         init_vars
         init_misc(node)
-        init_processing(node)
+        init_processing(node) # feeds init_i18n
         init_log(node)
         init_image(node)
         init_reqt(node)
@@ -39,12 +39,13 @@ module Metanorma
         @embed_hdr = node.attr("embed_hdr")
         @embed_id = node.attr("embed_id")
         @document_scheme = document_scheme(node)
-        @xrefstyle = node.attr("xrefstyle")
         @source_linenums = node.attr("source-linenums-option") == "true"
         @default_doctype = "standard"
       end
 
       def init_processing(node)
+        @localdir = Metanorma::Utils::localdir(node)
+        @xrefstyle = node.attr("xrefstyle")
         @novalid = node.attr("novalid")
         @smartquotes = node.attr("smartquotes") != "false"
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
@@ -100,7 +101,6 @@ module Metanorma
                       File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
                     else ""
                     end
-        @localdir = Metanorma::Utils::localdir(node)
         @output_dir = outputdir node
       end
 
@@ -109,7 +109,9 @@ module Metanorma
         @script = node.attr("script") ||
           Metanorma::Utils.default_script(node.attr("language"))
         @locale = node.attr("locale")
-        @isodoc = isodoc(@lang, @script, @locale, node.attr("i18nyaml"))
+        i18nyaml = node.attr("i18nyaml")
+        i18nyaml &&= File.join(@localdir, i18nyaml)
+        @isodoc = isodoc(@lang, @script, @locale, i18nyaml)
         @i18n = @isodoc.i18n
       end
 

data/lib/metanorma/standoc/isodoc-compile.rng

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar ns="https://www.metanorma.org/ns/standoc" xmlns="http://relaxng.org/ns/structure/1.0">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
   <include href="biblio-standoc.rng"/>
   <include href="isodoc.rng"/>
 </grammar>

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.1 -->
+<!-- VERSION v2.0.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -459,11 +459,14 @@ gives an explicit page orientation</a:documentation>
           <a:documentation>Description of location in a reference, which can be combined with other locations in a single citation</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="PureTextElement">
+      <optional>
+        <element name="display-text">
           <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-        </ref>
-      </zeroOrMore>
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -1205,10 +1208,13 @@ numbers</a:documentation>
         <value>presentation</value>
       </choice>
     </attribute>
+    <attribute name="flavor">
+      <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
+    </attribute>
   </define>
   <define name="standard-document">
     <a:documentation>Representation of a standardisation document</a:documentation>
-    <element name="standard-document">
+    <element name="metanorma">
       <ref name="Root-Attributes"/>
       <ref name="bibdata">
         <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>

data/lib/metanorma/standoc/render.rb

@@ -2,12 +2,14 @@ module Metanorma
   module Standoc
     module Base
       def html_extract_attributes(node)
+        i18nyaml = node.attr("i18nyaml")
+        i18nyaml &&= File.join(@localdir, i18nyaml)
         {
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
-          i18nyaml: node.attr("i18nyaml"),
+          i18nyaml: i18nyaml,
           scope: node.attr("scope"),
           htmlstylesheet: node.attr("htmlstylesheet"),
           htmlstylesheet_override: node.attr("htmlstylesheet-override"),
@@ -48,12 +50,14 @@ module Metanorma
       end
 
       def doc_extract_attributes(node)
+        i18nyaml = node.attr("i18nyaml")
+        i18nyaml &&= File.join(@localdir, i18nyaml)
         attrs = {
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
           headerfont: node.attr("header-font"),
           monospacefont: node.attr("monospace-font"),
-          i18nyaml: node.attr("i18nyaml"),
+          i18nyaml: i18nyaml,
           scope: node.attr("scope"),
           wordstylesheet: node.attr("wordstylesheet"),
           wordstylesheet_override: node.attr("wordstylesheet-override"),

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.10.4".freeze
+    VERSION = "3.0.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
-  spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.12.4"
+  spec.add_dependency "iev", "~> 0.3.5"
+  spec.add_dependency "isodoc", "~> 3.0.0"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.10.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.4
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.4
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -590,7 +590,7 @@ homepage: https://github.com/metanorma/metanorma-standoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -606,7 +606,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: metanorma-standoc realises standards following the Metanorma standoc model
 test_files: []