Skip to content

Commit e9ceb93

Browse files
opoudjisopoudjis
committed
2 parents c4dea0f + 7abd58b commit e9ceb93

9 files changed

+351
-9
lines changed

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

+39-1
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,10 @@
27032703

27042704
</xsl:attribute-set>
27052705

2706+
<xsl:template name="refine_termexample-style">
2707+
2708+
</xsl:template>
2709+
27062710
<xsl:attribute-set name="example-style">
27072711

27082712
<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
38453849
</xsl:for-each>
38463850
</xsl:template>
38473851

3852+
<xsl:template name="processMainSectionsDefault_flatxml">
3853+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3854+
<xsl:sort select="@displayorder" data-type="number"/>
3855+
<xsl:variable name="flatxml">
3856+
<xsl:apply-templates select="." mode="flatxml"/>
3857+
</xsl:variable>
3858+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3859+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3860+
3861+
</xsl:for-each>
3862+
3863+
<xsl:for-each select="/*/*[local-name()='annex']">
3864+
<xsl:sort select="@displayorder" data-type="number"/>
3865+
<xsl:variable name="flatxml">
3866+
<xsl:apply-templates select="." mode="flatxml"/>
3867+
</xsl:variable>
3868+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3869+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3870+
</xsl:for-each>
3871+
3872+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3873+
<xsl:sort select="@displayorder" data-type="number"/>
3874+
<xsl:variable name="flatxml">
3875+
<xsl:apply-templates select="." mode="flatxml"/>
3876+
</xsl:variable>
3877+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3878+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3879+
</xsl:for-each>
3880+
</xsl:template>
3881+
38483882
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
38493883
<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
38503884
<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -6580,6 +6614,10 @@
65806614
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
65816615
</xsl:template>
65826616

6617+
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618+
<xsl:value-of select="."/>
6619+
</xsl:template>
6620+
65836621
<!-- ========================= -->
65846622
<!-- END Rich text formatting -->
65856623
<!-- ========================= -->
@@ -10091,7 +10129,7 @@
1009110129
<!-- ====== -->
1009210130
<xsl:template match="*[local-name() = 'termexample']">
1009310131
<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094-
10132+
<xsl:call-template name="refine_termexample-style"/>
1009510133
<xsl:call-template name="setBlockSpanAll"/>
1009610134

1009710135
<xsl:apply-templates select="*[local-name()='name']"/>

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

+39-1
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,10 @@
27032703

27042704
</xsl:attribute-set>
27052705

2706+
<xsl:template name="refine_termexample-style">
2707+
2708+
</xsl:template>
2709+
27062710
<xsl:attribute-set name="example-style">
27072711

27082712
<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
38453849
</xsl:for-each>
38463850
</xsl:template>
38473851

3852+
<xsl:template name="processMainSectionsDefault_flatxml">
3853+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3854+
<xsl:sort select="@displayorder" data-type="number"/>
3855+
<xsl:variable name="flatxml">
3856+
<xsl:apply-templates select="." mode="flatxml"/>
3857+
</xsl:variable>
3858+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3859+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3860+
3861+
</xsl:for-each>
3862+
3863+
<xsl:for-each select="/*/*[local-name()='annex']">
3864+
<xsl:sort select="@displayorder" data-type="number"/>
3865+
<xsl:variable name="flatxml">
3866+
<xsl:apply-templates select="." mode="flatxml"/>
3867+
</xsl:variable>
3868+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3869+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3870+
</xsl:for-each>
3871+
3872+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3873+
<xsl:sort select="@displayorder" data-type="number"/>
3874+
<xsl:variable name="flatxml">
3875+
<xsl:apply-templates select="." mode="flatxml"/>
3876+
</xsl:variable>
3877+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3878+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3879+
</xsl:for-each>
3880+
</xsl:template>
3881+
38483882
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
38493883
<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
38503884
<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -6580,6 +6614,10 @@
65806614
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
65816615
</xsl:template>
65826616

6617+
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618+
<xsl:value-of select="."/>
6619+
</xsl:template>
6620+
65836621
<!-- ========================= -->
65846622
<!-- END Rich text formatting -->
65856623
<!-- ========================= -->
@@ -10091,7 +10129,7 @@
1009110129
<!-- ====== -->
1009210130
<xsl:template match="*[local-name() = 'termexample']">
1009310131
<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094-
10132+
<xsl:call-template name="refine_termexample-style"/>
1009510133
<xsl:call-template name="setBlockSpanAll"/>
1009610134

1009710135
<xsl:apply-templates select="*[local-name()='name']"/>

‎lib/isodoc/itu/itu.recommendation-annex.xsl

+39-1
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,10 @@
27032703

27042704
</xsl:attribute-set>
27052705

2706+
<xsl:template name="refine_termexample-style">
2707+
2708+
</xsl:template>
2709+
27062710
<xsl:attribute-set name="example-style">
27072711

27082712
<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
38453849
</xsl:for-each>
38463850
</xsl:template>
38473851

3852+
<xsl:template name="processMainSectionsDefault_flatxml">
3853+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3854+
<xsl:sort select="@displayorder" data-type="number"/>
3855+
<xsl:variable name="flatxml">
3856+
<xsl:apply-templates select="." mode="flatxml"/>
3857+
</xsl:variable>
3858+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3859+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3860+
3861+
</xsl:for-each>
3862+
3863+
<xsl:for-each select="/*/*[local-name()='annex']">
3864+
<xsl:sort select="@displayorder" data-type="number"/>
3865+
<xsl:variable name="flatxml">
3866+
<xsl:apply-templates select="." mode="flatxml"/>
3867+
</xsl:variable>
3868+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3869+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3870+
</xsl:for-each>
3871+
3872+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3873+
<xsl:sort select="@displayorder" data-type="number"/>
3874+
<xsl:variable name="flatxml">
3875+
<xsl:apply-templates select="." mode="flatxml"/>
3876+
</xsl:variable>
3877+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3878+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3879+
</xsl:for-each>
3880+
</xsl:template>
3881+
38483882
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
38493883
<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
38503884
<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -6580,6 +6614,10 @@
65806614
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
65816615
</xsl:template>
65826616

6617+
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618+
<xsl:value-of select="."/>
6619+
</xsl:template>
6620+
65836621
<!-- ========================= -->
65846622
<!-- END Rich text formatting -->
65856623
<!-- ========================= -->
@@ -10091,7 +10129,7 @@
1009110129
<!-- ====== -->
1009210130
<xsl:template match="*[local-name() = 'termexample']">
1009310131
<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094-
10132+
<xsl:call-template name="refine_termexample-style"/>
1009510133
<xsl:call-template name="setBlockSpanAll"/>
1009610134

1009710135
<xsl:apply-templates select="*[local-name()='name']"/>

‎lib/isodoc/itu/itu.recommendation-supplement.xsl

+39-1
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,10 @@
27032703

27042704
</xsl:attribute-set>
27052705

2706+
<xsl:template name="refine_termexample-style">
2707+
2708+
</xsl:template>
2709+
27062710
<xsl:attribute-set name="example-style">
27072711

27082712
<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
38453849
</xsl:for-each>
38463850
</xsl:template>
38473851

3852+
<xsl:template name="processMainSectionsDefault_flatxml">
3853+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3854+
<xsl:sort select="@displayorder" data-type="number"/>
3855+
<xsl:variable name="flatxml">
3856+
<xsl:apply-templates select="." mode="flatxml"/>
3857+
</xsl:variable>
3858+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3859+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3860+
3861+
</xsl:for-each>
3862+
3863+
<xsl:for-each select="/*/*[local-name()='annex']">
3864+
<xsl:sort select="@displayorder" data-type="number"/>
3865+
<xsl:variable name="flatxml">
3866+
<xsl:apply-templates select="." mode="flatxml"/>
3867+
</xsl:variable>
3868+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3869+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3870+
</xsl:for-each>
3871+
3872+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3873+
<xsl:sort select="@displayorder" data-type="number"/>
3874+
<xsl:variable name="flatxml">
3875+
<xsl:apply-templates select="." mode="flatxml"/>
3876+
</xsl:variable>
3877+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3878+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3879+
</xsl:for-each>
3880+
</xsl:template>
3881+
38483882
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
38493883
<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
38503884
<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -6580,6 +6614,10 @@
65806614
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
65816615
</xsl:template>
65826616

6617+
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618+
<xsl:value-of select="."/>
6619+
</xsl:template>
6620+
65836621
<!-- ========================= -->
65846622
<!-- END Rich text formatting -->
65856623
<!-- ========================= -->
@@ -10091,7 +10129,7 @@
1009110129
<!-- ====== -->
1009210130
<xsl:template match="*[local-name() = 'termexample']">
1009310131
<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094-
10132+
<xsl:call-template name="refine_termexample-style"/>
1009510133
<xsl:call-template name="setBlockSpanAll"/>
1009610134

1009710135
<xsl:apply-templates select="*[local-name()='name']"/>

‎lib/isodoc/itu/itu.recommendation.xsl

+39-1
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,10 @@
27032703

27042704
</xsl:attribute-set>
27052705

2706+
<xsl:template name="refine_termexample-style">
2707+
2708+
</xsl:template>
2709+
27062710
<xsl:attribute-set name="example-style">
27072711

27082712
<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
38453849
</xsl:for-each>
38463850
</xsl:template>
38473851

3852+
<xsl:template name="processMainSectionsDefault_flatxml">
3853+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3854+
<xsl:sort select="@displayorder" data-type="number"/>
3855+
<xsl:variable name="flatxml">
3856+
<xsl:apply-templates select="." mode="flatxml"/>
3857+
</xsl:variable>
3858+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3859+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3860+
3861+
</xsl:for-each>
3862+
3863+
<xsl:for-each select="/*/*[local-name()='annex']">
3864+
<xsl:sort select="@displayorder" data-type="number"/>
3865+
<xsl:variable name="flatxml">
3866+
<xsl:apply-templates select="." mode="flatxml"/>
3867+
</xsl:variable>
3868+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3869+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3870+
</xsl:for-each>
3871+
3872+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3873+
<xsl:sort select="@displayorder" data-type="number"/>
3874+
<xsl:variable name="flatxml">
3875+
<xsl:apply-templates select="." mode="flatxml"/>
3876+
</xsl:variable>
3877+
<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3878+
<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3879+
</xsl:for-each>
3880+
</xsl:template>
3881+
38483882
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
38493883
<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
38503884
<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -6580,6 +6614,10 @@
65806614
<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
65816615
</xsl:template>
65826616

6617+
<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618+
<xsl:value-of select="."/>
6619+
</xsl:template>
6620+
65836621
<!-- ========================= -->
65846622
<!-- END Rich text formatting -->
65856623
<!-- ========================= -->
@@ -10091,7 +10129,7 @@
1009110129
<!-- ====== -->
1009210130
<xsl:template match="*[local-name() = 'termexample']">
1009310131
<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094-
10132+
<xsl:call-template name="refine_termexample-style"/>
1009510133
<xsl:call-template name="setBlockSpanAll"/>
1009610134

1009710135
<xsl:apply-templates select="*[local-name()='name']"/>

0 commit comments

Comments
 (0)