metanorma-ogc 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065450d18c49c89724b52b0db86721eb2abe6fc843322b043f92e3c7082aac4f
-  data.tar.gz: fb90b5aba879eb33d3c6debfebbd171dd4b33cc387450048e0ad247992cd2243
+  metadata.gz: 2f51704a20c55c282a8557e05cb5d20425e3f08a63759aaa0ad9ae9d8d69e188
+  data.tar.gz: b9ff0a479fb5cd4e1ca3b84d9aae9962869da3111d33b59ceed42f84f1a30a9d
 SHA512:
-  metadata.gz: 6df39210730df8aa755c8c536b212957c69d5474ecbdbeb2173c4ef6febd813bc0c2864647e998b047ed8dbedccf38fbf3c244473c82b0f46ef341b042cdbf97
-  data.tar.gz: d22994f820930f4fc86af8db65d2d6dc009900b02b56386b0f0de227d507f47a49e2256e76ae0724abbcb4ecb0195e7ea670be8984bd6bb388b1f9ecad009277
+  metadata.gz: b9551ab0f6a1f0c43fdfbc07e4b3635417e7d3b2e0e5d6389c4ee790419b4159c92d2eabb1d2a55952117f632695c73daef712732fbb93bd6c7792379f85496f
+  data.tar.gz: c7e7e94b1c2f381b57fde63598efb59c5bff3ed94ef97001cfa158986cebc46314dd1ee7ec4dce1aebf15b6c8f0a5bd36f8d3159cc15e7ba916526d928f77df0

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

@@ -896,26 +896,26 @@ dl pre {
   list-style-type: none;
 }
 
-.figure .FigureTitle, .figure .figure-title {
+figure figcaption {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-.figure > img, .figure > svg {
+figure > img, figure > svg {
   margin-left: auto;
   margin-right: auto;
   display: block;
   max-width: 100%;
   height: auto;
 }
-.figure {
+figure {
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -1211,7 +1211,7 @@ td > p:last-child, th > p:last-child {
   margin-bottom: 0em;
 }
 
-p.TableTitle {
+table > caption {
   text-align: center;
   margin-top: 2.5em;
   font-weight: 400;
@@ -1271,8 +1271,12 @@ p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3em;
+}
+
 /* Blocks */
-.SourceTitle, .FigureTitle {
+.SourceTitle, figcaption {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
@@ -1325,7 +1329,7 @@ pre, .sourcecode {
   margin: 0;
 }
 
-.figure, pre, .pseudocode, .sourcecode {
+figure, pre, .pseudocode, .sourcecode {
   background-color: #e1eef1;
   color: #424242;
   font-size: {{monospacefontsize}};

data/lib/isodoc/ogc/html/htmlstyle.scss

@@ -148,11 +148,11 @@ nav {
   }
 }
 
-.figure {
+figure {
   @include figureBlock();
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -374,7 +374,7 @@ td > p:last-child, th > p:last-child {
 }
 
 
-p.TableTitle {
+table > caption {
   text-align: center;
   margin-top: 2.5em;
   font-weight: 400;
@@ -421,10 +421,13 @@ p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3em;
+}
 
 /* Blocks */
 
-.SourceTitle, .FigureTitle {
+.SourceTitle, figcaption {
   @include blockTitle();
 }
 
@@ -463,7 +466,7 @@ pre, .sourcecode {
   }
 }
 
-.figure, pre, .pseudocode, .sourcecode {
+figure, pre, .pseudocode, .sourcecode {
   background-color: #e1eef1;
   color: #424242;
   font-size: $monospacefontsize;

data/lib/isodoc/ogc/html_convert.rb

@@ -141,12 +141,12 @@ module IsoDoc
       end
 
       def figure_parse1(node, out)
-        out.div **figure_attrs(node) do |div|
+        out.figure **figure_attrs(node) do |div|
           node.children.each do |n|
             parse(n, div) unless n.name == "fmt-name"
           end
+          figure_name_parse(node, out, node.at(ns("./fmt-name")))
         end
-        figure_name_parse(node, out, node.at(ns("./fmt-name")))
       end
 
       def html_cleanup(html)

data/lib/isodoc/ogc/metadata.rb

@@ -42,7 +42,7 @@ module IsoDoc
 
       def logo_new
         File.expand_path(File.join(File.dirname(__FILE__), "html",
-                                       "logo.2021.svg"))
+                                   "logo.2021.svg"))
       end
 
       def images(_isoxml, _out)

data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl

@@ -35,7 +35,7 @@
 
 	<xsl:variable name="doctype">
 		<xsl:call-template name="capitalizeWords">
-			<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
+			<xsl:with-param name="str"><xsl:call-template name="getDoctype"/></xsl:with-param>
 		</xsl:call-template>
 	</xsl:variable>
 
@@ -528,7 +528,7 @@
 					</xsl:for-each>
 				<!-- </xsl:for-each> -->
 
-				<xsl:apply-templates select="//mn:indexsect" mode="sections"/>
+				<!-- <xsl:apply-templates select="//mn:indexsect" mode="sections"/> -->
 
 			</xsl:for-each>
 
@@ -1185,8 +1185,8 @@
 					<!-- <xsl:apply-templates select="."/> -->
 
 					<xsl:choose>
-						<xsl:when test="self::mn:indexsect">
-							<xsl:apply-templates select="."/>
+						<xsl:when test=".//mn:indexsect">
+							<xsl:apply-templates select=".//mn:indexsect" mode="index"/>
 						</xsl:when>
 						<xsl:otherwise>
 							<xsl:apply-templates/>
@@ -1199,6 +1199,16 @@
 
 	</xsl:template>
 
+	<xsl:template match="mn:indexsect"/>
+	<xsl:template match="mn:indexsect" mode="index">
+		<fo:block id="{@id}" span="all">
+			<xsl:apply-templates select="mn:fmt-title"/>
+		</fo:block>
+		<fo:block role="Index">
+			<xsl:apply-templates select="*[not(self::mn:fmt-title)]"/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -1240,18 +1250,21 @@
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
 
-			<xsl:variable name="type">
-				<xsl:value-of select="local-name()"/>
-			</xsl:variable>
+			<xsl:variable name="type" select="local-name()"/>
 
 			<mnx:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
+				<xsl:if test="$type = 'indexsect'">
+					<xsl:attribute name="level">1</xsl:attribute>
+				</xsl:if>
 				<xsl:if test="ancestor::mn:annex">
 					<xsl:attribute name="parent">annex</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
 					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
 				</mnx:title>
-				<xsl:apply-templates mode="contents"/>
+				<xsl:if test="$type != 'indexsect'">
+					<xsl:apply-templates mode="contents"/>
+				</xsl:if>
 			</mnx:item>
 		</xsl:if>
 
@@ -1830,7 +1843,9 @@
 		<xsl:param name="title"/>
 		<xsl:param name="level">1</xsl:param>
 		<fo:block>
-			<fo:block font-size="18pt" color="{$color_text_title}" keep-with-next="always" line-height="150%">
+			<xsl:variable name="title_styles"><styles xsl:use-attribute-sets="title-style"/></xsl:variable>
+			<fo:block line-height="150%">
+				<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*[local-name() = 'font-size' or local-name() = 'color' or        local-name() = 'keep-with-next']"/>
 				<xsl:if test="$section != ''">
 					<fo:inline padding-right="2mm">
 						<xsl:call-template name="addLetterSpacing">
@@ -3414,7 +3429,23 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:element name="page_sequence" namespace="{$namespace_full}">
 				<xsl:attribute name="main_page_sequence"/>
-				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+
+				<!-- from common <xsl:template name="index-pages"> -->
+				<xsl:variable name="docid">
+					<xsl:call-template name="getDocumentId"/>
+				</xsl:variable>
+
+				<xsl:variable name="current_document_index_id">
+					<xsl:apply-templates select="." mode="index_add_id">
+						<xsl:with-param name="docid" select="$docid"/>
+					</xsl:apply-templates>
+				</xsl:variable>
+				<xsl:variable name="current_document_index">
+					<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+				</xsl:variable>
+
+				<!-- xalan:nodeset($current_document_index) -->
+				<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="update_xml_step_move_pagebreak"/>
 			</xsl:element>
 		</xsl:for-each>
 	</xsl:template>
@@ -4511,6 +4542,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="tt-style">
+		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 		<xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
 
@@ -6318,6 +6350,11 @@
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			<xsl:apply-templates select="mn:fmt-name"/> <!-- table's title rendered before table -->
+			<xsl:if test="not(mn:fmt-name)"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+				<xsl:apply-templates select="mn:name">
+					<xsl:with-param name="process">true</xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:if>
 			<xsl:call-template name="table_name_fn_display"/>
 
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/mn:tr[1]/mn:td)"/>
@@ -6569,7 +6606,13 @@
 	</xsl:template>
 
 	<!-- table/name-->
-	<xsl:template match="*[local-name()='table']/mn:fmt-name">
+	<xsl:template match="mn:table[not(mn:fmt-name)]/mn:name"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:call-template name="table_name"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template match="*[local-name()='table']/mn:fmt-name" name="table_name">
 		<xsl:param name="continued"/>
 		<xsl:param name="cols-count"/>
 		<xsl:if test="normalize-space() != ''">
@@ -7045,12 +7088,14 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ../mn:key or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
+		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or       ../mn:example or       ../mn:dl or       ../mn:key or       (..//mn:fn[not(parent::mn:fmt-name)] and not(ancestor::mn:table[1]//mn:tfoot//mn:fmt-footnote-container)) or       ../mn:fmt-source or ../mn:p"/>
+		<!-- in JIS fmt-footnote-container renders in tfoot, so no need render fn in the separate table -->
 
-		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable_">
 		</xsl:variable>
+		<xsl:variable name="isNoteOrFnExistShowAfterTable" select="normalize-space($isNoteOrFnExistShowAfterTable_)"/>
 
-		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
+		<xsl:if test="$isNoteOrFnExist = 'true' or $isNoteOrFnExistShowAfterTable = 'true'">
 
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -12669,8 +12714,24 @@
 	<!-- End Highlight syntax styles -->
 
 	<!-- Index section styles -->
+
+	<xsl:attribute-set name="indexsect-region-body-style">
+		<xsl:attribute name="column-count">2</xsl:attribute>
+		<xsl:attribute name="column-gap">10mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="indexsect-title-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="span">all</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="indexsect-title-style">
 		<xsl:attribute name="role">H1</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
+		<xsl:attribute name="font-size">18pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 	</xsl:attribute-set> <!-- indexsect-title-style -->
 
 	<xsl:template name="refine_indexsect-title-style">
@@ -12696,6 +12757,27 @@
 		</xsl:for-each>
 	</xsl:variable>
 
+	<xsl:template name="index-pages">
+		<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+
+		<xsl:variable name="docid">
+			<xsl:call-template name="getDocumentId"/>
+		</xsl:variable>
+
+		<xsl:variable name="current_document_index_id">
+			<xsl:apply-templates select="//mn:indexsect" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<xsl:variable name="current_document_index">
+			<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+		</xsl:variable>
+
+		<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="index">
+			<xsl:with-param name="num" select="$num"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
 	<xsl:template match="@*|node()" mode="index_add_id">
 		<xsl:param name="docid"/>
 		<xsl:copy>
@@ -12748,7 +12830,7 @@
 	<xsl:template match="mn:indexsect//mn:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
-		<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
+			<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 
@@ -12956,11 +13038,24 @@
 	<!-- End of Index processing -->
 	<!-- =================== -->
 
-		<!-- =================== -->
+	<xsl:attribute-set name="form-checkbox-style">
+		<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
+		<xsl:attribute name="background-color">yellow</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:variable name="METANORMA_FORM_START_PREFIX">_metanorma_form_start</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_PREFIX">_metanorma_form_item_</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_BORDER">1pt solid black</xsl:variable>
+
+	<!-- =================== -->
 	<!-- Form's elements processing -->
 	<!-- =================== -->
 	<xsl:template match="mn:form">
 		<fo:block>
+			<fo:inline>
+				<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_START_PREFIX, '___', @id, '___', @name)"/></xsl:attribute>
+				<xsl:value-of select="$hair_space"/>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -12969,7 +13064,23 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 
-	<xsl:template match="mn:form//mn:input[@type = 'text' or @type = 'date' or @type = 'file' or @type = 'password']">
+	<xsl:template match="mn:form//mn:input[@type = 'text']">
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove, this border needs for mn2pdf FOPIFFormsHandler -->
+			<fo:inline>
+				<xsl:call-template name="set_id_metanorma_form_item"/>
+				<xsl:call-template name="text_input"/>
+			</fo:inline>
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template match="mn:form//mn:input[@type = 'date' or @type = 'file' or @type = 'password']">
 		<fo:inline>
 			<xsl:call-template name="text_input"/>
 		</fo:inline>
@@ -13001,7 +13112,20 @@
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'checkbox']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">checkbox</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -13011,11 +13135,24 @@
 					<polyline points="0,0 80,0 80,80 0,80 0,0" stroke="black" stroke-width="5" fill="white"/>
 				</svg>
 			</fo:instream-foreign-object>
-		</fo:inline>
+		</fo:inline><fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'radio']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">radiobutton</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -13027,6 +13164,7 @@
 				</svg>
 			</fo:instream-foreign-object>
 		</fo:inline>
+		<fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:select">
@@ -13036,11 +13174,28 @@
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:textarea">
-		<fo:block-container border="1pt solid black" width="50%">
+		<fo:block-container border="{$METANORMA_FORM_ITEM_BORDER}" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
 	</xsl:template>
 
+	<xsl:template name="set_id_metanorma_form_item">
+		<xsl:param name="form_item_type">textfield</xsl:param>
+		<xsl:param name="add_border_prefix">false</xsl:param>
+		<xsl:variable name="border_prefix"><xsl:if test="normalize-space($add_border_prefix) = 'true'">border_</xsl:if></xsl:variable>
+		<xsl:if test="@id">
+			<!-- _metanorma_form_item_border____form_item_type___id___name___value -->
+			<!-- split by '___': [2] - form_item_type, [3] - id, [4] - name, [5] - value -->
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="@type = 'checkbox'"><xsl:value-of select="normalize-space(@checked = 'true')"/><!-- true or false --></xsl:when>
+					<xsl:otherwise><xsl:value-of select="@value"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_ITEM_PREFIX, $border_prefix, '___', $form_item_type, '___', @id, '___', @name, '___', $value)"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
@@ -13097,6 +13252,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-pagenumber-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-pagenumber-style">
@@ -14927,7 +15083,12 @@
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination = 'true' or $internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true'">
+				<fo:wrapper role="Reference">
+					<xsl:copy-of select="$element_node"/>
+				</fo:wrapper>
+			</xsl:when>
+			<xsl:when test="$external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>