lib/isodoc/ogc/ogc.reference-model.xsl in metanorma-ogc-2.1.2 vs lib/isodoc/ogc/ogc.reference-model.xsl in metanorma-ogc-2.1.3
- old
+ new
@@ -219,11 +219,14 @@
<xsl:call-template name="addLetterSpacing">
<xsl:with-param name="text" select="$ogc_document"/>
<xsl:with-param name="letter-spacing" select="0.3"/>
</xsl:call-template>
</fo:block>
- <fo:block font-size="10pt">External identifier of this OGC<fo:inline font-size="58%" baseline-shift="30%">®</fo:inline> document: <fo:inline font-weight="normal"><xsl:value-of select="/ogc:ogc-standard/ogc:bibdata/ogc:docidentifier[@type='ogc-external']"/></fo:inline></fo:block>
+ <xsl:variable name="ogc_external" select="/ogc:ogc-standard/ogc:bibdata/ogc:docidentifier[@type='ogc-external']"/>
+ <xsl:if test="normalize-space($ogc_external) != ''">
+ <fo:block font-size="10pt">External identifier of this OGC<fo:inline font-size="58%" baseline-shift="30%">®</fo:inline> document: <fo:inline font-weight="normal"><xsl:value-of select="$ogc_external"/></fo:inline></fo:block>
+ </xsl:if>
</fo:table-cell>
<fo:table-cell text-align="right">
<fo:block>
<xsl:call-template name="insertLogo"/>
</fo:block>
@@ -261,11 +264,11 @@
<fo:block font-size="17pt" margin-bottom="14pt">
<xsl:call-template name="addLetterSpacing">
<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($doctype))"/>
</xsl:call-template>
<xsl:value-of select="$linebreak"/>
- <xsl:variable name="docsubtype" select="normalize-space(/ogc:ogc-standard/ogc:bibdata/ogc:ext/ogc:docsubtype)"/>
+ <xsl:variable name="docsubtype" select="normalize-space(/ogc:ogc-standard/ogc:bibdata/ogc:ext/ogc:subdoctype)"/>
<xsl:variable name="docsubtype_str">
<xsl:choose>
<xsl:when test="$docsubtype = 'implementation'">Implementation</xsl:when>
<xsl:when test="$docsubtype = 'conceptual-model'">Conceptual model</xsl:when>
<xsl:when test="$docsubtype = 'conceptual-model-and-encoding'">Conceptual model & encoding</xsl:when>
@@ -1610,11 +1613,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">
@@ -1624,11 +1627,13 @@
- <xsl:attribute name="font-family">Lato, STIX Two Math, Source Han Sans</xsl:attribute>
+
+ <xsl:attribute name="font-family">Lato, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
<xsl:attribute name="font-size">11pt</xsl:attribute>
<xsl:attribute name="color"><xsl:value-of select="$color_main"/></xsl:attribute>
@@ -1642,21 +1647,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 name="font-size">8pt</xsl:attribute>
<xsl:attribute name="line-height">125%</xsl:attribute>
@@ -1749,13 +1797,14 @@
+
- <xsl:attribute name="font-family">Fira Code</xsl:attribute>
+ <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
<xsl:attribute name="line-height">113%</xsl:attribute>
@@ -1835,19 +1884,21 @@
+
</xsl:attribute-set><xsl:attribute-set name="example-style">
+
<xsl:attribute name="margin-top">10pt</xsl:attribute>
<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
@@ -1871,10 +1922,11 @@
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -1908,10 +1960,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>
@@ -1927,10 +1980,11 @@
+
<xsl:attribute name="space-after">12pt</xsl:attribute>
@@ -1955,10 +2009,11 @@
+
@@ -1967,10 +2022,11 @@
<xsl:attribute name="keep-with-next">always</xsl:attribute>
+
<xsl:attribute name="text-align">left</xsl:attribute>
@@ -2046,10 +2102,11 @@
+
<xsl:attribute name="border">solid 0pt white</xsl:attribute>
<xsl:attribute name="padding-top">1mm</xsl:attribute>
<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
@@ -2066,13 +2123,13 @@
-
+
<xsl:attribute name="border">solid black 0pt</xsl:attribute>
</xsl:attribute-set><xsl:attribute-set name="table-note-style">
<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -2083,18 +2140,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>
@@ -2105,10 +2165,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>
@@ -2141,10 +2202,11 @@
+
<xsl:attribute name="margin-top">0pt</xsl:attribute>
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
@@ -2153,10 +2215,11 @@
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
@@ -2205,10 +2268,11 @@
+
@@ -2278,10 +2342,14 @@
<xsl:attribute name="font-weight">bold</xsl:attribute>
<xsl:attribute name="padding-right">1mm</xsl:attribute>
+ </xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
+
+ <xsl:attribute name="space-before">4pt</xsl:attribute>
+
</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>
<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -2329,10 +2397,11 @@
</xsl:attribute-set><xsl:attribute-set name="figure-style">
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
<!-- <xsl:attribute name="margin-top">12pt</xsl:attribute> -->
<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -2376,10 +2445,11 @@
+
<xsl:attribute name="text-align">left</xsl:attribute>
</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
@@ -2401,25 +2471,25 @@
</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">scale-to-fit</xsl:attribute>
- <xsl:attribute name="scaling">uniform</xsl:attribute>
-
-
+
</xsl:attribute-set><xsl:attribute-set name="tt-style">
- <xsl:attribute name="font-family">Fira Code</xsl:attribute>
+ <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
</xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
<xsl:attribute name="font-size">11pt</xsl:attribute>
<xsl:attribute name="font-weight">bold</xsl:attribute>
<xsl:attribute name="text-align">center</xsl:attribute>
@@ -2491,10 +2561,11 @@
+
<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
<xsl:attribute name="space-after">12pt</xsl:attribute>
<xsl:attribute name="line-height">115%</xsl:attribute>
@@ -2563,10 +2634,11 @@
+
<xsl:attribute name="font-size">65%</xsl:attribute>
<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -2588,10 +2660,11 @@
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
<xsl:attribute name="color"><xsl:value-of select="$color_main"/></xsl:attribute>
<xsl:attribute name="line-height">124%</xsl:attribute>
<xsl:attribute name="text-align">justify</xsl:attribute>
@@ -2614,10 +2687,11 @@
+
<xsl:attribute name="font-size">60%</xsl:attribute>
<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -2632,29 +2706,31 @@
+
<xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
<xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
<xsl:attribute name="margin-left">16mm</xsl:attribute>
<xsl:attribute name="margin-right">16mm</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">0mm</xsl:attribute>
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
+
<xsl:attribute name="padding">2mm</xsl:attribute>
<xsl:attribute name="padding-top">3mm</xsl:attribute>
@@ -2687,10 +2763,11 @@
+
<xsl:attribute name="font-style">italic</xsl:attribute>
@@ -2728,10 +2805,11 @@
+
<xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
@@ -2750,10 +2828,11 @@
+
<xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
@@ -2779,10 +2858,11 @@
+
<xsl:attribute name="vertical-align">super</xsl:attribute>
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
@@ -2799,10 +2879,11 @@
+
<xsl:attribute name="font-size">60%</xsl:attribute>
<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -2819,10 +2900,11 @@
+
</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
<xsl:attribute name="line-height">120%</xsl:attribute>
@@ -3271,10 +3353,12 @@
+
+
<xsl:if test="ancestor::*[local-name()='sections']">
@@ -3316,10 +3400,12 @@
+
+
</xsl:element>
</xsl:variable>
<xsl:if test="$isGenerateTableIF = 'true'">
<!-- to determine start of table -->
@@ -3458,27 +3544,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)"/>
@@ -3872,16 +3964,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/>
@@ -3978,20 +4076,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>
@@ -4076,12 +4180,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">
@@ -4092,10 +4199,12 @@
</fo:table-row>
</xsl:template><xsl:template match="*[local-name()='tr']">
<fo:table-row xsl:use-attribute-sets="table-body-row-style">
+
+
<xsl:variable name="number"><xsl:number/></xsl:variable>
<xsl:if test="$number mod 2 = 0">
<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
</xsl:if>
@@ -4181,10 +4290,12 @@
+
+
@@ -4252,11 +4363,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>
@@ -4327,11 +4442,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="@*"/>
@@ -5979,16 +6094,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>
@@ -6247,11 +6367,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>
@@ -7079,11 +7211,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>
@@ -7945,10 +8077,11 @@
+
<xsl:choose>
<xsl:when test="$depth = 2">2</xsl:when>
<xsl:otherwise>1</xsl:otherwise>
</xsl:choose>
@@ -8568,20 +8701,20 @@
</fo:block>
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
+ <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
<fo:list-item>
<fo:list-item-label end-indent="label-end()">
<fo:block>
<fo:inline>
- <xsl:number format="1."/>
+ <xsl:number format="1." count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
</fo:inline>
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -8908,16 +9041,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 xsl:use-attribute-sets="admonition-name-style">
<xsl:call-template name="displayAdmonitionName"/>
</fo:block>
<fo:block xsl:use-attribute-sets="admonition-p-style">
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
@@ -9122,10 +9259,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 != ''">
@@ -9228,10 +9367,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>
@@ -9416,9 +9576,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