metanorma-gb 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa05f8bf06951b8946e1afd845994998671639afeee7d8b1d43440cd7018482f
-  data.tar.gz: 16d11618fee5ea6be6f1fe005a21d12ae139a89fc2b0da08dc42f1cb33267d6d
+  metadata.gz: 6eec7b9e19b7b3b8dd7404fb9a7960ed4c3b6af39c297b0bb97347e78a7b5ff0
+  data.tar.gz: cca358c241fbd7d574d457e0a1c23c89ce1f22480c412c856b9d8a0870379cab
 SHA512:
-  metadata.gz: 1645f269ef3e8467e699e4ea8800e3ae62a5b816ae4dbbe3c157bfe773d6414a2b46f3eaf34afe341a72fc143237279ac1db8793ce3f97f0c828f9f832f818fb
-  data.tar.gz: 223e4d2f52db3c8389f7ecd062504b123505a93bc169c981227f10ea1f1cc5c24c1993e8e7c95cb198c8fb96f5e6bc11befc7f3dd0e38bd48c7959565e691955
+  metadata.gz: 34fed5d0aa192dc60c3d51a2292d4d17b9f6adacc910a60dbb0cff5b56a2afed9e448615480418cea7ef6e827dfb028cf91bb16421c50ff48f7c15504641947c
+  data.tar.gz: 717f6439e96d00d6c8914e8c89183bcbebcdf682776ada477e49051aded1a30d9f227adfd992de0992891463fbfa04bedda27f8a6c8720aeb93a52c5280e01a8

data/lib/asciidoctor/gb/basicdoc.rng

@@ -336,7 +336,9 @@
   </define>
   <define name="tname">
     <element name="name">
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="tclass">
@@ -812,6 +814,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -850,6 +855,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -875,6 +883,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>

data/lib/asciidoctor/gb/biblio.rng

@@ -919,6 +919,7 @@
     <choice>
       <value>main</value>
       <value>alt</value>
+      <text/>
     </choice>
   </define>
   <define name="seriesorganization">

data/lib/asciidoctor/gb/isodoc.rng

@@ -252,7 +252,11 @@
         </zeroOrMore>
       </group>
       <oneOrMore>
-        <ref name="clause-subsection"/>
+        <choice>
+          <ref name="clause-subsection"/>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+        </choice>
       </oneOrMore>
     </choice>
   </define>

data/lib/asciidoctor/gb/isostandard.rng

@@ -215,8 +215,14 @@
         <optional>
           <ref name="section-title"/>
         </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="bibitem"/>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references"/>
@@ -244,6 +250,9 @@
             </choice>
           </attribute>
         </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <ref name="dl"/>
       </element>
     </define>
@@ -271,6 +280,9 @@
         <optional>
           <ref name="section-title"/>
         </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <choice>
           <oneOrMore>
             <ref name="term"/>

data/lib/isodoc/gb/gbbaseconvert.rb

@@ -101,7 +101,7 @@ module IsoDoc
         @note = true
         out.table **attr_code(id: node["id"], class: "Note") do |t|
           t.tr do |tr|
-        @libdir = File.dirname(__FILE__)
+            @libdir = File.dirname(__FILE__)
             tr.td **EXAMPLE_TBL_ATTR do |td|
               td << l10n(note_label(node) + ":")
             end
@@ -168,9 +168,9 @@ module IsoDoc
         parts = x.split(%r{(\s*\[MODIFICATION\]|,)}m)
         parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == "," &&
           !/^\s*#{@modified_lbl}/.match(parts[2])
-        parts.map do |p|
-          /\s*\[MODIFICATION\]/.match(p) ? l10n(", #{@modified_lbl} &mdash; ") : p
-        end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))
+          parts.map do |p|
+            /\s*\[MODIFICATION\]/.match(p) ? l10n(", #{@modified_lbl} &mdash; ") : p
+          end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))
       end
 
       def termref_resolve(docxml)
@@ -192,6 +192,10 @@ module IsoDoc
         end
       end
 
+      def clausedelimspace(out)
+        out << "&#x3000;"
+      end
+
       def clause_name(num, title, div, header_class)
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
@@ -204,29 +208,17 @@ module IsoDoc
         div.parent.at(".//h1")
       end
 
-      def clause_parse_title(node, div, c1, out)
-        if node["inline-header"] == "true"
-          inline_header_title(out, node, c1)
-        else
-          div.send "h#{anchor(node['id'], :level) || '1'}" do |h|
-            lbl = anchor(node['id'], :label, false)
-            h << "#{lbl}.&#x3000;" if !@suppressheadingnumbers
-            c1 and c1.children.each { |c2| parse(c2, h) }
-          end
+      def example_span_label(node, div, name)
+        n = get_anchors[node["id"]]
+        div.span **{ class: "example_label" } do |p|
+          lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
+            l10n("#{@example_lbl} #{n[:label]}")
+          p << l10n(lbl + ":")
+          name and !lbl.nil? and p << "&nbsp;&mdash; "
+          name and name.children.each { |n| parse(n, div) }
         end
       end
 
-       def example_span_label(node, div, name)
-      n = get_anchors[node["id"]]
-      div.span **{ class: "example_label" } do |p|
-        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
-          l10n("#{@example_lbl} #{n[:label]}")
-        p << l10n(lbl + ":")
-        name and !lbl.nil? and p << "&nbsp;&mdash; "
-        name and name.children.each { |n| parse(n, div) }
-      end
-    end
-
       def example_p_parse(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|

data/lib/isodoc/gb/html/gb.scss

@@ -403,6 +403,8 @@ table.MsoISOTable td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
+table.MsoISOTable p
+{font-size:10.0pt; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
 	mso-tstyle-rowband-size:0;

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso