update rendering of boldface terms and numbers: metanorma/metanorma-i…

…so#554
metanorma · Nov 27, 2021 · 3f73109 · 3f73109
1 parent d910c8a
commit 3f73109
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/lib/asciidoctor/un/isodoc.rng b/lib/asciidoctor/un/isodoc.rng
@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1877,7 +1877,7 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
@@ -1895,14 +1895,14 @@
     </zeroOrMore>
   </define>
   <define name="fieldofapplication">
-    <element name="fieldofapplication">
+    <element name="field-of-application">
       <oneOrMore>
         <ref name="PureTextElement"/>
       </oneOrMore>
     </element>
   </define>
   <define name="usageinfo">
-    <element name="usageinfo">
+    <element name="usage-info">
       <oneOrMore>
         <ref name="PureTextElement"/>
       </oneOrMore>
@@ -1963,7 +1963,7 @@
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1973,7 +1973,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar-info">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -2000,6 +2000,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2031,7 +2036,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2044,6 +2049,13 @@
       <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>
@@ -2071,13 +2083,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element 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>
@@ -2086,7 +2101,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>

diff --git a/lib/isodoc/un/html/htmlstyle.scss b/lib/isodoc/un/html/htmlstyle.scss
@@ -346,13 +346,14 @@ h6 {
     font-weight: 100;
   }*/
 
-.TermNum,
-.Terms,
-.AltTerms {
-  color: $un-blue;
+.TermNum {
   font-weight: 100;
 }
 
+.TermNum, .Terms, .AltTerms {
+  color: $un-blue;
+}
+
 h2.TermNum {
   margin-bottom: 0;
 }

diff --git a/lib/isodoc/un/html/unece.scss b/lib/isodoc/un/html/unece.scss
@@ -314,7 +314,6 @@ p.Terms, li.Terms, div.Terms
         mso-fareast-font-family:$headerfont;
         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\)";