metanorma-csa 2.1.0 → 2.1.3

data/lib/isodoc/csa/html/csa.css

@@ -111,7 +111,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
   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: "";
@@ -142,13 +142,15 @@ 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: {{smallerfontsize}};
   mso-bidi-font-size: 11.0pt;
-  font-family: {{bodyfont}};
   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-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.ANNEX, li.ANNEX, div.ANNEX {
   mso-style-name: ANNEX;
   mso-style-priority: 10;
@@ -494,12 +496,14 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Quote, li.Quote {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.QuoteAttribution {
   text-align: right;
   mso-style-priority: 99;
@@ -529,8 +533,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}};
@@ -541,7 +543,11 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-bidi-theme-font: minor-bidi;
   color: #4472C4;
   mso-themecolor: accent1;
-  mso-ansi-language: EN-AU;
+  mso-ansi-language: EN-AU; }
+
+p.Admonition, li.Admonition {
+  font-size: 12.0pt;
+  font-family: {{bodyfont}};
   font-style: italic; }
 
 p.Code, li.Code, div.Code {
@@ -766,7 +772,9 @@ aside {
 
 p.example, li.example, td.example {
   margin-right: 0pt;
-  margin-left: 0pt; }
+  margin-left: 0pt;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
 
 div.example {
   margin-top: 0cm;
@@ -775,9 +783,7 @@ div.example {
   margin-left: 36.0pt; }
 
 p.example, li.example, div.example, td.example {
-  mso-pagination: none;
-  font-size: {{smallerfontsize}};
-  font-family: {{bodyfont}}; }
+  mso-pagination: none; }
 
 td.example p.MsoListParagraph {
   font-size: {{smallerfontsize}}; }

data/lib/isodoc/csa/html/csa.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,12 +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:$smallerfontsize;
 	mso-bidi-font-size:11.0pt;
-	font-family:$bodyfont;
 	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-size:$smallerfontsize;
+	font-family:$bodyfont;
+        }
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
 	mso-style-priority:10;
@@ -471,11 +473,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        }
 p.QuoteAttribution
         {text-align:right;
         mso-style-priority:99;
@@ -505,8 +509,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;
@@ -518,7 +520,12 @@ p.Admonition, li.Admonition, div.Admonition
 	color:#4472C4;
 	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
-	font-style:italic;}
+      }
+p.Admonition, li.Admonition {
+	font-size:12.0pt;
+	font-family:$bodyfont;
+        font-style:italic;
+        }
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;
@@ -721,6 +728,8 @@ margin-left: -36.0pt;
 p.example, li.example, td.example {
   margin-right: 0pt;
   margin-left: 0pt;
+  font-size:$smallerfontsize;
+  font-family:$bodyfont;
 }
 
 div.example {
@@ -732,8 +741,7 @@ div.example {
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:$smallerfontsize;
-        font-family:$bodyfont;}
+}
 
 td.example p.MsoListParagraph {
   font-size: $smallerfontsize;

data/lib/isodoc/csa/html/htmlstyle.css

@@ -668,6 +668,12 @@ pre,
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 .FigureTitle,
 .SourceTitle {
   font-weight: 700;

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

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

data/lib/isodoc/csa/presentation_xml_convert.rb

@@ -5,16 +5,15 @@ require "isodoc"
 module IsoDoc
   module Csa
     class PresentationXMLConvert < IsoDoc::Generic::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/csa/biblio.rng

@@ -614,12 +614,103 @@
     <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>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -638,9 +729,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +924,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -986,36 +1083,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">
@@ -1174,7 +1269,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1199,9 +1294,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">

data/lib/metanorma/csa/isodoc.rng

@@ -282,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -694,6 +703,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -729,6 +741,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2050,6 +2065,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">

data/lib/metanorma/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.3".freeze
   end
 end

data/metanorma-csa.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.1.0"
+  spec.add_dependency "metanorma-generic", "~> 2.1.1"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csa
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: metanorma-csa lets you write CSA Normal Documents (CSAND) in AsciiDoc.