metanorma-iso 2.4.7 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2442e19642be700d61abb7ebcf13f9f4769104b50ed5cdf3ed311e04774cefe7
-  data.tar.gz: 33bce8cd62b0612e30a6379a874b3900adc665e64efde522b7abc4eb6d0a6193
+  metadata.gz: b68e0ac152a02770b1ca677908a34d243a66ba8da955a98aac66391a6e1a73ae
+  data.tar.gz: 4122f534ef647b210a829dc1645240b79bc240a0059dec141ca3eec0f1c64efc
 SHA512:
-  metadata.gz: 30376e197fc7d1d0b216e5fdc3d3034736362d271c67f9a21b52de1358bf63e641f8ecc3c7811e0ea3cc4398d7c7dc36928c6be34a03e82d8d3c78a05006730b
-  data.tar.gz: 0171fc4f212e7413c0218e58d42fa08b9a6352bf3e927540aea7273d9069d3ea49e79aff37d5f079ced4e93a169fdd909ee0c307d619c6cd2818a22fbc5ac06e
+  metadata.gz: bb2d619b3e439f33ac96fd63691a288730daed7aa3ed8d478898caca5f755d3aea436469499afd81aa318519be87f5f12e5d8b632d17f40cff1b67e2c20851ad
+  data.tar.gz: 2e37056accf0f22aa7a13702ff79c928c359c0188126a10e165e8c448a9a7f110acf743b29fed45b5b972c54d77f7a8a7610a6da889f8ef9ca43d3b77bbfa501

data/lib/isodoc/iso/base_convert.rb

@@ -130,22 +130,13 @@ module IsoDoc
         end
       end
 
-      def middle(isoxml, out)
-        middle_title(isoxml, out)
-        middle_admonitions(isoxml, out)
-        i = scope isoxml, out, 0
-        i = norm_ref isoxml, out, i
-        clause_etc isoxml, out, i
-        annex isoxml, out
-        bibliography isoxml, out
-      end
-
-      def clause_etc(isoxml, out, num)
-        isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | " \
-                        "//sections/terms | //sections/definitions"))
-          .each do |f|
-            clause_etc1(f, out, num)
-          end
+      def top_element_render(elem, out)
+        if %w(clause terms definitions).include?(elem.name) &&
+            elem.parent.name == "sections" &&
+            elem["type"] != "scope"
+          clause_etc1(elem, out, 0)
+        else super
+        end
       end
 
       def clause_etc1(clause, out, num)
@@ -161,12 +152,6 @@ module IsoDoc
         end
       end
 
-      def indexsect(isoxml, out)
-        isoxml.xpath(ns("//indexsect")).each do |i|
-          clause_parse(i, out)
-        end
-      end
-
       def ol_attrs(node)
         super.merge(start: node["start"]).compact
       end

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

@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -120,14 +120,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -297,10 +301,10 @@ blockquote,
 q {
   quotes: none; }
 
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
+blockquote::before,
+blockquote::after,
+q::before,
+q::after {
   content: '';
   content: none; }
 
@@ -454,7 +458,7 @@ h2 p, .h2 p {
 ul > li {
   list-style: none; }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
   content: "\2014";
   display: inline-block;
   width: 1em;
@@ -466,7 +470,7 @@ li p {
   margin-bottom: 0.6em;
   line-height: 1.2; }
 
-#toc li:before {
+#toc li::before {
   content: " ";
   display: none; }
 
@@ -517,7 +521,7 @@ p.Terms {
     #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
-  #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
+  #toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
     content: " ";
     display: none; }
 
@@ -1026,7 +1030,7 @@ ol.footnotes-list p,
 aside.footnote {
   display: inline; }
 
-ol > li > p:before {
+ol > li > p::before {
   content: "";
   display: none; }
 

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

@@ -38,10 +38,10 @@ q {
     quotes: none;
 }
 
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
+blockquote::before,
+blockquote::after,
+q::before,
+q::after {
     content: '';
     content: none;
 }
@@ -232,7 +232,7 @@ ul>li {
     list-style: none;
 }
 
-ul>li>p:first-child:before {
+ul>li>p:first-child::before {
     content: "\2014";
     display: inline-block;
     width: 1em;
@@ -246,7 +246,7 @@ li p {
     line-height: 1.2;
 }
 
-#toc li:before {
+#toc li::before {
     content: " ";
     display: none;
 }
@@ -271,7 +271,7 @@ p.Terms {
     //     box-shadow: inset -5px 0px 10px -5px #1d1d1d !important;
     // }
 
-    li:before {
+    li::before {
         content: " ";
         display: none;
     }
@@ -694,7 +694,7 @@ aside.footnote {
     display: inline;
 }
 
-ol>li>p:before {
+ol>li>p::before {
     content: "";
     display: none;
 }

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

@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -120,14 +120,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -291,8 +295,8 @@ body {
 blockquote, q {
   quotes: none; }
 
-blockquote:before, blockquote:after,
-q:before, q:after {
+blockquote::before, blockquote::after,
+q::before, q::after {
   content: '';
   content: none; }
 
@@ -406,7 +410,7 @@ h2 p, .h2 p {
 ul > li {
   list-style: none; }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
   content: "\2014";
   display: inline-block;
   width: 1em;
@@ -469,7 +473,7 @@ p.Terms {
   #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     box-shadow: 0px 1px 0px 0px black !important;
     background: none; }
-  #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
+  #toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
     content: " ";
     display: none; }
 
@@ -789,57 +793,57 @@ ol > li {
   list-style: none;
   position: relative; }
 
-ol > li:before {
+ol > li::before {
   position: absolute;
   left: -1.4em; }
 
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   left: -2.0em; }
 
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   left: -2.3em; }
 
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[class="arabic"] > li:before {
+ol[class="arabic"] > li::before {
   counter-increment: arabic;
   content: counter(arabic, decimal) ") "; }
 
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: counter(roman, lower-roman) ") "; }
 
-ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha) ") "; }
 
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman) ") "; }
 
-ol > li:before {
+ol > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha) ") "; }
 
-ol[class="arabic"] ol[class="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li::before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal) ") "; }
 
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman) ") "; }
 
-ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha) ") "; }
 
-ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman) ") "; }
 
@@ -1063,7 +1067,7 @@ ol.footnotes-list:first-child {
 ol.footnotes-list p, aside.footnote p {
   display: inline; }
 
-ol > li > p:before {
+ol > li > p::before {
   content: "";
   display: none; }
 

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

@@ -27,8 +27,8 @@ body {
 blockquote, q {
 	quotes: none;
 }
-blockquote:before, blockquote:after,
-q:before, q:after {
+blockquote::before, blockquote::after,
+q::before, q::after {
 	content: '';
 	content: none;
 }
@@ -177,7 +177,7 @@ ul > li {
     list-style: none;
 }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
     content: "\2014";
     display: inline-block;
     width: 1em;
@@ -210,7 +210,7 @@ p.Terms {
         background: none;
     }
 
-    li:before {
+    li::before {
         content: " ";
         display: none;
     }
@@ -458,57 +458,57 @@ ol > li {
   list-style: none;
   position: relative;
 }
-ol > li:before {
+ol > li::before {
   position: absolute;
   left: -1.4em;
 }
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   left: -2.0em;
 }
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   left: -2.3em;
 }
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[class="arabic"] > li:before {
+ol[class="arabic"] > li::before {
   counter-increment: arabic;
   content: counter(arabic, decimal)") "
 }
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: counter(roman, lower-roman)") "
 }
-ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha)") "
 }
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman)") "
 }
-ol > li:before {
+ol > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha)") "
 }
-ol[class="arabic"] ol[class="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li::before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal)") "
 }
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman)") "
 }
-ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha)") "
 }
-ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman)") "
 }
@@ -723,7 +723,7 @@ ol.footnotes-list p, aside.footnote p {
     display: inline;
 }
 
-ol > li > p:before {
+ol > li > p::before {
     content: "";
     display: none;
 }

data/lib/isodoc/iso/html_convert.rb

@@ -81,18 +81,6 @@ module IsoDoc
         docxml
       end
 
-      def middle(isoxml, out)
-        middle_title(isoxml, out)
-        middle_admonitions(isoxml, out)
-        scope isoxml, out, 0
-        norm_ref isoxml, out, 0
-        clause_etc isoxml, out, 0
-        annex isoxml, out
-        bibliography isoxml, out
-        indexsect isoxml, out
-      end
-
-
       def html_toc1(ulist)
         u2 = nil
         ulist.xpath("./li").each do |l|

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

@@ -11,6 +11,7 @@ term_def_boilerplate: |
 all_rights_reserved: All rights reserved
 reference_number: Reference number
 price_based_on: Price based on % pages
+descriptor: Descriptor
 under_preparation: Under preparation. (Stage at the time of publication %).
 withdrawn: Withdrawn.
 cancelled_and_replaced: Cancelled and replaced by %.
@@ -23,6 +24,8 @@ secretariat: Secretariat
 edition: edition
 termsrelated: Terms related to 
 availablefrom: Available from
+voting_begins_on: Voting begins on
+voting_terminates_on: Voting terminates on
 multiple_and: "%1 and %2"
 multiple_or: "%1 or %2"
 doctype_dict:
@@ -85,3 +88,6 @@ inflection:
   Statement:
     sg: Statement
     pl: Statements
+  Descriptor:
+    sg: Descriptor
+    pl: Descriptors

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

@@ -11,6 +11,7 @@ term_def_boilerplate: |
 all_rights_reserved: Tous droits réservés
 reference_number: Numéro de référence
 price_based_on: Prix basé sur % pages
+descriptor: Descripteur
 under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
 withdrawn: Retiré.
 cancelled_and_replaced: Annulé et remplacé par %.
@@ -22,6 +23,8 @@ secretariat: Secrétariat
 edition: édition
 termsrelated: Termes liés 
 availablefrom: Disponible sur
+voting_begins_on: Le vote commence le
+voting_terminates_on: Le vote se termine le
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique
@@ -79,3 +82,6 @@ inflection:
   Déclaration:
     sg: Déclaration
     pl: Déclarations
+  Descripteur:
+    sg: Descripteur
+    pl: Descripteurs

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

@@ -1,3 +1,4 @@
+descriptor: 記述子
 stage_dict:
   "00": Preliminary work item
   "10": New work item proposal

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

@@ -9,6 +9,7 @@ term_def_boilerplate: |
       </p> </li> </ul>
 all_rights_reserved: Все права защищены
 reference_number: Ссылочный номер
+descriptor: Дескриптор
 price_based_on: Цена рассчитана на % стр.
 under_preparation: В стадии подготовки. (Стадия на момент публикации %).
 withdrawn: Отозван.
@@ -23,6 +24,8 @@ scope: Область применения
 edition: издание
 termsrelated: Термины, связанные 
 availablefrom: Доступна с
+voting_begins_on: Голосование начинается в
+voting_terminates_on: Голосование заканчивается в
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация
@@ -83,3 +86,6 @@ inflection:
   Утверждение:
     sg: Утверждение
     pl: Утверждения
+  Дескриптор:
+    sg: Дескриптор
+    pl: Дескрипторы

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

@@ -9,6 +9,7 @@ term_def_boilerplate: |
 all_rights_reserved: 版权所有
 reference_number: 参考编号
 price_based_on: 价格基于%页
+descriptor: 描述符
 under_preparation: 制定中（出版时最新状态为%）
 withdrawn: 撤回 .
 cancelled_and_replaced: 已取消并由%取代。
@@ -20,6 +21,8 @@ secretariat: 秘书处
 edition: 版
 termsrelated: 相关术语 
 availablefrom: 可从
+voting_begins_on: 投票开始于
+voting_terminates_on: 投票终止于
 doctype_dict:
   international-standard: 国际标准
   technical-specification: 技术规格