metanorma-csand 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b7a7301a69e7fbc2707f013c4217a111c4e67b8ef997634d6c90fce08e3833
-  data.tar.gz: a6329cf4b60098b3673dec7000d8061ec904e2dc1bfd61069b1824ace37adc2c
+  metadata.gz: 3f72fb053ef6f5498b07128eab4938b772ae6f978dc405fe7410dd1ce536d25c
+  data.tar.gz: 94cfb906070e72023908f51d3dd0719a564adc365fa8a7931534f5a1f2ac39af
 SHA512:
-  metadata.gz: 471e2aabf44fd8379d62597599b7cd40b7aecb46789653465d0fa456697e721dcaba9976422e18828039305a10442fee534a49adcf2be6b7aa6c97aa59635ddd
-  data.tar.gz: bfdb9b031cfb401aecf485eaea9ebdfc87bfce0589c07894d9e2cff046dd14ca86a02b89547aa70e2cf4d6f0612c842662948801c11612c43524ff65ba1a285a
+  metadata.gz: 5742c99c1d46d8d6c7eef7edd12e63e7b6e97a7cd99c27039a94b3bc6ec4eb51280f6f6bb9c2089f66ab535c9e775b3f79b4436cc9997e2fac97f3b9e519da58
+  data.tar.gz: bdd4cfc7feb8223270814bcef373258b2a1c3ba2334e6a4466d71af39de1b0b5d213b8cf6b2391bd54a6ad42a0ef8e3ea9bfed5a29611ad6acc57fecc042875c

data/lib/asciidoctor/csand/biblio.rng

@@ -414,6 +414,20 @@
       <ref name="BibliographicItem"/>
     </element>
   </define>
+  <define name="relaton_collection">
+    <element name="relaton-collection">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="btitle"/>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemType" combine="choice">
     <choice>
       <value>article</value>
@@ -531,7 +545,10 @@
   </define>
   <define name="fetched">
     <element name="fetched">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validity">
@@ -549,17 +566,26 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -744,6 +770,7 @@
     <element name="from">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>
@@ -752,6 +779,7 @@
     <element name="to">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>

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

@@ -88,6 +88,7 @@ dl {
 }
 
 dt {
+  font-weight: 500;
   grid-column-start: 1;
 }
 
@@ -212,6 +213,12 @@ main {
 
 }
 
+@media screen {
+  img {
+      width: 100%;
+      height: auto;
+  }
+}
 
 
 #toc ul {
@@ -399,16 +406,17 @@ p.document-stage {
 
 h1,h2,h3,h4,h5,h6 {
   font-family: $headerfont;
+  line-height: 1.2em;
   color: black;
   font-weight: 600;
-  margin-top: 2em;
+  margin-top: 1.5em;
   margin-bottom: 0.3em;
 }
 
 h1 {
   font-size: 1.8em;
   text-transform: uppercase;
-  margin-top: 2em;
+/*  margin-top: 2em;*/
 }
 
 h1#content {
@@ -503,7 +511,7 @@ a:hover {
 */
 
 ul, ol {
-  margin-left: 0.5em;
+  margin-left: 1em;
   list-style-position: inside;
 }
 
@@ -572,24 +580,33 @@ p.Biblio, p.NormRef {
   background-color: #F5F6F6;
   border-left: solid 5px #B1B6B8;
   color: rgb(91, 94, 95);
-  padding: 1.2em 1.2em 1.2em 2.2em;
-  margin: 2em 0 2em -1em;
+  padding: 0.5em 1em;
+}
+
+.note_label {
+  font-weight: 700;
 }
 
 /*
 3.8 Examples
 */
 
-.example {
+td.example,
+td.example_label {
   background-color: #F5F6F6;
-  border-left: solid 5px #B1B6B8;
   color: rgb(91, 94, 95);
-  padding: 1.2em 1.2em 1.2em 2.2em;
-  margin: 2em 0 2em -1em;;
+  padding: 0;
+}
+
+td > p.example {
+  margin: 0;
+  border-left: solid 5px #B1B6B8;
+  padding: 1em;
 }
 
-.example .example-title {
+td.example_label {
   font-weight: 700;
+  font-size: 1.2em;
   text-transform: uppercase;
   text-align: center;
   margin-top: 0;
@@ -857,6 +874,7 @@ padding: 2em 0;
 
 img.csa-logo {
   height: 50px;
+  width: auto;
   float: right;
   margin-right: 2em;
 }

data/lib/isodoc/csand/html_convert.rb

@@ -35,16 +35,13 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+          t.br
+          t.b do |b|
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
       end
 
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      end
-
       def pre_parse(node, out)
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end

data/lib/metanorma/csand/processor.rb

@@ -12,7 +12,9 @@ module Metanorma
 
       def output_formats
         super.merge(
-          html: "html"
+          html: "html",
+          # doc: "doc",
+          # pdf: "pdf"
         )
       end
 
@@ -20,14 +22,18 @@ module Metanorma
         "Metanorma::Csand #{Metanorma::Csand::VERSION}"
       end
 
-      def input_to_isodoc(file)
-        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      def input_to_isodoc(file, filename)
+        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
       def output(isodoc_node, outname, format, options={})
         case format
         when :html
           IsoDoc::Csand::HtmlConvert.new(options).convert(outname, isodoc_node)
+        # when :doc
+        #   IsoDoc::Csand::WordConvert.new(options).convert(outname, isodoc_node)
+        # when :pdf
+        #   IsoDoc::Csand::PdfConvert.new(options).convert(outname, isodoc_node)
         else
           super
         end

data/lib/metanorma/csand/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csand
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csand
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor