spacing in terms boilerplate: metanorma/metanorma-iec#339

metanorma · Aug 29, 2024 · 79198ac · 79198ac
1 parent e6a6787
commit 79198ac
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 27 deletions.
diff --git a/lib/isodoc/iso/i18n-de.yaml b/lib/isodoc/iso/i18n-de.yaml
@@ -3,10 +3,8 @@ term_def_boilerplate: |
        Standardisierung unter folgenden Adressen:</p>
 
       <ul>
-      <li><p>Online-Browsing-Plattform: verfügbar unter
-        <link target="https://www.iso.org/obp"/></p></li>
-      <li><p>IEC Electropedia: verfügbar unter
-      <link target="https://www.electropedia.org"/></p></li>
+      <li><p>Online-Browsing-Plattform: verfügbar unter <link target="https://www.iso.org/obp"/></p></li>
+      <li><p>IEC Electropedia: verfügbar unter <link target="https://www.electropedia.org"/></p></li>
       </ul>
 all_rights_reserved: Alle Rechte vorbehalten
 reference_number: Referenznummer

diff --git a/lib/isodoc/iso/i18n-en.yaml b/lib/isodoc/iso/i18n-en.yaml
@@ -3,10 +3,8 @@ term_def_boilerplate: |
       standardization at the following addresses:</p>
 
       <ul>
-      <li><p>ISO Online browsing platform: available at
-        <link target="https://www.iso.org/obp"/></p></li>
-      <li><p>IEC Electropedia: available at
-      <link target="https://www.electropedia.org"/></p></li>
+      <li><p>ISO Online browsing platform: available at <link target="https://www.iso.org/obp"/></p></li>
+      <li><p>IEC Electropedia: available at <link target="https://www.electropedia.org"/></p></li>
       </ul>
 all_rights_reserved: All rights reserved
 reference_number: Reference number
@@ -50,6 +48,7 @@ doctype_dict:
   directive: Directive
   committee-document: Committee Document
   recommendation: ISO Recommendation
+  addendum: Addendum
 stage_dict:
   "00": Preliminary work item
   "10": New work item proposal

diff --git a/lib/isodoc/iso/i18n-fr.yaml b/lib/isodoc/iso/i18n-fr.yaml
@@ -3,10 +3,8 @@ term_def_boilerplate: |
       destinées à être utilisées en normalisation, consultables aux adresses
       suivantes:</p>
       <ul>
-      <li> <p>ISO Online browsing platform: disponible à l'adresse
-        <link target="https://www.iso.org/obp"/></p></li>
-      <li> <p>IEC Electropedia: disponible à l'adresse
-        <link target="https://www.electropedia.org"/>
+      <li> <p>ISO Online browsing platform: disponible à l'adresse <link target="https://www.iso.org/obp"/></p></li>
+      <li> <p>IEC Electropedia: disponible à l'adresse <link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: Tous droits réservés
 reference_number: Numéro de référence
@@ -47,6 +45,7 @@ doctype_dict:
   directive: Directive
   committee-document: Document du comité
   recommendation: Recommandation ISO
+  addendum: Additif
 stage_dict:
   "00": Élément de travail préliminaire
   "10": Nouvelle proposition d'élément de travail

diff --git a/lib/isodoc/iso/i18n-ru.yaml b/lib/isodoc/iso/i18n-ru.yaml
@@ -2,10 +2,8 @@ term_def_boilerplate: |
   <p>ИСО и МЭК поддерживают терминологические базы данных для использования в стандартизации по следующим адресам:</p>
 
       <ul>
-      <li> <p>ИСО, Интернет-онлайн-платформа: доступна на 
-        <link target="https://www.iso.org/obp"/></p></li>
-      <li> <p>МЭК Electropedia: доступна на
-      <link target="https://www.electropedia.org"/>
+      <li> <p>ИСО, Интернет-онлайн-платформа: доступна на <link target="https://www.iso.org/obp"/></p></li>
+      <li> <p>МЭК Electropedia: доступна на <link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: Все права защищены
 reference_number: Ссылочный номерS
@@ -48,6 +46,7 @@ doctype_dict:
   directive: Директива
   committee-document: Документ комитета
   recommendation: Рекомендации ИСО
+  addendum: Дополнение
 stage_dict:
   "00": Предварительный рабочий элемент
   "10": Предложение нового рабочего элемента

diff --git a/lib/isodoc/iso/i18n-zh-Hans.yaml b/lib/isodoc/iso/i18n-zh-Hans.yaml
@@ -1,10 +1,8 @@
 term_def_boilerplate: |
       <p>ISO和IEC用于标准化的术语数据库地址如下：</p>
       <ul>
-      <li> <p>ISO在线浏览平台:
-        位于<link target="https://www.iso.org/obp"/></p></li>
-      <li> <p>IEC Electropedia:
-        位于<link target="https://www.electropedia.org"/>
+      <li> <p>ISO在线浏览平台: 位于<link target="https://www.iso.org/obp"/></p></li>
+      <li> <p>IEC Electropedia: 位于<link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: 版权所有
 reference_number: 参考编号

diff --git a/lib/metanorma/iso/basicdoc.rng b/lib/metanorma/iso/basicdoc.rng
@@ -1000,14 +1000,14 @@
   <define name="PureTextElement">
     <choice>
       <text/>
-      <ref name="em"/>
-      <ref name="strong"/>
+      <ref name="pure_em"/>
+      <ref name="pure_strong"/>
       <ref name="sub"/>
       <ref name="sup"/>
-      <ref name="tt"/>
-      <ref name="underline"/>
-      <ref name="strike"/>
-      <ref name="smallcap"/>
+      <ref name="pure_tt"/>
+      <ref name="pure_underline"/>
+      <ref name="pure_strike"/>
+      <ref name="pure_smallcap"/>
       <ref name="br"/>
     </choice>
   </define>
@@ -1031,6 +1031,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_em">
+    <element name="em">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="strong">
     <element name="strong">
       <zeroOrMore>
@@ -1046,6 +1053,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_strong">
+    <element name="strong">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
@@ -1060,6 +1074,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_tt">
+    <element name="tt">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
@@ -1090,13 +1111,42 @@
       <zeroOrMore>
         <choice>
           <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
           <ref name="index"/>
           <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_strike">
+    <element name="strike">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="underline">
+    <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="pure_underline">
     <element name="underline">
       <optional>
         <attribute name="style"/>
@@ -1107,6 +1157,21 @@
     </element>
   </define>
   <define name="smallcap">
+    <element name="smallcap">
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="pure_smallcap">
     <element name="smallcap">
       <zeroOrMore>
         <ref name="PureTextElement"/>

diff --git a/lib/metanorma/iso/biblio.rng b/lib/metanorma/iso/biblio.rng
@@ -1204,7 +1204,9 @@
       <optional>
         <ref name="formattedref"/>
       </optional>
-      <ref name="btitle"/>
+      <oneOrMore>
+        <ref name="btitle"/>
+      </oneOrMore>
       <optional>
         <ref name="bplace"/>
       </optional>

diff --git a/lib/metanorma/iso/isodoc.rng b/lib/metanorma/iso/isodoc.rng
@@ -662,6 +662,9 @@
             <value>LatexMath</value>
           </choice>
         </attribute>
+        <optional>
+          <attribute name="number-format"/>
+        </optional>
         <attribute name="block">
           <data type="boolean"/>
         </attribute>

diff --git a/lib/metanorma/iso/reqt.rng b/lib/metanorma/iso/reqt.rng
@@ -66,6 +66,9 @@
         <ref name="MultilingualRenderingType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>