metanorma-un 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c01dbd7826220e4745047a2e35efb4c1a84652261f3885f867a59c76689afaba
-  data.tar.gz: b92a663a7cfbd929b559fa8066f6c5b09737e85d8ddfb39a804fa51dfa03ddb8
+  metadata.gz: 45db2caa7f93f4ff5b5f36f7a0beca9f651c179145bed2f9d9c7fe2e7ab82d2d
+  data.tar.gz: 7bf800953c990b82199377d8e1a222d53b35b19015287bdf2d587dfcab3a67f5
 SHA512:
-  metadata.gz: 47b69cccf5f4f6b0415da7117820238a19e54760598e693e029095360a85fd68f6bccc6b9a3a3e5286a4c166c647a469e17118a98f41332add49e84bd2d687f9
-  data.tar.gz: f5b1c1ab84c63061e38a7134af4daf3e08a5d372c5a528f10915e6790dd417a3739089f5ee20116991ff36903f153d30aedc83b258ce3f509b6f60ba662da595
+  metadata.gz: 2bac1b91fe5b759e9d3022ae5fdb297b7412e51625cc12e9bb0e3cc7500f151fe13d91823b97c9cbdac862aef044a01c040d8ae48008f977c46a5541b8baea1e
+  data.tar.gz: d9db8fcca10946a9224dad32bb5ab589bbd12b2ceaba758e0fe1ebd2bb2b0fef0b2e1db9ced4a87e28632a53bf77b7739ed6bcb9eab0686eded5eb2e405246d0

data/.github/workflows/rake.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
@@ -48,15 +48,14 @@ jobs:
 
       - run: bundle exec rake
 
-  notify:
-    name: Trigger notify workflow
+  tests-passed:
     needs: rake
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger notify workflow
+      - name: Trigger tests passed event
         uses: Sibz/github-status-action@v1
         with:
-          authToken: ${{ secrets.GITHUB_TOKEN }}
+          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           context: 'tests-passed-successfully'
           description: 'Tests passed successfully'
           state: 'success'

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

@@ -230,7 +230,7 @@ body {
   margin-left: auto;
   margin-right: auto;
   max-width: 100%;
-  font-size: 15px;
+  font-size: {{normalfontsize}};
   font-weight: 300;
   line-height: 1.4em;
   color: #333;
@@ -709,7 +709,7 @@ p.NormRef {
 pre,
 .pseudocode {
   background-color: #f2f2f2;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
@@ -813,7 +813,7 @@ a.footnote-number {
   vertical-align: super; }
 
 .footnote {
-  font-size: 0.9em; }
+  font-size: {{footnotefontsize}}; }
 
 /*
     3.11 Blockquotes

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

@@ -58,7 +58,7 @@ $un-admonition-color: #47430c;
 $un-toc-active: #4d7ea5;
 
 body {
-  @include bodyStyle1(15px, 1.4em, $un-text, #ffffff, 300);
+  @include bodyStyle1($normalfontsize, 1.4em, $un-text, #ffffff, 300);
   font-weight: 400;
 }
 
@@ -523,7 +523,7 @@ a.footnote-number {
 }
 
 .footnote {
-  font-size: 0.9em;
+  font-size: $footnotefontsize;
 }
 
 

data/lib/isodoc/un/html/unece.css

@@ -14,7 +14,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre {
   text-align: left;
   mso-pagination: widow-orphan;
   tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-  font-size: 10.0pt;
+  font-size: {{monospacefontsize}};
   font-family: {{monospacefont}};
   mso-fareast-font-family: Calibri;
   mso-bidi-font-family: "Courier New";
@@ -31,7 +31,7 @@ p.pseudocode, li.pseudocode, div.pseudocode {
   text-align: left;
   mso-pagination: widow-orphan;
   tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: Calibri;
   mso-bidi-font-family: "Courier New";
@@ -49,7 +49,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef {
   tab-stops: 33.15pt;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-weight: normal;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
@@ -147,10 +147,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   mso-bidi-font-size: 11.0pt;
   font-family: {{bodyfont}};
-  font-size: 10.0pt;
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
@@ -415,7 +414,7 @@ p.zzCopyright, li.zzCopyright {
   tab-stops: 20.15pt 25.7pt 481.15pt;
   padding: 0cm;
   mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -501,7 +500,7 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -517,7 +516,7 @@ p.QuoteAttribution {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -575,7 +574,7 @@ p.Formula, li.Formula, div.Formula {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: right 487.45pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -698,7 +697,7 @@ table.MsoISOTable, table.MsoISOTableBig {
   mso-border-insideh: .75pt solid windowtext;
   mso-border-insidev: .75pt solid windowtext;
   margin-bottom: 12pt;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 table.MsoISOTable th, table.MsoISOTableBig th {
@@ -707,7 +706,7 @@ table.MsoISOTable th, table.MsoISOTableBig th {
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
 table.MsoISOTable p, table.MsoISOTableBig p {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 table.MsoISOTable td, table.MsoISOTableBig td {
   border: solid windowtext 1pt;
@@ -729,7 +728,7 @@ table.MsoTableGrid {
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   margin-bottom: 12pt;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 div.formula {
@@ -771,7 +770,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
   vertical-align: super; }
 
 aside {
-  font-size: 10.0pt; }
+  font-size: {{footnotefontsize}}; }
 
 .example-title {
   font-weight: bold;
@@ -789,32 +788,32 @@ div.example {
 
 p.example, li.example, div.example, td.example {
   mso-pagination: none;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 td.example p.MsoListParagraph {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 div.example p.MsoListParagraph {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 div.Note p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
 div.Note span.stem {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 div.Note p.Sourcecode, div.Note pre.Sourcecode {
   font-size: 8.0pt;
   margin-left: 1.0cm; }
 
 div.Note table.dl {
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   margin-left: 1.0cm; }
 
 span.note_label, span.example_label, td.example_label, td.note_label {
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 table.dl {

data/lib/isodoc/un/html/unece.scss

@@ -27,7 +27,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre
         text-align:left;
         mso-pagination:widow-orphan;
         tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-        font-size:10.0pt;
+        font-size:$monospacefontsize;
         font-family:$monospacefont;
         mso-fareast-font-family:Calibri;
         mso-bidi-font-family:"Courier New";
@@ -43,7 +43,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
 	text-align:left;
 	mso-pagination:widow-orphan;
 	tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Courier New";
@@ -60,7 +60,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef
     tab-stops: 33.15pt;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-weight:normal;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -153,10 +153,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
-    font-size:10.0pt;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
@@ -410,7 +409,7 @@ p.zzCopyright, li.zzCopyright
 	tab-stops:20.15pt 25.7pt 481.15pt;
 	padding:0cm;
 	mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -491,7 +490,7 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -506,7 +505,7 @@ p.QuoteAttribution
         line-height:12.0pt;
         mso-pagination:widow-orphan;
         tab-stops:20.15pt;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
@@ -562,7 +561,7 @@ p.Formula, li.Formula, div.Formula
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:right 487.45pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -681,14 +680,14 @@ table.MsoISOTable, table.MsoISOTableBig
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
         margin-bottom:12pt;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 table.MsoISOTable th, table.MsoISOTableBig th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
 table.MsoISOTable p, table.MsoISOTableBig p
-{font-size:10.0pt; }
+{font-size:$smallerfontsize; }
 table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
@@ -708,7 +707,7 @@ table.MsoTableGrid
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
         margin-bottom:12pt;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 div.formula
     {tab-stops:right 487.45pt;}
@@ -743,7 +742,7 @@ div.coverpage_warning
         vertical-align:super;}
 
         aside {
-          font-size:10.0pt;
+          font-size:$footnotefontsize;
 }
 
 .example-title {
@@ -765,24 +764,24 @@ div.example {
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:10.0pt;
+        font-size:$smallerfontsize;
         font-family:$bodyfont;}
 
 td.example p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: $smallerfontsize;
 }
 
 div.example p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: $smallerfontsize;
 }
 
 div.Note p.MsoListParagraph {
-  font-size: 10.0pt;
+  font-size: $smallerfontsize;
   margin-left: 1.0cm;
 }
 
 div.Note span.stem {
-  font-size: 10.0pt; }
+  font-size: $smallerfontsize; }
 
 div.Note p.Sourcecode, div.Note pre.Sourcecode  {
   font-size: 8.0pt;
@@ -790,13 +789,13 @@ div.Note p.Sourcecode, div.Note pre.Sourcecode  {
 }
 
 div.Note table.dl  {
-  font-size: 10.0pt;
+  font-size: $smallerfontsize;
   margin-left: 1.0cm;
 }
 
 span.note_label, span.example_label, td.example_label, td.note_label
 {
-font-size: 10.0pt;
+font-size: $smallerfontsize;
 font-family:$bodyfont;
 }
 

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

@@ -81,7 +81,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
   margin: 0cm;
   margin-bottom: 12.0pt;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -96,7 +96,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
   margin-bottom: 12.0pt;
   /* do not put in margin-left, it is specific to list level */
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -111,7 +111,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
   margin-bottom: 12.0pt;
   /* do not put in margin-left, it is specific to list level */
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -126,7 +126,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
   margin-bottom: 12.0pt;
   /* do not put in margin-left, it is specific to list level */
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -141,7 +141,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
   margin-bottom: 12.0pt;
   /* do not put in margin-left, it is specific to list level */
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -164,7 +164,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader {
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   tab-stops: center 216.0pt right 482.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -176,7 +176,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   tab-stops: center 367.0pt right 734.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -188,7 +188,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   tab-stops: right 482.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -200,7 +200,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
   tab-stops: right 734.0pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -592,7 +592,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-pagination: widow-orphan;
   mso-hyphenate: none;
   tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -615,7 +615,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
   mso-pagination: widow-orphan;
   mso-hyphenate: none;
   tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -638,7 +638,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   mso-pagination: widow-orphan;
   mso-hyphenate: none;
   tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -661,7 +661,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 9.0pt;
+  font-size: {{footnotefontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -680,7 +680,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
   text-align: justify;
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -796,9 +796,9 @@ p.Tablebody, li.Tablebody, div.Tablebody {
   margin-right: 0cm;
   margin-bottom: 3.0pt;
   margin-left: 0cm;
-  line-height: 10.5pt;
+  line-height: {{normalfontsize}};
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   mso-bidi-font-size: 11.0pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
@@ -1225,7 +1225,7 @@ table.MsoNormalTable {
   mso-para-margin: 0cm;
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 ol {

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

@@ -71,7 +71,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
 	margin:0cm;
 	margin-bottom:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -85,7 +85,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -99,7 +99,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -113,7 +113,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -127,7 +127,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -149,7 +149,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:center 216.0pt right 482.0pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -160,7 +160,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:center 367.0pt right 734.0pt;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -171,7 +171,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:right 482.0pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -182,7 +182,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:right 734.0pt;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -553,7 +553,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -575,7 +575,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -597,7 +597,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -618,7 +618,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:9.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -636,7 +636,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	text-align:justify;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -745,9 +745,9 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-right:0cm;
 	margin-bottom:3.0pt;
 	margin-left:0cm;
-	line-height:10.5pt;
+	line-height:$normalfontsize;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -1130,7 +1130,7 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 ol
 	{margin-bottom:0cm;

data/lib/isodoc/un/html_convert.rb

@@ -26,7 +26,9 @@ module IsoDoc
             '"SimHei",sans-serif' :
             '"Times New Roman", serif'
           ),
-          monospacefont: '"Courier New",monospace'
+          monospacefont: '"Courier New",monospace',
+          normalfontsize: "15px",
+          footnotefontsize: "0.9em",
         }
       end
 

data/lib/isodoc/un/un.plenary-attachment.xsl

@@ -37,7 +37,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Times New Roman, STIX Two Math, HanSans" font-size="10pt" xml:lang="{$lang}">
+		<fo:root font-family="Times New Roman, STIX Two Math, Source Han Sans" font-size="10pt" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- Cover page -->
 				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -1584,6 +1584,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -2877,6 +2878,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -3281,6 +3283,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3505,7 +3508,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3556,7 +3560,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -4288,7 +4292,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>

data/lib/isodoc/un/un.plenary.xsl

@@ -37,7 +37,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Times New Roman, STIX Two Math, HanSans" font-size="10pt" xml:lang="{$lang}">
+		<fo:root font-family="Times New Roman, STIX Two Math, Source Han Sans" font-size="10pt" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- Cover page -->
 				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -1584,6 +1584,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -2877,6 +2878,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -3281,6 +3283,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3505,7 +3508,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3556,7 +3560,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -4288,7 +4292,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>

data/lib/isodoc/un/un.recommendation.xsl

@@ -39,7 +39,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Times New Roman, STIX Two Math, HanSans" font-size="10pt" xml:lang="{$lang}">
+		<fo:root font-family="Times New Roman, STIX Two Math, Source Han Sans" font-size="10pt" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- Cover page -->
 				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -1444,6 +1444,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -2742,6 +2743,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -3146,6 +3148,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3374,7 +3377,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3430,7 +3434,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -4162,7 +4166,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>

data/lib/isodoc/un/word_convert.rb

@@ -20,7 +20,11 @@ module IsoDoc
                      '"Times New Roman",serif'),
           headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                        '"Times New Roman",serif'),
-          monospacefont: '"Courier New",monospace'
+                       monospacefont: '"Courier New",monospace',
+                       normalfontsize: "10.5pt",
+                       monospacefontsize: "10.0pt",
+                       smallerfontsize: "10.0pt",
+                       footnotefontsize: "9.0pt",
         }
       end
 

data/lib/metanorma/un/fonts_manifest.yaml

@@ -0,0 +1,6 @@
+---
+Arial:
+Arial Black:
+Courier:
+Times New Roman:
+Source Han Sans:

data/lib/metanorma/un/processor.rb

@@ -2,14 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module UN
-    def self.fonts_used
-      {
-        html: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
-        doc: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
-        pdf: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.5.7"
+    VERSION = "0.5.8"
   end
 end

data/metanorma-unece.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iso-639"
 
   spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 1.3.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roman-numerals
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -283,6 +283,7 @@ files:
 - lib/metanorma-un.rb
 - lib/metanorma/un.rb
 - lib/metanorma/un/UN_emblem_blue.svg
+- lib/metanorma/un/fonts_manifest.yaml
 - lib/metanorma/un/input.rb
 - lib/metanorma/un/processor.rb
 - lib/metanorma/un/version.rb