metanorma-generic 2.0.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63def4be8b40f7940f1359d56a759fd027b54c60c628c57a7bcd0d457517fd09
-  data.tar.gz: e81ccf24f2a0be29e526248dce9c0101b2b33d51b2afa94c9d6abc9db9c5deda
+  metadata.gz: 05f89e4a6adb0222c1cc71f880010902337d92cde88328a4754a61c5f30eb7dc
+  data.tar.gz: f506457c7e94d17694fe9512b559aa82a1665952bfdd06ae1554fc9b5e2d3d11
 SHA512:
-  metadata.gz: 28df8386ff89a224b0fe5b6a18bc7588fc97a88cd4ed2b93d6bee9b364d934a05cf1ee94c2209b4521ece0050919e949597e430abc9c8dc465311e7105a34e01
-  data.tar.gz: 65c07f7b771ce4927f9afc590ab8ead89a8a4f316f341cee75770c3b31670023d5fd6f8e4801f85da01be9ef318be4abdd7cf46c27c5dac0ed5309f84992ca16
+  metadata.gz: 704cda28036803f93d1cb11790dfe605fcc2c2eb4ff1ba09007b4ce30bf84cd511e307640f7803c83a1447d5f9af650dc32b00a447b0a704ca73ac198ea68523
+  data.tar.gz: b70f01e52405512c56e8fd3ef3994a245972f92f49029b2700c54d16b3cf7179fed7fd706c7fe683da3aae9cd294db4cf1bd561333b2689315ec8e0a58ad30fe

data/lib/isodoc/generic/base_convert.rb

@@ -14,7 +14,7 @@ module IsoDoc
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
           d["id"] = h2["id"]
           d.children.first.previous =
-            "<strong>#{h2.remove.children.to_xml}</strong>&nbsp;"
+            "<strong>#{h2.remove.children.to_xml}</strong>&#xa0;"
         end
         docxml
       end

data/lib/isodoc/generic/html/html_generic_titlepage.html

@@ -70,6 +70,8 @@
   </div>
 {% endif %}
 
+<div class="coverpage-warning" id="coverpage-note-destination"/>
+
 <div class="info-section">
 <div class="copyright">
   <p class="year">

data/lib/isodoc/generic/html/word_generic_titlepage.html

@@ -64,6 +64,10 @@ documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-si
 
 {% endif %}
 
+<div class="coverpage-warning" id="coverpage-note-destination" align="center" style='margin-bottom:6.0pt;text-align:center;
+border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:
+1.0pt 4.0pt 1.0pt 4.0pt'/>
+
 </div>
 
 <p class="MsoNormal" align="center" style='text-align:center'><span lang="EN-GB"

data/lib/isodoc/generic/html_convert.rb

@@ -4,7 +4,6 @@ require "isodoc"
 
 module IsoDoc
   module Generic
-
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
@@ -18,19 +17,25 @@ 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.html_bodyfont || '"Overpass",sans-serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",serif'
+            else
+              configuration.html_bodyfont || '"Overpass",sans-serif'
+            end
           ),
           headerfont: (
-            options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : 
-            configuration.html_headerfont || '"Overpass",sans-serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",sans-serif'
+            else
+              configuration.html_headerfont || '"Overpass",sans-serif'
+            end
           ),
           monospacefont: configuration.html_monospacefont || '"Space Mono",monospace',
           normalfontsize: configuration.html_normalfontsize,
@@ -43,21 +48,23 @@ module IsoDoc
       def default_file_locations(_options)
         {
           htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
-          html_doc_path("htmlstyle.scss"),
+            html_doc_path("htmlstyle.scss"),
           htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
-          html_doc_path("html_generic_titlepage.html"),
+            html_doc_path("html_generic_titlepage.html"),
           htmlintropage: baselocation(configuration.htmlintropage) ||
-          html_doc_path("html_generic_intro.html"),
+            html_doc_path("html_generic_intro.html"),
           scripts: baselocation(configuration.scripts),
-          i18nyaml: (configuration.i18nyaml.is_a?(String) ? 
-                     baselocation(configuration.i18nyaml) : nil)
+          i18nyaml: (if configuration.i18nyaml.is_a?(String)
+                       baselocation(configuration.i18nyaml)
+                     end),
         }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def googlefonts
         return unless configuration.webfont
+
         Array(configuration.webfont).map do |x|
-          %{<link href="#{x.gsub(/\&amp;/, '&')}" rel="stylesheet">}
+          %{<link href="#{x}" rel="stylesheet"/>}
         end.join("\n")
       end
 
@@ -66,4 +73,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/generic/init.rb

@@ -11,7 +11,7 @@ module IsoDoc
         @meta = Metadata.new(lang, script, i18n)
       end
 
-      def xref_init(lang, script, klass, i18n, options)
+      def xref_init(lang, script, _klass, i18n, options)
         html = HtmlConvert.new(language: lang, script: script)
         @xrefs = Xref.new(lang, script, html, i18n, options)
       end
@@ -20,7 +20,7 @@ module IsoDoc
         f = Metanorma::Generic.configuration.i18nyaml
         f = nil unless f.is_a? String
         @i18n = I18n.new(
-          lang, script, i18nyaml || f || @i18nyaml)
+          lang, script, i18nyaml: i18nyaml || f || @i18nyaml)
       end
 
       include Utils

data/lib/isodoc/generic/presentation_xml_convert.rb

@@ -5,16 +5,15 @@ require "isodoc"
 module IsoDoc
   module Generic
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
-      def annex1(f)
-        lbl = @xrefs.anchor(f['id'], :label)
-        if t = f.at(ns("./title"))
+      def annex1(elem)
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
           t.children = "<strong>#{t.children.to_xml}</strong>"
         end
-        prefix_name(f, "<br/>", lbl, "title")
+        prefix_name(elem, "<br/>", lbl, "title")
       end
 
       include Init
     end
   end
 end
-

data/lib/metanorma/generic/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -848,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -922,9 +954,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/lib/metanorma/generic/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -851,6 +888,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1225,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1252,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.0.3".freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -3,7 +3,6 @@ require "metanorma/generic/version"
 require "forwardable"
 require "yaml"
 
-
 module Metanorma
   module Generic # rubocop:disable Style/MutableConstant
     ORGANIZATION_NAME_SHORT = "Acme"

data/metanorma-generic.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

data/metanorma.yml.example

@@ -70,5 +70,5 @@ symbols_titles:
   - Abbreviations
 normref_titles:
   - Normative references
-bibliography_titles
+bibliography_titles:
   - Bibliography

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: Metanorma template gem for customisation.