metanorma-itu 2.1.10 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff80a10c49839631d4c76846f353bf8e180ce0ec482a126f63474ecbe091b3ad
-  data.tar.gz: e4d8301448368fbd4c9f01a512c8fd7372c88d2adfd34cec55a5e9f33d75c50d
+  metadata.gz: b5393dc3cee8090f06aa62a1232cea3cf22d13f0e036ee0ec62a84d333bd2a67
+  data.tar.gz: 0a63a589bf8155bef1b4912218b3eb0ba8db32373db44002ea182554dee23efb
 SHA512:
-  metadata.gz: cca3ddc45419d73b876c58cc13f1a3fd3328642bb815308125ceb58a5add436483645160f0975e4385567b7f294e59a2b78e306b5bff7be530092d933d05156d
-  data.tar.gz: bd00bfced817a40dce7e195d36638c15255bd8f76d5429ac5c105bb00852dbba0320d3b72326990be6f9b74cf91add3356069fc3fcf4e35dbffe24ac7ab00edb
+  metadata.gz: d62a67ecfb1d2de974adb8018f3400d4dd54973f208cb9de7d78d06bcb374f16078973bc39281cb5a0362f6eceb1f0cd24bcd92831eaf140d33131c6739475e3
+  data.tar.gz: a3ea90814d66b1b2e9df11caa2064cfbad13e7ab705d1fd685c81354f4b18b1b9f292a95b3db8dc190f85cdc31b30035cb0a530fb075df2d927db3e9db0fb4e9

data/lib/isodoc/itu/html/htmlstyle.css

@@ -811,7 +811,7 @@ nav #toc {
     font-weight: 700;
     font-size: 1em;
     text-align: center; }
-  .figure > img {
+  .figure > img, .figure > svg {
     margin-left: auto;
     margin-right: auto;
     display: block;

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

@@ -219,7 +219,7 @@
 				<fo:page-sequence master-reference="TR-first-page">
 					<fo:flow flow-name="xsl-region-body">
 							<fo:block>
-								<fo:table width="175mm" table-layout="fixed" border-top="1.5pt solid black">
+								<fo:table width="175mm" table-layout="fixed" border-top="1.5pt solid black" id="__internal_layout__meeting_{generate-id()}">
 									<fo:table-column column-width="29mm"/>
 									<fo:table-column column-width="45mm"/>
 									<fo:table-column column-width="28mm"/>
@@ -252,7 +252,7 @@
 									</fo:table-body>
 								</fo:table>
 
-								<fo:table width="175mm" table-layout="fixed">
+								<fo:table width="175mm" table-layout="fixed" id="__internal_layout__groups_{generate-id()}">
 									<fo:table-column column-width="29mm"/>
 									<fo:table-column column-width="10mm"/>
 									<fo:table-column column-width="35mm"/>
@@ -300,7 +300,7 @@
 								</fo:table>
 
 								<xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:person">
-									<fo:table width="175mm" table-layout="fixed" line-height="110%">
+									<fo:table width="175mm" table-layout="fixed" line-height="110%" id="__internal_layout__person_{generate-id()}">
 										<fo:table-column column-width="29mm"/>
 										<fo:table-column column-width="75mm"/>
 										<fo:table-column column-width="71mm"/>
@@ -395,10 +395,18 @@
 									</xsl:variable>
 									<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($tsb_full))"/>
 								</fo:block>
-								<fo:block-container height="20mm" display-align="center">
+								<fo:block-container height="20mm" display-align="center" width="90%">
 									<fo:block font-weight="bold">
 										<!-- complements -->
 										<!-- To do: Example: COMPLEMENT  TO  ITU-T  RECOMMENDATIONS  F.69  (06/1994) AND  F.68  (11/1988) -->
+										<fo:inline>COMPLEMENT TO ITU-T RECOMMENDATIONS  </fo:inline>
+										<xsl:for-each select="/*/itu:bibdata/itu:relation[@type = 'complements']">
+											<xsl:value-of select="translate(itu:bibitem/itu:docidentifier, ' ', ' ')"/>
+											<xsl:choose>
+												<xsl:when test="count(following-sibling::itu:relation[@type = 'complements']) = 1"> AND </xsl:when>
+												<xsl:when test="following-sibling::itu:relation[@type = 'complements']">, </xsl:when>
+											</xsl:choose>
+										</xsl:for-each>
 									</fo:block>
 								</fo:block-container>
 								<fo:block-container>
@@ -530,7 +538,7 @@
 						</fo:block-container>
 						<fo:block-container font-family="Arial">
 							<xsl:variable name="annexid" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:annexid)"/>
-							<fo:table width="100%" table-layout="fixed"> <!-- 175.4mm-->
+							<fo:table width="100%" table-layout="fixed" id="__internal_layout__coverpage_{generate-id()}"> <!-- 175.4mm-->
 								<fo:table-column column-width="25.2mm"/>
 								<fo:table-column column-width="44.4mm"/>
 								<fo:table-column column-width="35.8mm"/>
@@ -678,7 +686,7 @@
 										<fo:table-cell>
 											<fo:block> </fo:block>
 										</fo:table-cell>
-										<fo:table-cell font-size="16pt" number-columns-spanned="3" border-bottom="0.5mm solid black" padding-right="2mm" display-align="after">
+										<fo:table-cell font-size="16pt" number-columns-spanned="3" border-bottom="0.5mm solid black" display-align="after">
 											<fo:block-container>
 												<xsl:call-template name="setWritingMode"/>
 												<fo:block padding-bottom="7mm">
@@ -722,8 +730,18 @@
 															</xsl:if>
 														</fo:block>
 													</xsl:if>
+													<xsl:if test="$doctype = 'focus-group'">
+														<xsl:attribute name="padding-bottom">0mm</xsl:attribute>
+														<xsl:attribute name="border-bottom">1pt solid black</xsl:attribute>
+													</xsl:if>
 													<fo:block text-transform="uppercase">
-														<xsl:variable name="series_title" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[@type = 'full'])"/>
+														<xsl:variable name="series_title_full" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[@type = 'full'])"/>
+														<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:if>
+														</xsl:variable>
 														<xsl:if test="$series_title != ''">
 															<xsl:variable name="title">
 																<xsl:if test="$doctype != 'resolution'">
@@ -1296,6 +1314,7 @@
 		</fo:block>
 		<xsl:apply-templates/>
 	</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'">
@@ -2448,6 +2467,14 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="pre-style">
+		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="permission-style">
 
 	</xsl:attribute-set>
@@ -2551,6 +2578,11 @@
 	</xsl:variable>
 	<xsl:variable name="table-border" select="normalize-space($table-border_)"/>
 
+	<xsl:variable name="table-cell-border_">
+
+	</xsl:variable>
+	<xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
+
 	<xsl:attribute-set name="table-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -2563,8 +2595,6 @@
 	<xsl:attribute-set name="table-style">
 		<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
 		<xsl:attribute name="table-layout">fixed</xsl:attribute>
-		<xsl:attribute name="margin-left">0mm</xsl:attribute>
-		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 
 	</xsl:attribute-set><!-- table-style -->
 
@@ -3053,8 +3083,6 @@
 	<xsl:attribute-set name="bibitem-non-normative-style">
 
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
-			<xsl:attribute name="margin-left">14mm</xsl:attribute>
-			<xsl:attribute name="text-indent">-14mm</xsl:attribute>
 
 	</xsl:attribute-set> <!-- bibitem-non-normative-style -->
 
@@ -3681,6 +3709,12 @@
 				<xsl:variable name="table_attributes">
 
 					<xsl:element name="table_attributes" use-attribute-sets="table-style">
+
+						<xsl:if test="$margin-side != 0">
+							<xsl:attribute name="margin-left">0mm</xsl:attribute>
+							<xsl:attribute name="margin-right">0mm</xsl:attribute>
+						</xsl:if>
+
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
 
 							<xsl:if test="$doctype = 'service-publication'">
@@ -4464,6 +4498,10 @@
 	<xsl:template match="*[local-name()='tr']">
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
+			<xsl:if test="*[local-name() = 'th']">
+				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -5548,8 +5586,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -5905,8 +5952,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -6463,6 +6513,9 @@
 		<xsl:value-of select="substring($str, 2)"/>
 	</xsl:template>
 
+	<!-- ======================================= -->
+	<!-- math -->
+	<!-- ======================================= -->
 	<xsl:template match="mathml:math">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -6513,14 +6566,57 @@
 		<xsl:value-of select="$comment_text"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'asciimath']">
+		<xsl:param name="process" select="'false'"/>
+		<xsl:if test="$process = 'true'">
+			<xsl:apply-templates/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'latexmath']"/>
+
+	<xsl:template name="getMathml_asciimath_text">
+		<xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
+		<xsl:variable name="latexmath">
+
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_following">
+			<xsl:choose>
+				<xsl:when test="normalize-space($latexmath) != ''">
+					<xsl:value-of select="$latexmath"/>
+				</xsl:when>
+				<xsl:when test="normalize-space($asciimath) != ''">
+					<xsl:value-of select="$asciimath"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="following-sibling::node()[1][self::comment()]"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_">
+			<xsl:choose>
+				<xsl:when test="normalize-space($asciimath_text_following) != ''">
+					<xsl:value-of select="$asciimath_text_following"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_2" select="java:org.metanorma.fop.Util.unescape($asciimath_text_)"/>
+		<xsl:variable name="asciimath_text" select="java:trim(java:java.lang.String.new($asciimath_text_2))"/>
+		<xsl:value-of select="$asciimath_text"/>
+	</xsl:template>
+
 	<xsl:template name="mathml_instream_object">
-		<xsl:param name="comment_text"/>
+		<xsl:param name="asciimath_text"/>
 		<xsl:param name="mathml_content"/>
 
-		<xsl:variable name="comment_text_">
+		<xsl:variable name="asciimath_text_">
 			<xsl:choose>
-				<xsl:when test="normalize-space($comment_text) != ''"><xsl:value-of select="$comment_text"/></xsl:when>
-				<xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise>
+				<xsl:when test="normalize-space($asciimath_text) != ''"><xsl:value-of select="$asciimath_text"/></xsl:when>
+				<!-- <xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise> -->
+				<xsl:otherwise><xsl:call-template name="getMathml_asciimath_text"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 
@@ -6537,10 +6633,10 @@
 			</xsl:attribute>
 
 			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
-			<xsl:if test="normalize-space($comment_text_) != ''">
+			<xsl:if test="normalize-space($asciimath_text_) != ''">
 			<!-- put Mathin Alternate Text -->
 				<xsl:attribute name="fox:alt-text">
-					<xsl:value-of select="$comment_text_"/>
+					<xsl:value-of select="$asciimath_text_"/>
 				</xsl:attribute>
 			</xsl:if>
 			<!-- </xsl:if> -->
@@ -6613,6 +6709,29 @@
 		<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
 	</xsl:template>
 
+	<!-- Examples: 
+		<stem type="AsciiMath">x = 1</stem> 
+		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
+		<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
+	-->
+	<xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3">
+		<fo:inline xsl:use-attribute-sets="mathml-style">
+
+			<xsl:choose>
+				<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates>
+						<xsl:with-param name="process">true</xsl:with-param>
+					</xsl:apply-templates>
+				</xsl:otherwise>
+			</xsl:choose>
+
+		</fo:inline>
+	</xsl:template>
+	<!-- ======================================= -->
+	<!-- END: math -->
+	<!-- ======================================= -->
+
 	<xsl:template match="*[local-name()='localityStack']"/>
 
 	<xsl:template match="*[local-name()='link']" name="link">
@@ -7957,9 +8076,9 @@
 		<xsl:apply-templates mode="contents_item"/>
 	</xsl:template>
 
-	<!-- ====== -->
-	<!-- sourcecode   -->
-	<!-- ====== -->
+	<!-- =============== -->
+	<!-- sourcecode  -->
+	<!-- =============== -->
 	<xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 
 		<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
@@ -8258,8 +8377,22 @@
 			</fo:block>
 		</xsl:if>
 	</xsl:template>
-	<!-- ====== -->
-	<!-- ====== -->
+	<!-- =============== -->
+	<!-- END sourcecode  -->
+	<!-- =============== -->
+
+	<!-- =============== -->
+	<!-- pre  -->
+	<!-- =============== -->
+	<xsl:template match="*[local-name()='pre']" name="pre">
+		<fo:block xsl:use-attribute-sets="pre-style">
+			<xsl:copy-of select="@id"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	<!-- =============== -->
+	<!-- pre  -->
+	<!-- =============== -->
 
 	<!-- ========== -->
 	<!-- permission -->
@@ -9711,28 +9844,42 @@
 					<xsl:attribute name="text-indent">0mm</xsl:attribute>
 				</xsl:if>
 
+				<xsl:variable name="docidentifier_metanorma" select="normalize-space(itu:docidentifier[@type = 'metanorma'])"/>
+				<xsl:variable name="docidentifier_metanorma_ordinal" select="normalize-space(itu:docidentifier[@type = 'metanorma-ordinal'])"/>
+
 				<xsl:variable name="bibitem_label">
-					<xsl:value-of select="itu:docidentifier[@type = 'metanorma']"/>
-					<xsl:if test="not(itu:docidentifier[@type = 'metanorma'])">
+					<xsl:value-of select="$docidentifier_metanorma"/>
+					<xsl:if test="$docidentifier_metanorma = ''">
 						<fo:inline padding-right="5mm">
-							<xsl:text>[</xsl:text>
-								<xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/>
-							<xsl:text>] </xsl:text>
+							<xsl:variable name="docidentifier" select="normalize-space(itu:docidentifier[not(@type = 'metanorma-ordinal')])"/>
+							<xsl:choose>
+								<xsl:when test="$docidentifier != ''">
+									<xsl:text>[</xsl:text>
+										<xsl:value-of select="$docidentifier"/>
+									<xsl:text>] </xsl:text>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$docidentifier_metanorma_ordinal"/>
+								</xsl:otherwise>
+							</xsl:choose>
 						</fo:inline>
 					</xsl:if>
 				</xsl:variable>
 
 				<xsl:variable name="bibitem_body">
-					<xsl:text> </xsl:text>
-					<xsl:choose>
-						<xsl:when test="itu:docidentifier[@type = 'metanorma']">
-							<xsl:value-of select="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/>
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:if test="itu:formattedref and not(itu:docidentifier[@type = 'metanorma'])">, </xsl:if>
+					<xsl:variable name="docidentifier">
+						<xsl:text> </xsl:text>
+						<xsl:choose>
+							<xsl:when test="$docidentifier_metanorma != ''">
+								<xsl:value-of select="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:value-of select="$docidentifier"/>
+					<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
 					<xsl:apply-templates select="itu:formattedref"/>
 				</xsl:variable>
 
@@ -9743,15 +9890,33 @@
 							<fo:table-column column-width="80%"/>
 							<fo:table-body>
 								<fo:table-row>
-									<fo:table-cell><fo:block><xsl:copy-of select="$bibitem_label"/></fo:block></fo:table-cell>
+									<fo:table-cell><fo:block><xsl:value-of select="$bibitem_label"/></fo:block></fo:table-cell>
 									<fo:table-cell><fo:block><xsl:copy-of select="$bibitem_body"/></fo:block></fo:table-cell>
 								</fo:table-row>
 							</fo:table-body>
 						</fo:table>
 					</xsl:when> <!-- $doctype = 'implementers-guide' -->
-					<xsl:otherwise>
+					<xsl:when test="$bibitem_label != $docidentifier_metanorma_ordinal">
+						<xsl:attribute name="margin-left">14mm</xsl:attribute>
+						<xsl:attribute name="text-indent">-14mm</xsl:attribute>
 						<xsl:copy-of select="$bibitem_label"/>
 						<xsl:copy-of select="$bibitem_body"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<fo:list-block provisional-distance-between-starts="14mm">
+							<fo:list-item>
+								<fo:list-item-label end-indent="label-end()">
+									<fo:block>
+										<xsl:value-of select="$bibitem_label"/>
+									</fo:block>
+								</fo:list-item-label>
+								<fo:list-item-body start-indent="body-start()">
+									<fo:block>
+										<xsl:copy-of select="$bibitem_body"/>
+									</fo:block>
+								</fo:list-item-body>
+							</fo:list-item>
+						</fo:list-block>
 					</xsl:otherwise>
 				</xsl:choose>
 
@@ -10339,7 +10504,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
@@ -10815,13 +10980,14 @@
 	</xsl:template>
 
 	<xsl:template name="setId">
+		<xsl:param name="prefix"/>
 		<xsl:attribute name="id">
 			<xsl:choose>
 				<xsl:when test="@id">
-					<xsl:value-of select="@id"/>
+					<xsl:value-of select="concat($prefix, @id)"/>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:value-of select="generate-id()"/>
+					<xsl:value-of select="concat($prefix, generate-id())"/>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>