metanorma-iec 1.4.4 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a02490c7cf51e0e7d6d7bc61f6afcfd457c56b18f8cf1e98037bf48b2f8ad993
-  data.tar.gz: 54da10f826af0d1ba39362e74a46747cd52194dfae54115464b49b9c45882beb
+  metadata.gz: 6a9a7ccb87048ef451ffd636b6ba29c7cdf56d383ba7814427e9bb51c77126b0
+  data.tar.gz: 62935cdbf5fd3d9f6df5705b11e944c7f64e28b7dba5af5fadb6732c19010d59
 SHA512:
-  metadata.gz: 6dd8918d63ec440964bfa7902a03a3b668fd9940115dc908fd1f92353d14342c76586ad87d288454374ee18d4509696e774cec4a36634f5d53f1305cee41dc1b
-  data.tar.gz: 19cc0bbfe41cacb566e2e84c10194d5c48bc164f08c17d060f0002454df4c0edf41baee4ef8bc367dbb959dedc57df36c25abe3080dfad2916cb6675c6238857
+  metadata.gz: dd7849f9f6465ef7ee12f968029261003f074c843b6de479419e40d3478ac8a9600266dd53faf973cc7f9e7a7918cd7b0446284ee35b05f1c3812063d4b56228
+  data.tar.gz: a66f218acf2e29364adc6709feb6a104ca91062a39569579823a3deda80eeccd1100fc8c1f59e329a7f44e0317b3171d0c1e71da516b37ce2f3a56fb9190b695

data/.github/workflows/rake.yml

@@ -9,35 +9,7 @@ on:
   pull_request:
 
 jobs:
-  rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: tests-passed
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+  notify:
+    uses: metanorma/metanorma-build-scripts/.github/workflows/mn-processor-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.gitignore

@@ -4,3 +4,17 @@
 coverage/
 
 .rubocop-https--*
+
+/Gemfile.devel
+/Gemfile.lock
+/spec/assets/iso.doc
+/spec/assets/iso.html
+/spec/assets/iso.pdf
+/test.doc
+/test.err
+/test.html
+/test.pdf
+/test.presentation.xml
+/test.sts.xml
+/test.xml
+/test_alt.html

data/Gemfile

@@ -7,3 +7,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "reline", "~> 0.2.8.pre.11"
+
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
+end

data/lib/isodoc/iec/base_convert.rb

@@ -14,13 +14,17 @@ module IsoDoc
         page_break(out)
         iec_orgname(out)
         middle_title(isoxml, out)
-        out.div **attr_code(id: f ? f["id"] : "") do |s|
+        foreword1(f, b, out)
+      end
+
+      def foreword1(sect, boilerplate, out)
+        out.div **attr_code(id: sect ? sect["id"] : "") do |s|
           s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
           @meta.get[:doctype] == "Amendment" or
             s.div **attr_code(class: "boilerplate_legal") do |s1|
-              b&.elements&.each { |e| parse(e, s1) }
+              boilerplate&.elements&.each { |e| parse(e, s1) }
             end
-          f&.elements&.each { |e| parse(e, s) unless e.name == "title" }
+          sect&.elements&.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
@@ -31,19 +35,11 @@ module IsoDoc
       end
 
       def middle_title(_isoxml, out)
-        title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
-        @meta.get[:doctitleintro] and
-          title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"
-        if @meta.get[:doctitlepart]
-          title1 += " &mdash;"
-          title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
-          @meta.get[:doctitlepartlabel] and
-            title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
-        end
+        title1, title2 = middle_title_parts(out)
         out.p(**{ class: "zzSTDTitle1" }) do |p|
           p.b { |b| b << title1 }
         end
-        if @meta.get[:doctitlepart]
+        if title2
           out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
           out.p(**{ class: "zzSTDTitle2" }) do |p|
             p.b { |b| b << title2 }
@@ -52,6 +48,20 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
       end
 
+      def middle_title_parts(_out)
+        title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
+        @meta.get[:doctitleintro] and
+          title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"
+        title2 = nil
+        if @meta.get[:doctitlepart]
+          title1 += " &mdash;"
+          title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
+          @meta.get[:doctitlepartlabel] and
+            title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
+        end
+        [title1, title2]
+      end
+
       def bibliography(isoxml, out)
         return super unless @is_iev
       end
@@ -69,7 +79,8 @@ module IsoDoc
 
         page_break(out)
         out.div **attr_code(id: node["id"]) do |div|
-          out.p(**{ class: "zzSTDTitle2" }) do |p|
+          depth = clause_title_depth(node, nil)
+          out.send "h#{depth}", **{ class: "zzSTDTitle2" } do |p|
             p.b do |b|
               node&.at(ns("./title"))&.children&.each { |c2| parse(c2, b) }
             end

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

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -298,19 +307,19 @@ span.partlabel {
   font-size: 0.9em; }
 
 /* TYPOGRAPHY */
-h1 {
+h1, .h1 {
   font-size: 1.5em;
   line-height: 2em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.2em;
   line-height: 1.5em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   line-height: 1.2; }
 
 p {
@@ -322,7 +331,7 @@ p.zzSTDTitle1 {
   font-size: 1.5em;
   text-transform: uppercase; }
 
-p.zzSTDTitle2 {
+.zzSTDTitle2 {
   font-weight: 700;
   font-size: 1.5em; }
 
@@ -337,7 +346,7 @@ nav a {
   text-decoration: none;
   color: black; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 ul > li {
@@ -417,52 +426,58 @@ p.TermNum {
   #toggle {
     display: none; } }
 
-#toc {
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: {{bodyfont}};
   font-weight: 400; }
-  #toc ul {
+  #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
     margin: 0;
     padding: 0;
     list-style: none; }
-    #toc ul li a {
+    #toc ul li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
       padding: 5px 10px; }
-    #toc ul a {
+    #toc ul a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
       color: black;
       text-decoration: none;
       display: block; }
-      #toc ul a:hover {
+      #toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
         box-shadow: none;
         color: black; }
-  #toc .h2 {
+  #toc .h2, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
     padding-left: 30px; }
-  #toc .h3 {
+  #toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
     padding-left: 50px; }
-  #toc .toc-active, #toc li:hover {
+  #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     background: black;
     box-shadow: inset -5px 0px 10px -5px black !important; }
-    #toc .toc-active a, #toc li:hover a {
+    #toc .toc-active a, #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; }
   @media print {
-    #toc .toc-active, #toc li:hover {
+    #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
       background: white;
       box-shadow: none !important; }
-    #toc .toc-active a {
+    #toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
       color: black; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
   @media screen and (max-width: 768px) {
-    #toc {
+    #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
   #toc .toc-active,
-  #toc li:hover {
+  #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active,
+  #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     box-shadow: 0px 1px 0px 0px black !important;
     color: black;
     background: none; }
-  #toc ul a:hover {
+  #toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
     box-shadow: none;
     color: black; }
 
+#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 100%; }
+
 @media screen and (min-width: 768px) {
   nav {
     line-height: 1.2em; }
@@ -476,7 +491,7 @@ p.TermNum {
     display: none; }
   h1.toc-contents {
     margin-top: 1em; }
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0; } }
 

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

@@ -104,21 +104,21 @@ span.partlabel {
 
 /* TYPOGRAPHY */
 
-h1 {
+h1, .h1 {
     font-size: 1.5em;
     line-height: 2em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h2 {
+h2, .h2 {
     font-size: 1.2em;
     line-height: 1.5em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     line-height: 1.2;
 }
 
@@ -133,7 +133,7 @@ p.zzSTDTitle1 {
     text-transform: uppercase;
 }
 
-p.zzSTDTitle2 {
+.zzSTDTitle2 {
     font-weight: 700;
     font-size: 1.5em;
 }
@@ -152,7 +152,7 @@ nav a {
     color: black;
 }
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -205,7 +205,7 @@ nav {
     @include sidebarNavToggle(black, #f5faff)
 }
 
-#toc {
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     @include toc(black, black, black);
     @include sidebarToc();
 
@@ -224,6 +224,12 @@ nav {
     }
 }
 
+#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+   font-size: 100%;
+ }
+
 @media screen and (min-width: 768px) {
     nav {
         line-height: 1.2em;
@@ -247,7 +253,7 @@ nav {
         margin-top: 1em;
     }
 
-    ul#toc-list {
+    ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
         padding:0;
         margin:0;
     }

data/lib/isodoc/iec/html/wordstyle.css

@@ -207,7 +207,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 div.figure, p.figure {
   text-align: center; }
 
-h1.main {
+h1.main, .h1 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 1";
@@ -221,8 +221,6 @@ h1.main {
   text-indent: -19.85pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l26 level1 lfo40;
   mso-hyphenate: none;
   tab-stops: list 19.85pt;
   layout-grid-mode: char;
@@ -234,6 +232,10 @@ h1.main {
   mso-fareast-language: ZH-CN;
   font-weight: bold; }
 
+h1.main {
+  mso-outline-level: 1;
+  mso-list: l26 level1 lfo40; }
+
 /* IEC: p.ANNEXtitle */
 h1.Annex {
   mso-style-name: ANNEX_title;
@@ -265,7 +267,7 @@ h1.Annex {
 h1
 	{ mso-list:l26 level1 lfo40;}
 */
-.h2Annex, h2 {
+.h2Annex, h2, .h3 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "Heading 1";
@@ -293,7 +295,7 @@ h2 {
   mso-list: l26 level2 lfo40;
   mso-outline-level: 2; }
 
-.h3Annex, h3 {
+.h3Annex, h3, .h3 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 3";
@@ -321,7 +323,7 @@ h3 {
   mso-list: l26 level3 lfo40;
   mso-outline-level: 3; }
 
-.h4Annex, h4 {
+.h4Annex, h4, .h4 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 4";
@@ -349,7 +351,7 @@ h4 {
   mso-list: l26 level2 lfo40;
   mso-outline-level: 4; }
 
-.h5Annex, h5 {
+.h5Annex, h5, .h5 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 5";
@@ -377,7 +379,7 @@ h5 {
   mso-list: l26 level5 lfo40;
   mso-outline-level: 5; }
 
-h6 {
+h6, .h6 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 6";
@@ -405,7 +407,7 @@ h6 {
   mso-list: l26 level6 lfo40;
   mso-outline-level: 6; }
 
-p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
+p.MsoHeading7, li.MsoHeading7, div.MsoHeading7, .h7 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 7";
@@ -434,7 +436,7 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
 p.MsoHeading7 {
   mso-list: l26 level7 lfo40; }
 
-p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 {
+p.MsoHeading8, li.MsoHeading8, div.MsoHeading8, .h8 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 8";
@@ -463,7 +465,7 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 {
 p.MsoHeading8 {
   mso-list: l26 level8 lfo40; }
 
-p.MsoHeading9, li.MsoHeading9, div.MsoHeading9 {
+p.MsoHeading9, li.MsoHeading9, div.MsoHeading9, .h9 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-name: "Heading 9";

data/lib/isodoc/iec/html/wordstyle.scss

@@ -190,7 +190,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 div.figure, p.figure
         {text-align: center;}
 
-h1.main
+h1.main, .h1
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 1";
@@ -204,8 +204,6 @@ h1.main
 	text-indent:-19.85pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:1;
-	mso-list:l26 level1 lfo40;
 	mso-hyphenate:none;
 	tab-stops:list 19.85pt;
 	layout-grid-mode:char;
@@ -216,6 +214,10 @@ h1.main
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:ZH-CN;
 	font-weight:bold;}
+h1.main {
+	mso-outline-level:1;
+	mso-list:l26 level1 lfo40;
+}
 /* IEC: p.ANNEXtitle */
 h1.Annex
 	{mso-style-name:ANNEX_title;
@@ -246,7 +248,7 @@ h1.Annex
 h1
 	{ mso-list:l26 level1 lfo40;}
 */
-.h2Annex, h2
+.h2Annex, h2, .h3
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"Heading 1";
@@ -273,7 +275,7 @@ h2
 	{ mso-list:l26 level2 lfo40;
 	mso-outline-level:2;
         }
-.h3Annex, h3
+.h3Annex, h3, .h3
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 3";
@@ -299,7 +301,7 @@ h2
 h3      {mso-list:l26 level3 lfo40;
 	mso-outline-level:3;
         }
-.h4Annex, h4
+.h4Annex, h4, .h4
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 4";
@@ -325,7 +327,7 @@ h3      {mso-list:l26 level3 lfo40;
 h4      {mso-list:l26 level2 lfo40;
 	mso-outline-level:4;
         }
-.h5Annex, h5
+.h5Annex, h5, .h5
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 5";
@@ -351,7 +353,7 @@ h4      {mso-list:l26 level2 lfo40;
 h5      {mso-list:l26 level5 lfo40;
 	mso-outline-level:5;
         }
-h6
+h6, .h6
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 6";
@@ -377,7 +379,7 @@ h6
 h6      {mso-list:l26 level6 lfo40;
 	mso-outline-level:6;
         }
-p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
+p.MsoHeading7, li.MsoHeading7, div.MsoHeading7, .h7
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 7";
@@ -403,7 +405,7 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
 	mso-fareast-language:ZH-CN;
 	font-weight:bold;}
 p.MsoHeading7      {mso-list:l26 level7 lfo40;}
-p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
+p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 ,.h8
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 8";
@@ -429,7 +431,7 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
 	mso-fareast-language:ZH-CN;
 	font-weight:bold;}
 p.MsoHeading8      {mso-list:l26 level8 lfo40;}
-p.MsoHeading9, li.MsoHeading9, div.MsoHeading9
+p.MsoHeading9, li.MsoHeading9, div.MsoHeading9, .h9
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
         mso-style-name:"Heading 9";

data/lib/isodoc/iec/html_convert.rb

@@ -38,7 +38,8 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
+        auth = docxml.at("//div[@id = 'boilerplate-feedback' or "\
+                         "@class = 'boilerplate-feedback']")
         auth&.remove
         super
       end

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

@@ -18,7 +18,7 @@ term_def_boilerplate: |
         <link target="http://www.iso.org/obp"/></p> </li>
       </ul>
 doctype_dict:
-  international-standard: Norme international
+  international-standard: Norme internationale
   technical-specification: Spécification technique
   technical-report: Rapport technique
   publicly-available-specification: Spécification disponible publiquement