metanorma-ogc 2.5.1 → 2.5.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 (23) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ogc/html/scripts.html +3 -2
  3. data/lib/isodoc/ogc/metadata.rb +4 -2
  4. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +44 -6
  5. data/lib/isodoc/ogc/ogc.best-practice.xsl +44 -6
  6. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +44 -6
  7. data/lib/isodoc/ogc/ogc.community-practice.xsl +44 -6
  8. data/lib/isodoc/ogc/ogc.community-standard.xsl +44 -6
  9. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +44 -6
  10. data/lib/isodoc/ogc/ogc.draft-standard.xsl +44 -6
  11. data/lib/isodoc/ogc/ogc.engineering-report.xsl +44 -6
  12. data/lib/isodoc/ogc/ogc.other.xsl +44 -6
  13. data/lib/isodoc/ogc/ogc.policy.xsl +44 -6
  14. data/lib/isodoc/ogc/ogc.reference-model.xsl +44 -6
  15. data/lib/isodoc/ogc/ogc.release-notes.xsl +44 -6
  16. data/lib/isodoc/ogc/ogc.standard.xsl +44 -6
  17. data/lib/isodoc/ogc/ogc.test-suite.xsl +44 -6
  18. data/lib/isodoc/ogc/ogc.user-guide.xsl +44 -6
  19. data/lib/isodoc/ogc/ogc.white-paper.xsl +44 -6
  20. data/lib/metanorma/ogc/front.rb +3 -4
  21. data/lib/metanorma/ogc/version.rb +1 -1
  22. data/metanorma-ogc.gemspec +1 -1
  23. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 74e1a3d766e10152fd9b43ea442aab695736b16eab77e921c29c194db08761b3
4
- data.tar.gz: ac7fa37c540c5270870222e7361858e3a609c299ee252e03c54dce0d18a956f9
3
+ metadata.gz: ed52d084ad8d9bcd783e6cc8c8e5564a1eeae09d007ab43177681331be41d366
4
+ data.tar.gz: 8619fdaf6d0d8b7de450ba16383dd1ed1d2ece1fd903f80034d138873067b5a4
5
5
  SHA512:
6
- metadata.gz: 169037e8a8f06c1749ca3ef1cec1c127213e2b592e8f6e8c03cb4f0028c6296c5a6fbf5c73e40bfd3b21ba6aa94f6a9fc4faef4016a36c5ecf42a5001927ab3c
7
- data.tar.gz: 9ef4fe458fecb874acdf04acc91dfca78be408d99d876ebda1cee4ccce4e91874c0fc930a71438255e74174520950c00290a0b3824bb09c0797afe8e62d546d7
6
+ metadata.gz: 22bc6e3c49034f83122b1407d35010fd8ba4a6aae483206c2c169568cde528d37fa8514afe387b7e1a83ae2124edd17ba18bee22fdbf390b8929fe5e881ad12f
7
+ data.tar.gz: 930ee5cc2220a4c492ac73a7355b7c5684aa9be9b33ccc8a0721ddabbcfa22073dc4cfdf0131460a8998ede9749c9bde90e13ef8648f6ff9a2e6840d111ae81f
data/lib/isodoc/ogc/html/scripts.html CHANGED
@@ -5,18 +5,19 @@
5
5
  });
6
6
  </script>
7
7
 
8
- <script>
8
+ <script>
9
9
  //TOC toggle animation
10
10
  $('#toggle').on('click', function(){
11
11
  if( $('nav').is(':visible') ) {
12
12
  $('nav').animate({ 'left': '-353px' }, 'slow', function(){
13
13
  $('nav').hide();
14
14
  });
15
- $('.container').animate({ 'padding-left': '31px' }, 'slow');
15
+ $('body').animate({ 'margin-left': '-333px' }, 'slow');
16
16
  }
17
17
  else {
18
18
  $('nav').show();
19
19
  $('nav').animate({ 'left': '0px' }, 'slow');
20
+ $('body').animate({ 'margin-left': '0' }, 'slow');
20
21
  }
21
22
  });
22
23
  </script>
data/lib/isodoc/ogc/metadata.rb CHANGED
@@ -47,9 +47,11 @@ module IsoDoc
47
47
  end
48
48
 
49
49
  def title(isoxml, _out)
50
- main = isoxml.at(ns("//bibdata/title[@language='en']"))&.text
50
+ main = isoxml.at(ns("//bibdata/title[@language='en']"))
51
+ &.children&.to_xml
51
52
  set(:doctitle, main)
52
- main = isoxml.at(ns("//bibdata/abstract"))&.text&.strip&.gsub(/\s+/, " ")
53
+ main = isoxml.at(ns("//bibdata/abstract"))
54
+ &.text&.strip&.gsub(/\s+/, " ")
53
55
  set(:abstract, main)
54
56
  end
55
57
 
data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl CHANGED
@@ -2152,6 +2152,10 @@
2152
2152
 
2153
2153
  </xsl:attribute-set>
2154
2154
 
2155
+ <xsl:template name="refine_termexample-style">
2156
+
2157
+ </xsl:template>
2158
+
2155
2159
  <xsl:attribute-set name="example-style">
2156
2160
 
2157
2161
  <xsl:attribute name="margin-top">10pt</xsl:attribute>
@@ -3331,6 +3335,36 @@
3331
3335
  </xsl:for-each>
3332
3336
  </xsl:template>
3333
3337
 
3338
+ <xsl:template name="processMainSectionsDefault_flatxml">
3339
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3340
+ <xsl:sort select="@displayorder" data-type="number"/>
3341
+ <xsl:variable name="flatxml">
3342
+ <xsl:apply-templates select="." mode="flatxml"/>
3343
+ </xsl:variable>
3344
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3345
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3346
+
3347
+ </xsl:for-each>
3348
+
3349
+ <xsl:for-each select="/*/*[local-name()='annex']">
3350
+ <xsl:sort select="@displayorder" data-type="number"/>
3351
+ <xsl:variable name="flatxml">
3352
+ <xsl:apply-templates select="." mode="flatxml"/>
3353
+ </xsl:variable>
3354
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3355
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3356
+ </xsl:for-each>
3357
+
3358
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3359
+ <xsl:sort select="@displayorder" data-type="number"/>
3360
+ <xsl:variable name="flatxml">
3361
+ <xsl:apply-templates select="." mode="flatxml"/>
3362
+ </xsl:variable>
3363
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3364
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3365
+ </xsl:for-each>
3366
+ </xsl:template>
3367
+
3334
3368
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3335
3369
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3336
3370
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5437,13 +5471,13 @@
5437
5471
  <tr>
5438
5472
  <td>
5439
5473
  <xsl:attribute name="id">
5440
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5474
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5441
5475
  </xsl:attribute>
5442
5476
  <xsl:apply-templates/>
5443
5477
  </td>
5444
5478
  <td>
5445
5479
  <xsl:attribute name="id">
5446
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
5480
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5447
5481
  </xsl:attribute>
5448
5482
 
5449
5483
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6064,6 +6098,10 @@
6064
6098
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6065
6099
  </xsl:template>
6066
6100
 
6101
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6102
+ <xsl:value-of select="."/>
6103
+ </xsl:template>
6104
+
6067
6105
  <!-- ========================= -->
6068
6106
  <!-- END Rich text formatting -->
6069
6107
  <!-- ========================= -->
@@ -6694,7 +6732,7 @@
6694
6732
  </xsl:choose>
6695
6733
  </xsl:variable>
6696
6734
  <xsl:attribute name="id">
6697
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
6735
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
6698
6736
  </xsl:attribute>
6699
6737
 
6700
6738
  <xsl:for-each select="*[local-name() = 'p']">
@@ -6702,7 +6740,7 @@
6702
6740
  <xsl:copy-of select="@*"/>
6703
6741
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
6704
6742
  <xsl:attribute name="id">
6705
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6743
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6706
6744
  </xsl:attribute>
6707
6745
 
6708
6746
  <!-- <xsl:copy-of select="node()" /> -->
@@ -6766,7 +6804,7 @@
6766
6804
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
6767
6805
  <xsl:copy>
6768
6806
  <xsl:attribute name="id">
6769
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6807
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6770
6808
  </xsl:attribute>
6771
6809
  <xsl:copy-of select="node()"/>
6772
6810
  </xsl:copy>
@@ -9626,7 +9664,7 @@
9626
9664
  <!-- ====== -->
9627
9665
  <xsl:template match="*[local-name() = 'termexample']">
9628
9666
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
9629
-
9667
+ <xsl:call-template name="refine_termexample-style"/>
9630
9668
  <xsl:call-template name="setBlockSpanAll"/>
9631
9669
 
9632
9670
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/ogc/ogc.best-practice.xsl CHANGED
@@ -2152,6 +2152,10 @@
2152
2152
 
2153
2153
  </xsl:attribute-set>
2154
2154
 
2155
+ <xsl:template name="refine_termexample-style">
2156
+
2157
+ </xsl:template>
2158
+
2155
2159
  <xsl:attribute-set name="example-style">
2156
2160
 
2157
2161
  <xsl:attribute name="margin-top">10pt</xsl:attribute>
@@ -3331,6 +3335,36 @@
3331
3335
  </xsl:for-each>
3332
3336
  </xsl:template>
3333
3337
 
3338
+ <xsl:template name="processMainSectionsDefault_flatxml">
3339
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3340
+ <xsl:sort select="@displayorder" data-type="number"/>
3341
+ <xsl:variable name="flatxml">
3342
+ <xsl:apply-templates select="." mode="flatxml"/>
3343
+ </xsl:variable>
3344
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3345
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3346
+
3347
+ </xsl:for-each>
3348
+
3349
+ <xsl:for-each select="/*/*[local-name()='annex']">
3350
+ <xsl:sort select="@displayorder" data-type="number"/>
3351
+ <xsl:variable name="flatxml">
3352
+ <xsl:apply-templates select="." mode="flatxml"/>
3353
+ </xsl:variable>
3354
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3355
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3356
+ </xsl:for-each>
3357
+
3358
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3359
+ <xsl:sort select="@displayorder" data-type="number"/>
3360
+ <xsl:variable name="flatxml">
3361
+ <xsl:apply-templates select="." mode="flatxml"/>
3362
+ </xsl:variable>
3363
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3364
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3365
+ </xsl:for-each>
3366
+ </xsl:template>
3367
+
3334
3368
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3335
3369
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3336
3370
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5437,13 +5471,13 @@
5437
5471
  <tr>
5438
5472
  <td>
5439
5473
  <xsl:attribute name="id">
5440
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5474
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5441
5475
  </xsl:attribute>
5442
5476
  <xsl:apply-templates/>
5443
5477
  </td>
5444
5478
  <td>
5445
5479
  <xsl:attribute name="id">
5446
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
5480
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5447
5481
  </xsl:attribute>
5448
5482
 
5449
5483
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6064,6 +6098,10 @@
6064
6098
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6065
6099
  </xsl:template>
6066
6100
 
6101
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6102
+ <xsl:value-of select="."/>
6103
+ </xsl:template>
6104
+
6067
6105
  <!-- ========================= -->
6068
6106
  <!-- END Rich text formatting -->
6069
6107
  <!-- ========================= -->
@@ -6694,7 +6732,7 @@
6694
6732
  </xsl:choose>
6695
6733
  </xsl:variable>
6696
6734
  <xsl:attribute name="id">
6697
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
6735
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
6698
6736
  </xsl:attribute>
6699
6737
 
6700
6738
  <xsl:for-each select="*[local-name() = 'p']">
@@ -6702,7 +6740,7 @@
6702
6740
  <xsl:copy-of select="@*"/>
6703
6741
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
6704
6742
  <xsl:attribute name="id">
6705
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6743
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6706
6744
  </xsl:attribute>
6707
6745
 
6708
6746
  <!-- <xsl:copy-of select="node()" /> -->
@@ -6766,7 +6804,7 @@
6766
6804
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
6767
6805
  <xsl:copy>
6768
6806
  <xsl:attribute name="id">
6769
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6807
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6770
6808
  </xsl:attribute>
6771
6809
  <xsl:copy-of select="node()"/>
6772
6810
  </xsl:copy>
@@ -9626,7 +9664,7 @@
9626
9664
  <!-- ====== -->
9627
9665
  <xsl:template match="*[local-name() = 'termexample']">
9628
9666
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
9629
-
9667
+ <xsl:call-template name="refine_termexample-style"/>
9630
9668
  <xsl:call-template name="setBlockSpanAll"/>
9631
9669
 
9632
9670
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl CHANGED
@@ -2152,6 +2152,10 @@
2152
2152
 
2153
2153
  </xsl:attribute-set>
2154
2154
 
2155
+ <xsl:template name="refine_termexample-style">
2156
+
2157
+ </xsl:template>
2158
+
2155
2159
  <xsl:attribute-set name="example-style">
2156
2160
 
2157
2161
  <xsl:attribute name="margin-top">10pt</xsl:attribute>
@@ -3331,6 +3335,36 @@
3331
3335
  </xsl:for-each>
3332
3336
  </xsl:template>
3333
3337
 
3338
+ <xsl:template name="processMainSectionsDefault_flatxml">
3339
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3340
+ <xsl:sort select="@displayorder" data-type="number"/>
3341
+ <xsl:variable name="flatxml">
3342
+ <xsl:apply-templates select="." mode="flatxml"/>
3343
+ </xsl:variable>
3344
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3345
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3346
+
3347
+ </xsl:for-each>
3348
+
3349
+ <xsl:for-each select="/*/*[local-name()='annex']">
3350
+ <xsl:sort select="@displayorder" data-type="number"/>
3351
+ <xsl:variable name="flatxml">
3352
+ <xsl:apply-templates select="." mode="flatxml"/>
3353
+ </xsl:variable>
3354
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3355
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3356
+ </xsl:for-each>
3357
+
3358
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3359
+ <xsl:sort select="@displayorder" data-type="number"/>
3360
+ <xsl:variable name="flatxml">
3361
+ <xsl:apply-templates select="." mode="flatxml"/>
3362
+ </xsl:variable>
3363
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3364
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3365
+ </xsl:for-each>
3366
+ </xsl:template>
3367
+
3334
3368
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3335
3369
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3336
3370
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5437,13 +5471,13 @@
5437
5471
  <tr>
5438
5472
  <td>
5439
5473
  <xsl:attribute name="id">
5440
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5474
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5441
5475
  </xsl:attribute>
5442
5476
  <xsl:apply-templates/>
5443
5477
  </td>
5444
5478
  <td>
5445
5479
  <xsl:attribute name="id">
5446
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
5480
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5447
5481
  </xsl:attribute>
5448
5482
 
5449
5483
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6064,6 +6098,10 @@
6064
6098
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6065
6099
  </xsl:template>
6066
6100
 
6101
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6102
+ <xsl:value-of select="."/>
6103
+ </xsl:template>
6104
+
6067
6105
  <!-- ========================= -->
6068
6106
  <!-- END Rich text formatting -->
6069
6107
  <!-- ========================= -->
@@ -6694,7 +6732,7 @@
6694
6732
  </xsl:choose>
6695
6733
  </xsl:variable>
6696
6734
  <xsl:attribute name="id">
6697
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
6735
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
6698
6736
  </xsl:attribute>
6699
6737
 
6700
6738
  <xsl:for-each select="*[local-name() = 'p']">
@@ -6702,7 +6740,7 @@
6702
6740
  <xsl:copy-of select="@*"/>
6703
6741
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
6704
6742
  <xsl:attribute name="id">
6705
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6743
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6706
6744
  </xsl:attribute>
6707
6745
 
6708
6746
  <!-- <xsl:copy-of select="node()" /> -->
@@ -6766,7 +6804,7 @@
6766
6804
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
6767
6805
  <xsl:copy>
6768
6806
  <xsl:attribute name="id">
6769
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6807
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6770
6808
  </xsl:attribute>
6771
6809
  <xsl:copy-of select="node()"/>
6772
6810
  </xsl:copy>
@@ -9626,7 +9664,7 @@
9626
9664
  <!-- ====== -->
9627
9665
  <xsl:template match="*[local-name() = 'termexample']">
9628
9666
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
9629
-
9667
+ <xsl:call-template name="refine_termexample-style"/>
9630
9668
  <xsl:call-template name="setBlockSpanAll"/>
9631
9669
 
9632
9670
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/ogc/ogc.community-practice.xsl CHANGED
@@ -2152,6 +2152,10 @@
2152
2152
 
2153
2153
  </xsl:attribute-set>
2154
2154
 
2155
+ <xsl:template name="refine_termexample-style">
2156
+
2157
+ </xsl:template>
2158
+
2155
2159
  <xsl:attribute-set name="example-style">
2156
2160
 
2157
2161
  <xsl:attribute name="margin-top">10pt</xsl:attribute>
@@ -3331,6 +3335,36 @@
3331
3335
  </xsl:for-each>
3332
3336
  </xsl:template>
3333
3337
 
3338
+ <xsl:template name="processMainSectionsDefault_flatxml">
3339
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3340
+ <xsl:sort select="@displayorder" data-type="number"/>
3341
+ <xsl:variable name="flatxml">
3342
+ <xsl:apply-templates select="." mode="flatxml"/>
3343
+ </xsl:variable>
3344
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3345
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3346
+
3347
+ </xsl:for-each>
3348
+
3349
+ <xsl:for-each select="/*/*[local-name()='annex']">
3350
+ <xsl:sort select="@displayorder" data-type="number"/>
3351
+ <xsl:variable name="flatxml">
3352
+ <xsl:apply-templates select="." mode="flatxml"/>
3353
+ </xsl:variable>
3354
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3355
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3356
+ </xsl:for-each>
3357
+
3358
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3359
+ <xsl:sort select="@displayorder" data-type="number"/>
3360
+ <xsl:variable name="flatxml">
3361
+ <xsl:apply-templates select="." mode="flatxml"/>
3362
+ </xsl:variable>
3363
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3364
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3365
+ </xsl:for-each>
3366
+ </xsl:template>
3367
+
3334
3368
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3335
3369
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3336
3370
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5437,13 +5471,13 @@
5437
5471
  <tr>
5438
5472
  <td>
5439
5473
  <xsl:attribute name="id">
5440
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5474
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5441
5475
  </xsl:attribute>
5442
5476
  <xsl:apply-templates/>
5443
5477
  </td>
5444
5478
  <td>
5445
5479
  <xsl:attribute name="id">
5446
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
5480
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5447
5481
  </xsl:attribute>
5448
5482
 
5449
5483
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6064,6 +6098,10 @@
6064
6098
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6065
6099
  </xsl:template>
6066
6100
 
6101
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6102
+ <xsl:value-of select="."/>
6103
+ </xsl:template>
6104
+
6067
6105
  <!-- ========================= -->
6068
6106
  <!-- END Rich text formatting -->
6069
6107
  <!-- ========================= -->
@@ -6694,7 +6732,7 @@
6694
6732
  </xsl:choose>
6695
6733
  </xsl:variable>
6696
6734
  <xsl:attribute name="id">
6697
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
6735
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
6698
6736
  </xsl:attribute>
6699
6737
 
6700
6738
  <xsl:for-each select="*[local-name() = 'p']">
@@ -6702,7 +6740,7 @@
6702
6740
  <xsl:copy-of select="@*"/>
6703
6741
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
6704
6742
  <xsl:attribute name="id">
6705
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6743
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6706
6744
  </xsl:attribute>
6707
6745
 
6708
6746
  <!-- <xsl:copy-of select="node()" /> -->
@@ -6766,7 +6804,7 @@
6766
6804
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
6767
6805
  <xsl:copy>
6768
6806
  <xsl:attribute name="id">
6769
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6807
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6770
6808
  </xsl:attribute>
6771
6809
  <xsl:copy-of select="node()"/>
6772
6810
  </xsl:copy>
@@ -9626,7 +9664,7 @@
9626
9664
  <!-- ====== -->
9627
9665
  <xsl:template match="*[local-name() = 'termexample']">
9628
9666
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
9629
-
9667
+ <xsl:call-template name="refine_termexample-style"/>
9630
9668
  <xsl:call-template name="setBlockSpanAll"/>
9631
9669
 
9632
9670
  <xsl:apply-templates select="*[local-name()='name']"/>
data/lib/isodoc/ogc/ogc.community-standard.xsl CHANGED
@@ -2152,6 +2152,10 @@
2152
2152
 
2153
2153
  </xsl:attribute-set>
2154
2154
 
2155
+ <xsl:template name="refine_termexample-style">
2156
+
2157
+ </xsl:template>
2158
+
2155
2159
  <xsl:attribute-set name="example-style">
2156
2160
 
2157
2161
  <xsl:attribute name="margin-top">10pt</xsl:attribute>
@@ -3331,6 +3335,36 @@
3331
3335
  </xsl:for-each>
3332
3336
  </xsl:template>
3333
3337
 
3338
+ <xsl:template name="processMainSectionsDefault_flatxml">
3339
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3340
+ <xsl:sort select="@displayorder" data-type="number"/>
3341
+ <xsl:variable name="flatxml">
3342
+ <xsl:apply-templates select="." mode="flatxml"/>
3343
+ </xsl:variable>
3344
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3345
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3346
+
3347
+ </xsl:for-each>
3348
+
3349
+ <xsl:for-each select="/*/*[local-name()='annex']">
3350
+ <xsl:sort select="@displayorder" data-type="number"/>
3351
+ <xsl:variable name="flatxml">
3352
+ <xsl:apply-templates select="." mode="flatxml"/>
3353
+ </xsl:variable>
3354
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3355
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3356
+ </xsl:for-each>
3357
+
3358
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
3359
+ <xsl:sort select="@displayorder" data-type="number"/>
3360
+ <xsl:variable name="flatxml">
3361
+ <xsl:apply-templates select="." mode="flatxml"/>
3362
+ </xsl:variable>
3363
+ <!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
3364
+ <xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
3365
+ </xsl:for-each>
3366
+ </xsl:template>
3367
+
3334
3368
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
3335
3369
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
3336
3370
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5437,13 +5471,13 @@
5437
5471
  <tr>
5438
5472
  <td>
5439
5473
  <xsl:attribute name="id">
5440
- <xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
5474
+ <xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
5441
5475
  </xsl:attribute>
5442
5476
  <xsl:apply-templates/>
5443
5477
  </td>
5444
5478
  <td>
5445
5479
  <xsl:attribute name="id">
5446
- <xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
5480
+ <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5447
5481
  </xsl:attribute>
5448
5482
 
5449
5483
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6064,6 +6098,10 @@
6064
6098
  <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
6065
6099
  </xsl:template>
6066
6100
 
6101
+ <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
6102
+ <xsl:value-of select="."/>
6103
+ </xsl:template>
6104
+
6067
6105
  <!-- ========================= -->
6068
6106
  <!-- END Rich text formatting -->
6069
6107
  <!-- ========================= -->
@@ -6694,7 +6732,7 @@
6694
6732
  </xsl:choose>
6695
6733
  </xsl:variable>
6696
6734
  <xsl:attribute name="id">
6697
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
6735
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
6698
6736
  </xsl:attribute>
6699
6737
 
6700
6738
  <xsl:for-each select="*[local-name() = 'p']">
@@ -6702,7 +6740,7 @@
6702
6740
  <xsl:copy-of select="@*"/>
6703
6741
  <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
6704
6742
  <xsl:attribute name="id">
6705
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6743
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
6706
6744
  </xsl:attribute>
6707
6745
 
6708
6746
  <!-- <xsl:copy-of select="node()" /> -->
@@ -6766,7 +6804,7 @@
6766
6804
  <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
6767
6805
  <xsl:copy>
6768
6806
  <xsl:attribute name="id">
6769
- <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6807
+ <xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
6770
6808
  </xsl:attribute>
6771
6809
  <xsl:copy-of select="node()"/>
6772
6810
  </xsl:copy>
@@ -9626,7 +9664,7 @@
9626
9664
  <!-- ====== -->
9627
9665
  <xsl:template match="*[local-name() = 'termexample']">
9628
9666
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
9629
-
9667
+ <xsl:call-template name="refine_termexample-style"/>
9630
9668
  <xsl:call-template name="setBlockSpanAll"/>
9631
9669
 
9632
9670
  <xsl:apply-templates select="*[local-name()='name']"/>