metanorma-itu 2.4.1 → 2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/itu/itu.implementers-guide.xsl +44 -6
  3. data/lib/isodoc/itu/itu.in-force.xsl +44 -6
  4. data/lib/isodoc/itu/itu.recommendation-annex.xsl +44 -6
  5. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +44 -6
  6. data/lib/isodoc/itu/itu.recommendation.xsl +44 -6
  7. data/lib/isodoc/itu/itu.resolution.xsl +44 -6
  8. data/lib/isodoc/itu/itu.service-publication.xsl +44 -6
  9. data/lib/isodoc/itu/itu.technical-paper.xsl +44 -6
  10. data/lib/isodoc/itu/itu.technical-report.xsl +44 -6
  11. data/lib/isodoc/itu/presentation_bibdata.rb +9 -5
  12. data/lib/isodoc/itu/presentation_xml_convert.rb +78 -14
  13. data/lib/isodoc/itu/ref.rb +0 -51
  14. data/lib/metanorma/itu/front_id.rb +0 -1
  15. data/lib/metanorma/itu/version.rb +1 -1
  16. data/lib/relaton/render/general.rb +6 -0
  17. data/lib/relaton/render/parse.rb +9 -0
  18. data/metanorma-itu.gemspec +1 -1
  19. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c8e61096b15f4b135a799e331bcc85b54a4b38aeb6990b5dc5989c7454a27e30
4
- data.tar.gz: 125d62e67992c51c335135f1f1dca44068dc00b1769dbc5a1f5a6e1cb22ed598
3
+ metadata.gz: 3d173fd252ee677a77d8fe211f7f2215ca310bb1dada1dc8710f00b55b6d5b55
4
+ data.tar.gz: 0c517b8f430d94458f4c423a411034eb9eea1e02319aa6b03a59db930d88736a
5
5
  SHA512:
6
- metadata.gz: 578d11cd942206d2fa5999abe9a0d67d00dd0ba356631bb7d9ff54515caf01823868badeff8d3bd7f4da4833e6632c1f8f770ee336640208e18516f55317cc88
7
- data.tar.gz: 1f59a2b63a1b0b09f6c653a7a27184bf0a355104849c55b62e87fd2712b6cd588688e93c5fa9c8600bde0c0dccbcf89a4fbf97698330a65a7e7691ca28f2f65c
6
+ metadata.gz: de66fbb0149faf3e41ef3008ad5472cbf83122abe37de4ed52250a95e57264ac682ce39c051ffb4a3175c9811c15de83e9a045fbed06533a7b0ff9de4c037249
7
+ data.tar.gz: 800e775da616ffce73ae7fd6add9e6168c8d6bb4f919946318adae8fb7904f1ac6d96728949794977691b82900c1db8264347c5a92ece8476a2785c0901b0a0f
data/lib/isodoc/itu/itu.implementers-guide.xsl CHANGED
@@ -2703,6 +2703,10 @@
2703
2703
 
2704
2704
  </xsl:attribute-set>
2705
2705
 
2706
+ <xsl:template name="refine_termexample-style">
2707
+
2708
+ </xsl:template>
2709
+
2706
2710
  <xsl:attribute-set name="example-style">
2707
2711
 
2708
2712
  <xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
3845
3849
  </xsl:for-each>
3846
3850
  </xsl:template>
3847
3851
 
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
+
3848
3882
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3849
3883
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3850
3884
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5959,13 +5993,13 @@
5959
5993
  <tr>
5960
5994
  <td>
5961
5995
  <xsl:attribute name="id">
5962
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5996
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5963
5997
  </xsl:attribute>
5964
5998
  <xsl:apply-templates/>
5965
5999
  </td>
5966
6000
  <td>
5967
6001
  <xsl:attribute name="id">
5968
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
6002
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5969
6003
  </xsl:attribute>
5970
6004
 
5971
6005
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6580,6 +6614,10 @@
6580
6614
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6581
6615
  </xsl:template>
6582
6616
 
6617
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618
+ <xsl:value-of select="."/>
6619
+ </xsl:template>
6620
+
6583
6621
  <!-- ========================= -->
6584
6622
  <!-- END Rich text formatting -->
6585
6623
  <!-- ========================= -->
@@ -7210,7 +7248,7 @@
7210
7248
  </xsl:choose>
7211
7249
  </xsl:variable>
7212
7250
  <xsl:attribute name="id">
7213
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
7251
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
7214
7252
  </xsl:attribute>
7215
7253
 
7216
7254
  <xsl:for-each select="*[local-name() = 'p']">
@@ -7218,7 +7256,7 @@
7218
7256
  <xsl:copy-of select="@*"/>
7219
7257
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
7220
7258
  <xsl:attribute name="id">
7221
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7259
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7222
7260
  </xsl:attribute>
7223
7261
 
7224
7262
  <!-- <xsl:copy-of select="node()" /> -->
@@ -7282,7 +7320,7 @@
7282
7320
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
7283
7321
  <xsl:copy>
7284
7322
  <xsl:attribute name="id">
7285
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7323
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7286
7324
  </xsl:attribute>
7287
7325
  <xsl:copy-of select="node()"/>
7288
7326
  </xsl:copy>
@@ -10091,7 +10129,7 @@
10091
10129
  <!-- ====== -->
10092
10130
  <xsl:template match="*[local-name() = 'termexample']">
10093
10131
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094
-
10132
+ <xsl:call-template name="refine_termexample-style"/>
10095
10133
  <xsl:call-template name="setBlockSpanAll"/>
10096
10134
 
10097
10135
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/itu/itu.in-force.xsl CHANGED
@@ -2703,6 +2703,10 @@
2703
2703
 
2704
2704
  </xsl:attribute-set>
2705
2705
 
2706
+ <xsl:template name="refine_termexample-style">
2707
+
2708
+ </xsl:template>
2709
+
2706
2710
  <xsl:attribute-set name="example-style">
2707
2711
 
2708
2712
  <xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
3845
3849
  </xsl:for-each>
3846
3850
  </xsl:template>
3847
3851
 
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
+
3848
3882
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3849
3883
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3850
3884
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5959,13 +5993,13 @@
5959
5993
  <tr>
5960
5994
  <td>
5961
5995
  <xsl:attribute name="id">
5962
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5996
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5963
5997
  </xsl:attribute>
5964
5998
  <xsl:apply-templates/>
5965
5999
  </td>
5966
6000
  <td>
5967
6001
  <xsl:attribute name="id">
5968
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
6002
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5969
6003
  </xsl:attribute>
5970
6004
 
5971
6005
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6580,6 +6614,10 @@
6580
6614
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6581
6615
  </xsl:template>
6582
6616
 
6617
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618
+ <xsl:value-of select="."/>
6619
+ </xsl:template>
6620
+
6583
6621
  <!-- ========================= -->
6584
6622
  <!-- END Rich text formatting -->
6585
6623
  <!-- ========================= -->
@@ -7210,7 +7248,7 @@
7210
7248
  </xsl:choose>
7211
7249
  </xsl:variable>
7212
7250
  <xsl:attribute name="id">
7213
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
7251
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
7214
7252
  </xsl:attribute>
7215
7253
 
7216
7254
  <xsl:for-each select="*[local-name() = 'p']">
@@ -7218,7 +7256,7 @@
7218
7256
  <xsl:copy-of select="@*"/>
7219
7257
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
7220
7258
  <xsl:attribute name="id">
7221
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7259
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7222
7260
  </xsl:attribute>
7223
7261
 
7224
7262
  <!-- <xsl:copy-of select="node()" /> -->
@@ -7282,7 +7320,7 @@
7282
7320
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
7283
7321
  <xsl:copy>
7284
7322
  <xsl:attribute name="id">
7285
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7323
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7286
7324
  </xsl:attribute>
7287
7325
  <xsl:copy-of select="node()"/>
7288
7326
  </xsl:copy>
@@ -10091,7 +10129,7 @@
10091
10129
  <!-- ====== -->
10092
10130
  <xsl:template match="*[local-name() = 'termexample']">
10093
10131
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094
-
10132
+ <xsl:call-template name="refine_termexample-style"/>
10095
10133
  <xsl:call-template name="setBlockSpanAll"/>
10096
10134
 
10097
10135
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/itu/itu.recommendation-annex.xsl CHANGED
@@ -2703,6 +2703,10 @@
2703
2703
 
2704
2704
  </xsl:attribute-set>
2705
2705
 
2706
+ <xsl:template name="refine_termexample-style">
2707
+
2708
+ </xsl:template>
2709
+
2706
2710
  <xsl:attribute-set name="example-style">
2707
2711
 
2708
2712
  <xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
3845
3849
  </xsl:for-each>
3846
3850
  </xsl:template>
3847
3851
 
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
+
3848
3882
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3849
3883
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3850
3884
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5959,13 +5993,13 @@
5959
5993
  <tr>
5960
5994
  <td>
5961
5995
  <xsl:attribute name="id">
5962
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5996
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5963
5997
  </xsl:attribute>
5964
5998
  <xsl:apply-templates/>
5965
5999
  </td>
5966
6000
  <td>
5967
6001
  <xsl:attribute name="id">
5968
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
6002
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5969
6003
  </xsl:attribute>
5970
6004
 
5971
6005
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6580,6 +6614,10 @@
6580
6614
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6581
6615
  </xsl:template>
6582
6616
 
6617
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618
+ <xsl:value-of select="."/>
6619
+ </xsl:template>
6620
+
6583
6621
  <!-- ========================= -->
6584
6622
  <!-- END Rich text formatting -->
6585
6623
  <!-- ========================= -->
@@ -7210,7 +7248,7 @@
7210
7248
  </xsl:choose>
7211
7249
  </xsl:variable>
7212
7250
  <xsl:attribute name="id">
7213
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
7251
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
7214
7252
  </xsl:attribute>
7215
7253
 
7216
7254
  <xsl:for-each select="*[local-name() = 'p']">
@@ -7218,7 +7256,7 @@
7218
7256
  <xsl:copy-of select="@*"/>
7219
7257
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
7220
7258
  <xsl:attribute name="id">
7221
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7259
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7222
7260
  </xsl:attribute>
7223
7261
 
7224
7262
  <!-- <xsl:copy-of select="node()" /> -->
@@ -7282,7 +7320,7 @@
7282
7320
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
7283
7321
  <xsl:copy>
7284
7322
  <xsl:attribute name="id">
7285
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7323
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7286
7324
  </xsl:attribute>
7287
7325
  <xsl:copy-of select="node()"/>
7288
7326
  </xsl:copy>
@@ -10091,7 +10129,7 @@
10091
10129
  <!-- ====== -->
10092
10130
  <xsl:template match="*[local-name() = 'termexample']">
10093
10131
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094
-
10132
+ <xsl:call-template name="refine_termexample-style"/>
10095
10133
  <xsl:call-template name="setBlockSpanAll"/>
10096
10134
 
10097
10135
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/itu/itu.recommendation-supplement.xsl CHANGED
@@ -2703,6 +2703,10 @@
2703
2703
 
2704
2704
  </xsl:attribute-set>
2705
2705
 
2706
+ <xsl:template name="refine_termexample-style">
2707
+
2708
+ </xsl:template>
2709
+
2706
2710
  <xsl:attribute-set name="example-style">
2707
2711
 
2708
2712
  <xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
3845
3849
  </xsl:for-each>
3846
3850
  </xsl:template>
3847
3851
 
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
+
3848
3882
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3849
3883
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3850
3884
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5959,13 +5993,13 @@
5959
5993
  <tr>
5960
5994
  <td>
5961
5995
  <xsl:attribute name="id">
5962
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5996
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5963
5997
  </xsl:attribute>
5964
5998
  <xsl:apply-templates/>
5965
5999
  </td>
5966
6000
  <td>
5967
6001
  <xsl:attribute name="id">
5968
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
6002
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5969
6003
  </xsl:attribute>
5970
6004
 
5971
6005
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6580,6 +6614,10 @@
6580
6614
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6581
6615
  </xsl:template>
6582
6616
 
6617
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618
+ <xsl:value-of select="."/>
6619
+ </xsl:template>
6620
+
6583
6621
  <!-- ========================= -->
6584
6622
  <!-- END Rich text formatting -->
6585
6623
  <!-- ========================= -->
@@ -7210,7 +7248,7 @@
7210
7248
  </xsl:choose>
7211
7249
  </xsl:variable>
7212
7250
  <xsl:attribute name="id">
7213
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
7251
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
7214
7252
  </xsl:attribute>
7215
7253
 
7216
7254
  <xsl:for-each select="*[local-name() = 'p']">
@@ -7218,7 +7256,7 @@
7218
7256
  <xsl:copy-of select="@*"/>
7219
7257
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
7220
7258
  <xsl:attribute name="id">
7221
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7259
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7222
7260
  </xsl:attribute>
7223
7261
 
7224
7262
  <!-- <xsl:copy-of select="node()" /> -->
@@ -7282,7 +7320,7 @@
7282
7320
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
7283
7321
  <xsl:copy>
7284
7322
  <xsl:attribute name="id">
7285
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7323
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7286
7324
  </xsl:attribute>
7287
7325
  <xsl:copy-of select="node()"/>
7288
7326
  </xsl:copy>
@@ -10091,7 +10129,7 @@
10091
10129
  <!-- ====== -->
10092
10130
  <xsl:template match="*[local-name() = 'termexample']">
10093
10131
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094
-
10132
+ <xsl:call-template name="refine_termexample-style"/>
10095
10133
  <xsl:call-template name="setBlockSpanAll"/>
10096
10134
 
10097
10135
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/itu/itu.recommendation.xsl CHANGED
@@ -2703,6 +2703,10 @@
2703
2703
 
2704
2704
  </xsl:attribute-set>
2705
2705
 
2706
+ <xsl:template name="refine_termexample-style">
2707
+
2708
+ </xsl:template>
2709
+
2706
2710
  <xsl:attribute-set name="example-style">
2707
2711
 
2708
2712
  <xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3845,6 +3849,36 @@
3845
3849
  </xsl:for-each>
3846
3850
  </xsl:template>
3847
3851
 
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
+
3848
3882
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3849
3883
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3850
3884
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5959,13 +5993,13 @@
5959
5993
  <tr>
5960
5994
  <td>
5961
5995
  <xsl:attribute name="id">
5962
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5996
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5963
5997
  </xsl:attribute>
5964
5998
  <xsl:apply-templates/>
5965
5999
  </td>
5966
6000
  <td>
5967
6001
  <xsl:attribute name="id">
5968
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
6002
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5969
6003
  </xsl:attribute>
5970
6004
 
5971
6005
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6580,6 +6614,10 @@
6580
6614
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6581
6615
  </xsl:template>
6582
6616
 
6617
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6618
+ <xsl:value-of select="."/>
6619
+ </xsl:template>
6620
+
6583
6621
  <!-- ========================= -->
6584
6622
  <!-- END Rich text formatting -->
6585
6623
  <!-- ========================= -->
@@ -7210,7 +7248,7 @@
7210
7248
  </xsl:choose>
7211
7249
  </xsl:variable>
7212
7250
  <xsl:attribute name="id">
7213
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
7251
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
7214
7252
  </xsl:attribute>
7215
7253
 
7216
7254
  <xsl:for-each select="*[local-name() = 'p']">
@@ -7218,7 +7256,7 @@
7218
7256
  <xsl:copy-of select="@*"/>
7219
7257
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
7220
7258
  <xsl:attribute name="id">
7221
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7259
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
7222
7260
  </xsl:attribute>
7223
7261
 
7224
7262
  <!-- <xsl:copy-of select="node()" /> -->
@@ -7282,7 +7320,7 @@
7282
7320
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
7283
7321
  <xsl:copy>
7284
7322
  <xsl:attribute name="id">
7285
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7323
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
7286
7324
  </xsl:attribute>
7287
7325
  <xsl:copy-of select="node()"/>
7288
7326
  </xsl:copy>
@@ -10091,7 +10129,7 @@
10091
10129
  <!-- ====== -->
10092
10130
  <xsl:template match="*[local-name() = 'termexample']">
10093
10131
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
10094
-
10132
+ <xsl:call-template name="refine_termexample-style"/>
10095
10133
  <xsl:call-template name="setBlockSpanAll"/>
10096
10134
 
10097
10135
  <xsl:apply-templates select="*[local-name()='name']"/>