metanorma-iso 1.9.6 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ee078ae53c881c7b83242412a6adb7e238e5b471119280c22edc6f7b45a71e
-  data.tar.gz: 553430cda221363dbcef14070bba64f214b2269dd4b4d5e52927e574ffae2f4d
+  metadata.gz: 496766841b7e48e3e2f8f879f5e9c485b0874212ea6316a926558ba434f1636a
+  data.tar.gz: 24bc39c4fdf29b8dfeaba19a972d8a2d2610d940b6b9afb93da58975c8bd6ac3
 SHA512:
-  metadata.gz: acd0cd92b131c86e859891c63d26dc2ef6e093a26667350f90b6a2ade3062e33737c154f732f7cbe6b4e82ced031e368641fa06ff9acb825ff17abf1546dedcf
-  data.tar.gz: 43082f2a384ad764599231c6b0378c3d5df8ba74a3db9209e9d7341c76f74700f23260689aa65287a7c889f777a4c66359c568a66180e332959d00ffa17b7bda
+  metadata.gz: 2a780fb001362017bf69e8b64ca78eb9c877d20c7bed50670d69fbf9f7a71c40756725e272e3baa0cc9d026c4809cbb222a466f0f9b77b30fe35afbdc9038d60
+  data.tar.gz: 9db3e3c657f3d5525e2407cc27c498bffbda194dcf06199e49def7a540af8a70755e1f6ff2b4465af09ea9440ffae9a106a965ba2e6696363774faf3bbab7004

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 "asciimath", git: "https://github.com/asciidoctor/asciimath"
 
 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/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

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <!-- include "biblio.rnc" { } -->
   <include href="basicdoc.rng">
@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1803,17 +1803,17 @@
         <ref name="admitted"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="related"/>
+        <ref name="deprecates"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="deprecates"/>
+        <ref name="related"/>
       </zeroOrMore>
       <optional>
         <ref name="termdomain"/>
       </optional>
-      <zeroOrMore>
-        <ref name="termgrammar"/>
-      </zeroOrMore>
+      <optional>
+        <ref name="termsubject"/>
+      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1830,41 +1830,232 @@
   </define>
   <define name="preferred">
     <element name="preferred">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="Designation"/>
     </element>
   </define>
   <define name="admitted">
     <element name="admitted">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="Designation"/>
     </element>
   </define>
   <define name="related">
     <element name="related">
+      <attribute name="type">
+        <ref name="RelatedTermType"/>
+      </attribute>
+      <element name="preferred">
+        <ref name="Designation"/>
+      </element>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
+  <define name="RelatedTermType">
+    <choice>
+      <value>deprecates</value>
+      <value>supersedes</value>
+      <value>narrower</value>
+      <value>broader</value>
+      <value>equivalent</value>
+      <value>compare</value>
+      <value>contrast</value>
+      <value>see</value>
+    </choice>
+  </define>
+  <define name="deprecates">
+    <element name="deprecates">
+      <ref name="Designation"/>
+    </element>
+  </define>
+  <define name="Designation">
+    <optional>
+      <attribute name="absent">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <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>
-        <attribute name="type">
+        <attribute name="isInternational">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <element name="name">
+        <oneOrMore>
           <choice>
-            <value>compare</value>
-            <value>contrast</value>
-            <value>see</value>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
           </choice>
+        </oneOrMore>
+      </element>
+    </element>
+  </define>
+  <define name="graphical_symbol_designation">
+    <element name="graphical-symbol">
+      <optional>
+        <attribute name="isInternational">
+          <data type="boolean"/>
         </attribute>
       </optional>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="figure"/>
     </element>
   </define>
-  <define name="deprecates">
-    <element name="deprecates">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+  <define name="expression_designation">
+    <element name="expression">
+      <optional>
+        <attribute name="language">
+          <a:documentation>ISO-639</a:documentation>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="script">
+          <a:documentation>ISO-15924</a:documentation>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="type">
+          <ref name="ExpressionDesignationType"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="isInternational">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <element name="name">
+        <zeroOrMore>
+          <ref name="PureTextElement"/>
+        </zeroOrMore>
+      </element>
+      <optional>
+        <element name="abbreviation-type">
+          <ref name="AbbreviationType"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="pronunciation">
+          <ref name="LocalizedString"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="grammar-info">
+          <ref name="Grammar"/>
+        </element>
+      </optional>
     </element>
   </define>
+  <define name="ExpressionDesignationType">
+    <choice>
+      <value>prefix</value>
+      <value>suffix</value>
+      <value>abbreviation</value>
+      <value>full</value>
+    </choice>
+  </define>
+  <define name="AbbreviationType">
+    <choice>
+      <value>truncation</value>
+      <value>acronym</value>
+      <value>initialism</value>
+    </choice>
+  </define>
+  <define name="Grammar">
+    <zeroOrMore>
+      <element name="gender">
+        <ref name="GrammarGender"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
+    <optional>
+      <element name="isPreposition">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isParticiple">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isAdjective">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isVerb">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isAdverb">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isNoun">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <element name="grammar-value">
+        <text/>
+      </element>
+    </zeroOrMore>
+  </define>
+  <define name="GrammarGender">
+    <choice>
+      <value>masculine</value>
+      <value>feminine</value>
+      <value>neuter</value>
+      <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>
@@ -1872,8 +2063,8 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termgrammar">
-    <element name="grammar">
+  <define name="termsubject">
+    <element name="subject">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1881,9 +2072,39 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <choice>
+        <ref name="verbaldefinition"/>
+        <ref name="nonverbalrep"/>
+        <group>
+          <ref name="verbaldefinition"/>
+          <ref name="nonverbalrep"/>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <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"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="nonverbalrep">
+    <element name="non-verbal-representation">
+      <oneOrMore>
+        <choice>
+          <ref name="table"/>
           <ref name="figure"/>
           <ref name="formula"/>
         </choice>
@@ -1972,6 +2193,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/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

@@ -63,7 +63,7 @@ module Asciidoctor
       def locality_erefs_validate(root)
         root.xpath("//eref[descendant::locality]").each do |t|
           if /^(ISO|IEC)/.match?(t["citeas"]) &&
-              !(/: ?(\d+{4}|–)$/.match?(t["citeas"]))
+              !/: ?(\d+{4}|–)$/.match?(t["citeas"])
             @log.add("Style", t,
                      "undated reference #{t['citeas']} should not contain "\
                      "specific elements")
@@ -78,8 +78,8 @@ module Asciidoctor
       # ISO/IEC DIR 2, 16.5.6
       def termdef_style(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          para = t.at("./definition") || return
-          term = t.at("./preferred").text
+          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")
           termdef_warn(para.text, /\.\Z/i, t, term,
@@ -90,10 +90,10 @@ module Asciidoctor
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(international-standard technical-specification technical-report
-        publicly-available-specification international-workshop-agreement
-        guide amendment technical-corrigendum).include? doctype or
-        @log.add("Document Attributes", nil,
-                 "#{doctype} is not a recognised document type")
+           publicly-available-specification international-workshop-agreement
+           guide amendment technical-corrigendum).include? doctype or
+          @log.add("Document Attributes", nil,
+                   "#{doctype} is not a recognised document type")
       end
 
       def script_validate(xmldoc)

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").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*/

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

@@ -252,7 +252,6 @@ p.AltTerms {
 }
 
 p.Terms {
-    font-weight: bold;
     margin-top: 0em;
 }
 

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*/

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

@@ -193,7 +193,6 @@ p.AltTerms {
 }
 
 p.Terms {
-    font-weight: bold;
     margin-top: 0em;
 }