metanorma-csand 1.0.12 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aaf5dad445a83317143fbdad1534c9ff74ec9c083952609f4d4bd90542b5205
-  data.tar.gz: 688033b19b5cbe59f82ebe7b69c737b8c33dfddbdaa9a94dcc352beb52ee228e
+  metadata.gz: 620bf5ceef94857dc88b940d11a7063805dcb457183bafccffac421c7adbf4d2
+  data.tar.gz: 7d759000284422aad56f28ff5b7df7d05634f38dab1513b4827a5a2045acb14f
 SHA512:
-  metadata.gz: '08ca16e7d8022aaf147153a0c991550ccd115b67a3588979bc61465da26265bae8adcf67cd3d2f20a88bf1471c25efa2185f6ad88b4b345e19de6ab875e54764'
-  data.tar.gz: 9330d4482157b48abd8842b6f6d4c975dfe2face533ca48c428fda446b750b7ed2585f810b0c26f89207c68e60d1c673701874dd60da03f03d7713a95425de87
+  metadata.gz: 0ed7c4db29034e5cd44db84938ab6c6c4725fa72169ded1c65e07af970cdcd12eb04ff3669b0a80f2e7d343d6e2ba06bdbfba923023980953364cdd6d4fa562e
+  data.tar.gz: 3de1db054e93eb947b40d23683b757ae99dc163d023aae2627ced5226b9cd1765d8b9e468fa21f8e2cfb46d10ddd7d09a035eb7f6332f1cae406bd1bc4f938a4

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/csand/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/csand/isodoc.rng

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

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

@@ -631,6 +631,28 @@ td.example_label {
   margin-top: 0;
 }
 
+.example {
+    background-color: #F5F6F6;
+    color: rgb(91, 94, 95);
+    padding: 0.5em;
+    margin: 2em 0 1em 0;
+    text-align: left;
+    padding-left: 2em;
+}
+
+.example p {
+    margin: 0;
+}
+
+.example .example-title {
+font-weight: 700;
+font-size: 1.2em;
+text-transform: uppercase;
+margin-top:0;
+margin-left:-1.5em;
+}
+
+
 /*
 3.9 Tables
 */

data/lib/isodoc/csand/metadata.rb

@@ -42,7 +42,7 @@ module IsoDoc
       end
 
       def unpublished(status)
-        %w(published withdrawn).include? status.downcase
+        !%w(published withdrawn).include? status.downcase
       end
     end
   end

data/lib/metanorma/csand/version.rb

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

data/metanorma-csand.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csand
 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: asciidoctor
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement