metanorma-iso 1.5.12 → 1.5.13

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -166,9 +166,9 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Cambria, Times New Roman, Cambria Math, HanSans" font-size="11pt" xml:lang="{$lang}"> <!--   -->
+		<fo:root font-family="Cambria, Times New Roman, Cambria Math, Source Han Sans" font-size="11pt" xml:lang="{$lang}"> <!--   -->
 			<xsl:if test="$lang = 'zh'">
-				<xsl:attribute name="font-family">HanSans, Times New Roman, Cambria Math</xsl:attribute>
+				<xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute>
 			</xsl:if>
 			<fo:layout-master-set>
 				
@@ -2547,6 +2547,7 @@
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -3911,6 +3912,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -4315,6 +4317,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -4528,7 +4531,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -4579,7 +4583,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -5317,7 +5321,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>

data/lib/isodoc/iso/metadata.rb

@@ -211,6 +211,7 @@ module IsoDoc
         ics = []
         isoxml.xpath(ns("//bibdata/ext/ics/code")).each { |i| ics << i.text }
         set(:ics, ics.empty? ? nil : ics.join(", "))
+        a = isoxml.at(ns("//bibdata/ext/horizontal")) and set(:horizontal, a.text)
       end
     end
   end

data/lib/isodoc/iso/word_convert.rb

@@ -21,6 +21,10 @@ module IsoDoc
                      headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                                   '"Cambria",serif'),
                                   monospacefont: '"Courier New",monospace',
+                                  normalfontsize: "11.0pt",
+                                  monospacefontsize: "9.0pt",
+                                  smallerfontsize: "10.0pt",
+                                  footnotefontsize: "10.0pt",
         }
       end
 

data/lib/isodoc/iso/xref.rb

@@ -34,6 +34,9 @@ module IsoDoc
           @anchors[c["id"]] = anchor_struct(i + 1, nil, @labels["appendix"], "clause")
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
+          c.xpath(ns("./clause | ./references")).each_with_index do |c, j|
+            appendix_names1(c, l10n("#{@labels["appendix"]} #{i + 1}.#{j + 1}"), 3, clause["id"])
+          end
         end
       end
 
@@ -55,6 +58,13 @@ module IsoDoc
         end
       end
 
+      def appendix_names1(clause, num, level, container)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level, container: container }
+        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
+          appendix_names1(c, "#{num}.#{i + 1}", level + 1, container)
+        end
+      end
+
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|

data/lib/metanorma/iso/fonts_manifest.yaml

@@ -0,0 +1,6 @@
+---
+Cambria:
+Cambria Math:
+Times New Roman:
+Source Han Sans:
+Courier New:

data/lib/metanorma/iso/processor.rb

@@ -2,15 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module Iso
-    def self.fonts_used
-      {
-        html: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-        html_alt: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-        doc: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-        pdf: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.12".freeze
+    VERSION = "1.5.13".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 1.3.0"
   spec.add_dependency "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

data/spec/asciidoctor-iso/base_spec.rb

@@ -99,6 +99,7 @@ RSpec.describe Asciidoctor::ISO do
       :title-part-fr: Part du Titre
       :library-ics: 1,2,3
       :copyright-year: 2000
+      :horizontal: true
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
@@ -152,6 +153,7 @@ RSpec.describe Asciidoctor::ISO do
          </copyright>
          <ext>
          <doctype>article</doctype>
+         <horizontal>true</horizontal>
          <editorialgroup>
            <technical-committee number="1" type="A">TC</technical-committee>
            <technical-committee number="11" type="A1">TC1</technical-committee>

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe Asciidoctor::ISO do
       #{BLANK_HDR}
       <sections>
          <admonition id="_" type="safety precautions"><name>Safety Precautions</name><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
-       <ol id="_" type="arabic">
+       <ol id="_">
          <li>
            <p id="_">They are allergic to cinnamon.</p>
          </li>

data/spec/asciidoctor-iso/lists_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Asciidoctor::ISO do
          </li>
          <li>
            <p id="_">List 3</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">List A</p>
          </li>
@@ -107,13 +107,13 @@ RSpec.describe Asciidoctor::ISO do
          <li><p id="_">Second</p><p id="_">entry1</p>
        <p id="_">entry2</p></li>
        </ul>
-       <ol id="id1" type="alphabet">
+       <ol id="id1">
          <li>
            <p id="_">First</p>
          </li>
          <li>
            <p id="_">Second</p>
-           <ol id="_" type="alphabet_upper">
+           <ol id="_">
          <li>
            <p id="_">Third</p>
          </li>
@@ -129,19 +129,19 @@ RSpec.describe Asciidoctor::ISO do
            <p id="_">Sixth</p>
          </li>
        </ol>
-       <ol id="_" type="roman">
+       <ol id="_">
          <li>
            <p id="_">A</p>
          </li>
          <li>
            <p id="_">B</p>
-           <ol id="_" type="roman_upper">
+           <ol id="_">
          <li>
            <p id="_">C</p>
          </li>
          <li>
            <p id="_">D</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">E</p>
          </li>

data/spec/asciidoctor-iso/refs_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe Asciidoctor::ISO do
                <note format='text/plain' type='Unpublished-Status'>The standard is in press</note>
              </bibitem>
              <bibitem id='fdis' type='standard'>
-               <fetched>2020-11-09</fetched>
+               <fetched>#{Date.today}</fetched>
                <title type='title-intro' format='text/plain' language='fr' script='Latn'>Traitement de produits de soins de santé</title>
                <title type='title-main' format='text/plain' language='fr' script='Latn'>
                  Informations relatives au traitement des dispositifs médicaux à

data/spec/asciidoctor-iso/section_spec.rb

@@ -50,6 +50,8 @@ RSpec.describe Asciidoctor::ISO do
       [%appendix]
       === Appendix 1
 
+      ==== Appendix subclause
+
       == Bibliography
 
       === Bibliography Subsection
@@ -136,6 +138,9 @@ standardization at the following addresses:</p>
        </clause>
        <appendix id="_" inline-header="false" obligation="normative">
           <title>Appendix 1</title>
+          <clause id='_' inline-header='false' obligation='normative'>
+  <title>Appendix subclause</title>
+</clause>
        </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative references</title>
          <p id="_">There are no normative references in this document.</p>

data/spec/isodoc/metadata_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
   <keyword>kw1</keyword>
   <ext>
   <doctype>international-standard</doctype>
+  <horizontal>true</horizontal>
   <editorialgroup>
     <technical-committee number="34">Food products</technical-committee>
     <subcommittee number="4">Cereals and pulses</subcommittee>
@@ -106,6 +107,7 @@ INPUT
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
+:horizontal=>"true",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
 :keywords=>["kw2", "kw1"],

data/spec/isodoc/section_spec.rb

@@ -55,6 +55,9 @@ RSpec.describe IsoDoc do
        </clause>
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
+         <clause id='Q2a' inline-header='false' obligation='normative'>
+  <title>Appendix subclause</title>
+</clause>
        </appendix>
        <references id="Q3" normative="false"><title>Annex Bibliography</title></references>
        </annex><bibliography><references id="R" obligation="informative" normative="true">
@@ -140,6 +143,13 @@ RSpec.describe IsoDoc do
      </clause>
      <appendix id='Q2' inline-header='false' obligation='normative'>
      <title depth='2'>Appendix 1<tab/>An Appendix</title>
+     <clause id='Q2a' inline-header='false' obligation='normative'>
+  <title depth='3'>
+    Appendix 1.1
+    <tab/>
+    Appendix subclause
+  </title>
+</clause>
      </appendix>
      <references id='Q3' normative='false'>
        <title depth='2'>A.2<tab/>Annex Bibliography</title>
@@ -222,6 +232,9 @@ RSpec.describe IsoDoc do
          </div>
                   <div id="Q2">
                 <h2>Appendix 1&#160; An Appendix</h2>
+                <div id='Q2a'>
+  <h3> Appendix 1.1 &#160; Appendix subclause </h3>
+</div>
                 </div>
                  <div>
                 <h2 class="Section3">A.2&#160; Annex Bibliography</h2>
@@ -318,6 +331,13 @@ OUTPUT
         </div>
                  <div id="Q2">
           <h2>Appendix 1<span style="mso-tab-count:1">&#160; </span>An Appendix</h2>
+          <div id='Q2a'>
+  <h3>
+     Appendix 1.1
+    <span style='mso-tab-count:1'>&#160; </span>
+     Appendix subclause
+  </h3>
+</div>
           </div>
 <div>
   <h2 class='Section3'>

data/spec/isodoc/xref_spec.rb

@@ -936,6 +936,7 @@ RSpec.describe IsoDoc do
          <xref target="Q"/>
          <xref target="Q1"/>
          <xref target="Q2"/>
+         <xref target="Q3"/>
          <xref target="R"/>
          </p>
        </foreword>
@@ -985,6 +986,9 @@ RSpec.describe IsoDoc do
        </clause>
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
+         <clause id='Q3' inline-header='false' obligation='normative'>
+  <title>Appendix subclause</title>
+</clause>
        </appendix>
        </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
@@ -1019,6 +1023,7 @@ RSpec.describe IsoDoc do
                 <xref target='Q'>A.1</xref>
                 <xref target='Q1'>A.1.1</xref>
                 <xref target='Q2'>Annex A, Appendix 1</xref>
+                <xref target='Q3'>Annex A, Appendix 1.1</xref>
                 <xref target='R'>Clause 2</xref>
               </p>
             </foreword>
@@ -1126,6 +1131,13 @@ RSpec.describe IsoDoc do
   <tab/>
    An Appendix
 </title>
+<clause id='Q3' inline-header='false' obligation='normative'>
+  <title depth='3'>
+    Appendix 1.1
+    <tab/>
+    Appendix subclause
+  </title>
+</clause>
             </appendix>
           </annex>
           <bibliography>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
@@ -261,10 +261,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
-- ".github/workflows/macos.yml"
 - ".github/workflows/rake.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -339,6 +336,7 @@ files:
 - lib/isodoc/iso/xref.rb
 - lib/metanorma-iso.rb
 - lib/metanorma/iso.rb
+- lib/metanorma/iso/fonts_manifest.yaml
 - lib/metanorma/iso/processor.rb
 - lib/metanorma/iso/version.rb
 - metanorma-iso.gemspec

data/.github/workflows/macos.yml

@@ -1,49 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Cache gems
-        uses: actions/cache@preview
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gem-${{ hashFiles('Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ruby }}-gem-
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        run: |
-          brew install plantuml
-      - name: Run specs
-        run: |
-          bundle exec rake