metanorma-iso 1.10.0 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80f036674b2fadf0f45d564dee4050674cf69babf4d88c6ee84986e82ed8a5ce
-  data.tar.gz: 491de6c6a6b92a4ce05212833f6acd5e2de4094973e4f8e3c44e2981ca983fce
+  metadata.gz: abbf367b7ec988ab0de353fe50309648657bc86b3d7a1495c4ac6722b4653b5b
+  data.tar.gz: 365546239553eb27bb0dcdc1e4920234922b93dcb235027f42f7f1a682f3fd18
 SHA512:
-  metadata.gz: d08a1c0909b6c0c0fafa0748132851eea415c110d6ce6bac821364df0a5c257adf30d3a86649ee2ed9d92a8dec6f1986fccfa39414aaf1a376f1a9e057ea6659
-  data.tar.gz: 21fda2fe4ceec7d933d3f960dc19b4a2758e4e8cf4aa713e65da4e66d1447d55b34e08fe150dea6abd4d0c2c5e18d1d4acd961fc5200d3c632167278fe62348f
+  metadata.gz: bbbdb1ad0d1b86c34f437af1ad664c2c6d19d706a28fa01a25cb5b677d1fddaec5d2eec0fdc4eb5846e5254777b3ea0d868ae31ee5c9e59c58f40f67bd17b339
+  data.tar.gz: eb62b3b9ab796aba24059a9c45c8432a7fc5a7ee0a3b30c6893fda63bbce62452270ee13f93c66d3f16b054dd9cf92887cca868a849f42c248b5f8c37efbfdfa

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,41 @@
+name: ubuntu
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup prerequisites
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install xsltproc
+
+      - run: make xsd_doc
+        env:
+          GITHUB_USERNAME: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - uses: actions/upload-artifact@master
+        with:
+          name: xsd_doc
+          path: xsd_doc
+
+  deploy-gh-pages:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/checkout@master
+
+    - uses: actions/download-artifact@master
+      with:
+        name: xsd_doc-ubuntu
+        path: xsd_doc
+

data/Gemfile

@@ -4,11 +4,10 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-#gem "asciimath", git: "https://github.com/asciidoctor/asciimath"
+gem "relaton", git: "https://github.com/relaton/relaton"
 
 gemspec
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
-

data/Makefile

@@ -8,6 +8,15 @@ SHELL := /bin/bash
 # Ensure the xml2rfc cache directory exists locally
 IGNORE := $(shell mkdir -p $(HOME)/.cache/xml2rfc)
 
+TRANG_RELEASE := https://github.com/relaxng/jing-trang/releases/download/V20181222/trang-20181222.zip
+TOOLS_DIR := ${CURDIR}/tools
+TRANG_JAR := $(TOOLS_DIR)/trang.jar
+XSDVIPATH := $(TOOLS_DIR)/xsdvi.jar
+XSLT_FILE := $(TOOLS_DIR)/xs3pxsl
+XSLT_FILE_MERGE := $(TOOLS_DIR)/xsdmerge.xsl
+RNG_FILE_SRC := lib/asciidoctor/iso/isostandard.rng
+XSD_FILE_DEST := ${CURDIR}/xsd_doc/isostandard.xsd
+
 all: $(TXT) $(HTML) $(XML) $(NITS)
 
 clean:
@@ -37,3 +46,38 @@ clean:
 open:
 	open *.txt
 
+
+$(XSDVIPATH):
+	mkdir -p $(dir $@); \
+	curl -sSL https://sourceforge.net/projects/xsdvi/files/latest/download > $(dir $@)/xsdvi.zip; \
+	unzip -p $(dir $@)/xsdvi.zip dist/lib/xercesImpl.jar > $(dir $@)/xercesImpl.jar; \
+	curl -sSL https://github.com/metanorma/xsdvi/releases/download/v1.0/xsdvi-1.0.jar > $@
+
+$(XSLT_FILE):
+	mkdir -p $(dir $@)
+	curl -sSL https://raw.githubusercontent.com/metanorma/xs3p/main/xsl/xs3p.xsl > $@
+
+$(XSLT_FILE_MERGE):
+	mkdir -p $(dir $@)
+	curl -sSL https://raw.githubusercontent.com/metanorma/xs3p/main/xsl/xsdmerge.xsl > $@
+
+$(TRANG_JAR):
+	mkdir -p $(dir $@); \
+	cd $(dir $@); \
+	curl -sSL $(TRANG_RELEASE) > trang.zip; \
+ 	unzip -p trang.zip trang-20181222/trang.jar > $@
+
+
+$(XSD_FILE_DEST): $(TRANG_JAR)
+	mkdir -p $(dir $@); \
+	java -jar $< $(RNG_FILE_SRC) $@
+
+xsd_doc:  $(XSD_FILE_DEST) $(XSDVIPATH) $(XSLT_FILE) $(XSLT_FILE_MERGE)
+	mkdir -p $@/diagrams; \
+	cd $@; \
+	java -jar $(XSDVIPATH) $< -rootNodeName all -oneNodeOnly -outputPath diagrams; \
+	xsltproc --nonet --stringparam rootxsd iso-standard --output $@.tmp $(XSLT_FILE_MERGE) $<;\
+	xsltproc --nonet --param title "'Metanorma XML Schema Documentation, ISO Standard'" \
+		--output index.html $(XSLT_FILE) $@.tmp;\
+	rm $@.tmp
+

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)

data/bin/rspec

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-  
+
 # This file was generated by Bundler.
 #
 # The application 'rspec' is installed as part of a gem, and
@@ -15,4 +15,3 @@ require "rubygems"
 require "bundler/setup"
 
 load Gem.bin_path("rspec-core", "rspec")
-

data/lib/asciidoctor/iso/base.rb

@@ -28,7 +28,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::Iso::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::Iso::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def sts_converter(node)

data/lib/asciidoctor/iso/cleanup.rb

@@ -8,7 +8,7 @@ module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
       PRE_NORMREF_FOOTNOTES = "//preface//fn | "\
-        "//clause[@type = 'scope']//fn".freeze
+                              "//clause[@type = 'scope']//fn".freeze
 
       NORMREF_FOOTNOTES =
         "//references[@normative = 'true']//fn".freeze
@@ -41,7 +41,7 @@ module Asciidoctor
         xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
                      "/organization").each do |x|
           x1 = x.at("abbreviation")&.text || x.at("name")&.text
-          x1 == "ISO" and prefix.unshift("ISO") or prefix << x1
+          (x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
         end
         prefix
       end
@@ -64,14 +64,15 @@ module Asciidoctor
         super
       end
 
-      TERM_CLAUSE = "//sections//terms | "\
+      TERM_CLAUSE =
+        "//sections//terms | "\
         "//sections//clause[descendant::terms][not(descendant::definitions)]"
-        .freeze
+          .freeze
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
       OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
-        "@type = 'ISBN'".freeze
+                 "@type = 'ISBN'".freeze
 
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
@@ -111,7 +112,7 @@ module Asciidoctor
           bib&.at("./title")&.text || bib&.at("./formattedref")&.text
         "#{pubclass} :: #{type} :: "\
           "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: "\
-          "#{partid} :: #{id&.text} :: #{title}"
+          "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
       end
 
       def sections_cleanup(xml)

data/lib/asciidoctor/iso/front.rb

@@ -18,8 +18,8 @@ module Asciidoctor
           xml.updates_document_type a
       end
 
-      def metadata_doctype(node, xml)
-        xml.doctype doctype(node)
+      def metadata_subdoctype(node, xml)
+        super
         a = node.attr("horizontal") and xml.horizontal a
       end
 

data/lib/asciidoctor/iso/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1946,7 +1977,7 @@
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1987,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar-info">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2014,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2050,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2063,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2084,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,9 +2097,17 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
-        <ref name="paragraph"/>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="dl"/>
+          <ref name="ol"/>
+          <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
+        </choice>
       </oneOrMore>
       <zeroOrMore>
         <ref name="termsource"/>
@@ -2071,7 +2115,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>
@@ -2163,6 +2207,12 @@
           <value>modified</value>
         </choice>
       </attribute>
+      <attribute name="type">
+        <choice>
+          <value>authoritative</value>
+          <value>lineage</value>
+        </choice>
+      </attribute>
       <ref name="origin"/>
       <optional>
         <ref name="modification"/>

data/lib/asciidoctor/iso/isostandard.rng

@@ -159,6 +159,20 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
         <ref name="preferred"/>
         <zeroOrMore>
           <ref name="admitted"/>

data/lib/asciidoctor/iso/section.rb

@@ -1,5 +1,5 @@
 require "htmlentities"
-require "uri"
+require "uri" if /^2\./.match?(RUBY_VERSION)
 
 module Asciidoctor
   module ISO

data/lib/asciidoctor/iso/validate.rb

@@ -78,7 +78,7 @@ module Asciidoctor
       # ISO/IEC DIR 2, 16.5.6
       def termdef_style(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          para = t.at("./definition/verbaldefinition") || return
+          para = t.at("./definition/verbal-definition") || return
           term = t.at("./preferred//name").text
           termdef_warn(para.text, /\A(the|a)\b/i, t, term,
                        "term definition starts with article")

data/lib/asciidoctor/iso/validate_section.rb

@@ -216,7 +216,7 @@ module Asciidoctor
 
       def asset_style(root)
         root.xpath("//example | //termexample").each { |e| example_style(e) }
-        root.xpath("//definition/verbaldefinition").each { |e| definition_style(e) }
+        root.xpath("//definition/verbal-definition").each { |e| definition_style(e) }
         root.xpath("//note").each { |e| note_style(e) }
         root.xpath("//fn").each { |e| footnote_style(e) }
         root.xpath(ASSETS_TO_STYLE).each { |e| style(e, extract_text(e)) }

data/lib/isodoc/iso/html/isodoc.css

@@ -689,7 +689,6 @@ p.Terms, li.Terms, div.Terms {
   mso-fareast-font-family: "SimHei",serif;
   mso-bidi-font-family: {{headerfont}};
   mso-ansi-language: EN-GB;
-  font-weight: bold;
   mso-bidi-font-weight: normal; }
 
 p.AltTerms, li.AltTerms, div.AltTerms {

data/lib/isodoc/iso/html/isodoc.scss

@@ -658,7 +658,6 @@ p.Terms, li.Terms, div.Terms
 	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
 	{mso-style-name:"AltTerm\(s\)";

data/lib/isodoc/iso/html/style-human.css

@@ -429,7 +429,6 @@ p.AltTerms {
   margin-left: 2em; }
 
 p.Terms {
-  font-weight: bold;
   margin-top: 0em; }
 
 /* Navigation*/
@@ -977,3 +976,24 @@ span.keyword {
 .Admonition p,
 .admonition p {
   margin: 0; }
+
+/* Collapse TOC */
+.collapse-group {
+  display: flex;
+  align-items: center;
+  position: relative; }
+
+.collapse-button {
+  position: absolute;
+  right: 0;
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+  cursor: pointer;
+  background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>'); }
+
+.collapse {
+  display: none; }
+
+.expand {
+  transform: rotateZ(-180deg); }

data/lib/isodoc/iso/html/style-human.scss

@@ -252,7 +252,6 @@ p.AltTerms {
 }
 
 p.Terms {
-    font-weight: bold;
     margin-top: 0em;
 }
 
@@ -693,3 +692,29 @@ span.keyword {
 .admonition p {
     margin: 0;
 }
+
+/* Collapse TOC */
+
+                .collapse-group {
+                        display: flex;
+                        align-items: center;
+                        position: relative;
+                }
+
+                .collapse-button {
+                        position: absolute;
+                        right: 0;
+                        display: inline-block;
+                        height: 20px;
+                        width: 20px;
+                        cursor: pointer;
+                        background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>');
+                }
+
+                .collapse {
+                        display: none;
+                }
+
+                .expand {
+                        transform: rotateZ(-180deg);
+                }

data/lib/isodoc/iso/html/style-iso.css

@@ -378,7 +378,6 @@ p.AltTerms {
   margin-left: 2em; }
 
 p.Terms {
-  font-weight: bold;
   margin-top: 0em; }
 
 /* Navigation*/
@@ -1005,3 +1004,24 @@ span.keyword {
 
 .Admonition p, .admonition p {
   margin: 0; }
+
+/* Collapse TOC */
+.collapse-group {
+  display: flex;
+  align-items: center;
+  position: relative; }
+
+.collapse-button {
+  position: absolute;
+  right: 0;
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+  cursor: pointer;
+  background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>'); }
+
+.collapse {
+  display: none; }
+
+.expand {
+  transform: rotateZ(-180deg); }

data/lib/isodoc/iso/html/style-iso.scss

@@ -193,7 +193,6 @@ p.AltTerms {
 }
 
 p.Terms {
-    font-weight: bold;
     margin-top: 0em;
 }
 
@@ -710,3 +709,29 @@ font-weight: 600;
 .Admonition p, .admonition p {
     margin: 0;
 }
+
+/* Collapse TOC */
+
+                .collapse-group {
+                        display: flex;
+                        align-items: center;
+                        position: relative;
+                }
+
+                .collapse-button {
+                        position: absolute;
+                        right: 0;
+                        display: inline-block;
+                        height: 20px;
+                        width: 20px;
+                        cursor: pointer;
+                        background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>');
+                }
+
+                .collapse {
+                        display: none;
+                }
+
+                .expand {
+                        transform: rotateZ(-180deg);
+                }