metanorma-itu 2.0.8 → 2.0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e30e3335fc27b626ca6cba25b687f537aac08babe91e60664b75cdf3d15b297
-  data.tar.gz: 35647c71c2143a270867b3ac28df029132b57d7aa6f06775eb86f54ed2d2e4b4
+  metadata.gz: 8b72833fd8174442ae52fa5586d1153f1487ea255d8624976c06b3865483ddeb
+  data.tar.gz: 84f4c5e4ec5fa53caa2e5b6d2dc9868adfac469a5eb570bf8262ab08ae768639
 SHA512:
-  metadata.gz: 4d5973cea39ad61788f98e1176eae971ab0e7cf680e6aac7fd823d8a240055d73a672f2fcf7484b293dcaf6e6c6bca58dc3732cfdc1a7d1a2ca1f14620dd1768
-  data.tar.gz: de137661607d004bd80e2b119f2932abaae1ffc78b4cc57789ecde1c7b20c295ddf6369184c55c6b82774f1d42e2e0f3c54efe97c9a633e070bc7737c12021e5
+  metadata.gz: ebc8d6bf3d905a53717b86b91c2b9ad42b95b0fea78308ad7d2c76dd9bf8f35324c3931257f316f91f5996684fc3bfaaa07217ad0fb37f4653e60c20ca7c1aa8
+  data.tar.gz: 504a360980e1614092bb9ae5c9f900553646c7d7d72f8ed9293cfc7a5063e8c5fefce2a3af286aa35315f1ee2ca5d8bdf39445368f6804f3d9992edc65122886

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

@@ -2068,7 +2068,7 @@
 		</xsl:if>
 	</xsl:template>
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
 	</xsl:variable><xsl:variable name="pageWidth_">
 		210
@@ -3550,9 +3550,11 @@
 					<xsl:with-param name="margin" select="$margin"/>
 				</xsl:call-template>
 			
-	</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
-		<!-- <xsl:call-template name="add-zero-spaces"/> -->
-		<xsl:call-template name="add-zero-spaces-java"/>
+	</xsl:template><xsl:variable name="express_reference_separators">_.\</xsl:variable><xsl:variable name="express_reference_characters" select="concat($upper,$lower,'1234567890',$express_reference_separators)"/><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
+		
+				<!-- <xsl:call-template name="add-zero-spaces"/> -->
+				<xsl:call-template name="add-zero-spaces-java"/>
+			
 	</xsl:template><xsl:template match="*[local-name()='table']" name="table">
 	
 		<xsl:variable name="table-preamble">
@@ -3682,16 +3684,9 @@
 							</xsl:for-each>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:for-each select="xalan:nodeset($colwidths)//column">
-								<xsl:choose>
-									<xsl:when test=". = 1 or . = 0">
-										<fo:table-column column-width="proportional-column-width(2)"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<fo:table-column column-width="proportional-column-width({.})"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</xsl:for-each>
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
 					
@@ -3899,6 +3894,12 @@
 				<xsl:with-param name="table" select="$table"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[(local-name()='strong' or (local-name()='inline' and @font-weight = 'bold'))]" mode="td_text">
+		<xsl:apply-templates mode="td_text"/>
+	</xsl:template><xsl:template match="*[(local-name()='strong' or (local-name()='inline' and @font-weight = 'bold'))]/text()[translate(., $express_reference_characters, '') = '']" mode="td_text">
+		
+				<xsl:value-of select="."/>
+			
 	</xsl:template><xsl:template match="text()" mode="td_text">
 		<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
@@ -4006,16 +4007,9 @@
 						</xsl:for-each>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:for-each select="xalan:nodeset($colwidths)//column">
-							<xsl:choose>
-								<xsl:when test=". = 1 or . = 0">
-									<fo:table-column column-width="proportional-column-width(2)"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<fo:table-column column-width="proportional-column-width({.})"/>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
 					</xsl:otherwise>
 				</xsl:choose>
 				
@@ -4710,9 +4704,15 @@
 								<xsl:variable name="maxlength_dt">							
 									<xsl:call-template name="getMaxLength_dt"/>							
 								</xsl:variable>
+								<xsl:variable name="isContainsExpressReference_">
+									false
+								</xsl:variable>
+								<xsl:variable name="isContainsExpressReference" select="normalize-space($isContainsExpressReference_)"/>
+								<!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
 								<xsl:call-template name="setColumnWidth_dl">
 									<xsl:with-param name="colwidths" select="$colwidths"/>							
 									<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+									<xsl:with-param name="isContainsExpressReference" select="$isContainsExpressReference"/>
 								</xsl:call-template>
 								<fo:table-body>
 									<xsl:apply-templates>
@@ -4728,6 +4728,7 @@
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>		
 		<xsl:param name="maxlength_dt"/>
+		<xsl:param name="isContainsExpressReference"/>
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
 				<fo:table-column column-width="50%"/>
@@ -4735,6 +4736,11 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
+					<xsl:when test="$isContainsExpressReference">
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
+					</xsl:when>
 					<!-- to set width check most wide chars like `W` -->
 					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 2"> <!-- if dt contains short text like t90, a, etc -->
 						<fo:table-column column-width="7%"/>
@@ -4765,20 +4771,25 @@
 						<fo:table-column column-width="60%"/>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:for-each select="xalan:nodeset($colwidths)//column">
-							<xsl:choose>
-								<xsl:when test=". = 1 or . = 0">
-									<fo:table-column column-width="proportional-column-width(2)"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<fo:table-column column-width="proportional-column-width({.})"/>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="insertTableColumnWidth">
+		<xsl:param name="colwidths"/>
+		<xsl:for-each select="xalan:nodeset($colwidths)//column">
+			<xsl:choose>
+				<xsl:when test=". = 1 or . = 0">
+					<fo:table-column column-width="proportional-column-width(2)"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<fo:table-column column-width="proportional-column-width({.})"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
 	</xsl:template><xsl:template name="getMaxLength_dt">
 		<xsl:variable name="lengths">
 			<xsl:for-each select="*[local-name()='dt']">
@@ -5396,6 +5407,9 @@
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		
 		<fo:inline xsl:use-attribute-sets="mathml-style">
+		
+			
+			
 			
 			
 			<xsl:call-template name="setTrackChangesStyles">
@@ -5403,48 +5417,80 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
+			<xsl:if test="$add_math_as_text = 'true'">
+				<!-- insert helper tag -->
+				<!-- set unique font-size (fiction) -->
+				<xsl:variable name="font-size_sfx"><xsl:number level="any"/></xsl:variable>
+				<fo:inline color="white" font-size="1.{$font-size_sfx}pt" font-style="normal" font-weight="normal"><xsl:value-of select="$zero_width_space"/></fo:inline> <!-- zero width space -->
+			</xsl:if>
 			
-			
-			<xsl:variable name="mathml">
-				<xsl:apply-templates select="." mode="mathml"/>
+			<xsl:variable name="mathml_content">
+				<xsl:apply-templates select="." mode="mathml_actual_text"/>
 			</xsl:variable>
-			<fo:instream-foreign-object fox:alt-text="Math">
 			
+			
+					<xsl:call-template name="mathml_instream_object">
+						<xsl:with-param name="mathml_content" select="$mathml_content"/>
+					</xsl:call-template>
 				
-				
-				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
-				<xsl:variable name="comment_text_">
-					<xsl:choose>
-						<xsl:when test="normalize-space($comment_text_following) != ''">
-							<xsl:value-of select="$comment_text_following"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable> 
-				<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
-				
-				<xsl:if test="normalize-space($comment_text) != ''">
-				<!-- put Mathin Alternate Text -->
-					<xsl:attribute name="fox:alt-text">
-						<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
-					</xsl:attribute>
-				</xsl:if>
-				
-				<xsl:variable name="mathml_content">
-					<xsl:apply-templates select="." mode="mathml_actual_text"/>
-				</xsl:variable>
-				<!-- put MathML in Actual Text -->
-				<xsl:attribute name="fox:actual-text">
-					<xsl:value-of select="$mathml_content"/>
-				</xsl:attribute>
-				
-				
-				
-				<xsl:copy-of select="xalan:nodeset($mathml)"/>
-			</fo:instream-foreign-object>			
+			
 		</fo:inline>
+	</xsl:template><xsl:template name="getMathml_comment_text">
+		<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
+		<xsl:variable name="comment_text_">
+			<xsl:choose>
+				<xsl:when test="normalize-space($comment_text_following) != ''">
+					<xsl:value-of select="$comment_text_following"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable> 
+		<xsl:variable name="comment_text_2" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+		<xsl:variable name="comment_text" select="java:trim(java:java.lang.String.new($comment_text_2))"/>
+		<xsl:value-of select="$comment_text"/>
+	</xsl:template><xsl:template name="mathml_instream_object">
+		<xsl:param name="comment_text"/>
+		<xsl:param name="mathml_content"/>
+	
+		<xsl:variable name="comment_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:choose>
+		</xsl:variable>
+	
+		<xsl:variable name="mathml">
+			<xsl:apply-templates select="." mode="mathml"/>
+		</xsl:variable>
+			
+		<fo:instream-foreign-object fox:alt-text="Math">
+					
+			
+			
+			
+			
+			
+			
+			<!-- put MathML in Actual Text -->
+			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
+			<xsl:attribute name="fox:actual-text">
+				<xsl:value-of select="$mathml_content"/>
+			</xsl:attribute>
+			
+			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
+			<xsl:if test="normalize-space($comment_text_) != ''">
+			<!-- put Mathin Alternate Text -->
+				<xsl:attribute name="fox:alt-text">
+					<xsl:value-of select="$comment_text_"/>
+				</xsl:attribute>
+			</xsl:if>
+			<!-- </xsl:if> -->
+		
+			<xsl:copy-of select="xalan:nodeset($mathml)"/>
+			
+		</fo:instream-foreign-object>
 	</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
 		<!-- <xsl:text>a+b</xsl:text> -->
 		<xsl:text>&lt;</xsl:text>
@@ -6074,18 +6120,33 @@
 	</xsl:template><xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
-			<xsl:variable name="viewbox">
+			<xsl:variable name="viewbox_">
 				<xsl:call-template name="split">
 					<xsl:with-param name="pText" select="@viewBox"/>
 					<xsl:with-param name="sep" select="' '"/>
 				</xsl:call-template>
 			</xsl:variable>
+			<xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
+			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
+			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
+			
 			<xsl:attribute name="width">
-				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[3])"/>
+				<xsl:choose>
+					<xsl:when test="$width != ''">
+						<xsl:value-of select="round($width)"/>
+					</xsl:when>
+					<xsl:otherwise>400</xsl:otherwise> <!-- default width -->
+				</xsl:choose>
 			</xsl:attribute>
 			<xsl:attribute name="height">
-				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[4])"/>
+				<xsl:choose>
+					<xsl:when test="$height != ''">
+						<xsl:value-of select="round($height)"/>
+					</xsl:when>
+					<xsl:otherwise>400</xsl:otherwise> <!-- default height -->
+				</xsl:choose>
 			</xsl:attribute>
+			
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">

data/lib/isodoc/itu/itu.in-force.xsl

@@ -2068,7 +2068,7 @@
 		</xsl:if>
 	</xsl:template>
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
 	</xsl:variable><xsl:variable name="pageWidth_">
 		210
@@ -3550,9 +3550,11 @@
 					<xsl:with-param name="margin" select="$margin"/>
 				</xsl:call-template>
 			
-	</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
-		<!-- <xsl:call-template name="add-zero-spaces"/> -->
-		<xsl:call-template name="add-zero-spaces-java"/>
+	</xsl:template><xsl:variable name="express_reference_separators">_.\</xsl:variable><xsl:variable name="express_reference_characters" select="concat($upper,$lower,'1234567890',$express_reference_separators)"/><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
+		
+				<!-- <xsl:call-template name="add-zero-spaces"/> -->
+				<xsl:call-template name="add-zero-spaces-java"/>
+			
 	</xsl:template><xsl:template match="*[local-name()='table']" name="table">
 	
 		<xsl:variable name="table-preamble">
@@ -3682,16 +3684,9 @@
 							</xsl:for-each>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:for-each select="xalan:nodeset($colwidths)//column">
-								<xsl:choose>
-									<xsl:when test=". = 1 or . = 0">
-										<fo:table-column column-width="proportional-column-width(2)"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<fo:table-column column-width="proportional-column-width({.})"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</xsl:for-each>
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
 					
@@ -3899,6 +3894,12 @@
 				<xsl:with-param name="table" select="$table"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[(local-name()='strong' or (local-name()='inline' and @font-weight = 'bold'))]" mode="td_text">
+		<xsl:apply-templates mode="td_text"/>
+	</xsl:template><xsl:template match="*[(local-name()='strong' or (local-name()='inline' and @font-weight = 'bold'))]/text()[translate(., $express_reference_characters, '') = '']" mode="td_text">
+		
+				<xsl:value-of select="."/>
+			
 	</xsl:template><xsl:template match="text()" mode="td_text">
 		<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
@@ -4006,16 +4007,9 @@
 						</xsl:for-each>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:for-each select="xalan:nodeset($colwidths)//column">
-							<xsl:choose>
-								<xsl:when test=". = 1 or . = 0">
-									<fo:table-column column-width="proportional-column-width(2)"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<fo:table-column column-width="proportional-column-width({.})"/>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
 					</xsl:otherwise>
 				</xsl:choose>
 				
@@ -4710,9 +4704,15 @@
 								<xsl:variable name="maxlength_dt">							
 									<xsl:call-template name="getMaxLength_dt"/>							
 								</xsl:variable>
+								<xsl:variable name="isContainsExpressReference_">
+									false
+								</xsl:variable>
+								<xsl:variable name="isContainsExpressReference" select="normalize-space($isContainsExpressReference_)"/>
+								<!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
 								<xsl:call-template name="setColumnWidth_dl">
 									<xsl:with-param name="colwidths" select="$colwidths"/>							
 									<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+									<xsl:with-param name="isContainsExpressReference" select="$isContainsExpressReference"/>
 								</xsl:call-template>
 								<fo:table-body>
 									<xsl:apply-templates>
@@ -4728,6 +4728,7 @@
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>		
 		<xsl:param name="maxlength_dt"/>
+		<xsl:param name="isContainsExpressReference"/>
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
 				<fo:table-column column-width="50%"/>
@@ -4735,6 +4736,11 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
+					<xsl:when test="$isContainsExpressReference">
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
+					</xsl:when>
 					<!-- to set width check most wide chars like `W` -->
 					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 2"> <!-- if dt contains short text like t90, a, etc -->
 						<fo:table-column column-width="7%"/>
@@ -4765,20 +4771,25 @@
 						<fo:table-column column-width="60%"/>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:for-each select="xalan:nodeset($colwidths)//column">
-							<xsl:choose>
-								<xsl:when test=". = 1 or . = 0">
-									<fo:table-column column-width="proportional-column-width(2)"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<fo:table-column column-width="proportional-column-width({.})"/>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:for-each>
+						<xsl:call-template name="insertTableColumnWidth">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+						</xsl:call-template>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="insertTableColumnWidth">
+		<xsl:param name="colwidths"/>
+		<xsl:for-each select="xalan:nodeset($colwidths)//column">
+			<xsl:choose>
+				<xsl:when test=". = 1 or . = 0">
+					<fo:table-column column-width="proportional-column-width(2)"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<fo:table-column column-width="proportional-column-width({.})"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
 	</xsl:template><xsl:template name="getMaxLength_dt">
 		<xsl:variable name="lengths">
 			<xsl:for-each select="*[local-name()='dt']">
@@ -5396,6 +5407,9 @@
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		
 		<fo:inline xsl:use-attribute-sets="mathml-style">
+		
+			
+			
 			
 			
 			<xsl:call-template name="setTrackChangesStyles">
@@ -5403,48 +5417,80 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
+			<xsl:if test="$add_math_as_text = 'true'">
+				<!-- insert helper tag -->
+				<!-- set unique font-size (fiction) -->
+				<xsl:variable name="font-size_sfx"><xsl:number level="any"/></xsl:variable>
+				<fo:inline color="white" font-size="1.{$font-size_sfx}pt" font-style="normal" font-weight="normal"><xsl:value-of select="$zero_width_space"/></fo:inline> <!-- zero width space -->
+			</xsl:if>
 			
-			
-			<xsl:variable name="mathml">
-				<xsl:apply-templates select="." mode="mathml"/>
+			<xsl:variable name="mathml_content">
+				<xsl:apply-templates select="." mode="mathml_actual_text"/>
 			</xsl:variable>
-			<fo:instream-foreign-object fox:alt-text="Math">
 			
+			
+					<xsl:call-template name="mathml_instream_object">
+						<xsl:with-param name="mathml_content" select="$mathml_content"/>
+					</xsl:call-template>
 				
-				
-				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
-				<xsl:variable name="comment_text_">
-					<xsl:choose>
-						<xsl:when test="normalize-space($comment_text_following) != ''">
-							<xsl:value-of select="$comment_text_following"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable> 
-				<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
-				
-				<xsl:if test="normalize-space($comment_text) != ''">
-				<!-- put Mathin Alternate Text -->
-					<xsl:attribute name="fox:alt-text">
-						<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
-					</xsl:attribute>
-				</xsl:if>
-				
-				<xsl:variable name="mathml_content">
-					<xsl:apply-templates select="." mode="mathml_actual_text"/>
-				</xsl:variable>
-				<!-- put MathML in Actual Text -->
-				<xsl:attribute name="fox:actual-text">
-					<xsl:value-of select="$mathml_content"/>
-				</xsl:attribute>
-				
-				
-				
-				<xsl:copy-of select="xalan:nodeset($mathml)"/>
-			</fo:instream-foreign-object>			
+			
 		</fo:inline>
+	</xsl:template><xsl:template name="getMathml_comment_text">
+		<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
+		<xsl:variable name="comment_text_">
+			<xsl:choose>
+				<xsl:when test="normalize-space($comment_text_following) != ''">
+					<xsl:value-of select="$comment_text_following"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable> 
+		<xsl:variable name="comment_text_2" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+		<xsl:variable name="comment_text" select="java:trim(java:java.lang.String.new($comment_text_2))"/>
+		<xsl:value-of select="$comment_text"/>
+	</xsl:template><xsl:template name="mathml_instream_object">
+		<xsl:param name="comment_text"/>
+		<xsl:param name="mathml_content"/>
+	
+		<xsl:variable name="comment_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:choose>
+		</xsl:variable>
+	
+		<xsl:variable name="mathml">
+			<xsl:apply-templates select="." mode="mathml"/>
+		</xsl:variable>
+			
+		<fo:instream-foreign-object fox:alt-text="Math">
+					
+			
+			
+			
+			
+			
+			
+			<!-- put MathML in Actual Text -->
+			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
+			<xsl:attribute name="fox:actual-text">
+				<xsl:value-of select="$mathml_content"/>
+			</xsl:attribute>
+			
+			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
+			<xsl:if test="normalize-space($comment_text_) != ''">
+			<!-- put Mathin Alternate Text -->
+				<xsl:attribute name="fox:alt-text">
+					<xsl:value-of select="$comment_text_"/>
+				</xsl:attribute>
+			</xsl:if>
+			<!-- </xsl:if> -->
+		
+			<xsl:copy-of select="xalan:nodeset($mathml)"/>
+			
+		</fo:instream-foreign-object>
 	</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
 		<!-- <xsl:text>a+b</xsl:text> -->
 		<xsl:text>&lt;</xsl:text>
@@ -6074,18 +6120,33 @@
 	</xsl:template><xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
-			<xsl:variable name="viewbox">
+			<xsl:variable name="viewbox_">
 				<xsl:call-template name="split">
 					<xsl:with-param name="pText" select="@viewBox"/>
 					<xsl:with-param name="sep" select="' '"/>
 				</xsl:call-template>
 			</xsl:variable>
+			<xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
+			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
+			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
+			
 			<xsl:attribute name="width">
-				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[3])"/>
+				<xsl:choose>
+					<xsl:when test="$width != ''">
+						<xsl:value-of select="round($width)"/>
+					</xsl:when>
+					<xsl:otherwise>400</xsl:otherwise> <!-- default width -->
+				</xsl:choose>
 			</xsl:attribute>
 			<xsl:attribute name="height">
-				<xsl:value-of select="round(xalan:nodeset($viewbox)//item[4])"/>
+				<xsl:choose>
+					<xsl:when test="$height != ''">
+						<xsl:value-of select="round($height)"/>
+					</xsl:when>
+					<xsl:otherwise>400</xsl:otherwise> <!-- default height -->
+				</xsl:choose>
 			</xsl:attribute>
+			
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">