metanorma-itu 2.2.15 → 2.3.0

data/lib/isodoc/itu/itu.technical-paper.xsl

@@ -34,17 +34,19 @@
 	<xsl:variable name="contents_">
 		<contents>
 			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:preface/node()" mode="contents"/> -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents"/> <!-- @id = 'scope' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents" /> -->
 
 			<!-- Normative references -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents"/> <!-- @id = 'references' -->
-
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents"/> <!-- @id != 'scope' -->
-
-			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/>
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents" />
+			
+			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents" />
+				
+			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/> -->
 
 			<!-- Bibliography -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> <!-- @id = 'bibliography' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> -->
+
+			<xsl:call-template name="processMainSectionsDefault_Contents"/>
 
 			<xsl:apply-templates select="//itu:table" mode="contents"/>
 
@@ -1069,16 +1071,16 @@
 
 				<fo:flow flow-name="xsl-region-body">
 
-					<xsl:if test="$doctype != 'service-publication'">
-						<fo:block-container font-size="14pt">
+					<!-- <xsl:if test="$doctype != 'service-publication' and 1 = 2"> 
+						<fo:block-container font-size="14pt" >
 							<xsl:choose>
 								<xsl:when test="$doctype = 'resolution'">
 									<fo:block text-align="center">
 										<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type='resolution' and @language = $lang]"/>
 									</fo:block>
 								</xsl:when>
-								<xsl:when test="$doctype = 'implementers-guide'"/>
-								<xsl:when test="$doctype = 'recommendation-supplement'">
+								<xsl:when  test="$doctype = 'implementers-guide'"></xsl:when>
+								<xsl:when  test="$doctype = 'recommendation-supplement'">
 									<fo:block font-weight="bold">
 										<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement-Internal']"/>
 									</fo:block>
@@ -1086,30 +1088,30 @@
 								<xsl:otherwise>
 									<fo:block font-weight="bold">
 										<xsl:value-of select="$doctypeTitle"/>
-										<xsl:text> </xsl:text>
+										<xsl:text>&#xA0;</xsl:text>
 										<xsl:value-of select="$docname"/>
 									</fo:block>
 								</xsl:otherwise>
 							</xsl:choose>
-
+							
 							<fo:block font-weight="bold" text-align="center" margin-top="15pt" margin-bottom="15pt" role="H1">
 								<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'main' and @language = $lang]"/>
-
+								
 								<xsl:variable name="subtitle" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
 								<xsl:if test="$subtitle != ''">
 									<fo:block margin-top="18pt" font-weight="normal" font-style="italic">
-										<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+										<xsl:if test="$lang = 'ar'">
 											<xsl:attribute name="font-style">normal</xsl:attribute>
 										</xsl:if>
 										<xsl:value-of select="$subtitle"/>
-									</fo:block>
+									</fo:block>								
 								</xsl:if>
-
+								
 								<xsl:variable name="resolution-placedate" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'resolution-placedate' and @language = $lang]"/>
 								<xsl:if test="$doctype = 'resolution' and $resolution-placedate != ''">
 									<fo:block font-size="11pt" margin-top="6pt" font-weight="normal">
 										<fo:inline font-style="italic">
-											<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+											<xsl:if test="$lang = 'ar'">
 												<xsl:attribute name="font-style">normal</xsl:attribute>
 											</xsl:if>
 											<xsl:text>(</xsl:text><xsl:value-of select="$resolution-placedate"/><xsl:text>)</xsl:text>
@@ -1119,22 +1121,25 @@
 								</xsl:if>
 							</fo:block>
 						</fo:block-container>
-					</xsl:if>
+					</xsl:if> -->
 
 					<!-- Clause(s) -->
 					<fo:block>
 						<!-- Scope -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']"/> <!-- @id = 'scope' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" /> -->
 
 						<!-- Normative references -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']"/> <!-- @id = 'references' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" />
+							
+						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" />
+							
+						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/> -->
 
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]"/> <!-- @id != 'scope' -->
+						<!-- Bibliography -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> -->
 
-						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/>
+						<xsl:call-template name="processMainSectionsDefault"/>
 
-						<!-- Bibliography -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> <!-- @id = 'bibliography' -->
 					</fo:block>
 
 				</fo:flow>
@@ -1286,6 +1291,37 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="itu:clause[@type = 'keyword']" priority="4"/>
+
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="14pt">
+			<xsl:choose>
+				<xsl:when test="$doctype = 'resolution'">
+					<xsl:attribute name="text-align">center</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:attribute name="font-weight">bold</xsl:attribute>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-top="15pt" margin-bottom="15pt" role="H1">
+			<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+				<xsl:attribute name="font-style">normal</xsl:attribute>
+			</xsl:if>
+			<!-- Example: <p align="center" class="zzSTDTitle2" displayorder="4"><em>(Hammamet, 2016</em>) -->
+			<xsl:if test="@align = 'center'">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+				<xsl:attribute name="margin-top">6pt</xsl:attribute>
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -1740,25 +1776,25 @@
 	</xsl:template> -->
 
 	<!-- footnotes for title -->
-	<xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
+	<!-- <xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
 		<xsl:variable name="number" select="position()"/>
 		<fo:footnote>
 			<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
 				<fo:basic-link internal-destination="title_footnote_{$number}" fox:alt-text="titlefootnote  {$number}">
 					<xsl:value-of select="$number"/>
 				</fo:basic-link>
-				<xsl:if test="position() != last()">,</xsl:if><!-- <fo:inline  baseline-shift="20%">,</fo:inline> -->
+				<xsl:if test="position() != last()">,</xsl:if>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block font-size="11pt" margin-bottom="12pt" text-align="justify">
 					<fo:inline id="title_footnote_{$number}" font-size="85%" padding-right="2mm" keep-with-next.within-line="always" baseline-shift="30%">
 						<xsl:value-of select="$number"/>
 					</fo:inline>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 				</fo:block>
 			</fo:footnote-body>
 		</fo:footnote>
-	</xsl:template>
+	</xsl:template> -->
 
 	<xsl:template match="*[local-name()='tt']" priority="2">
 		<xsl:variable name="element-name">
@@ -6114,6 +6150,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -8204,25 +8243,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
+
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-												<xsl:value-of select="$width_effective"/>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									</xsl:variable>
+											<xsl:variable name="image_width_effective">
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+														<xsl:value-of select="$width_effective"/>
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+											</xsl:variable>
 
-									</xsl:if>
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -11911,7 +11970,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/itu/itu.technical-report.xsl

@@ -34,17 +34,19 @@
 	<xsl:variable name="contents_">
 		<contents>
 			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:preface/node()" mode="contents"/> -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents"/> <!-- @id = 'scope' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents" /> -->
 
 			<!-- Normative references -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents"/> <!-- @id = 'references' -->
-
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents"/> <!-- @id != 'scope' -->
-
-			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/>
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents" />
+			
+			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents" />
+				
+			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/> -->
 
 			<!-- Bibliography -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> <!-- @id = 'bibliography' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> -->
+
+			<xsl:call-template name="processMainSectionsDefault_Contents"/>
 
 			<xsl:apply-templates select="//itu:table" mode="contents"/>
 
@@ -1069,16 +1071,16 @@
 
 				<fo:flow flow-name="xsl-region-body">
 
-					<xsl:if test="$doctype != 'service-publication'">
-						<fo:block-container font-size="14pt">
+					<!-- <xsl:if test="$doctype != 'service-publication' and 1 = 2"> 
+						<fo:block-container font-size="14pt" >
 							<xsl:choose>
 								<xsl:when test="$doctype = 'resolution'">
 									<fo:block text-align="center">
 										<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type='resolution' and @language = $lang]"/>
 									</fo:block>
 								</xsl:when>
-								<xsl:when test="$doctype = 'implementers-guide'"/>
-								<xsl:when test="$doctype = 'recommendation-supplement'">
+								<xsl:when  test="$doctype = 'implementers-guide'"></xsl:when>
+								<xsl:when  test="$doctype = 'recommendation-supplement'">
 									<fo:block font-weight="bold">
 										<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement-Internal']"/>
 									</fo:block>
@@ -1086,30 +1088,30 @@
 								<xsl:otherwise>
 									<fo:block font-weight="bold">
 										<xsl:value-of select="$doctypeTitle"/>
-										<xsl:text> </xsl:text>
+										<xsl:text>&#xA0;</xsl:text>
 										<xsl:value-of select="$docname"/>
 									</fo:block>
 								</xsl:otherwise>
 							</xsl:choose>
-
+							
 							<fo:block font-weight="bold" text-align="center" margin-top="15pt" margin-bottom="15pt" role="H1">
 								<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'main' and @language = $lang]"/>
-
+								
 								<xsl:variable name="subtitle" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
 								<xsl:if test="$subtitle != ''">
 									<fo:block margin-top="18pt" font-weight="normal" font-style="italic">
-										<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+										<xsl:if test="$lang = 'ar'">
 											<xsl:attribute name="font-style">normal</xsl:attribute>
 										</xsl:if>
 										<xsl:value-of select="$subtitle"/>
-									</fo:block>
+									</fo:block>								
 								</xsl:if>
-
+								
 								<xsl:variable name="resolution-placedate" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'resolution-placedate' and @language = $lang]"/>
 								<xsl:if test="$doctype = 'resolution' and $resolution-placedate != ''">
 									<fo:block font-size="11pt" margin-top="6pt" font-weight="normal">
 										<fo:inline font-style="italic">
-											<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+											<xsl:if test="$lang = 'ar'">
 												<xsl:attribute name="font-style">normal</xsl:attribute>
 											</xsl:if>
 											<xsl:text>(</xsl:text><xsl:value-of select="$resolution-placedate"/><xsl:text>)</xsl:text>
@@ -1119,22 +1121,25 @@
 								</xsl:if>
 							</fo:block>
 						</fo:block-container>
-					</xsl:if>
+					</xsl:if> -->
 
 					<!-- Clause(s) -->
 					<fo:block>
 						<!-- Scope -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']"/> <!-- @id = 'scope' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" /> -->
 
 						<!-- Normative references -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']"/> <!-- @id = 'references' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" />
+							
+						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" />
+							
+						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/> -->
 
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]"/> <!-- @id != 'scope' -->
+						<!-- Bibliography -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> -->
 
-						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/>
+						<xsl:call-template name="processMainSectionsDefault"/>
 
-						<!-- Bibliography -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> <!-- @id = 'bibliography' -->
 					</fo:block>
 
 				</fo:flow>
@@ -1286,6 +1291,37 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="itu:clause[@type = 'keyword']" priority="4"/>
+
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="14pt">
+			<xsl:choose>
+				<xsl:when test="$doctype = 'resolution'">
+					<xsl:attribute name="text-align">center</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:attribute name="font-weight">bold</xsl:attribute>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-top="15pt" margin-bottom="15pt" role="H1">
+			<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+				<xsl:attribute name="font-style">normal</xsl:attribute>
+			</xsl:if>
+			<!-- Example: <p align="center" class="zzSTDTitle2" displayorder="4"><em>(Hammamet, 2016</em>) -->
+			<xsl:if test="@align = 'center'">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+				<xsl:attribute name="margin-top">6pt</xsl:attribute>
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -1740,25 +1776,25 @@
 	</xsl:template> -->
 
 	<!-- footnotes for title -->
-	<xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
+	<!-- <xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
 		<xsl:variable name="number" select="position()"/>
 		<fo:footnote>
 			<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
 				<fo:basic-link internal-destination="title_footnote_{$number}" fox:alt-text="titlefootnote  {$number}">
 					<xsl:value-of select="$number"/>
 				</fo:basic-link>
-				<xsl:if test="position() != last()">,</xsl:if><!-- <fo:inline  baseline-shift="20%">,</fo:inline> -->
+				<xsl:if test="position() != last()">,</xsl:if>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block font-size="11pt" margin-bottom="12pt" text-align="justify">
 					<fo:inline id="title_footnote_{$number}" font-size="85%" padding-right="2mm" keep-with-next.within-line="always" baseline-shift="30%">
 						<xsl:value-of select="$number"/>
 					</fo:inline>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 				</fo:block>
 			</fo:footnote-body>
 		</fo:footnote>
-	</xsl:template>
+	</xsl:template> -->
 
 	<xsl:template match="*[local-name()='tt']" priority="2">
 		<xsl:variable name="element-name">
@@ -6114,6 +6150,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -8204,25 +8243,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
+
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-												<xsl:value-of select="$width_effective"/>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									</xsl:variable>
+											<xsl:variable name="image_width_effective">
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+														<xsl:value-of select="$width_effective"/>
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+											</xsl:variable>
 
-									</xsl:if>
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -11911,7 +11970,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/itu/presentation_bibdata.rb

@@ -40,7 +40,7 @@ module IsoDoc
 
       def bibdata_title_service_population(bib)
         date = bib&.at(ns("./date[@type = 'published']"))&.text or return
-        text = l10n(@i18n.get["position_on"].sub(/%/, ddmmmmyyyy(date)))
+        text = l10n(@i18n.get["position_on"].sub("%", ddmmmmyyyy(date)))
         ins = bib.at(ns("./title"))
         ins.next = <<~INS
           <title language="#{@lang}" format="text/plain" type="position-sp">#{text}</title>

data/lib/isodoc/itu/presentation_preface.rb

@@ -0,0 +1,78 @@
+module IsoDoc
+  module ITU
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def insert_preface_sections(docxml)
+        x = insert_editors_clause(docxml) and
+          editors_insert_pt(docxml).next = x
+      end
+
+      def editors_insert_pt(docxml)
+        docxml.at(ns("//preface")) || docxml.at(ns("//sections"))
+          .add_previous_sibling("<preface> </preface>").first
+        ins = docxml.at(ns("//preface/acknolwedgements")) and return ins
+        docxml.at(ns("//preface")).children[-1]
+      end
+
+      def insert_editors_clause(doc)
+        ret = extract_editors(doc) or return
+        eds = ret[:names].each_with_object([]).with_index do |(_x, acc), i|
+          acc << { name: ret[:names][i], affiliation: ret[:affiliations][i],
+                   email: ret[:emails][i] }
+        end
+        editors_clause(eds)
+      end
+
+      def extract_editors(doc)
+        e = doc.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person"))
+        e.empty? and return
+        { names: @meta.extract_person_names(e),
+          affiliations: @meta.extract_person_affiliations(e),
+          emails: e.reduce([]) { |ret, p| ret << p.at(ns("./email"))&.text } }
+      end
+
+      def editors_clause(eds)
+        ed_lbl = @i18n.inflect(@i18n.get["editor_full"],
+                               number: eds.size > 1 ? "pl" : "sg")
+        ed_lbl &&= l10n("#{ed_lbl.capitalize}:")
+        mail_lbl = l10n("#{@i18n.get['email']}: ")
+        ret = <<~SUBMITTING
+          <clause id="_#{UUIDTools::UUID.random_create}" type="editors">
+          <table id="_#{UUIDTools::UUID.random_create}" unnumbered="true"><tbody>
+        SUBMITTING
+        ret += editor_table_entries(eds, ed_lbl, mail_lbl)
+        "#{ret}</tbody></table></clause>"
+      end
+
+      def editor_table_entries(eds, ed_lbl, mail_lbl)
+        eds.each_with_index.with_object([]) do |(n, i), m|
+          mail = ""
+          n[:email] and
+            mail = "#{mail_lbl}<link target='mailto:#{n[:email]}'>" \
+                   "#{n[:email]}</link>"
+          aff = n[:affiliation].empty? ? "" : "<br/>#{n[:affiliation]}"
+          th = "<th>#{i.zero? ? ed_lbl : ''}</th>"
+          m << "<tr>#{th}<td>#{n[:name]}#{aff}</td><td>#{mail}</td></tr>"
+        end.join("\n")
+      end
+
+      def rearrange_clauses(docxml)
+        super
+        k = keywords(docxml) or return
+        if a = docxml.at(ns("//preface/abstract"))
+          a.next = k
+        elsif a = docxml.at(ns("//preface"))
+          a.children.first.previous = k
+        end
+      end
+
+      def keywords(_docxml)
+        kw = @meta.get[:keywords]
+        kw.nil? || kw.empty? and return
+        "<clause type='keyword'><title>#{@i18n.keywords}</title>" \
+          "<p>#{kw.join(', ')}.</p>"
+      end
+
+      include Init
+    end
+  end
+end