metanorma-generic 2.4.1 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ca4a738a95870e27c98de6d0fbe097d09680ea4d0cb937bfbf2bcbb132f1d9
-  data.tar.gz: a7f17f995cea68405d7fdfe2cd8d88a2e47d439361085f2840cb4ae3ecba43c2
+  metadata.gz: 887490f8778fe098a195bdc2864f62a157779a0fff114b971e00729314ff0256
+  data.tar.gz: 43a57233fe44dca78b437cfc5b7b38208b25bb9f41ab0a70571c85baa8b6aa90
 SHA512:
-  metadata.gz: 9e922e3c785d8c13798070a8f05e6047dd65e94b3ff6c27f6f2b94b01e6c1dfd7a706cd346248c14f77011e337fcb33b49da8745076d48faf25fa5a1c2347944
-  data.tar.gz: 9841a5dd0d679c4a4c3de1f94fbf4a78cdee6e895edb5ec034ef9cbc6b868bb4bac4a39f0f1a0052bc53fda30df2236834b2445fbff6bf243eed9dba392f522b
+  metadata.gz: f4c1a759d5b44ce75491e9aaa3a1608a815200cabb34c0ecc09e63d5a0f86f3429ff36e7b31b853ddddd7b8acb841abe378591dd03f6bc87eaffd7e2d7648d4d
+  data.tar.gz: a9e8da8406b04cb36db99d948dd2dd82c3bd69bdde02f1564b45248ed9fe5192cc16a8666c20112f9aded72f8b6edaa9ff3a129d7782b3e2da696864415031a1

data/lib/isodoc/generic/html/word_generic_intro.html

@@ -67,6 +67,3 @@ mso-bidi-font-size:11.0pt;color:windowtext'>www.iso.org<o:p></o:p></span></p>
 
 </div>
 
-<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
-
-WORDTOC

data/lib/isodoc/generic/metadata.rb

@@ -11,7 +11,10 @@ class Nokogiri::XML::Node
       h[:text] = text&.strip
       a = attribute_nodes.map(&:to_hash)
       if element? && !a.empty?
-        h[:attr] = a.inject({}) { |m, v| m[v[:name]] = v[:text]; m }
+        h[:attr] = a.inject({}) do |m, v|
+          m[v[:name]] = v[:text]
+          m
+        end
       end
       c = children.map(&:to_hash)
       if element? && !(c&.size == 1 && c[0][:kind] == "text")

data/lib/isodoc/generic/utils.rb

@@ -12,11 +12,16 @@ module IsoDoc
       def baselocation(loc)
         return nil if loc.nil?
         return "" if loc.empty?
+
         return loc
-        f = defined?(self.class::_file) ? (self.class::_file || __FILE__) :
-          __FILE__
+        f = if defined?(self.class::_file)
+              (self.class::_file || __FILE__)
+            else
+              __FILE__
+            end
         File.expand_path(File.join(
-          File.dirname(f), "..", "..", "..", loc))
+                           File.dirname(f), "..", "..", "..", loc
+                         ))
       end
     end
   end

data/lib/isodoc/generic/word_convert.rb

@@ -17,44 +17,51 @@ module IsoDoc
         attr_accessor :_file
       end
 
-      def self.inherited( k )
-        k._file = caller_locations.first.absolute_path
+      def self.inherited(k)
+        k._file = caller_locations(1..1).first.absolute_path
       end
 
       def default_fonts(options)
         {
           bodyfont: (
-            options[:script] == "Hans" ? '"Source Han Sans",serif' : 
-            configuration.word_bodyfont || '"Arial",sans-serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",serif'
+            else
+              configuration.word_bodyfont || '"Arial",sans-serif'
+            end
           ),
           headerfont: (
-            options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : 
-            configuration.word_headerfont ||  '"Arial",sans-serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",sans-serif'
+            else
+              configuration.word_headerfont || '"Arial",sans-serif'
+            end
           ),
-          monospacefont:  configuration.word_monospacefont ||  '"Courier New",monospace',
+          monospacefont: configuration.word_monospacefont || '"Courier New",monospace',
           normalfontsize: configuration.word_normalfontsize,
           smallerfontsize: configuration.word_smallerfontsize,
           footnotefontsize: configuration.word_footnotefontsize,
           monospacefontsize: configuration.word_monospacefontsize,
-        }.transform_values { |v| v&.empty? ? nil : v  }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
-      def default_file_locations(options)
+      def default_file_locations(_options)
         {
           wordstylesheet: baselocation(configuration.wordstylesheet) ||
-          html_doc_path("wordstyle.scss"),
+            html_doc_path("wordstyle.scss"),
           standardstylesheet: baselocation(configuration.standardstylesheet) ||
-          html_doc_path("generic.scss"),
+            html_doc_path("generic.scss"),
           header: baselocation(configuration.header) ||
-          html_doc_path("header.html"),
+            html_doc_path("header.html"),
           wordcoverpage: baselocation(configuration.wordcoverpage) ||
-          html_doc_path("word_generic_titlepage.html"),
+            html_doc_path("word_generic_titlepage.html"),
           wordintropage: baselocation(configuration.wordintropage) ||
-          html_doc_path("word_generic_intro.html"),
-          i18nyaml: (configuration.i18nyaml.is_a?(String) ?
-                     baselocation(configuration.i18nyaml) : nil),
-        ulstyle: "l3",
-        olstyle: "l2",
+            html_doc_path("word_generic_intro.html"),
+          i18nyaml: (if configuration.i18nyaml.is_a?(String)
+                       baselocation(configuration.i18nyaml)
+                     end),
+          ulstyle: "l3",
+          olstyle: "l2",
         }.transform_values { |v| v&.empty? ? nil : v }
       end
 

data/lib/metanorma/generic/converter.rb

@@ -39,12 +39,17 @@ module Metanorma
 
       def doctype(node)
         d = super
-        configuration.doctypes or return d == "article" ? (configuration.default_doctype || "standard") : d
+        node.attr("doctype") == "article" and d = "article"
+        unless configuration.doctypes
+          d == "article" and return (configuration.default_doctype || "standard")
+          return d
+        end
         type = configuration.default_doctype ||
-          configuration.doctypes.keys.dig(0) || "standard"
-        unless configuration.doctypes.keys.include? d
-          @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to '#{type}'")
+          configuration.doctypes.keys[0] || "standard"
+        if !configuration.doctypes.key?(d)
+          (node.attr("doctype") && node.attr("doctype") != "article") and # factory default
+            @log.add("Document Attributes", nil,
+                     "#{d} is not a legal document type: reverting to '#{type}'")
           d = type
         end
         d

data/lib/metanorma/generic/generic.rng

@@ -1,7 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/generic" xmlns="http://relaxng.org/ns/structure/1.0">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+<grammar ns='https://www.metanorma.org/ns/generic' xmlns="http://relaxng.org/ns/structure/1.0">
+  <!--
+    VERSION v1.2.1
+    Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
+    we cannot have a new default namespace: we will end up with a grammar with two different
+    namespaces, one for isostandard and one for csand additions. And we do not want that.
+  -->
   <include href="biblio-standoc.rng"/>
-  <include href="isodoc.rng"/>
+  <include href="isodoc.rng">
+    <start>
+      <ref name="generic-standard"/>
+    </start>
+  </include>
+  <define name="generic-standard">
+    <element name="generic-standard">
+      <ref name="Root-Attributes"/>
+      <ref name="bibdata"/>
+      <zeroOrMore>
+        <ref name="termdocsource"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
+      <optional>
+        <ref name="boilerplate"/>
+      </optional>
+      <ref name="preface"/>
+      <oneOrMore>
+        <ref name="sections"/>
+      </oneOrMore>
+      <zeroOrMore>
+        <ref name="annex"/>
+      </zeroOrMore>
+      <ref name="bibliography"/>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
+    </element>
+  </define>
 </grammar>
-<!-- end overrides -->

data/lib/metanorma/generic/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.2 -->
 <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">
@@ -210,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1349,15 +1353,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>
@@ -2131,6 +2139,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.4.1".freeze
+    VERSION = "2.4.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities