From 3cb8bc874f79edbb9d5156c4cdbd8660c236f990 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Tue, 17 Nov 2020 21:45:40 +1100 Subject: [PATCH] CSS font size configure: https://github.com/metanorma/isodoc/issues/227 --- lib/isodoc/itu/html/htmlstyle.scss | 10 ++-- lib/isodoc/itu/html/itu.scss | 87 +++++++++++++++--------------- lib/isodoc/itu/html/wordstyle.scss | 74 ++++++++++++------------- lib/isodoc/itu/html_convert.rb | 5 +- lib/isodoc/itu/word_convert.rb | 7 ++- 5 files changed, 96 insertions(+), 87 deletions(-) diff --git a/lib/isodoc/itu/html/htmlstyle.scss b/lib/isodoc/itu/html/htmlstyle.scss index 6a1f5b80..a591b997 100644 --- a/lib/isodoc/itu/html/htmlstyle.scss +++ b/lib/isodoc/itu/html/htmlstyle.scss @@ -33,7 +33,7 @@ dl.glossary dt { } body { - @include bodyStyle1(14px, 1.6em, #141115, #fff); + @include bodyStyle1($normalfontsize, 1.6em, #141115, #fff); } nav { @@ -59,7 +59,7 @@ nav { li { a { - font-size: 14px; + font-size: $normalfontsize; } &:hover a { background: none; @@ -143,7 +143,7 @@ nav { @include monospaceBlockStyle(); background-color: #f6f6f6; - font-size: 0.8em; + font-size: $monospacefontsize; } .SourceTitle { @@ -152,7 +152,7 @@ nav { pre { @include sourceBlock(#f6f6f6); - font-size: 0.8em; + font-size: $monospacefontsize; } .example pre, .example .pseudocode { @@ -456,7 +456,7 @@ a.footnote-number { } .footnote { - font-size: 0.9em; + font-size: $footnotefontsize; } .Quote { diff --git a/lib/isodoc/itu/html/itu.scss b/lib/isodoc/itu/html/itu.scss index 23167c48..57f0cd30 100644 --- a/lib/isodoc/itu/html/itu.scss +++ b/lib/isodoc/itu/html/itu.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:12.0pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:Calibri; mso-bidi-font-family:"Courier New"; @@ -45,7 +45,7 @@ p.annex_obligation, li.annex_obligation, div.annex_obligation mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:"Times New Roman"; mso-ansi-language:EN-US;} @@ -64,7 +64,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -74,7 +74,7 @@ p.FigureTitle {mso-style-unhide:no; mso-style-qformat:yes; mso-style-parent:""; - margin-top:12.0pt; + margin-top:$normalfontsize; margin-right:0cm; margin-bottom:6.0pt; margin-left:0cm; @@ -85,7 +85,7 @@ p.FigureTitle punctuation-wrap:simple; text-autospace:none; font-weight:bold; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -107,7 +107,7 @@ p.SourceTitle punctuation-wrap:simple; text-autospace:none; font-weight:bold; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -129,7 +129,7 @@ p.AdmonitionTitle, p.RecommendationTitle punctuation-wrap:simple; text-autospace:none; font-weight:bold; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -151,7 +151,7 @@ p.TableTitle punctuation-wrap:simple; text-autospace:none; font-weight:bold; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -172,7 +172,7 @@ p.Note, div.Note, li.Note mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:11.0pt; + font-size:$smallerfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -192,7 +192,7 @@ p.TableFootnote, div.TableFootnote, li.TableFootnote mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:11.0pt; + font-size:$smallerfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -294,7 +294,7 @@ p.Normalaftertitle, li.Normalaftertitle, div.Normalaftertitle mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -330,10 +330,10 @@ p.Definition, li.Definition, div.Definition margin-bottom:6.0pt; margin-left:0cm; text-align:justify; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; tab-stops:20.15pt; - font-size:11.0pt; + font-size:$smallerfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -417,12 +417,12 @@ p.Terms, li.Terms, div.Terms mso-style-next:Definition; margin:0cm; margin-bottom:.0001pt; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; page-break-after:avoid; mso-hyphenate:none; tab-stops:20.15pt; - font-size:11.0pt; + font-size:$smallerfontsize; font-family:$headerfont; mso-fareast-font-family:$headerfont; mso-bidi-font-family:$headerfont; @@ -436,12 +436,12 @@ p.AltTerms, li.AltTerms, div.AltTerms mso-style-next:Definition; margin:0cm; margin-bottom:.0001pt; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; page-break-after:avoid; mso-hyphenate:none; tab-stops:20.15pt; - font-size:11.0pt; + font-size:$smallerfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -454,12 +454,12 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms mso-style-next:Definition; margin:0cm; margin-bottom:.0001pt; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; page-break-after:avoid; mso-hyphenate:none; tab-stops:20.15pt; - font-size:11.0pt; + font-size:$smallerfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -474,13 +474,13 @@ p.TermNum, li.TermNum, div.TermNum margin-right:0cm; margin-bottom:0cm; margin-left:0cm; - line-height:12.0pt; + line-height:$normalfontsize; text-align:justify; text-justify:inter-ideograph; mso-pagination:widow-orphan; page-break-after:avoid; tab-stops:20.15pt; - font-size:12.0pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -520,12 +520,12 @@ p.zzCopyright, li.zzCopyright margin-bottom:6.0pt; margin-left:14.2pt; text-align:justify; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; tab-stops:20.15pt 25.7pt 481.15pt; padding:0cm; mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt; - font-size:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -650,10 +650,10 @@ p.Quote, li.Quote, div.Quote margin-bottom:0cm; margin-left:36.0pt; text-align:justify; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; tab-stops:20.15pt; - font-size:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -665,10 +665,10 @@ p.QuoteAttribution margin-right:36.0pt; margin-bottom:0cm; margin-left:36.0pt; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; tab-stops:20.15pt; - font-size:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -687,7 +687,7 @@ p.Admonition, li.Admonition, div.Admonition mso-border-themecolor:accent1; padding:0cm; mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt; - font-size:12.0pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-ascii-font-family:$bodyfont; mso-ascii-theme-font:minor-latin; @@ -731,7 +731,7 @@ p.Formula, li.Formula, div.Formula mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -758,7 +758,7 @@ p.enumlev1, li.enumlev1, div.enumlev1 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -781,7 +781,7 @@ p.enumlev2, li.enumlev2, div.enumlev2 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -804,7 +804,7 @@ p.enumlev3, li.enumlev3, div.enumlev3 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -837,7 +837,7 @@ p.boilerplateHdr { } p.boilerplate { font-family:$bodyfont; - font-size:11.0pt; + font-size:$smallerfontsize; text-align:justify; margin-top:6.0pt; margin-bottom:0.0pt; @@ -980,7 +980,7 @@ table.MsoISOTable, table.MsoISOTableBig mso-yfti-tbllook:480; mso-border-insideh:.75pt solid windowtext; mso-border-insidev:.75pt solid windowtext; - font-size:11.0pt; + font-size:$smallerfontsize; font-family:$bodyfont;} table.MsoISOTable th, table.MsoISOTableBig th {border:solid windowtext 1pt; @@ -991,7 +991,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:11.0pt; } +{font-size:$smallerfontsize; } table.MsoTableGrid {mso-style-name:"Table Grid"; mso-tstyle-rowband-size:0; @@ -1018,7 +1018,8 @@ body font-weight:bold;} .coverpage_techcommittee {text-align:center; - font-size:12.0pt} + font-size:$normalfontsize; + } .coverpage_docstage {text-align:center; font-size:30.0pt; @@ -1041,7 +1042,7 @@ div.coverpage_warning vertical-align:super;} aside { - font-size:10.0pt; + font-size:$footnotefontsize; } .example-title { @@ -1075,12 +1076,12 @@ div.example p.MsoListParagraph { } div.Note p.MsoListParagraph { - font-size: 11.0pt; + font-size: $smallerfontsize; margin-left: 1.0cm; } div.Note span.stem { - font-size: 11.0pt; } + font-size: $smallerfontsize; } div.Note p.Sourcecode, div.Note pre.Sourcecode { font-size: 9.0pt; @@ -1088,13 +1089,13 @@ div.Note p.Sourcecode, div.Note pre.Sourcecode { } div.Note table.dl { - font-size: 11.0pt; + font-size: $smallerfontsize; margin-left: 1.0cm; } span.note_label, span.example_label, td.example_label, td.note_label { -font-size: 11.0pt; +font-size: $smallerfontsize; font-family:$bodyfont; } @@ -1103,7 +1104,7 @@ table.dl width:95%; mso-table-layout-alt: auto; margin-right:0cm; - margin-bottom:11.0pt; + margin-bottom:$smallerfontsize; margin-left:0cm;} table.biblio td { diff --git a/lib/isodoc/itu/html/wordstyle.scss b/lib/isodoc/itu/html/wordstyle.scss index 8a2d9e29..e4572c3c 100644 --- a/lib/isodoc/itu/html/wordstyle.scss +++ b/lib/isodoc/itu/html/wordstyle.scss @@ -80,7 +80,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12pt; + 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:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-ansi-language:EN-AU; mso-fareast-language:EN-US;} @@ -114,7 +114,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:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-ansi-language:EN-AU; mso-fareast-language:EN-US;} @@ -131,7 +131,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:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-ansi-language:EN-AU; mso-fareast-language:EN-US;} @@ -148,7 +148,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:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-ansi-language:EN-AU; mso-fareast-language:EN-US;} @@ -243,7 +243,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText margin-left:0cm; margin-bottom:.0001pt; mso-pagination:widow-orphan; - font-size:12.0pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:"Times New Roman"; mso-bidi-font-family:"Times New Roman"; @@ -355,7 +355,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:"Times New Roman"; @@ -406,7 +406,7 @@ p.MsoRMPane, li.MsoRMPane, div.MsoRMPane margin:0cm; margin-bottom:.0001pt; mso-pagination:widow-orphan; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:SimSun; @@ -447,7 +447,7 @@ h1 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; mso-list:l1 level1 lfo6; mso-hyphenate:none; @@ -502,7 +502,7 @@ p.h1Preface mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$headerfont; mso-fareast-font-family:$headerfont; @@ -553,7 +553,7 @@ h1.Annex { mso-style-parent:"Heading 1"; mso-style-link:"Heading 2 Char"; mso-style-next:Normal; - margin-top:12.0pt; + margin-top:$normalfontsize; margin-right:0cm; margin-bottom:6pt; margin-left:39.7pt; @@ -566,7 +566,7 @@ h1.Annex { tab-stops:39.7pt 59.55pt 79.4pt 99.25pt; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; font-weight:bold; mso-bidi-font-size:10.0pt; font-family:$headerfont; @@ -583,7 +583,7 @@ h2 mso-style-parent:"Heading 1"; mso-style-link:"Heading 2 Char"; mso-style-next:Normal; - margin-top:12.0pt; + margin-top:$normalfontsize; margin-right:0cm; margin-bottom:6pt; margin-left:39.7pt; @@ -597,7 +597,7 @@ h2 tab-stops:39.7pt 59.55pt 79.4pt 99.25pt; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$headerfont; mso-fareast-font-family:$headerfont; @@ -625,7 +625,7 @@ h3 mso-list:l1 level3 lfo6; mso-hyphenate:none; tab-stops:39.7pt 59.55pt 79.4pt 99.25pt; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$headerfont; color:black; @@ -656,7 +656,7 @@ h4 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$headerfont; color:black; @@ -687,7 +687,7 @@ h5 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-weight:bold; font-family:$headerfont; @@ -716,7 +716,7 @@ h6 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; mso-list:l1 level6 lfo6; mso-hyphenate:none; @@ -745,7 +745,7 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$headerfont; mso-fareast-font-family:"Times New Roman"; @@ -771,7 +771,7 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$headerfont; mso-fareast-font-family:"Times New Roman"; @@ -797,7 +797,7 @@ p.MsoHeading9, li.MsoHeading9, div.MsoHeading9 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$headerfont; mso-fareast-font-family:"Times New Roman"; @@ -819,7 +819,7 @@ p.MsoIndex1, li.MsoIndex1, div.MsoIndex1 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:"Times New Roman"; @@ -839,7 +839,7 @@ p.MsoIndex2, li.MsoIndex2, div.MsoIndex2 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:"Times New Roman"; @@ -859,7 +859,7 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:"Times New Roman"; @@ -879,7 +879,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -903,7 +903,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -927,7 +927,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -949,7 +949,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -971,7 +971,7 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -993,7 +993,7 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -1015,7 +1015,7 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -1037,7 +1037,7 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -1059,7 +1059,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9 mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:12.0pt; + font-size:$normalfontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -1091,7 +1091,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText mso-layout-grid-align:none; punctuation-wrap:simple; text-autospace:none; - font-size:11.0pt; + font-size:$footnotefontsize; mso-bidi-font-size:10.0pt; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; @@ -1108,9 +1108,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText margin-bottom:6.0pt; margin-left:0cm; text-align:justify; - line-height:12.0pt; + line-height:$normalfontsize; mso-pagination:widow-orphan; - font-size:12pt; + font-size:$normalfontsize; font-family:$bodyfont; mso-fareast-font-family:$bodyfont; mso-bidi-font-family:$bodyfont; @@ -1138,7 +1138,7 @@ span.Heading2Char mso-style-locked:yes; mso-style-parent:""; mso-style-link:"Heading 2"; - mso-ansi-font-size:12.0pt; + mso-ansi-font-size:$normalfontsize; font-family:$headerfont; mso-ascii-font-family:Cambria; mso-fareast-font-family:$headerfont; diff --git a/lib/isodoc/itu/html_convert.rb b/lib/isodoc/itu/html_convert.rb index 41eb952a..53a0b76a 100644 --- a/lib/isodoc/itu/html_convert.rb +++ b/lib/isodoc/itu/html_convert.rb @@ -21,7 +21,10 @@ def default_fonts(options) '"Times New Roman",serif'), headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Times New Roman",serif'), - monospacefont: '"Courier New",monospace' + monospacefont: '"Courier New",monospace', + normalfontsize: "14px", + monospacefontsize: "0.8em", + footnotefontsize: "0.9em", } end diff --git a/lib/isodoc/itu/word_convert.rb b/lib/isodoc/itu/word_convert.rb index 0016e163..7a0b4fcf 100644 --- a/lib/isodoc/itu/word_convert.rb +++ b/lib/isodoc/itu/word_convert.rb @@ -69,7 +69,12 @@ def default_fonts(options) '"Times New Roman",serif'), headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Times New Roman",serif'), - monospacefont: '"Courier New",monospace' } + monospacefont: '"Courier New",monospace', + normalfontsize: "12.0pt", + footnotefontsize: "11.0pt", + smallerfontsize: "11.0pt", + monospacefontsize: "10.0pt", + } end def default_file_locations(options)