metanorma-csa 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9482a7b054061fd42439fac150f5d2e328bcd165387e5d0213811b736362c75b
-  data.tar.gz: 5e5e352e61b1c4f62fe5f9aaab7592d49704874c28f461c13009a7df1037cd9c
+  metadata.gz: 8a611dbc71c58150cd8102bf56cf7f71b514a94b498600dfdd7f00e273eb81a9
+  data.tar.gz: '018ce3ef9b1621ac802ac2defe1c9f8b4295a8eb945a28cc59e2509a87ab4f13'
 SHA512:
-  metadata.gz: '058d7bf311553b32294bd267c6e58146f80241d804e8eb866421f5c93fe9932082cba1c71e7de6ca3ac3ff796e1d1d3d557cae6da7d9a11df07c9627c10aaa3b'
-  data.tar.gz: 07b932b56ca67039d21a19bb4aa0bcf9f885a0d28cc86cb0bcda0aa298fee6bc71b1abe6576b671eb01c7c87d88de9f24a753116c10dc22e4631d65bff316a03
+  metadata.gz: f6a9634bccfd8971fce8ca005e93ba9d830b0d0529159e0cb3296fcce031c164b0cd56f1bfd01d67cfdaf2d5044a34c20f47754641ddce84bba73b124f0bc3a5
+  data.tar.gz: f7ac4faaad94d9c4b9ce5ee70dcd79a06e73cfd4e5005f67d1fed6ac1d5e46489b6eff8a705f3d6933ac3ac8040f3a341274b1d4070e7f7b0a5b0543347fdbe9

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/csa/csa.standard.xsl

@@ -33,7 +33,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="AzoSans, STIX Two Math" font-size="10pt" xml:lang="{$lang}">
+		<fo:root font-family="Azo Sans, STIX Two Math" 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}">
@@ -519,7 +519,7 @@
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
-				<fo:block font-family="AzoSans-Light" font-size="10pt" margin-bottom="12pt" font-weight="normal" text-indent="0" start-indent="0" color="rgb(168, 170, 173)" text-align="left">
+				<fo:block font-family="Azo Sans Lt" font-size="10pt" margin-bottom="12pt" font-weight="normal" text-indent="0" start-indent="0" color="rgb(168, 170, 173)" text-align="left">
 					<fo:inline id="footnote_{@reference}" keep-with-next.within-line="always" font-size="60%" vertical-align="super">
 						<xsl:value-of select="$number "/><!-- + count(//csa:bibitem/csa:note) -->
 					</fo:inline>
@@ -601,7 +601,7 @@
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
-				<fo:block font-family="AzoSans-Light" font-size="10pt" margin-bottom="12pt" start-indent="0pt" color="rgb(168, 170, 173)">
+				<fo:block font-family="Azo Sans Lt" font-size="10pt" margin-bottom="12pt" start-indent="0pt" color="rgb(168, 170, 173)">
 					<fo:inline id="{generate-id()}" keep-with-next.within-line="always" font-size="60%" vertical-align="super"><!-- baseline-shift="30%" padding-right="9mm"  alignment-baseline="hanging" -->
 						<xsl:value-of select="$number"/><!-- <xsl:text>)</xsl:text> -->
 					</fo:inline>
@@ -856,7 +856,7 @@
 			</fo:block-container>
 		</fo:static-content>
 		<fo:static-content flow-name="footer">
-			<fo:block-container font-family="AzoSans-Light" font-size="10.1pt" height="100%" display-align="after"> <!-- 11.5pt -->
+			<fo:block-container font-family="Azo Sans Lt" font-size="10.1pt" height="100%" display-align="after"> <!-- 11.5pt -->
 				<fo:block padding-bottom="13mm" text-align="right" color="rgb(144, 144, 144)">
 					<fo:inline padding-right="7mm"><xsl:value-of select="$copyright"/></fo:inline>
 					<fo:page-number/>
@@ -1040,7 +1040,7 @@
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
 		
 		
-			<xsl:attribute name="font-family">SourceCodePro</xsl:attribute>			
+			<xsl:attribute name="font-family">Source Code Pro</xsl:attribute>			
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			<xsl:attribute name="line-height">113%</xsl:attribute>
@@ -1290,6 +1290,7 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
 		
+		
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="text-align">center</xsl:attribute>
@@ -1336,7 +1337,7 @@
 
 	</xsl:attribute-set><xsl:attribute-set name="tt-style">
 		
-			<xsl:attribute name="font-family">SourceCodePro</xsl:attribute>			
+			<xsl:attribute name="font-family">Source Code Pro</xsl:attribute>			
 		
 		
 		
@@ -2543,6 +2544,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']">
@@ -2947,6 +2949,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3162,7 +3165,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>
@@ -3213,7 +3217,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"/>
@@ -3946,7 +3950,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/csa/html/csa.css

@@ -9,7 +9,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";
@@ -26,7 +26,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";
@@ -44,7 +44,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}};
@@ -142,10 +142,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}};
@@ -496,7 +495,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}};
@@ -512,7 +511,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}};
@@ -574,7 +573,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}};
@@ -688,7 +687,7 @@ table.MsoISOTable, table.MsoISOTableBig {
   mso-yfti-tbllook: 480;
   mso-border-insideh: .75pt solid windowtext;
   mso-border-insidev: .75pt solid windowtext;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 table.MsoISOTable th, table.MsoISOTableBig th {
@@ -702,7 +701,7 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
 table.MsoISOTable p, table.MsoISOTableBig p {
-  font-size: 10.0pt; }
+  font-size: {{smallerfontsize}}; }
 
 table.MsoTableGrid {
   mso-style-name: "Table Grid";
@@ -718,7 +717,7 @@ table.MsoTableGrid {
   mso-para-margin: 0cm;
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 div.formula {
@@ -760,7 +759,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
   vertical-align: super; }
 
 aside {
-  font-size: 10.0pt; }
+  font-size: {{footnotefontsize}}; }
 
 .example-title {
   font-weight: bold;
@@ -778,32 +777,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/csa/html/csa.scss

@@ -9,7 +9,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";
@@ -25,7 +25,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";
@@ -42,7 +42,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;
@@ -135,10 +135,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;}
@@ -392,7 +391,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;
@@ -473,7 +472,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;
@@ -488,7 +487,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;
@@ -548,7 +547,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;
@@ -651,7 +650,7 @@ table.MsoISOTable, table.MsoISOTableBig
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 table.MsoISOTable th, table.MsoISOTableBig th
     {border:solid windowtext 1pt;
@@ -662,7 +661,7 @@ table.MsoISOTable td, table.MsoISOTableBig td
     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.MsoTableGrid
 	{mso-style-name:"Table Grid";
 	mso-tstyle-rowband-size:0;
@@ -677,7 +676,7 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 div.formula
     {tab-stops:right 487.45pt;}
@@ -712,7 +711,7 @@ div.coverpage_warning
         vertical-align:super;}
 
         aside {
-          font-size:10.0pt;
+          font-size:$footnotefontsize;
 }
 
 .example-title {
@@ -734,24 +733,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;
@@ -759,14 +758,14 @@ 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/csa/html/htmlstyle.css

@@ -621,12 +621,12 @@ pre,
 .pseudocode {
   color: #5b5e5f;
   background-color: #F5F6F6;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
-  font-size: 1em;
+  font-size: {{monospacefontsize}};
   border-left: solid 5px #B1B6B8;
   padding: 1.2em 1.2em 1.2em 2.2em;
   margin: 2em 0 2em -1em; }
@@ -687,7 +687,7 @@ td > p.example {
 
 td.example_label {
   font-weight: 700;
-  font-size: 1.2em;
+  font-size: {{normalfontsize}};
   text-transform: uppercase;
   text-align: center;
   margin-top: 0; }
@@ -708,7 +708,7 @@ td.example_label {
     margin-left: -1.5em; }
   .example .example-title {
     margin-top: 0;
-    font-size: 1.2em; }
+    font-size: {{normalfontsize}}; }
   .example pre,
   .example .pseudocode {
     background: none; }
@@ -753,7 +753,7 @@ a.footnote-number {
   font-size: 0.8em; }
 
 .footnote {
-  font-size: 0.9em; }
+  font-size: {{footnotefontsize}}; }
 
 /*
 3.11 Blockquotes
@@ -818,7 +818,7 @@ span.keyword {
   font-weight: 400; }
 
 p {
-  font-size: 1.2em;
+  font-size: {{normalfontsize}};
   line-height: 1.5;
   margin-top: 1em;
   margin-bottom: 1em; }
@@ -827,7 +827,7 @@ p {
 Paragraphs
 */
 p {
-  font-size: 1.2em;
+  font-size: {{normalfontsize}};
   line-height: 1.5;
   margin-top: 1em;
   margin-bottom: 1em; }

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

@@ -310,7 +310,7 @@ pre {
 pre,
 .pseudocode {
   @include pseudocodeBlock(#F5F6F6, rgb(91, 94, 95));
-  font-size: 1em;
+  font-size: $monospacefontsize;
   border-left: solid 5px #B1B6B8;
   padding: 1.2em 1.2em 1.2em 2.2em;
   margin: 2em 0 2em -1em;
@@ -365,7 +365,7 @@ td>p.example {
 
 td.example_label {
   font-weight: 700;
-  font-size: 1.2em;
+  font-size: $normalfontsize;
   text-transform: uppercase;
   text-align: center;
   margin-top: 0;
@@ -377,7 +377,7 @@ td.example_label {
 
   .example-title {
     margin-top: 0;
-    font-size: 1.2em;
+    font-size: $normalfontsize;
   }
 
   pre,
@@ -421,7 +421,7 @@ a.footnote-number {
 }
 
 .footnote {
-  font-size: 0.9em;
+  font-size: $footnotefontsize;
 }
 
 
@@ -490,7 +490,7 @@ span.keyword {
 }
 
 p {
-  font-size: 1.2em;
+  font-size: $normalfontsize;
   line-height: 1.5;
   margin-top: 1em;
   margin-bottom: 1em;
@@ -501,7 +501,7 @@ Paragraphs
 */
 
 p {
-  font-size: 1.2em;
+  font-size: $normalfontsize;
   line-height: 1.5;
   margin-top: 1em;
   margin-bottom: 1em;

data/lib/isodoc/csa/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;
@@ -97,7 +97,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   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.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -129,7 +129,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -145,7 +145,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 10.5pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -156,7 +156,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   margin: 0cm;
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{footnotefontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -168,7 +168,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;
@@ -180,7 +180,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;
@@ -192,7 +192,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;
@@ -204,7 +204,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;
@@ -333,7 +333,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
   margin: 0cm;
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{footnotefontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -605,7 +605,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}};
@@ -629,7 +629,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}};
@@ -653,7 +653,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}};
@@ -677,7 +677,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: 10.0pt;
+  font-size: {{footnotefontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -696,7 +696,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}};
@@ -812,9 +812,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}};
@@ -1241,7 +1241,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/csa/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;
@@ -86,7 +86,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -101,7 +101,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -116,7 +116,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -131,7 +131,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -142,7 +142,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -153,7 +153,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;
@@ -164,7 +164,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;
@@ -175,7 +175,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;
@@ -186,7 +186,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;
@@ -306,7 +306,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -567,7 +567,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;
@@ -590,7 +590,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;
@@ -613,7 +613,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;
@@ -635,7 +635,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -653,7 +653,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;
@@ -762,9 +762,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;
@@ -1147,7 +1147,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/csa/html_convert.rb

@@ -20,7 +20,10 @@ module IsoDoc
           bodyfont: (is_hans ? '"SimSun",serif' : 'AzoSans,"Source Sans Pro",sans-serif'),
           headerfont: (is_hans ? '"SimHei",sans-serif'
                               : 'AzoSans,"Source Sans Pro",sans-serif'),
-          monospacefont: '"Source Code Pro",monospace'
+          monospacefont: '"Source Code Pro",monospace',
+          normalfontsize: "1.2em",
+          monospacefontsize: "1.0em",
+          footnotefontsize: "0.9em",
         }
       end
 

data/lib/isodoc/csa/word_convert.rb

@@ -19,7 +19,11 @@ module IsoDoc
         {
           bodyfont: (is_hans ? '"SimSun",serif' : 'AzoSans,Arial,sans-serif'),
           headerfont: (is_hans ? '"SimHei",sans-serif' : 'AzoSans,Arial,sans-serif'),
-          monospacefont: '"Source Code Pro","Courier New",monospace'
+          monospacefont: '"Source Code Pro","Courier New",monospace',
+          normalfontsize: "10.5pt",
+          footnotefontsize: "10.0pt",
+          monospacefontsize: "10.0pt",
+          smallerfontsize: "10.0pt",
         }
       end
 

data/lib/metanorma/csa/fonts_manifest.yaml

@@ -0,0 +1,4 @@
+---
+AzoSans:
+Source Code Pro:
+- Light

data/lib/metanorma/csa/processor.rb

@@ -5,14 +5,6 @@ require 'asciidoctor/csa/converter'
 
 module Metanorma
   module Csa
-    def self.fonts_used
-      {
-        html: %w(AzoSans AzoSans-Light SourceCodePro-Light),
-        doc: %w(AzoSans AzoSans-Light SourceCodePro-Light),
-        pdf: %w(AzoSans AzoSans-Light SourceCodePro-Light)
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize

data/lib/metanorma/csa/version.rb

@@ -2,6 +2,6 @@
 
 module Metanorma
   module Csa
-    VERSION = '1.6.7'
+    VERSION = '1.6.8'
   end
 end

data/metanorma-csa.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "uuidtools"
 
   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-csa
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.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: htmlentities
@@ -114,14 +114,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
@@ -324,6 +324,7 @@ files:
 - lib/isodoc/csa/xref.rb
 - lib/metanorma-csa.rb
 - lib/metanorma/csa.rb
+- lib/metanorma/csa/fonts_manifest.yaml
 - lib/metanorma/csa/processor.rb
 - lib/metanorma/csa/version.rb
 - metanorma-csa.gemspec