metanorma-iso 3.4.5 → 3.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f9230ee17e15e6511a7d8b4a787c90ea830403daf0cfc54b75a7fabb4e4d0c
-  data.tar.gz: 83d997bcc7d2bf3a7884a7bf155e7b2e0ef63148b99075e560821d309467277b
+  metadata.gz: 0af54faafa49b9a295ffdbe60b9ab015f6a097bf130283dbfb043fb96be24714
+  data.tar.gz: 0f882ef90048ea6f2dad7aacc0ec647561be2d767a463488986f300521bd10e5
 SHA512:
-  metadata.gz: 49c2ddd6e4c19245d0ee90f3ff4697a1971a20b7a8ec608b8cb7b704b6ed838299502917453100c683c2c5a69c45c53c10eb2432ea6c6300ba119e3be3bfa215
-  data.tar.gz: 2f70229f2706c9bc2e01e0b879e243575fe6a387f9dc1ebf77665260ea523ab79f11bf88deebe6677a4e9f74c241d9fb29583c19819eaadc3bae290d8307c44f
+  metadata.gz: 9f4904edaadda14223f80d4da1e88cf1b436f8dc78b988ef7e515774e81ca8cffecf2dfb4a7fba0cebbb8971d5a0bd0ff815b993fef3a613c5523ccce2ccfa3e
+  data.tar.gz: cc9b504554654940a3eccd7be06cf8bfe89dfa866354faa443f22e4020cedfbf85dbd60312dddda87b831306e611caa45c71f234c5a4fa150c448a5cb51c24c1

data/.rubocop.yml

@@ -3,8 +3,20 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
+# Rubocop plugins enabled centrally so every metanorma-org gem picks them up
+# on cimas sync — best practice belongs at the shared-template layer, not
+# per-repo. Per ronaldtse feedback on metanorma/ci#332.
+plugins:
+  - rubocop-rspec
+  - rubocop-performance
+  - rubocop-rake
+
 # local repo-specific modifications
 # ...
 
 AllCops:
-  TargetRubyVersion: 3.4
+  # 3.3 matches the org-wide minimum being pushed via #274 (Raise minimum
+  # Ruby version to 3.3 due to EOL of 3.2 on 2026-03-31). Was 3.4 before
+  # this commit — 3.4 was above the org's stated minimum and would have
+  # applied Rubocop rules that fail-close on gems still targeting 3.3.
+  TargetRubyVersion: 3.3

data/Makefile

@@ -8,15 +8,6 @@ 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/metanorma/iso/isostandard-compile.rng
-XSD_FILE_DEST := ${CURDIR}/xsd_doc/isostandard.xsd
-
 all: $(TXT) $(HTML) $(XML) $(NITS)
 
 clean:
@@ -45,39 +36,3 @@ 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/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -46,6 +46,12 @@
 {% if doctitleaddlabel %}
 <div class="doctitle-part">{{ doctitleaddlabel }}{% if doctitleadd %}: {{ doctitleadd }}{% endif %}</div>
 {% endif %}
+{% if doctitlesuplabel %}
+<div class="doctitle-part">{{ doctitlesuplabel }}{% if doctitlesup %}: {{ doctitlesup }}{% endif %}</div>
+{% endif %}
+{% if doctitleextlabel %}
+<div class="doctitle-part">{{ doctitleextlabel }}{% if doctitleext %}: {{ doctitleext }}{% endif %}</div>
+{% endif %}
 {% if doctitlecorrlabel %}
 <div class="doctitle-part">{{ doctitlecorrlabel }}</div>
 {% endif %}

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

@@ -849,10 +849,6 @@ nav {
     display: none;
   }
 }
-#toggle {
-  margin-left: -4em;
-  margin-top: -2em;
-}
 
 @media screen and (min-width: 768px) {
   .container {

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

@@ -301,8 +301,6 @@ nav {
 
 #toggle {
     @include sidebarNavToggle(white, black);
-    margin-left: -4em;
-    margin-top: -2em;
 }
 
 @media screen and (min-width: 768px) {

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

@@ -800,8 +800,6 @@ nav {
 }
 #toggle {
   border-right: solid black 1px;
-  margin-left: -4em;
-  margin-top: -2em;
 }
 
 @media screen and (min-width: 768px) {

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

@@ -242,8 +242,6 @@ nav {
 #toggle {
     @include sidebarNavToggle(black, #f7f7f7);
     border-right: solid black 1px;
-    margin-left: -4em;
-    margin-top: -2em;
 }
 
 @media screen and (min-width: 768px) {

data/lib/isodoc/iso/html/word_iso_titlepage-dis.html

@@ -34,6 +34,14 @@
 <p class="zzCover"><b>{{ doctitleaddlabel }}</b></p>
 {% endif %}
 
+{% if doctitlesuplabel %}
+<p class="zzCover"><b>{{ doctitlesuplabel }}</b></p>
+{% endif %}
+
+{% if doctitleextlabel %}
+<p class="zzCover"><b>{{ doctitleextlabel }}</b></p>
+{% endif %}
+
 {% if doctitlecorrlabel %}
 <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}
@@ -52,6 +60,12 @@
 {% if doctitleaddlabel %}
 <p class="zzCover"><b>{{ doctitleaddlabel }}{% if doctitleadd %}: {{ doctitleadd }}{% endif %}</b></p>
 {% endif %}
+{% if doctitlesuplabel %}
+<p class="zzCover"><b>{{ doctitlesuplabel }}{% if doctitlesup %}: {{ doctitlesup }}{% endif %}</b></p>
+{% endif %}
+{% if doctitleextlabel %}
+<p class="zzCover"><b>{{ doctitleextlabel }}{% if doctitleext %}: {{ doctitleext }}{% endif %}</b></p>
+{% endif %}
 {% if doctitlecorrlabel %}
 <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}

data/lib/isodoc/iso/html/word_iso_titlepage-prf.html

@@ -28,6 +28,14 @@
 <p class="zzCover"><b>{{ doctitleaddlabel }}</b></p>
 {% endif %}
 
+{% if doctitlesuplabel %}
+<p class="zzCover"><b>{{ doctitlesuplabel }}</b></p>
+{% endif %}
+
+{% if doctitleextlabel %}
+<p class="zzCover"><b>{{ doctitleextlabel }}</b></p>
+{% endif %}
+
 {% if doctitlecorrlabel %}
 <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}
@@ -46,6 +54,12 @@
 {% if doctitleaddlabel %}
 <p class="zzCover"><b>{{ doctitleaddlabel }}{% if doctitleadd %}: {{ doctitleadd }}{% endif %}</b></p>
 {% endif %}
+{% if doctitlesuplabel %}
+<p class="zzCover"><b>{{ doctitlesuplabel }}{% if doctitlesup %}: {{ doctitlesup }}{% endif %}</b></p>
+{% endif %}
+{% if doctitleextlabel %}
+<p class="zzCover"><b>{{ doctitleextlabel }}{% if doctitleext %}: {{ doctitleext }}{% endif %}</b></p>
+{% endif %}
 {% if doctitlecorrlabel %}
 <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -22,6 +22,14 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'>
 <p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitleaddlabel }}</b></p>
 {% endif %}
 
+{% if doctitlesuplabel %}
+<p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitlesuplabel }}</b></p>
+{% endif %}
+
+{% if doctitleextlabel %}
+<p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitleextlabel }}</b></p>
+{% endif %}
+
 {% if doctitlecorrlabel %}
 <p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}
@@ -61,6 +69,12 @@ style='mso-no-proof:yes'>{{ editorialgroup }}</span></p>
 {% if doctitleaddlabel %}
 <p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ doctitleaddlabel }}{% if doctitleadd %}: {{ doctitleadd }}{% endif %}</p>
 {% endif %}
+{% if doctitlesuplabel %}
+<p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ doctitlesuplabel }}{% if doctitlesup %}: {{ doctitlesup }}{% endif %}</p>
+{% endif %}
+{% if doctitleextlabel %}
+<p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ doctitleextlabel }}{% if doctitleext %}: {{ doctitleext }}{% endif %}</p>
+{% endif %}
 {% if doctitlecorrlabel %}
 <p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ doctitlecorrlabel }}</p>
 {% endif %}

data/lib/isodoc/iso/i18n-de.yaml

@@ -48,6 +48,8 @@ doctype_dict:
   guide: Leitfaden
   amendment: Änderung
   addendum: Nachtrag
+  supplement: Beiblatt
+  extract: Auszug
   technical-corrigendum: Technische Berichtigung
   directive: Richtlinie
   committee-document: Ausschussdokument

data/lib/isodoc/iso/i18n-en.yaml

@@ -44,6 +44,8 @@ title_prefixes:
   amendment: "AMENDMENT {{ var1 }}"
   corrigendum: "TECHNICAL CORRIGENDUM {{ var1 }}"
   addendum: "ADDENDUM {{ var1 }}"
+  supplement: "SUPPLEMENT {{ var1 }}"
+  extract: "EXTRACT {{ var1 }}"
 doctype_dict:
   international-standard: International Standard
   technical-specification: Technical Specification
@@ -53,6 +55,8 @@ doctype_dict:
   guide: Guide
   amendment: Amendment
   addendum: Addendum
+  supplement: Supplement
+  extract: Extract
   technical-corrigendum: Technical Corrigendum
   directive: Directive
   committee-document: Committee Document

data/lib/isodoc/iso/i18n-fr.yaml

@@ -42,6 +42,8 @@ title_prefixes:
   amendment: "AMENDEMENT {{ var1 }}"
   corrigendum: "RECTIFICATIF TECHNIQUE {{ var1 }}"
   addendum: "ADDITIF {{ var1 }}"
+  supplement: "SUPPLÉMENT {{ var1 }}"
+  extract: "EXTRAIT {{ var1 }}"
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique
@@ -51,6 +53,8 @@ doctype_dict:
   guide: Guide
   amendment: Amendement
   addendum: Additif
+  supplement: Supplément
+  extract: Extrait
   technical-corrigendum: Rectificatif technique
   directive: Directive
   committee-document: Document du comité

data/lib/isodoc/iso/i18n-ru.yaml

@@ -42,6 +42,8 @@ title_prefixes:
   amendment: "ПОПРАВКА {{ var1 }}"
   corrigendum: "ТЕХНИЧЕСКОЕ ИСПРАВЛЕНИЕ {{ var1 }}"
   addendum: "ДОПОЛНЕНИЕ {{ var1 }}"
+  supplement: "ПРИБАВЛЕНИЕ {{ var1 }}"
+  extract: "ИЗВЛЕЧЕНИЕ {{ var1 }}"
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация
@@ -51,6 +53,8 @@ doctype_dict:
   guide: Руководство
   amendment: Поправка
   addendum: Дополнение
+  supplement: Прибавление
+  extract: Извлечение
   technical-corrigendum: Техническое Исправление
   directive: Директива
   committee-document: Документ комитета

data/lib/isodoc/iso/i18n-zh-Hans.yaml

@@ -33,6 +33,8 @@ doctype_dict:
   guide: 指南
   amendment: 修正
   addendum: 附录
+  supplement: 补充
+  extract: 摘录
   technical-corrigendum: 技术勘误
   directive: 指令
   committee-document: 委员会文件