diff --git a/lib/isodoc/iec/html/htmlstyle.scss b/lib/isodoc/iec/html/htmlstyle.scss
index 39c66f56..23968bca 100644
--- a/lib/isodoc/iec/html/htmlstyle.scss
+++ b/lib/isodoc/iec/html/htmlstyle.scss
@@ -517,7 +517,7 @@ p.NormRef {
pre,
.pseudocode {
@include pseudocodeBlock(#f5faff);
- font-size: 1em;
+ font-size: $monospacefontsize;
}
pre {
@@ -618,7 +618,7 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
}
.footnote {
- font-size: 0.9em;
+ font-size: $footnotefontsize;
}
sup a {
@@ -626,7 +626,7 @@ sup a {
font-size: 0.8em;
}
#footnote_box {
- font-size: 14px;
+ font-size: $footnotefontsize;
background: white;
padding: 0 10px;
margin: 10px;
@@ -642,7 +642,7 @@ ol.footnotes-list, aside.footnote {
}
ol.footnotes-list li, aside.footnote {
- font-size: 0.9em;
+ font-size: $footnotefontsize;
vertical-align: top;
list-style:decimal;
margin-bottom: 1em;
diff --git a/lib/isodoc/iec/html/isodoc.scss b/lib/isodoc/iec/html/isodoc.scss
index d09edf50..268e4994 100644
--- a/lib/isodoc/iec/html/isodoc.scss
+++ b/lib/isodoc/iec/html/isodoc.scss
@@ -10,9 +10,9 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
text-align:left;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:9.0pt;
- mso-bidi-font-size:10.0pt;
- font-family:"Courier New",monospace;
+ font-size:$monospacefontsize;
+ mso-bidi-font-size:$normalfontsize;
+ font-family:$monospacefont;
mso-fareast-font-family:"Times New Roman";
mso-bidi-font-family:Arial;
letter-spacing:-.1pt;
@@ -30,9 +30,9 @@ p.pseudocode, li.pseudocode, div.pseudocode
text-align:left;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:10.0pt;
- mso-bidi-font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ mso-bidi-font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
mso-bidi-font-family:Arial;
letter-spacing:-.1pt;
@@ -52,9 +52,9 @@ p.CODE-TableCell, li.CODE-TableCell, div.CODE-TableCell, pre.CODE-TableCell
text-align:left;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:8.0pt;
- mso-bidi-font-size:10.0pt;
- font-family:"Courier New";
+ font-size:$smallerfontsize;
+ mso-bidi-font-size:$normalfontsize;
+ font-family:$monospacefontsize;
mso-fareast-font-family:"Times New Roman";
mso-bidi-font-family:Arial;
letter-spacing:-.1pt;
@@ -68,7 +68,7 @@ p.Biblio, li.Biblio, div.Biblio
mso-style-parent:Normal;
margin-top:5.0pt;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:34.0pt;
text-align:justify;
text-indent:-34.0pt;
@@ -77,8 +77,8 @@ p.Biblio, li.Biblio, div.Biblio
/* mso-list:l6 level1 lfo20; */
tab-stops:list 34.0pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -89,7 +89,7 @@ p.NormRef, li.NormRef, div.NormRef
mso-style-parent:Normal;
margin-top:5.0pt;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0pt;
text-align:justify;
mso-pagination:widow-orphan;
@@ -97,8 +97,8 @@ p.NormRef, li.NormRef, div.NormRef
/* mso-list:l6 level1 lfo20; */
tab-stops:list 34.0pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -110,13 +110,13 @@ p.FigureTitle
mso-style-next:Normal;
margin-top:5.0pt;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -128,13 +128,13 @@ p.AdmonitionTitle, p.RecommendationTitle
mso-style-next:Normal;
margin-top:5.0pt;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -146,13 +146,13 @@ p.SourceTitle
mso-style-next:Normal;
margin-top:5.0pt;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -166,14 +166,14 @@ p.TableTitle
mso-style-next:Normal;
margin-top:5.0pt;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
mso-pagination:widow-orphan;
page-break-after:avoid;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -191,8 +191,8 @@ p.Note, div.Note, li.Note
text-align:justify;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:8.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$smallerfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -212,8 +212,8 @@ p.TableFootnote, div.TableFootnote, li.TableFootnote
mso-pagination:widow-orphan;
tab-stops:14.2pt;
layout-grid-mode:char;
- font-size:8.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$smallerfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -227,7 +227,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle, h1.ForewordTitle
mso-style-next:Normal;
margin-top:0cm;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
text-indent:0pt;
@@ -237,8 +237,8 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle, h1.ForewordTitle
mso-hyphenate:none;
layout-grid-mode:char;
font-size:12.0pt;
- mso-bidi-font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-bidi-font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -252,7 +252,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle
mso-style-next:Normal;
margin-top:0cm;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
text-indent:0pt;
@@ -262,8 +262,8 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle
mso-hyphenate:none;
layout-grid-mode:char;
font-size:12.0pt;
- mso-bidi-font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-bidi-font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -275,7 +275,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
mso-style-next:Normal;
margin-top:0cm;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
text-indent:0pt;
@@ -284,8 +284,8 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
mso-hyphenate:none;
layout-grid-mode:char;
font-size:12.0pt;
- mso-bidi-font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-bidi-font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -307,8 +307,8 @@ p.Terms, li.Terms, div.Terms
mso-pagination:widow-orphan;
page-break-after:avoid;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -332,8 +332,8 @@ p.AltTerms, li.AltTerms, div.AltTerms
mso-pagination:widow-orphan;
page-break-after:avoid;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -353,8 +353,8 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
text-align:justify;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:8.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$smallerfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -380,8 +380,8 @@ p.TermNum, li.TermNum, div.TermNum
mso-hyphenate:none;
tab-stops:list 31.2pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -445,7 +445,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1
mso-pagination:widow-orphan;
layout-grid-mode:char;
font-size:12.0pt;
- font-family:"Arial",sans-serif;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -463,7 +463,7 @@ p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2
mso-pagination:widow-orphan;
layout-grid-mode:char;
font-size:12.0pt;
- font-family:"Arial",sans-serif;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -482,8 +482,8 @@ p.TABLE-col-heading, li.TABLE-col-heading, div.TABLE-col-heading
mso-pagination:widow-orphan;
page-break-after:avoid;
layout-grid-mode:char;
- font-size:8.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$smallerfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -501,9 +501,9 @@ p.TABLE-cell, li.TABLE-cell, div.TABLE-cell
text-align:left;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:8.0pt;
- mso-bidi-font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$smallerfontsize;
+ mso-bidi-font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -519,7 +519,7 @@ p.Quote, li.Quote, div.Quote
line-height:12.0pt;
mso-pagination:widow-orphan;
tab-stops:20.15pt;
- font-size:10.0pt;
+ font-size:$normalfontsize;
font-family:$bodyfont;
mso-fareast-font-family:$bodyfont;
mso-bidi-font-family:$bodyfont;
@@ -529,7 +529,7 @@ p.QuoteAttribution
p.Admonition, li.Admonition, div.Admonition
{mso-style-priority:99;
mso-pagination:widow-orphan;
- font-size:10.0pt;
+ font-size:$normalfontsize;
font-family:$bodyfont;
mso-ascii-font-family:$bodyfont;
mso-ascii-theme-font:minor-latin;
@@ -551,16 +551,16 @@ p.formula, li.formula, div.formula
mso-style-unhide:no;
mso-style-qformat:yes;
mso-style-next:Normal;
- margin-top:10.0pt;
+ margin-top:$normalfontsize;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:justify;
mso-pagination:widow-orphan;
tab-stops:center 8.0cm right 16.0cm;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -580,8 +580,8 @@ p.FOREWORD, li.FOREWORD, div.FOREWORD
mso-pagination:widow-orphan;
tab-stops:14.2pt;
layout-grid-mode:char;
- font-size:8.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$smallerfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -626,7 +626,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:$normalfontsize;
font-family:$bodyfont;}
table.MsoISOTable th, table.MsoISOTableBig th
{border:solid windowtext 1pt;
@@ -637,7 +637,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:$normalfontsize; }
table.MsoTableGrid
{mso-style-name:"Table Grid";
mso-tstyle-rowband-size:0;
@@ -652,7 +652,7 @@ table.MsoTableGrid
mso-para-margin:0cm;
mso-para-margin-bottom:.0001pt;
mso-pagination:widow-orphan;
- font-size:10.0pt;
+ font-size:$normalfontsize;
font-family:$bodyfont;}
body
{tab-interval:36.0pt;}
@@ -679,7 +679,7 @@ div.coverpage_warning
margin-right:4.25pt}
.coverpage_warning
{color:#485094;
- font-size:10.0pt;}
+ font-size:$normalfontsize;}
.coverpage {
text-align: center;
margin: 2em 0;
@@ -778,7 +778,7 @@ a.TableFootnoteRef, span.TableFootnoteRef
vertical-align:super;}
aside {
- font-size:10.0pt;
+ font-size:$footnotefontsize;
}
/*
@@ -786,9 +786,9 @@ div.example {
border:solid black .25pt;
mso-border-alt:solid black .25pt;
padding:10pt;
- mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
+ mso-padding-alt:$normalfontsize 10.0pt 10.0pt 10.0pt;
margin:10pt;
- mso-margin-alt:10.0pt 10.0pt 10.0pt 10.0pt;
+ mso-margin-alt:$normalfontsize 10.0pt 10.0pt 10.0pt;
}
*/
@@ -803,32 +803,32 @@ p.example, li.example, div.example, td.example
{
mso-pagination:none;
tab-stops:70.9pt;
- font-size:10.0pt;
+ font-size:$normalfontsize;
font-family:$bodyfont;}
td.example p.MsoListParagraph {
- font-size: 10.0pt;
+ font-size: $normalfontsize;
}
div.example p.MsoListParagraph {
- font-size: 10.0pt;
+ font-size: $normalfontsize;
}
div.Note p.MsoListParagraph {
- font-size: 8.0pt;
+ font-size: $smallerfontsize;
margin-left: 1.0cm;
}
div.Note span.stem {
- font-size: 8.0pt; }
+ font-size: $smallerfontsize; }
div.Note p.Sourcecode, div.Note pre.Sourcecode {
- font-size: 8.0pt;
+ font-size: $smallerfontsize;
margin-left: 1.0cm;
}
div.Note table.dl {
- font-size: 8.0pt;
+ font-size: $smallerfontsize;
margin-left: 1.0cm;
}
@@ -840,12 +840,12 @@ div.example, td.example {
span.example_label, td.example_label
{
-font-size: 10.0pt;
+font-size: $normalfontsize;
font-family:$bodyfont;
}
span.note_label, td.note_label
{
-font-size: 8.0pt;
+font-size: $smallerfontsize;
font-family:$bodyfont;
}
diff --git a/lib/isodoc/iec/html/wordstyle.scss b/lib/isodoc/iec/html/wordstyle.scss
index a02b1785..70e2c919 100644
--- a/lib/isodoc/iec/html/wordstyle.scss
+++ b/lib/isodoc/iec/html/wordstyle.scss
@@ -74,13 +74,13 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
mso-style-link:"PARAGRAPH Char";
margin-top:5.0pt;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:justify;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -95,8 +95,8 @@ p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent
margin-bottom:.0001pt;
text-align:justify;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -111,8 +111,8 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
margin-left:72.0pt;
text-align:justify;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -129,8 +129,8 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
margin-bottom:.0001pt;
text-align:justify;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -147,8 +147,8 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
margin-bottom:.0001pt;
text-align:justify;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -164,8 +164,8 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
margin-bottom:.0001pt;
text-align:justify;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -181,8 +181,8 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
margin-bottom:.0001pt;
text-align:justify;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -195,9 +195,9 @@ h1.main
mso-style-qformat:yes;
mso-style-parent:Normal;
mso-style-next:Normal;
- margin-top:10.0pt;
+ margin-top:$normalfontsize;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:19.85pt;
text-align:left;
text-indent:-19.85pt;
@@ -209,7 +209,7 @@ h1.main
tab-stops:list 19.85pt;
layout-grid-mode:char;
font-size:11.0pt;
- font-family:"Arial",sans-serif;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-font-kerning:0pt;
mso-ansi-language:EN-GB;
@@ -224,7 +224,7 @@ h1.Annex
mso-style-next:ANNEX-heading1;
margin-top:0cm;
margin-right:0cm;
- margin-bottom:10.0pt;
+ margin-bottom:$normalfontsize;
margin-left:0cm;
text-align:center;
/* text-indent:25.5pt; */
@@ -234,7 +234,7 @@ h1.Annex
mso-list:l4 level1 lfo19;
layout-grid-mode:char;
font-size:12.0pt;
- font-family:"Arial",sans-serif;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -261,8 +261,8 @@ h1
mso-hyphenate:none;
tab-stops:list 31.2pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:ZH-CN;
@@ -287,8 +287,8 @@ h2
mso-hyphenate:none;
tab-stops:list 42.55pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:ZH-CN;
@@ -312,8 +312,8 @@ h3 {mso-list:l26 level3 lfo40;
mso-hyphenate:none;
tab-stops:list 53.85pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:ZH-CN;
@@ -337,8 +337,8 @@ h4 {mso-list:l26 level2 lfo40;
mso-hyphenate:none;
tab-stops:list 65.2pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:ZH-CN;
@@ -362,8 +362,8 @@ h6
mso-hyphenate:none;
tab-stops:list 76.55pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:ZH-CN;
@@ -388,8 +388,8 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
mso-hyphenate:none;
tab-stops:list 87.9pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -413,8 +413,8 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
mso-hyphenate:none;
tab-stops:list 99.25pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -438,8 +438,8 @@ p.MsoHeading9, li.MsoHeading9, div.MsoHeading9
mso-hyphenate:none;
tab-stops:list 110.55pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -459,8 +459,8 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
mso-hyphenate:none;
tab-stops:22.7pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -480,8 +480,8 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
mso-hyphenate:none;
tab-stops:49.65pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -501,8 +501,8 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
mso-hyphenate:none;
tab-stops:78.0pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -522,8 +522,8 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4
mso-hyphenate:none;
tab-stops:78.0pt 130.4pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -543,8 +543,8 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5
mso-hyphenate:none;
tab-stops:78.0pt 184.3pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -564,8 +564,8 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6
mso-hyphenate:none;
tab-stops:78.0pt 246.65pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -585,8 +585,8 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7
mso-hyphenate:none;
tab-stops:22.7pt right 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -606,8 +606,8 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8
mso-hyphenate:none;
tab-stops:22.7pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -627,8 +627,8 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9
mso-hyphenate:none;
tab-stops:22.7pt right dotted 453.5pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -642,8 +642,8 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
mso-pagination:widow-orphan;
tab-stops:center 8.0cm right 16.0cm;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -656,8 +656,8 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
mso-pagination:widow-orphan;
tab-stops:center 331.0pt right 662.0pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -673,8 +673,8 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
mso-pagination:widow-orphan;
tab-stops:center 8.0cm right 16.0cm;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -690,8 +690,8 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
mso-pagination:widow-orphan;
tab-stops:center 331.0pt right 662.0pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -702,7 +702,7 @@ span.MsoFootnoteReference
mso-style-parent:"";
mso-ansi-font-size:8.0pt;
mso-bidi-font-size:8.0pt;
- font-family:"Arial",sans-serif;
+ font-family:$bodyfont;
mso-ascii-font-family:Arial;
mso-hansi-font-family:Arial;
position:relative;
@@ -720,8 +720,8 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
text-indent:-14.2pt;
mso-pagination:widow-orphan;
layout-grid-mode:char;
- font-size:8.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$footnotefontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -749,7 +749,7 @@ span.Heading1Char
mso-style-link:"Heading 1";
mso-ansi-font-size:11.0pt;
font-size:11.0pt;
- font-family:"Arial",sans-serif;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-font-kerning:0pt;
mso-ansi-language:EN-GB;
@@ -762,9 +762,9 @@ span.Heading2Char
mso-style-locked:yes;
mso-style-parent:"";
mso-style-link:"Heading 2";
- mso-ansi-font-size:10.0pt;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-ansi-font-size:$normalfontsize;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:ZH-CN;
@@ -776,9 +776,9 @@ span.Heading3Char
mso-style-locked:yes;
mso-style-parent:"";
mso-style-link:"Heading 3";
- mso-ansi-font-size:10.0pt;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-ansi-font-size:$normalfontsize;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:JA;
@@ -791,9 +791,9 @@ span.Heading4Char
mso-style-locked:yes;
mso-style-parent:"";
mso-style-link:"Heading 4";
- mso-ansi-font-size:10.0pt;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-ansi-font-size:$normalfontsize;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:JA;
@@ -806,9 +806,9 @@ span.Heading5Char
mso-style-locked:yes;
mso-style-parent:"";
mso-style-link:"Heading 5";
- mso-ansi-font-size:10.0pt;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-ansi-font-size:$normalfontsize;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:JA;
@@ -821,9 +821,9 @@ span.Heading6Char
mso-style-locked:yes;
mso-style-parent:"";
mso-style-link:"Heading 6";
- mso-ansi-font-size:10.0pt;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ mso-ansi-font-size:$normalfontsize;
+ font-size:$normalfontsize;
+ font-family:$headerfont;
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
mso-fareast-language:JA;
@@ -981,7 +981,7 @@ span.BodyTextChar
mso-style-locked:yes;
mso-style-parent:"";
mso-style-link:"Body Text";
- font-family:"Arial",sans-serif;
+ font-family:$bodyfont;
mso-ascii-font-family:Arial;
mso-hansi-font-family:Arial;
mso-bidi-font-family:Arial;
@@ -1025,7 +1025,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
line-height:12.0pt;
mso-pagination:widow-orphan;
tab-stops:20.15pt;
- font-size:10.0pt;
+ font-size:$normalfontsize;
font-family:$headerfont;
mso-fareast-font-family:$headerfont;
mso-bidi-font-family:$headerfont;
@@ -1042,7 +1042,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
margin-left:0cm;
line-height:10.5pt;
mso-pagination:widow-orphan;
- font-size:10.0pt;
+ font-size:$normalfontsize;
mso-bidi-font-size:11.0pt;
font-family:$bodyfont;
mso-fareast-font-family:$bodyfont;
@@ -1066,8 +1066,8 @@ p.Tablebody, li.Tablebody, div.Tablebody
mso-pagination:widow-orphan;
tab-stops:17.0pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1085,8 +1085,8 @@ p.MsoListBullet, li.MsoListBullet, div.MsoListBullet
mso-list:l22 level1 lfo8;
tab-stops:17.0pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1105,8 +1105,8 @@ p.MsoListNumber, li.MsoListNumber, div.MsoListNumber
mso-list:l15 level1 lfo1;
tab-stops:17.0pt;
layout-grid-mode:char;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1119,13 +1119,13 @@ p.MsoIndex1, li.MsoIndex1, div.MsoIndex1
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
- margin-left:10.0pt;
+ margin-left:$normalfontsize;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1141,10 +1141,10 @@ p.MsoIndex2, li.MsoIndex2, div.MsoIndex2
margin-left:20.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1160,10 +1160,10 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3
margin-left:30.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1179,10 +1179,10 @@ p.MsoIndex4, li.MsoIndex4, div.MsoIndex4
margin-left:40.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1198,10 +1198,10 @@ p.MsoIndex5, li.MsoIndex5, div.MsoIndex5
margin-left:50.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1217,10 +1217,10 @@ p.MsoIndex6, li.MsoIndex6, div.MsoIndex6
margin-left:60.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1236,10 +1236,10 @@ p.MsoIndex7, li.MsoIndex7, div.MsoIndex7
margin-left:70.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1255,10 +1255,10 @@ p.MsoIndex8, li.MsoIndex8, div.MsoIndex8
margin-left:80.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1274,10 +1274,10 @@ p.MsoIndex9, li.MsoIndex9, div.MsoIndex9
margin-left:90.0pt;
margin-bottom:.0001pt;
text-align:justify;
- text-indent:-10.0pt;
+ text-indent:-$normalfontsize;
mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Arial",sans-serif;
+ font-size:$normalfontsize;
+ font-family:$bodyfont;
mso-fareast-font-family:"Times New Roman";
letter-spacing:.4pt;
mso-ansi-language:EN-GB;
@@ -1290,7 +1290,7 @@ p.MsoIndexHeading, li.MsoIndexHeading, div.MsoIndexHeading
margin-bottom:.0001pt;
text-align:justify;
mso-pagination:widow-orphan;
- font-size:10.0pt;
+ font-size:$normalfontsize;
font-family:"Cambria",serif;
mso-fareast-font-family:"MS Gothic";
mso-bidi-font-family:"Times New Roman";
@@ -1849,7 +1849,7 @@ table.MsoNormalTable
mso-para-margin:0cm;
mso-para-margin-bottom:.0001pt;
mso-pagination:widow-orphan;
- font-size:10.0pt;
+ font-size:$normalfontsize;
font-family:$bodyfont;}
ol
{margin-bottom:0cm;
diff --git a/lib/isodoc/iec/html_convert.rb b/lib/isodoc/iec/html_convert.rb
index ac13aca0..4775222d 100644
--- a/lib/isodoc/iec/html_convert.rb
+++ b/lib/isodoc/iec/html_convert.rb
@@ -16,6 +16,8 @@ def default_fonts(options)
bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
monospacefont: ('"Courier New",monospace'),
+ monospacefontsize: "1.0em",
+ footnotefontsize: "0.9em",
}
end
diff --git a/lib/isodoc/iec/word_convert.rb b/lib/isodoc/iec/word_convert.rb
index e70b06b9..40037f40 100644
--- a/lib/isodoc/iec/word_convert.rb
+++ b/lib/isodoc/iec/word_convert.rb
@@ -16,6 +16,10 @@ def default_fonts(options)
bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
monospacefont: '"Courier New",monospace',
+ normalfontsize: "10.0pt",
+ footnotefontsize: "8.0pt",
+ smallerfontsize: "8.0pt",
+ monospacefontsize: "9.0pt",
}
end
diff --git a/spec/isodoc/iso_spec.rb b/spec/isodoc/iso_spec.rb
index 2610485e..da8e2884 100644
--- a/spec/isodoc/iso_spec.rb
+++ b/spec/isodoc/iso_spec.rb
@@ -65,9 +65,9 @@
INPUT
html = File.read("test.doc", encoding: "utf-8")
- expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New",monospace;]m)
+ expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
expect(html).to match(%r[Quote[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
- expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial",sans-serif;]m)
+ expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
end
it "processes examples" do