metanorma-itu 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094600fa0601e8d0d0d1cc785753b36f303708857c814d1137c949b0a170a11a'
-  data.tar.gz: '0489e85d27e58fa185ec6e0d70b8a35bb602cf343ae7f662b5f14626dd470507'
+  metadata.gz: ae8bffca61b97282d12a8f010fd5e9845a457f7b926cdb369c8e00182a8b535a
+  data.tar.gz: 16dff326beb84a5a35f90051ca0be7ad3f9daac15104a626367bf2ca3c361da4
 SHA512:
-  metadata.gz: 3467eeb6c89581fca56cea3ef51a69fa0426d865d2d313d15ad0861240c2dd400a0d5240551225a1a4f9c9f468ff1d931692d248ab0adb802f607be4bf661cf4
-  data.tar.gz: c5eb014d0f82ee0b76f10d03511aae57747433a4d5a893a0de53c2e67d6155104efd335d4e50e1e4cd7a5937ff0d29762384767b1a31d33a5b46ef9b5e528b2e
+  metadata.gz: aa49e3402d52df88338cd0b838ee77433c13e1b04f65167b4d2c7c8e75353704123588061b050a16e0536aa7d4aa5a41034a43c27972c42290f742922b6cb487
+  data.tar.gz: 54557e86c7cb3f9bfe58561a516df13aa333d69753e42ead97f7cd1368472d235a6f1fb923a8db44aaad0d61d9b81e8158965528ab5051e66084a29f47998bea

data/lib/isodoc/itu/base_convert.rb

@@ -8,7 +8,7 @@ require_relative "./cleanup"
 module IsoDoc
   module ITU
     module BaseConvert
-      FRONT_CLAUSE = "//*[parent::preface]"\
+      FRONT_CLAUSE = "//*[parent::preface]" \
                      "[not(local-name() = 'abstract')]".freeze
 
       def preface(isoxml, out)
@@ -55,7 +55,7 @@ module IsoDoc
       def annex_name(annex, name, div)
         preceding_floating_titles(name, div)
         r_a = @meta.get[:doctype_original] == "recommendation-annex"
-        div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
+        div.h1 class: r_a ? "RecommendationAnnex" : "Annex" do |t|
           name&.children&.each { |c2| parse(c2, t) }
         end
         @meta.get[:doctype_original] == "resolution" or
@@ -64,7 +64,7 @@ module IsoDoc
 
       def annex_obligation_subtitle(annex, div)
         info = annex["obligation"] == "informative"
-        div.p **{ class: "annex_obligation" } do |p|
+        div.p class: "annex_obligation" do |p|
           p << (info ? @i18n.inform_annex : @i18n.norm_annex)
             .sub(/%/, @meta.get[:doctype] || "")
         end
@@ -102,15 +102,15 @@ module IsoDoc
 
       def middle_title_resolution(isoxml, out)
         res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
-        out.p(**{ align: "center", style: "text-align:center;" }) do |p|
+        out.p(align: "center", style: "text-align:center;") do |p|
           res.children.each { |n| parse(n, p) }
         end
-        out.p(**{ class: "zzSTDTitle2" }) { |p| p << @meta.get[:doctitle] }
+        out.p(class: "zzSTDTitle2") { |p| p << @meta.get[:doctitle] }
         middle_title_resolution_subtitle(isoxml, out)
       end
 
       def middle_title_resolution_subtitle(isoxml, out)
-        out.p(**{ align: "center", style: "text-align:center;" }) do |p|
+        out.p(align: "center", style: "text-align:center;") do |p|
           p.i do |i|
             i << "("
             isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
@@ -124,26 +124,26 @@ module IsoDoc
       end
 
       def middle_title_recommendation(isoxml, out)
-        out.p(**{ class: "zzSTDTitle1" }) do |p|
+        out.p(class: "zzSTDTitle1") do |p|
           type = @meta.get[:doctype]
           @meta.get[:unpublished] && @meta.get[:draft_new_doctype] and
             type = @meta.get[:draft_new_doctype]
           id = @meta.get[:docnumber] and p << "#{type} #{id}"
         end
-        out.p(**{ class: "zzSTDTitle2" }) do |p|
+        out.p(class: "zzSTDTitle2") do |p|
           p << @meta.get[:doctitle]
           isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
             footnote_parse(f, p)
           end
         end
         s = @meta.get[:docsubtitle] and
-          out.p(**{ class: "zzSTDTitle3" }) { |p| p << s }
+          out.p(class: "zzSTDTitle3") { |p| p << s }
       end
 
       def note_p_parse(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
-          name and p.span **{ class: "note_label" } do |s|
+          name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
             s << note_delim
           end
@@ -155,7 +155,7 @@ module IsoDoc
       def note_parse1(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
-          name and p.span **{ class: "note_label" } do |s|
+          name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
           end
         end

data/lib/isodoc/itu/html/header.html

@@ -88,22 +88,22 @@ exactly'></p>
 
 <div style='mso-element:header' id=eh2>
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:header' id=eh2l>
 <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2>
 <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2l>
 <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB></span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{% if document_td or document_provisional %}{% if document_td %}{{ document_td }}{% endif %}{% if document_td and document_provisional %}; {% endif %}{% if document_provisional %}{{ document_provisional }}{% endif %}{% endif %}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>

data/lib/isodoc/itu/html/html_itu_titlepage.html

@@ -47,6 +47,8 @@
             {% if amendmentid %}<div class="doc-subidentifier">{{ amendmentid }}</div>{% endif %} 
             {% if corrigendumid %}<div class="doc-subidentifier">{{ corrigendumid }}</div>{% endif %}       
             {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
+            {% if docnumber_td %}<br/><span class="doc-subidentifier">TD number: {{docnumber_td}}</span>{%endif%}
+          {% if docnumber_provisional %}<br/><span class="doc-subidentifier">Provisional identifier: {{docnumber_provisional}}</span>{%endif%}
             <div> {{ draftinfo }}</div>
           </div>
           {% if pubdate_monthyear %}

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -212,6 +212,8 @@
   normal'><span lang="EN-US" style='font-size:30.0pt;mso-bidi-font-size:10.0pt;
   font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}{% endif %}<o:p></o:p></span></b></a>
     {% endif %}
+              {% if docnumber_td %}<br/><span class="doc-identifier" style='font-family:"Arial",sans-serif'>TD number: {{docnumber_td}}</span>{%endif%}
+          {% if docnumber_provisional %}<br/><span class="doc-identifier" style='font-family:"Arial",sans-serif'>Provisional identifier: {{docnumber_provisional}}</span>{%endif%}
   </span></p>
   </td>
   <span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dnume'></span></span>

data/lib/isodoc/itu/html/word_itu_titlepage_sp.html

@@ -16,6 +16,8 @@ lang="EN-GB" style='font-size:10.0pt'>{{ annex_to_itu_ob }}</span></i></p>
 <p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
 lang="EN-GB" style='font-size:10.0pt'>{{ number_abbrev }} {{ docnumeric }} – {{ pubdate_ddMMMyyyy }}</span></i></p>
 {% endif %}
+{% if docnumber_td %}<p><span class="doc-identifier">TD number: {{docnumber_td}}</span></p>{%endif%}
+{% if docnumber_provisional %}<p><span class="doc-identifier">Provisional identifier: {{docnumber_provisional}}</span></p>{%endif%}
 
 <p class="MEP"><span lang="EN-GB" style='font-size:10.0pt'><o:p>&#xA0;</o:p></span></p>
 

data/lib/isodoc/itu/i18n-ar.yaml

@@ -18,6 +18,7 @@ formula: معادلة
 inequality: عدم مساواة
 clause: فقرة
 section: قسم
+abstract: ملخص
 annex_subclause: فقرة
 in: في
 to: إلى

data/lib/isodoc/itu/i18n-de.yaml

@@ -17,6 +17,7 @@ formula: Gleichung
 inequality: Ungleichheit
 clause: Klausel
 section: Abschnitt
+abstract: Zusammenfassung
 annex_subclause: Klausel
 in: in
 to: bis

data/lib/isodoc/itu/i18n-en.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Abbreviations and acronyms
 abbrev: Abbreviations and acronyms
 symbols: Abbreviations and acronyms
 conventions: Conventions
+abstract: Summary
 elsewhere_terms: >-
   This Recommendation uses the following terms defined elsewhere:
 here_terms: >-

data/lib/isodoc/itu/i18n-es.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Abreviaciones y acrónimos
 abbrev: Abreviaciones y acrónimos
 symbols: Abreviaciones y acrónimos
 conventions: Convenciones
+abstract: Resumen
 elsewhere_terms: >-
   Esta Recomendación utiliza los siguientes términos definidos en otro lugar:
 here_terms: >-

data/lib/isodoc/itu/i18n-fr.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Abréviations et acronymes
 abbrev: Abréviations et acronymes
 symbols: Abréviations et acronymes
 conventions: Conventions
+abstract: Résumé
 elsewhere_terms: >-
   La présente Recommandation utilise les termes suivants définis ailleurs:
 here_terms: >-

data/lib/isodoc/itu/i18n-ru.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: Сокращения и акронимы
 abbrev: Сокращения и акронимы
 symbols: Сокращения и акронимы
 conventions: Соглашения
+abstract: Резюме
 elsewhere_terms: >-
   Эта Рекомендация использует следующие термины, определенные в другом месте:
 here_terms: >-

data/lib/isodoc/itu/i18n-zh-Hans.yaml

@@ -8,6 +8,7 @@ symbolsabbrev: 缩略语与缩写
 abbrev: 缩略语与缩写
 symbols: 缩略语与缩写
 conventions: 惯例
+abstract: 概括
 elsewhere_terms: >-
   本建议书采用下列他处定义的术语：
 here_terms: >-

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -69,13 +69,24 @@
 	</xsl:variable>
 
 	<xsl:variable name="footer-text">
+		<xsl:variable name="additionalIdentifiers_">
+			<xsl:if test="$TDnumber != ''">/<xsl:value-of select="$TDnumber"/></xsl:if>
+			<xsl:if test="$provisionalIdentifier != ''">/<xsl:value-of select="$provisionalIdentifier"/></xsl:if>
+		</xsl:variable>
+		<xsl:variable name="additionalIdentifiers" select="normalize-space($additionalIdentifiers_)"/>
 		<xsl:choose>
 			<xsl:when test="$doctype = 'technical-report' or $doctype = 'technical-paper'">
-				<xsl:variable name="date" select="concat('(',substring(/itu:itu-standard/itu:bibdata/itu:version/itu:revision-date,1,7), ')')"/>
-				<xsl:value-of select="concat($xSTR-ACRONYM, ' ', $date)"/>
+				<xsl:variable name="date_">
+					<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:version/itu:revision-date"/>
+					<xsl:if test="not(/itu:itu-standard/itu:bibdata/itu:version/itu:revision-date)"/>
+					<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:date[@type = 'published']/itu:on"/>
+				</xsl:variable>
+				<xsl:variable name="date" select="concat('(',substring($date_,1,7), ')')"/>
+				<xsl:value-of select="concat($xSTR-ACRONYM, $additionalIdentifiers, ' ', $date)"/>
 			</xsl:when>
 			<xsl:when test="$doctype = 'implementers-guide'">
 				<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:doctype[@language = $lang]"/>
+				<xsl:value-of select="$additionalIdentifiers"/>
 				<xsl:text> for </xsl:text>
 				<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU-Recommendation']"/>
 				<xsl:text> </xsl:text>
@@ -87,19 +98,22 @@
 				<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:meeting/@acronym"/>
 				<xsl:text> – </xsl:text>
 				<xsl:value-of select="$doctypeTitle"/>
+				<xsl:value-of select="$additionalIdentifiers"/>
 				<xsl:text> </xsl:text>
 				<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
 			</xsl:when>
 			<xsl:when test="$doctype = 'recommendation-supplement'">
 				<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement-Short']"/>
+				<xsl:value-of select="$additionalIdentifiers"/>
 				<xsl:text> </xsl:text>
 				<xsl:value-of select="$docdate"/>
 			</xsl:when>
 			<xsl:when test="$doctype = 'service-publication'">
 				<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-lang']"/>
+				<xsl:value-of select="$additionalIdentifiers"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="concat($footerprefix, $docname, ' ', $docdate)"/>
+				<xsl:value-of select="concat($footerprefix, $docname, $additionalIdentifiers, ' ', $docdate)"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
@@ -107,6 +121,9 @@
 	<xsl:variable name="isAmendment" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:amendment[@language = $lang])"/>
 	<xsl:variable name="isCorrigendum" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:corrigendum[@language = $lang])"/>
 
+	<xsl:variable name="TDnumber" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-TemporaryDocument'])"/>
+	<xsl:variable name="provisionalIdentifier" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-provisional'])"/>
+
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
 		<fo:root xml:lang="{$lang}">
@@ -265,13 +282,15 @@
 												<fo:block font-weight="bold">Study Group:</fo:block>
 											</fo:table-cell>
 											<fo:table-cell padding-top="2mm">
-												<fo:block><xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:subgroup/itu:name"/></fo:block>
+												<xsl:variable name="subgroup" select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:subgroup/itu:name"/>
+												<fo:block><xsl:value-of select="java:replaceAll(java:java.lang.String.new($subgroup),'(.)','$1​')"/></fo:block>
 											</fo:table-cell>
 											<fo:table-cell padding-top="2mm">
 												<fo:block font-weight="bold">Working Party:</fo:block>
 											</fo:table-cell>
 											<fo:table-cell padding-top="2mm">
-												<fo:block><xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:workgroup/itu:name"/></fo:block>
+												<xsl:variable name="workgroup" select="/itu:itu-standard/itu:bibdata/itu:ext/itu:editorialgroup/itu:workgroup/itu:name"/>
+												<fo:block><xsl:value-of select="java:replaceAll(java:java.lang.String.new($workgroup),'(.)','$1​')"/></fo:block>
 											</fo:table-cell>
 											<fo:table-cell padding-top="2mm">
 												<fo:block font-weight="bold">Intended type of document <fo:inline font-weight="normal">(R-C-TD)</fo:inline>:</fo:block>
@@ -517,14 +536,17 @@
 					</xsl:if>
 					<fo:flow flow-name="xsl-region-body">
 
-						<fo:block-container absolute-position="fixed" top="265mm">
+						<fo:block-container absolute-position="fixed" top="255mm">
 							<fo:block text-align="right" margin-right="19mm">
 								<xsl:choose>
 									<xsl:when test="$doctype = 'resolution'">
 										<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo_resolution))}" content-height="21mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
 									</xsl:when>
 									<xsl:otherwise>
-										<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo))}" content-height="17.7mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
+										<!-- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo))}" content-height="17.7mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/> -->
+										<fo:instream-foreign-object content-width="24.1mm" fox:alt-text="Image Logo">
+											<xsl:copy-of select="$Image-ITU-Logo"/>
+										</fo:instream-foreign-object>
 									</xsl:otherwise>
 								</xsl:choose>
 
@@ -617,6 +639,48 @@
 											</fo:block-container>
 										</fo:table-cell>
 									</fo:table-row>
+									<xsl:variable name="additionalNumbers">
+										<xsl:if test="$TDnumber != ''">
+											<fo:block-container space-after="2pt">
+												<xsl:call-template name="setWritingMode"/>
+												<fo:block font-size="14pt">TD number: <xsl:value-of select="$TDnumber"/></fo:block>
+											</fo:block-container>
+										</xsl:if>
+										<xsl:if test="$provisionalIdentifier != ''">
+											<fo:block-container space-after="2pt">
+												<xsl:call-template name="setWritingMode"/>
+												<fo:block font-size="14pt">Provisional identifier: <xsl:value-of select="$provisionalIdentifier"/></fo:block>
+											</fo:block-container>
+										</xsl:if>
+										<xsl:if test="$annexid != ''">
+											<fo:block-container>
+												<xsl:call-template name="setWritingMode"/>
+												<fo:block font-size="18pt" font-weight="bold">
+													<xsl:call-template name="getLocalizedString">
+														<xsl:with-param name="key">annex</xsl:with-param>
+													</xsl:call-template>
+													<xsl:text> </xsl:text>
+													<xsl:value-of select="$annexid"/>
+												</fo:block>
+											</fo:block-container>
+										</xsl:if>
+										<xsl:if test="$isAmendment != ''">
+											<fo:block-container>
+												<xsl:call-template name="setWritingMode"/>
+												<fo:block font-size="18pt" font-weight="bold">
+													<xsl:value-of select="$isAmendment"/>
+												</fo:block>
+											</fo:block-container>
+										</xsl:if>
+										<xsl:if test="$isCorrigendum != ''">
+											<fo:block-container>
+												<xsl:call-template name="setWritingMode"/>
+												<fo:block font-size="18pt" font-weight="bold">
+													<xsl:value-of select="$isCorrigendum"/>
+												</fo:block>
+											</fo:block-container>
+										</xsl:if>
+									</xsl:variable>
 									<fo:table-row height="17.2mm">
 										<fo:table-cell>
 											<fo:block> </fo:block>
@@ -636,34 +700,7 @@
 											</fo:block-container>
 										</fo:table-cell>
 										<fo:table-cell text-align="right">
-											<xsl:if test="$annexid != ''">
-												<fo:block-container>
-													<xsl:call-template name="setWritingMode"/>
-													<fo:block font-size="18pt" font-weight="bold">
-														<xsl:call-template name="getLocalizedString">
-															<xsl:with-param name="key">annex</xsl:with-param>
-														</xsl:call-template>
-														<xsl:text> </xsl:text>
-														<xsl:value-of select="$annexid"/>
-													</fo:block>
-												</fo:block-container>
-											</xsl:if>
-											<xsl:if test="$isAmendment != ''">
-												<fo:block-container>
-													<xsl:call-template name="setWritingMode"/>
-													<fo:block font-size="18pt" font-weight="bold">
-														<xsl:value-of select="$isAmendment"/>
-													</fo:block>
-												</fo:block-container>
-											</xsl:if>
-											<xsl:if test="$isCorrigendum != ''">
-												<fo:block-container>
-													<xsl:call-template name="setWritingMode"/>
-													<fo:block font-size="18pt" font-weight="bold">
-														<xsl:value-of select="$isCorrigendum"/>
-													</fo:block>
-												</fo:block-container>
-											</xsl:if>
+											<xsl:copy-of select="$additionalNumbers"/>
 											<fo:block font-size="14pt">
 												<xsl:choose>
 													<xsl:when test="($doctype = 'technical-report' or $doctype = 'technical-paper') and /itu:itu-standard/itu:bibdata/itu:version/itu:revision-date">
@@ -682,7 +719,11 @@
 											</fo:block>
 										</fo:table-cell>
 									</fo:table-row>
+									<xsl:variable name="countAdditionalNumbers" select="count(xalan:nodeset($additionalNumbers)/*)"/>
 									<fo:table-row height="64mm"> <!-- 59mm -->
+										<xsl:if test="$countAdditionalNumbers != 0">
+											<xsl:attribute name="height"><xsl:value-of select="64 - $countAdditionalNumbers * 5"/>mm</xsl:attribute>
+										</xsl:if>
 										<fo:table-cell>
 											<fo:block> </fo:block>
 										</fo:table-cell>
@@ -739,7 +780,7 @@
 														<xsl:variable name="series_title">
 															<xsl:value-of select="$series_title_full"/>
 															<xsl:if test="$series_title_full = ''">
-																<xsl:value-of select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[@type != 'full' and @type != 'abbrev'])"/>
+																<xsl:value-of select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[(@type != 'full' and @type != 'abbrev') or not(@type)])"/>
 															</xsl:if>
 														</xsl:variable>
 														<xsl:if test="$series_title != ''">
@@ -1317,26 +1358,6 @@
 		</fo:block>
 	</xsl:template>
 
-	<!-- Summary -->
-	<xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']" priority="3">
-		<fo:block font-size="12pt">
-			<xsl:value-of select="$linebreak"/>
-			<xsl:value-of select="$linebreak"/>
-		</fo:block>
-		<fo:block id="{@id}">
-			<fo:block font-weight="bold" keep-with-next="always" margin-top="18pt" margin-bottom="18pt" role="H2">
-				<xsl:variable name="title-summary">
-					<xsl:call-template name="getTitle">
-						<xsl:with-param name="name" select="'title-summary'"/>
-					</xsl:call-template>
-				</xsl:variable>
-				<xsl:value-of select="$title-summary"/>
-			</fo:block>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']/itu:title" priority="4"/>
-
 	<xsl:template match="itu:preface/itu:clause" priority="3">
 		<xsl:if test="$doctype != 'service-publication'">
 			<fo:block font-size="12pt">
@@ -2022,6 +2043,19 @@
 		</svg>
 	</xsl:variable>
 
+	<xsl:variable name="Image-ITU-Logo">
+		<svg xmlns="http://www.w3.org/2000/svg" id="ITU-logo" data-name="Layer 1" width="272" height="300" viewBox="0 0 272 300">
+			<defs>
+				<style>.cls-1{fill:#16a0db;}</style>
+			</defs>
+			<title>ITU</title>
+			<path class="cls-1" d="M53.95176,124.04334a1.39913,1.39913,0,0,1,1.40068,1.40094v84.80738a1.404,1.404,0,0,1-1.40068,1.40666H28.56261a1.40764,1.40764,0,0,1-1.40068-1.40666V125.44428a1.40272,1.40272,0,0,1,1.40068-1.40094H53.95176"/>
+			<path class="cls-1" d="M145.67105,124.04334a1.39914,1.39914,0,0,1,1.40068,1.40094V146.326a1.404,1.404,0,0,1-1.40068,1.40668H123.50867a1.404,1.404,0,0,0-1.40663,1.40092v61.118a1.4041,1.4041,0,0,1-1.401,1.40666H95.31221a1.404,1.404,0,0,1-1.40068-1.40666v-61.118a1.40277,1.40277,0,0,0-1.401-1.40092H70.85941a1.4089,1.4089,0,0,1-1.40664-1.40668V125.44428a1.404,1.404,0,0,1,1.40664-1.40094h74.81164"/>
+			<path class="cls-1" d="M244.46942,124.04334a1.40422,1.40422,0,0,1,1.40663,1.40094v43.22185c0,28.627-15.0027,43.76154-43.38279,43.76154-27.4157,0-41.31559-14.93933-41.31559-44.4046V125.44428a1.39921,1.39921,0,0,1,1.401-1.40094h25.38284a1.40043,1.40043,0,0,1,1.40664,1.40094v42.441c0,9.33564,2.45758,20.46263,14.1585,20.46263,9.5251,0,14.1529-6.69457,14.1529-20.46263v-42.441a1.404,1.404,0,0,1,1.40664-1.40094h25.3832"/>
+			<path class="cls-1" d="M271.12012,299c-16.84562-8.30792-35.804-17.7871-53.2867-28.20789q4.4696-3.46207,8.635-7.28018A133.03915,133.03915,0,0,0,247.28128,89.2695a134.47457,134.47457,0,0,0-183.33695-38.91C53.0126,35.11588,42.035,18.58043,30.43146,1,34.083,8.41225,44.91131,31.26336,57.60572,54.60822A135.0389,135.0389,0,0,0,.87988,164.51161,132.39673,132.39673,0,0,0,14.19454,222.5522,134.51424,134.51424,0,0,0,209.97884,276.436c20.48556,8.47442,41.07449,15.55367,61.14128,22.564M122.93256,287.31035a124.4229,124.4229,0,0,1-79.12931-39.63342,33.60229,33.60229,0,0,1-5.5575-15.96706,175.63893,175.63893,0,0,0,46.236,31.6298,187.00148,187.00148,0,0,0,59.79738,17.44261c-6.9757,4.87453-14.19285,7.13093-21.34657,6.52807M35.2888,220.36472c-.12055,1.24016-.19519,2.4516-.24705,3.65157-1.11368-1.21145-2.21053-2.42291-3.25517-3.65157H27.79026c2.23365,2.74441,4.65654,5.44865,7.22871,8.107a45.77546,45.77546,0,0,0,1.52718,10.55285A122.68891,122.68891,0,0,1,31.91274,96.4923a67.04283,67.04283,0,0,0-1.91757,18.82631H32.998a60.01641,60.01641,0,0,1,4.93163-27.09979A124.9733,124.9733,0,0,1,54.3905,71.115q4.70245-2.64395,9.6516-4.9262c7.3377,12.87816,14.97957,25.13044,22.00714,34.18475a148.36379,148.36379,0,0,1-23.71234-.49375l1.28609.36171c-.40756-.03445-.8095-.07464-1.223-.11483,2.50313,5.2075,5.24211,10.26575,8.14719,15.192h51.174q-4.01332-3.28127-7.90049-6.80366A214.83757,214.83757,0,0,1,150.4569,84.37778a53.34945,53.34945,0,0,0,15.33,11.7241,55.86873,55.86873,0,0,0,23.69482,6.4649c.90166,4.13961,1.67681,8.39979,2.31986,12.75183h3.05436q-.94722-6.53667-2.29077-12.77481c7.64748-.32152,14.16411-2.77312,18.07423-7.25146a134.07139,134.07139,0,0,1,17.02329,20.02627h3.6459A136.97749,136.97749,0,0,0,212.41925,92.812a16.79184,16.79184,0,0,0,1.36633-12.93552,28.74433,28.74433,0,0,0-4.31767-8.95674,30.75992,30.75992,0,0,1,14.968,7.02761,122.772,122.772,0,0,1,27.39258,131.0722c-10.52418,21.89225-35.98762,33.78285-67.28436,34.65556,13.21689-3.34152,23.74668-7.92323,36.22872-15.82926-4.66776-2.14155-9.35268-4.48408-14.038-6.98737-1.44658.07464-2.91069.12057-4.4207.12057-26.07215,0-42.30907-11.483-47.59113-34.18476-8.18749-6.27545-16.18541-12.815-23.91909-19.48085V186.312c10.95486,9.9787,21.89219,19.14211,32.10623,27.5878-7.85984,5.23625-33.30611,12.96428-38.29,13.837q6.425,5.14149,13.00454,9.78347a193.15732,193.15732,0,0,1-31.4229-11.83893q-1.50755-.72342-2.99724-1.46982c-.14333-.06891-.2814-.13779-.41912-.20669q-2.79014-1.40381-5.506-2.87648a142.74922,142.74922,0,0,1-33.249-24.631v4.21425q4.43541,4.2975,9.41015,8.2907a161.36744,161.36744,0,0,0,33.77149,20.4741,193.87776,193.87776,0,0,0,37.5954,13.00445q10.4809,6.97591,21.226,12.9413c-.08025.14355-.16646.29281-.25267.4421-5.52876,9.37583-11.54042,16.78233-17.79283,22.05875-19.77944-1.72244-41.33837-7.50411-62.26618-17.5115-18.82626-9.00265-35.19529-20.5832-47.72885-33.30632a59.25825,59.25825,0,0,1,.32135-6.74049ZM143.4006,71.93026a29.50071,29.50071,0,0,0,5.09283,10.05906,219.33257,219.33257,0,0,0-36.93484,24.46443c-13.62445-12.64847-26.25017-27.427-38.72625-43.98547.06869-.023.13211-.05738.2008-.08038.01156-.00574.02873-.01147.0403-.01721v.00574A109.521,109.521,0,0,1,90.648,57.42727a126.6736,126.6736,0,0,1,54.11372,1.57318,16.75412,16.75412,0,0,0-1.36108,12.92981m2.917-.77512a13.70221,13.70221,0,0,1,1.3835-11.18439c.0403-.06316.09182-.12059.13212-.18371a143.44783,143.44783,0,0,1,28.32857,10.93177q-2.86792.82678-5.82768,1.83727a157.61385,157.61385,0,0,0-19.06175,8.03234,26.81162,26.81162,0,0,1-4.95476-9.43328m31.05564-3.198A147.18752,147.18752,0,0,0,150.02657,57.255c3.72019-3.37024,9.47919-5.08123,16.14476-5.0927a69.51757,69.51757,0,0,1,11.20191,15.7948m-6.7693-15.5594a54.77565,54.77565,0,0,1,19.40027,5.9941,52.42951,52.42951,0,0,1,12.06888,8.58352,78.61407,78.61407,0,0,0-20.57772,2.34825,79.14234,79.14234,0,0,0-10.89143-16.92587m.70612,23.01761c2.90508-.9933,5.73587-1.83728,8.50884-2.555q1.83451,3.953,3.47944,8.34234a152.17933,152.17933,0,0,1,5.50038,18.37848,53.66044,53.66044,0,0,1-21.61675-6.1606,50.91755,50.91755,0,0,1-13.90024-10.461,154.40473,154.40473,0,0,1,18.02833-7.54427m14.81872,4.731q-.973-2.60091-2.01533-5.05249a142.63376,142.63376,0,0,1,24.3326,18.12584c-3.45071,4.07645-9.43328,6.2295-16.52988,6.40748a157.66347,157.66347,0,0,0-5.78739-19.48083M184.412,71.781a69.52887,69.52887,0,0,1,20.74978-1.487A27.61015,27.61015,0,0,1,210.863,80.65155a14.07557,14.07557,0,0,1-.71769,10.01889A146.12178,146.12178,0,0,0,184.412,71.781m6.98165-16.07038a55.6803,55.6803,0,0,0-23.71794-6.45916,43.3225,43.3225,0,0,0-7.05069-5.71279,124.27675,124.27675,0,0,1,53.95848,25.47493,42.49122,42.49122,0,0,0-7.96322-1.69373,53.22364,53.22364,0,0,0-15.22663-11.60925m-28.1905-6.35583c-6.95293.54545-12.86086,2.89944-16.53549,7.01035a129.93743,129.93743,0,0,0-56.59934-1.90043,113.03233,113.03233,0,0,0-18.574,5.27067v.01148c-.178.0689-.36164.14354-.54527.21245-.13772-.1895-.287-.38469-.42508-.57414a124.53515,124.53515,0,0,1,65.22347-18.31533q5.55453,0,10.9892.47654c5.74709.67747,11.30494,3.353,16.46646,7.80841M148.72892,281.20141c3.85265.30431,7.66465.47655,11.41988.47655,2.78453,0,5.54629-.08612,8.26179-.25837,3.69741-.22965,7.25744-.63156,10.67906-1.17125a124.84385,124.84385,0,0,1-41.6082,7.68209,45.52058,45.52058,0,0,0,11.24747-6.729m3.44475-2.97408a92.61049,92.61049,0,0,0,16.20818-20.83009c.10338-.17224.20115-.34447.29857-.51671,9.70907,5.31086,19.54395,10.08778,29.42508,14.47425-.683.39616-1.3779.76936-2.06685,1.1483-12.26968,4.7482-27.3698,6.68882-43.865,5.72425m31.343-31.515c4.19678-.08612,8.33643-.36171,12.37831-.83826,20.75575-2.46308,37.45173-9.88683,48.60739-21.364a124.33918,124.33918,0,0,1-36.27463,40.34537,214.60728,214.60728,0,0,1-24.71107-18.14309"/>
+		</svg>
+	</xsl:variable>
+
 	<!-- convert YYYY-MM-DD to (MM/YYYY) -->
 	<xsl:template name="formatDate">
 		<xsl:param name="date"/>