metanorma-iso 2.1.0 → 2.1.3

data/lib/isodoc/iso/html/isodoc.css

@@ -375,7 +375,7 @@ p.SourceTitle {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
-p.Tabletitle, li.Tabletitle, div.Tabletitle {
+p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -520,13 +520,15 @@ 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: {{smallerfontsize}};
   mso-bidi-font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
+
 /* may need to be revised */
 p.ANNEX, li.ANNEX, div.ANNEX {
   mso-style-name: ANNEX;
@@ -747,6 +749,25 @@ p.TermNum, li.TermNum, div.TermNum {
   font-weight: bold;
   mso-bidi-font-weight: normal; }
 
+p.zzHelp, li.zzHelp, div.zzHelp {
+  mso-style-name: zzHelp;
+  mso-style-unhide: no;
+  margin-top: 0cm;
+  margin-right: 0cm;
+  margin-bottom: 12.0pt;
+  margin-left: 0cm;
+  text-align: justify;
+  line-height: 12.0pt;
+  mso-pagination: widow-orphan;
+  font-size: {{normalfontsize}};
+  mso-bidi-font-size: 10.0pt;
+  font-family: {{bodyfont}};
+  mso-fareast-font-family: "MS Mincho";
+  mso-bidi-font-family: "Times New Roman";
+  color: green;
+  mso-ansi-language: EN-GB;
+  mso-fareast-language: JA; }
+
 p.zzContents, li.zzContents, div.zzContents {
   mso-style-name: zzContents;
   mso-style-noshow: yes;
@@ -926,12 +947,14 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun",serif;
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Quote, li.Quote {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.QuoteAttribution {
   text-align: right; }
 
@@ -940,8 +963,6 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-pagination: widow-orphan;
   border: none;
   padding: 0cm;
-  font-size: 12.0pt;
-  font-family: {{bodyfont}};
   mso-ascii-font-family: {{bodyfont}};
   mso-ascii-theme-font: minor-latin;
   mso-fareast-font-family: "SimSun",serif;
@@ -950,9 +971,13 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-hansi-theme-font: minor-latin;
   mso-bidi-font-family: {{bodyfont}};
   mso-bidi-theme-font: minor-bidi;
-  font-weight: bold;
   mso-ansi-language: EN-AU; }
 
+p.Admonition, li.Admonition {
+  font-size: 12.0pt;
+  font-family: {{bodyfont}};
+  font-weight: bold; }
+
 p.Code, li.Code, div.Code {
   mso-style-name: Code;
   mso-style-priority: 16;
@@ -1268,7 +1293,11 @@ div.example {
 }
 */
 p.Example, li.Example, div.Example, td.Example {
-  tab-stops: 70.9pt;
+  tab-stops: 70.9pt; }
+
+p.Example, li.Example, td.Example {
+  mso-style-name: Example;
+  mso-style-link: "Example Char";
   font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
@@ -1283,10 +1312,8 @@ div.Example p.MsoListParagraph {
   font-size: {{smallerfontsize}}; }
 
 p.Example, li.Example, div.Example {
-  mso-style-name: Example;
   mso-style-unhide: no;
   mso-style-qformat: yes;
-  mso-style-link: "Example Char";
   margin-top: 0cm;
   margin-right: 0cm;
   margin-bottom: 6.0pt;
@@ -1295,8 +1322,6 @@ p.Example, li.Example, div.Example {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   /* tab-stops:20.15pt; */
-  font-size: {{smallerfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: Calibri;
   mso-bidi-font-family: "Times New Roman";
   mso-ansi-language: EN-GB;

data/lib/isodoc/iso/html/isodoc.scss

@@ -357,7 +357,7 @@ p.SourceTitle
         mso-fareast-font-family:"SimSun",serif;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.Tabletitle, li.Tabletitle, div.Tabletitle
+p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -495,12 +495,14 @@ 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:$smallerfontsize;
 	mso-bidi-font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+	font-size:$smallerfontsize;
+	font-family:$bodyfont;
+        }
 	/* may need to be revised */
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
@@ -712,6 +714,24 @@ p.TermNum, li.TermNum, div.TermNum
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+p.zzHelp, li.zzHelp, div.zzHelp
+	{mso-style-name:zzHelp;
+	mso-style-unhide:no;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	margin-left:0cm;
+	text-align:justify;
+	line-height:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:$normalfontsize;
+	mso-bidi-font-size:10.0pt;
+	font-family:$bodyfont;
+	mso-fareast-font-family:"MS Mincho";
+	mso-bidi-font-family:"Times New Roman";
+	color:green;
+	mso-ansi-language:EN-GB;
+	mso-fareast-language:JA;}
 p.zzContents, li.zzContents, div.zzContents
 	{mso-style-name:zzContents;
 	mso-style-noshow:yes;
@@ -885,11 +905,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        }
 p.QuoteAttribution
         {text-align:right;}
 p.Admonition, li.Admonition, div.Admonition
@@ -897,8 +919,6 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-pagination:widow-orphan;
 	border:none;
 	padding:0cm;
-	font-size:12.0pt;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:"SimSun",serif;
@@ -907,8 +927,12 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-hansi-theme-font:minor-latin;
 	mso-bidi-font-family:$bodyfont;
 	mso-bidi-theme-font:minor-bidi;
-        font-weight:bold;
 	mso-ansi-language:EN-AU;}
+p.Admonition, li.Admonition {
+	font-size:12.0pt;
+	font-family:$bodyfont;
+        font-weight:bold;
+        }
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;
@@ -1230,6 +1254,11 @@ div.example {
 p.Example, li.Example, div.Example, td.Example
 	{	
     tab-stops:70.9pt;
+  }
+
+p.Example, li.Example, td.Example {
+        mso-style-name:Example;
+        mso-style-link:"Example Char";
 	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 
@@ -1247,10 +1276,9 @@ div.Example p.MsoListParagraph {
 }
 
 p.Example, li.Example, div.Example
-	{mso-style-name:Example;
+	{
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
-	mso-style-link:"Example Char";
 	margin-top:0cm;
 	margin-right:0cm;
 	margin-bottom:6.0pt;
@@ -1259,8 +1287,6 @@ p.Example, li.Example, div.Example
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	/* tab-stops:20.15pt; */
-	font-size:$smallerfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;

data/lib/isodoc/iso/html/style-human.css

@@ -806,6 +806,12 @@ pre {
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 .figure-title,
 .FigureTitle,
 .SourceTitle,
@@ -989,9 +995,16 @@ span.keyword {
   text-align: left; }
 
 .Admonition p,
-.admonition p {
+.admonition p,
+.zzHelp p {
   margin: 0; }
 
+div.zzHelp {
+  color: green;
+  padding: 0.5em;
+  margin: 1.5em 0 1.5em 0;
+  text-align: left; }
+
 /* Collapse TOC */
 .collapse-group {
   display: flex;

data/lib/isodoc/iso/html/style-human.scss

@@ -504,6 +504,7 @@ pre {
 
 @include admonitionBlock();
 @include recommendationBlock();
+@include listBlock();
 
 .figure-title,
 .FigureTitle,
@@ -696,10 +697,18 @@ span.keyword {
 }
 
 .Admonition p,
-.admonition p {
+.admonition p,
+.zzHelp p {
     margin: 0;
 }
 
+div.zzHelp {
+  color: green;
+  padding: 0.5em;
+  margin: 1.5em 0 1.5em 0;
+  text-align: left;
+}
+
 /* Collapse TOC */
 
                 .collapse-group {

data/lib/isodoc/iso/html/style-iso.css

@@ -707,34 +707,34 @@ ul, ol {
   list-style-type: none; }
 
 /* https://github.com/metanorma/metanorma-iso/issues/319 : force a) parentheses for ordered lists */
-ol[type="alphabet"] {
+ol[class="alphabet"] {
   counter-reset: alphabet; }
 
-ol[type="arabic"] {
+ol[class="arabic"] {
   counter-reset: arabic; }
 
-ol[type="roman"] {
+ol[class="roman"] {
   counter-reset: roman; }
 
-ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper; }
 
-ol[type="roman_upper"] {
+ol[class="roman_upper"] {
   counter-reset: roman_upper; }
 
-ol[type="alphabet"] ol[type="alphabet"] {
+ol[class="alphabet"] ol[class="alphabet"] {
   counter-reset: alphabet2; }
 
-ol[type="arabic"] ol[type="arabic"] {
+ol[class="arabic"] ol[class="arabic"] {
   counter-reset: arabic2; }
 
-ol[type="roman"] ol[type="roman"] {
+ol[class="roman"] ol[class="roman"] {
   counter-reset: roman2; }
 
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper2; }
 
-ol[type="roman_upper"] ol[type="roman_upper"] {
+ol[class="roman_upper"] ol[class="roman_upper"] {
   counter-reset: roman_upper2; }
 
 ol {
@@ -748,29 +748,29 @@ ol > li:before {
   position: absolute;
   left: -1.4em; }
 
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   left: -2.0em; }
 
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   left: -2.3em; }
 
-ol[type="alphabet"] > li:before {
+ol[class="alphabet"] > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[type="arabic"] > li:before {
+ol[class="arabic"] > li:before {
   counter-increment: arabic;
   content: counter(arabic, decimal) ") "; }
 
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   counter-increment: roman;
   content: counter(roman, lower-roman) ") "; }
 
-ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha) ") "; }
 
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman) ") "; }
 
@@ -778,23 +778,23 @@ ol > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[type="alphabet"] ol[type="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li:before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha) ") "; }
 
-ol[type="arabic"] ol[type="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li:before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal) ") "; }
 
-ol[type="roman"] ol[type="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li:before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman) ") "; }
 
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha) ") "; }
 
-ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman) ") "; }
 
@@ -848,6 +848,12 @@ pre {
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
   font-weight: 700;
   font-size: 1em;
@@ -873,9 +879,15 @@ pre {
   margin: 1.5em 0 1.5em 0;
   text-align: left; }
 
-.Admonition p {
+.Admonition p, .zzHelp p {
   margin: 0; }
 
+div.zzHelp {
+  color: green;
+  padding: 0.5em;
+  margin: 1.5em 0 1.5em 0;
+  text-align: left; }
+
 /*
 3.8 Examples
 */

data/lib/isodoc/iso/html/style-iso.scss

@@ -410,34 +410,34 @@ ul, ol {
 
 /* https://github.com/metanorma/metanorma-iso/issues/319 : force a) parentheses for ordered lists */
 
-ol[type="alphabet"] {
+ol[class="alphabet"] {
   counter-reset: alphabet;
 }
-ol[type="arabic"] {
+ol[class="arabic"] {
   counter-reset: arabic;
 }
-ol[type="roman"] {
+ol[class="roman"] {
   counter-reset: roman;
 }
-ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper;
 }
-ol[type="roman_upper"] {
+ol[class="roman_upper"] {
   counter-reset: roman_upper;
 }
-ol[type="alphabet"] ol[type="alphabet"] {
+ol[class="alphabet"] ol[class="alphabet"] {
   counter-reset: alphabet2;
 }
-ol[type="arabic"] ol[type="arabic"] {
+ol[class="arabic"] ol[class="arabic"] {
   counter-reset: arabic2;
 }
-ol[type="roman"] ol[type="roman"] {
+ol[class="roman"] ol[class="roman"] {
   counter-reset: roman2;
 }
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper2;
 }
-ol[type="roman_upper"] ol[type="roman_upper"] {
+ol[class="roman_upper"] ol[class="roman_upper"] {
   counter-reset: roman_upper2;
 }
 ol {
@@ -452,29 +452,29 @@ ol > li:before {
   position: absolute;
   left: -1.4em;
 }
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   left: -2.0em;
 }
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   left: -2.3em;
 }
-ol[type="alphabet"] > li:before {
+ol[class="alphabet"] > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[type="arabic"] > li:before {
+ol[class="arabic"] > li:before {
   counter-increment: arabic;
   content: counter(arabic, decimal)") "
 }
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   counter-increment: roman;
   content: counter(roman, lower-roman)") "
 }
-ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha)") "
 }
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman)") "
 }
@@ -482,23 +482,23 @@ ol > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[type="alphabet"] ol[type="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li:before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha)") "
 }
-ol[type="arabic"] ol[type="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li:before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal)") "
 }
-ol[type="roman"] ol[type="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li:before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman)") "
 }
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha)") "
 }
-ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman)") "
 }
@@ -537,6 +537,7 @@ pre {
 
 @include admonitionBlock();
 @include recommendationBlock();
+@include listBlock();
 
 .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
     @include blockTitle()
@@ -569,10 +570,17 @@ pre {
     text-align: left;
 }
 
-.Admonition p {
+.Admonition p, .zzHelp p {
     margin: 0;
 }
 
+div.zzHelp {
+  color: green;
+  padding: 0.5em;
+  margin: 1.5em 0 1.5em 0;
+  text-align: left;
+}
+
 
 /*
 3.8 Examples

data/lib/isodoc/iso/html/word_iso_intro-dis.html

@@ -1,14 +1,9 @@
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 {% else %}
 
-<div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
-border-bottom-alt:solid windowtext .5pt;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:
-solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;
-margin-left:5.1pt;margin-right:5.1pt'>
 <div id="boilerplate-copyright-destination"/>
-</div>
 
-<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
+<p class="zzContents"><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
 
 WORDTOC
 {% endif %}

data/lib/isodoc/iso/html/word_iso_titlepage-dis.html

@@ -1,17 +1,28 @@
 {% if tc_docnumber.size > 0 %}
 {% for num in tc_docnumber %}
-<p class="zzCover"><span lang="EN-GB">Reference number of working document: {{agency}}/{{tc}} {{ num }}</span><span lang="EN-GB"><o:p></o:p></span></p>
+<p class="zzCover"><span lang="EN-GB">Reference number of working document: {{ num }}</span><span lang="EN-GB"><o:p></o:p></span></p>
 {% endfor %}
 {% endif %}
 
 {% if revdate %}
-<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ revdate }}</span></span></p>
+{% assign doc_date = revdate %}
+{% elsif publisheddate %}
+{% assign doc_date = publisheddate %}
+{% elsif issueddate %}
+{% assign doc_date = issueddate %}
+{% elsif createddate %}
+{% assign doc_date = createddate %}
 {% endif %}
 
-<p class="zzCover"><span lang="EN-GB">Reference number of project: {{ docnumber_undated }} {{ draftinfo }}</span></p>
+{% if doc_date %}
+<p class="zzCover" align="right" style='text-align:right;font-weight:normal;'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ doc_date }}</span></span></p>
+{% endif %}
+
+<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Reference number of project: {{ docnumber_undated }}{% if draftinfo %} {{ draftinfo }}{% endif %}</span></p>
 
-<p class="zzCover"><span lang="EN-GB">Committee identification: {{agency}}/{{ editorialgroup | join: "/" }}</span></p>
+<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Committee identification: {{ agency }}/{{ approvalgroup | join: "/" }}</span></p>
 
+<!--
 {% if doctitleamdlabel %}
 <p class="zzCover"><b>{{ doctitleamdlabel }}</b></p>
 {% endif %}
@@ -19,28 +30,28 @@
 {% if doctitlecorrlabel %}
 <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}
+-->
 
 {% if secretariat %}
-<p class="zzCover"><span lang="EN-GB">Secretariat: <span>{{ secretariat }}</span></span></p>
+<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">{{ labels["secretariat"] }}: <span>{{ secretariat }}</span></span></p>
 {% endif %}
 
 <p class="zzCover">
-<span lang="EN-GB">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}
-</p>
+<span lang="EN-GB"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}{% endif %}</b></span></p>
+
 {% if doctitleamdlabel %}
-<p class="zzCover">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
+<p class="zzCover"><b>{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</b></p>
 {% endif %}
 {% if doctitlecorrlabel %}
-<p class="zzCover">{{ doctitlecorrlabel }}</p>
+<p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}
 
-<p class="zzCover">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}
-</p>
+<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}</i></p>
 {% if docsubtitleamdlabel %}
-<p class="zzCover">{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
+<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</i></p>
 {% endif %}
 {% if docsubtitlecorrlabel %}
-<p class="zzCover">{{ docsubtitlecorrlabel }}</p>
+<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitlecorrlabel }}</i></p>
 {% endif %}
 
 <div class="coverpage-warning" id="coverpage-note-destination"/>