metanorma-generic 2.0.4 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45775140cca6282358f9b35080c4a1a2fca6e71e4312743f27660573263b813b
-  data.tar.gz: '02856167ec2d7572a1e69485c2c35dd9576a7f9566ab2577215b01f658421944'
+  metadata.gz: f62fbca91a932dfd2962b5bc10e5fcb2ee58b26dbc1caead516decf679fa1fe3
+  data.tar.gz: 3b940ed44e676a48c5d263e57651e5e18883148fedc04776c27e31821552b083
 SHA512:
-  metadata.gz: 878071bc35aea75cd59acffadef5784392ee465752c100a5ebb4a51fed450f86b82e1a307a27e4a7c2cd0fc5d3fc876b2b03aa6c4f532c9b42966ce18cb1f2a8
-  data.tar.gz: dff26dda9647322c2a548ea8f5b11881799ca866e045efe4f2aeaff6ea19567f2658f6183d1983126b60bff0def43b5d74a0c17e6815043ef998c66f95ec9569
+  metadata.gz: af9a7f040d1a5202ab38d52b34705bdff7130c3513a479bf2f9530bd9f012869359408c09da7e644995b897c925a3e2ffd2131d8f85f06b78c13de6734206f16
+  data.tar.gz: b4fa73685306cff6096ed6cb7689e755feee0666b494d56ea68d940e31f373ae146293c2fd4ccef9b4b025bb66db965762d2f4f4c852aa025dd7596d1fdea992

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/generic.scss

@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.TableTitle
+p.TableTitle, p.ListTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -135,13 +135,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.0pt;
 	mso-bidi-font-size:11.0pt;
-	font-family:$bodyfont;
-    font-size:10.0pt;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+	font-family:$bodyfont;
+        font-size:10.0pt;
+}
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
 	mso-style-priority:10;
@@ -471,11 +472,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.5pt;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:10.5pt;
+	font-family:$bodyfont;
+}
 p.QuoteAttribution
         {text-align:right;
         mso-style-priority:99;
@@ -505,8 +508,6 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-border-themecolor:accent1;
 	padding:0cm;
 	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
-	font-size:12.0pt;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:$bodyfont;
@@ -519,6 +520,10 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
 	font-style:italic;}
+p.Admonition, li.Admonition {
+	font-size:12.0pt;
+	font-family:$bodyfont;
+}
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;
@@ -732,12 +737,13 @@ div.example {
 p.example, li.example, td.example {
   margin-right: 0pt;
   margin-left: 0pt;
+  font-size:10.0pt;
+  font-family:$bodyfont;
 }
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:10.0pt;
-        font-family:$bodyfont;}
+}
 
 td.example p.MsoListParagraph {
   font-size: 10.0pt;

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/htmlstyle.scss

@@ -336,6 +336,7 @@ pre {
 
 @include admonitionBlock();
 @include recommendationBlock();
+@include listBlock();
 
 .FigureTitle, .SourceTitle {
   @include blockTitle()

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/i18n.rb

@@ -7,17 +7,22 @@ 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 load_yaml1(lang, script)
         return super unless configuration.i18nyaml
-        file = configuration.i18nyaml.is_a?(Hash) ?
-          configuration.i18nyaml[lang] : configuration.i18nyaml
+
+        file = if configuration.i18nyaml.is_a?(Hash)
+                 configuration.i18nyaml[lang]
+               else
+                 configuration.i18nyaml
+               end
         return super if file.nil?
+
         y = YAML.load_file(baselocation(file))
-        super.merge(y)
+        super.deep_merge(y)
       end
 
       include Utils

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">
@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -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">
@@ -934,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

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>
@@ -245,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -287,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -323,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -851,6 +897,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 +1234,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1261,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.4".freeze
+    VERSION = "2.1.2".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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-06-06 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.3.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Metanorma template gem for customisation.