metanorma-gb 1.0.12 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ccd7f3961a3138c3aa4126b3d6efb68fe3d2e2efd5216563c7bc5e48c7269c
-  data.tar.gz: c547a63cca08a9f0b3a46b536c893bc75ef4fdff233bc050ff906efc4f3ce347
+  metadata.gz: 10351e9508e07385bebe80fc1655dcb55da123a23263140f8bc5d2924289a404
+  data.tar.gz: 05ac2092d8dcab14fd2010de03473265835427d0326c0c565fe6c824483e777d
 SHA512:
-  metadata.gz: f60532239eae7906adea6f217d21d6a25f620c0686574fd791903072a3053355cc08e923616c8639171d6fe101a75ca33d476f4ffd88b5151831b7bdd34aea3a
-  data.tar.gz: b0b54bdb356f951dfa7b05a91c8f3b0ed8106e733382d61c9b2835c405df938a2cf14c7bbfc9154d9c097705eb57cf4d7e3130d5cd7fe34238d4cad0a20ae065
+  metadata.gz: 2267cd3211dd73c0d7add935a7f1318f44e18ea771ea90e744a85d0b1d609a8cc42203142128a288bbb1895f9e633387d65c4d400b09392257b91405e217b5b8
+  data.tar.gz: 361e89d32fd9f188d2d117e596760ada3f67442a074d42e32fba1ef8d0f12ce41118861085cd85b27de786571d9d2ce7264805fbf5097d583d27acb1e5b27564

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - 2.3
   - ruby-head
 before_install:
-  - gem install bundler -v 1.16.1
+  - gem install bundler -v 2.0.1
   - unset _JAVA_OPTIONS
 matrix:
   allow_failures:

data/lib/asciidoctor/gb/biblio.rng

@@ -286,18 +286,23 @@
   </define>
   <define name="address">
     <element name="address">
-      <oneOrMore>
+      <choice>
         <!-- iso191606 TODO -->
-        <ref name="street"/>
-      </oneOrMore>
-      <ref name="city"/>
-      <optional>
-        <ref name="state"/>
-      </optional>
-      <ref name="country"/>
-      <optional>
-        <ref name="postcode"/>
-      </optional>
+        <group>
+          <oneOrMore>
+            <ref name="street"/>
+          </oneOrMore>
+          <ref name="city"/>
+          <optional>
+            <ref name="state"/>
+          </optional>
+          <ref name="country"/>
+          <optional>
+            <ref name="postcode"/>
+          </optional>
+        </group>
+        <ref name="formattedAddress"/>
+      </choice>
     </element>
   </define>
   <define name="street">
@@ -325,6 +330,11 @@
       <text/>
     </element>
   </define>
+  <define name="formattedAddress">
+    <element name="formattedAddress">
+      <text/>
+    </element>
+  </define>
   <define name="person-identifier">
     <element name="identifier">
       <attribute name="type">

data/lib/asciidoctor/gb/isodoc.rng

@@ -911,6 +911,9 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
     </element>
   </define>
   <define name="stem">

data/lib/isodoc/gb/gbconvert.rb

@@ -21,11 +21,11 @@ module IsoDoc
         File.join(File.dirname(__FILE__), loc)
       end
 
-      def format_agency(agency, format)
-        return "<img class='logo' src='#{@standardissuerimg}' alt='#{agency.join(",")}'></img>" if @standardissuerimg
+      def format_agency(agency, format, localdir)
+        return "<img class='logo' src='#{localdir}/#{@standardissuerimg}' alt='#{agency.join(",")}'></img>" if @standardissuerimg
         return agency unless agency.is_a?(Array)
         if agency == ["中华人民共和国国家质量监督检验检疫总局", "中国国家标准化管理委员会"]
-          logo = "gb-issuer-default.gif"
+          logo = "#{localdir}/gb-issuer-default.gif"
           FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
           return "<img class='logo' src='#{logo}' alt='#{agency.join(",")}'></img>"
         end
@@ -40,14 +40,14 @@ module IsoDoc
         ret
       end
 
-      def format_logo(prefix, scope, _format)
+      def format_logo(prefix, scope, _format, localdir)
         logo = @meta.standard_logo(prefix)
-        return format_logo1(logo, prefix, scope) if @standardlogoimg
+        return format_logo1(logo, prefix, scope, localdir) if @standardlogoimg
         return "" if %w(enterprise social-group).include? scope
         if logo.nil?
           "<span style='font-size:36pt;font-weight:bold'>#{prefix}</span>"
         else
-          format_logo1(logo, prefix, scope)
+          format_logo1("#{localdir}/#{logo}", prefix, scope, localdir)
         end
       end
 
@@ -58,9 +58,9 @@ module IsoDoc
       end
 
 
-      def format_logo1(logo, prefix, scope)
+      def format_logo1(logo, prefix, scope, localdir)
         local = local_logo_suffix(scope)
-        return "<img class='logo' width='113' height='56' src='#{@standardlogoimg}' alt='#{prefix}'></img>"\
+        return "<img class='logo' width='113' height='56' src='#{localdir}/#{@standardlogoimg}' alt='#{prefix}'></img>"\
           "#{local}" if  @standardlogoimg
         logo += ".gif"
         FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo

data/lib/isodoc/gb/gbhtmlrender.rb

@@ -39,17 +39,8 @@ module IsoDoc
         { valign: "top", class: "example_label",
           style: "padding:2pt 2pt 2pt 2pt" }.freeze
 
-      def example_parse(node, out)
-        out.table **attr_code(id: node["id"], class: "example") do |t|
-          t.tr do |tr|
-            tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << l10n(example_label(node) + ":")
-            end
-            tr.td **{ valign: "top", class: "example" } do |td|
-              node.children.each { |n| parse(n, td) }
-            end
-          end
-        end
+      def example_label(node)
+        l10n(super + ":")
       end
 
       def note_parse(node, out)
@@ -134,11 +125,11 @@ module IsoDoc
 
       def populate_template(docxml, format)
         meta = @meta.get.merge(@labels)
-        logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format)
+        logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
         logofile = @meta.standard_logo(meta[:gbprefix])
         docxml = termref_resolve(docxml)
         meta[:standard_agency_formatted] =
-          @common.format_agency(meta[:standard_agency], format)
+          @common.format_agency(meta[:standard_agency], format, @localdir)
         meta[:standard_logo] = logo
         template = Liquid::Template.parse(docxml)
         template.render(meta.map { |k, v| [k.to_s, v] }.to_h)
@@ -183,8 +174,8 @@ module IsoDoc
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]}<br/><br/>"
           t.b do |b|
-          name&.children&.each { |c2| parse(c2, b) }
-        end
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
       end
 

data/lib/isodoc/gb/gbwordrender.rb

@@ -134,12 +134,12 @@ module IsoDoc
 
       def populate_template(docxml, format)
         meta = @meta.get.merge(@labels)
-        logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format)
+        logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
         logofile = @meta.standard_logo(meta[:gbprefix])
         @files_to_delete << logofile + ".gif" unless logofile.nil?
         docxml = termref_resolve(docxml)
         meta[:standard_agency_formatted] =
-          @common.format_agency(meta[:standard_agency], format)
+          @common.format_agency(meta[:standard_agency], format, @localdir)
         meta[:standard_logo] = logo
         template = Liquid::Template.parse(docxml)
         template.render(meta.map { |k, v| [k.to_s, v] }.to_h)

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

@@ -1091,7 +1091,6 @@ font-family: $headerfont;
 .example .example-title {
 font-weight: 700;
 text-transform: uppercase;
-text-align: center;
 margin-top:0;
 }
 

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

@@ -878,6 +878,7 @@ text-align: center;
     padding: 0.5em;
     margin: 2em 0 1em 0;
     text-align: left;
+    padding-left: 2em;
 }
 
 .example p {
@@ -887,8 +888,8 @@ text-align: center;
 .example .example-title {
 font-weight: 700;
 text-transform: uppercase;
-text-align: center;
 margin-top:0;
+margin-left:-1.5em;
 }
 
 /*

data/lib/isodoc/gb/metadata.rb

@@ -158,7 +158,7 @@ module IsoDoc
       def standard_class(scope, prefix, mandate)
         standardclassimg = get[:standardclassimg]
         ret = @agencies.standard_class(scope, prefix, mandate)
-        return "<img class='logo' src='#{standardclassimg}' alt='#{ret}'></img>" if standardclassimg
+        return "<img class='logo' src='#{@localdir}/#{standardclassimg}' alt='#{ret}'></img>" if standardclassimg
         ret
       end
 

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.0.12"
+    VERSION = "1.1.0"
   end
 end

data/metanorma-gb.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "metanorma-iso", "~> 1.0.1"
+  spec.add_dependency "metanorma-iso", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.1"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "gb-agencies", "~> 0.0.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement