lib/isodoc/un/un.plenary-attachment.xsl in metanorma-un-0.9.2 vs lib/isodoc/un/un.plenary-attachment.xsl in metanorma-un-0.9.3

- old
+ new

@@ -902,11 +902,11 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/> </xsl:otherwise> </xsl:choose> - </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style"> + </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable><xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable><xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable><xsl:attribute-set name="root-style"> @@ -919,11 +919,13 @@ - <xsl:attribute name="font-family">Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute> + + <xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute> + <xsl:attribute name="font-family-generic">Serif</xsl:attribute> <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:attribute-set><xsl:template name="insertRootStyle"> <xsl:param name="root-style"/> <xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/> @@ -933,21 +935,64 @@ <xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if> </xsl:for-each> </xsl:variable> <xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/> + <xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/> + <xsl:for-each select="$root-style_/root-style/@*"> + <xsl:choose> - <xsl:when test="local-name() = 'font-family' and $additional_fonts != ''"> + <xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when> + <xsl:when test="local-name() = 'font-family'"> + + <xsl:variable name="font_regional_prefix"> + <xsl:choose> + <xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when> + <xsl:otherwise>Noto Serif</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:attribute name="{local-name()}"> - <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/> + + <xsl:variable name="font_extended"> + <xsl:choose> + <xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when> + <xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when> + <xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when> + <xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when> + <xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when> + <xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:if test="normalize-space($font_extended) != ''"> + <xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text> + <xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text> + </xsl:if> + + <xsl:value-of select="."/> + + <xsl:if test="$additional_fonts != ''"> + <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/> + </xsl:if> </xsl:attribute> </xsl:when> <xsl:otherwise> <xsl:copy-of select="."/> </xsl:otherwise> </xsl:choose> + + <!-- <xsl:choose> + <xsl:when test="local-name() = 'font-family'"> + <xsl:attribute name="{local-name()}"> + <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/> + </xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="."/> + </xsl:otherwise> + </xsl:choose> --> </xsl:for-each> </xsl:template><xsl:attribute-set name="copyright-statement-style"> </xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style"> @@ -1014,17 +1059,18 @@ + - <xsl:attribute name="font-family">Courier New</xsl:attribute> + <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute> <xsl:attribute name="margin-top">6pt</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="permission-style"> @@ -1058,10 +1104,11 @@ + </xsl:attribute-set><xsl:attribute-set name="example-style"> @@ -1073,10 +1120,11 @@ + </xsl:attribute-set><xsl:attribute-set name="example-body-style"> @@ -1092,10 +1140,11 @@ + <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> @@ -1132,10 +1181,11 @@ </xsl:attribute-set><xsl:variable name="table-border_"> + </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style"> <xsl:attribute name="margin-left">0mm</xsl:attribute> <xsl:attribute name="margin-right">0mm</xsl:attribute> @@ -1154,10 +1204,11 @@ + <xsl:attribute name="margin-bottom">18pt</xsl:attribute> <xsl:attribute name="font-size">8pt</xsl:attribute> @@ -1183,19 +1234,21 @@ + <xsl:attribute name="border-top">0.5pt solid black</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="table-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> + @@ -1278,10 +1331,11 @@ + <xsl:attribute name="display-align">before</xsl:attribute> <xsl:attribute name="padding-left">0mm</xsl:attribute> <xsl:attribute name="padding-top">2mm</xsl:attribute> <xsl:attribute name="padding-bottom">1mm</xsl:attribute> <xsl:attribute name="border">solid black 0pt</xsl:attribute> @@ -1299,14 +1353,14 @@ - + </xsl:attribute-set><xsl:attribute-set name="table-note-style"> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> @@ -1314,18 +1368,21 @@ + </xsl:attribute-set><xsl:attribute-set name="table-fn-style"> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + + </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style"> <xsl:attribute name="font-size">80%</xsl:attribute> <xsl:attribute name="padding-right">5mm</xsl:attribute> @@ -1337,10 +1394,11 @@ + <xsl:attribute name="vertical-align">super</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="fn-container-body-style"> <xsl:attribute name="text-indent">0</xsl:attribute> <xsl:attribute name="start-indent">0</xsl:attribute> @@ -1373,18 +1431,20 @@ + </xsl:attribute-set><xsl:attribute-set name="dl-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> + @@ -1423,10 +1483,11 @@ + @@ -1490,10 +1551,12 @@ </xsl:attribute-set><xsl:attribute-set name="termnote-name-style"> + </xsl:attribute-set><xsl:attribute-set name="termnote-p-style"> + </xsl:attribute-set><xsl:attribute-set name="quote-style"> <xsl:attribute name="margin-left">12mm</xsl:attribute> <xsl:attribute name="margin-right">12mm</xsl:attribute> @@ -1530,10 +1593,11 @@ </xsl:attribute-set><xsl:attribute-set name="figure-style"> </xsl:attribute-set><xsl:attribute-set name="figure-name-style"> + @@ -1574,10 +1638,11 @@ + </xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style"> <xsl:attribute name="text-align">right</xsl:attribute> @@ -1596,21 +1661,20 @@ </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style"> </xsl:attribute-set><xsl:attribute-set name="image-graphic-style"> + <xsl:attribute name="width">100%</xsl:attribute> + <xsl:attribute name="content-height">100%</xsl:attribute> + <xsl:attribute name="scaling">uniform</xsl:attribute> - <xsl:attribute name="width">100%</xsl:attribute> - <xsl:attribute name="content-height">100%</xsl:attribute> <xsl:attribute name="content-width">scale-to-fit</xsl:attribute> - <xsl:attribute name="scaling">uniform</xsl:attribute> - - + </xsl:attribute-set><xsl:attribute-set name="tt-style"> </xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style"> @@ -1684,10 +1748,11 @@ + <xsl:attribute name="provisional-distance-between-starts">4mm</xsl:attribute> <xsl:attribute name="margin-left">-8mm</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="list-name-style"> @@ -1749,10 +1814,11 @@ + <xsl:attribute name="font-size">60%</xsl:attribute> <xsl:attribute name="vertical-align">super</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="fn-body-style"> @@ -1775,10 +1841,11 @@ + <xsl:attribute name="font-size">9pt</xsl:attribute> <xsl:attribute name="text-align">justify</xsl:attribute> <xsl:attribute name="line-height">125%</xsl:attribute> <xsl:attribute name="margin-left">8mm</xsl:attribute> @@ -1799,10 +1866,11 @@ + <xsl:attribute name="font-size">60%</xsl:attribute> <xsl:attribute name="vertical-align">super</xsl:attribute> <xsl:attribute name="padding-right">8mm</xsl:attribute> @@ -1818,27 +1886,31 @@ + <xsl:attribute name="border">0.25pt solid black</xsl:attribute> <xsl:attribute name="margin-left">-3mm</xsl:attribute> <xsl:attribute name="margin-right">-3mm</xsl:attribute> <xsl:attribute name="padding-top">4mm</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="admonition-container-style"> + <xsl:attribute name="margin-left">0mm</xsl:attribute> + <xsl:attribute name="margin-right">0mm</xsl:attribute> + <xsl:attribute name="margin-left">2mm</xsl:attribute> <xsl:attribute name="margin-right">2mm</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="admonition-name-style"> @@ -1870,10 +1942,11 @@ + <xsl:attribute name="text-align">justify</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="line-height">122%</xsl:attribute> @@ -1912,10 +1985,11 @@ + </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style"> @@ -1931,10 +2005,11 @@ + </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style"> </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style"> @@ -1957,10 +2032,11 @@ + <xsl:attribute name="vertical-align">super</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style"> <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute> @@ -1977,10 +2053,11 @@ + <xsl:attribute name="font-size">60%</xsl:attribute> <xsl:attribute name="vertical-align">super</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style"> <xsl:attribute name="font-size">10pt</xsl:attribute> @@ -1995,10 +2072,11 @@ + </xsl:attribute-set><xsl:attribute-set name="references-non-normative-style"> </xsl:attribute-set><xsl:attribute-set name="hljs-doctag"> @@ -2426,10 +2504,12 @@ + + @@ -2470,10 +2550,12 @@ + + </xsl:element> </xsl:variable> <xsl:if test="$isGenerateTableIF = 'true'"> <!-- to determine start of table --> @@ -2612,27 +2694,33 @@ </xsl:choose> </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"> <xsl:param name="continued"/> <xsl:if test="normalize-space() != ''"> - <fo:block xsl:use-attribute-sets="table-name-style"> - + + - - - - <xsl:choose> - <xsl:when test="$continued = 'true'"> + <fo:block xsl:use-attribute-sets="table-name-style"> + - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> + + + + <xsl:choose> + <xsl:when test="$continued = 'true'"> + + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + + + </fo:block> + - - </fo:block> + </xsl:if> </xsl:template><xsl:template name="calculate-columns-numbers"> <xsl:param name="table-row"/> <xsl:variable name="columns-count" select="count($table-row/*)"/> <xsl:variable name="sum-colspans" select="sum($table-row/*/@colspan)"/> @@ -3026,16 +3114,22 @@ <xsl:param name="cols-count"/> <!-- row for title --> <fo:table-row> <fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black"> - <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']"> - <xsl:with-param name="continued">true</xsl:with-param> - </xsl:apply-templates> + <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']"> + <xsl:with-param name="continued">true</xsl:with-param> + </xsl:apply-templates> + + + + + + </fo:table-cell> </fo:table-row> </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody"> <fo:table-body> <xsl:apply-templates/> @@ -3132,20 +3226,26 @@ <!-- horizontal row separator --> <!-- fn processing --> - <xsl:call-template name="table_fn_display"/> + <xsl:call-template name="table_fn_display"/> + + + <!-- for PAS display Notes after footnotes --> </fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> + + + </xsl:if> </xsl:template><xsl:template match="*[local-name()='tbody']"> <xsl:variable name="cols-count"> <xsl:choose> @@ -3230,12 +3330,15 @@ + + + <xsl:call-template name="setTableRowAttributes"/> <xsl:apply-templates/> </fo:table-row> </xsl:template><xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2"> @@ -3249,10 +3352,12 @@ + + <xsl:call-template name="setTableRowAttributes"/> <xsl:apply-templates/> </fo:table-row> </xsl:template><xsl:template name="setTableRowAttributes"> @@ -3334,10 +3439,12 @@ + + @@ -3409,11 +3516,15 @@ </xsl:variable> <xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/> <xsl:variable name="gen_id" select="generate-id(.)"/> <xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/> - <xsl:variable name="reference" select="@reference"/> + <xsl:variable name="reference_"> + <xsl:value-of select="@reference"/> + <xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if> + </xsl:variable> + <xsl:variable name="reference" select="normalize-space($reference_)"/> <!-- fn sequence number in document --> <xsl:variable name="current_fn_number"> <xsl:choose> <xsl:when test="@current_fn_number"><xsl:value-of select="@current_fn_number"/></xsl:when> <!-- for BSI --> <xsl:otherwise> @@ -3484,11 +3595,11 @@ <fn gen_id="{generate-id(.)}"> <xsl:copy-of select="@*"/> <xsl:copy-of select="node()"/> </fn> </xsl:for-each> - <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*"> + <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*"> <xsl:sort select="@displayorder" data-type="number"/> <xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]"> <!-- copy unique fn --> <fn gen_id="{generate-id(.)}"> <xsl:copy-of select="@*"/> @@ -5125,16 +5236,21 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> <fo:inline xsl:use-attribute-sets="link-style"> + <xsl:if test="starts-with(normalize-space(@target), 'mailto:')"> + <xsl:attribute name="keep-together.within-line">always</xsl:attribute> + </xsl:if> + + <xsl:choose> <xsl:when test="$target_text = ''"> <xsl:apply-templates/> </xsl:when> <xsl:otherwise> @@ -5403,11 +5519,23 @@ <xsl:if test="normalize-space() != ''"> <xsl:apply-templates/> <xsl:value-of select="$suffix"/> </xsl:if> </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']"> - <fo:inline><xsl:apply-templates/></fo:inline> + <xsl:variable name="num"><xsl:number/></xsl:variable> + <xsl:choose> + <xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name --> + <fo:inline xsl:use-attribute-sets="termnote-p-style"> + <xsl:apply-templates/> + </fo:inline> + </xsl:when> + <xsl:otherwise> + <fo:block xsl:use-attribute-sets="termnote-p-style"> + <xsl:apply-templates/> + </fo:block> + </xsl:otherwise> + </xsl:choose> </xsl:template><xsl:template match="*[local-name() = 'terms']"> <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> --> <fo:block id="{@id}"> <xsl:apply-templates/> </fo:block> @@ -6220,11 +6348,11 @@ <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents"> <xsl:value-of select="."/> - </xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item"> + </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item"> <xsl:text> </xsl:text> </xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item"> <xsl:copy> <xsl:apply-templates mode="contents_item"/> </xsl:copy> @@ -7073,10 +7201,11 @@ + <xsl:choose> <xsl:when test="ancestor::un:sections and $depth = 1">12</xsl:when> <xsl:when test="ancestor::un:sections">8</xsl:when> </xsl:choose> @@ -8009,16 +8138,20 @@ <!-- text in the box --> <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style"> + + <fo:block-container xsl:use-attribute-sets="admonition-container-style"> + + <fo:block-container margin-left="0mm" margin-right="0mm"> <fo:block> <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </fo:block-container> @@ -8222,10 +8355,12 @@ <xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/> </xsl:call-template> </xsl:when> <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise> </xsl:choose> + </xsl:template><xsl:template match="*[local-name() = 'lang_none']"> + <fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline> </xsl:template><xsl:template name="printEdition"> <xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/> <xsl:text> </xsl:text> <xsl:choose> <xsl:when test="$edition_i18n != ''"> @@ -8328,10 +8463,31 @@ <xsl:when test="normalize-space($lowercase) = 'true'"> <xsl:value-of select="java:toLowerCase(java:java.lang.String.new($monthStr_))"/> </xsl:when> <xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise> </xsl:choose> + </xsl:template><xsl:template name="getMonthLocalizedByNum"> + <xsl:param name="num"/> + <xsl:variable name="monthStr"> + <xsl:choose> + <xsl:when test="$num = '01'">january</xsl:when> + <xsl:when test="$num = '02'">february</xsl:when> + <xsl:when test="$num = '03'">march</xsl:when> + <xsl:when test="$num = '04'">april</xsl:when> + <xsl:when test="$num = '05'">may</xsl:when> + <xsl:when test="$num = '06'">june</xsl:when> + <xsl:when test="$num = '07'">july</xsl:when> + <xsl:when test="$num = '08'">august</xsl:when> + <xsl:when test="$num = '09'">september</xsl:when> + <xsl:when test="$num = '10'">october</xsl:when> + <xsl:when test="$num = '11'">november</xsl:when> + <xsl:when test="$num = '12'">december</xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:call-template name="getLocalizedString"> + <xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param> + </xsl:call-template> </xsl:template><xsl:template name="insertKeywords"> <xsl:param name="sorting" select="'true'"/> <xsl:param name="charAtEnd" select="'.'"/> <xsl:param name="charDelim" select="', '"/> <xsl:choose> @@ -8516,9 +8672,10 @@ </xsl:template><xsl:template name="getDocumentId"> <xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/> </xsl:template><xsl:template name="namespaceCheck"> <xsl:variable name="documentNS" select="namespace-uri(/*)"/> <xsl:variable name="XSLNS"> + \ No newline at end of file