metanorma-ogc 1.3.4 → 1.3.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 81ed0dec50afce67f2d5b901a85ef55b241d47fe1db7bd8114626b1bf4ef5605
4
- data.tar.gz: d48a1c18a0827649c3eb5593850894351c8d2d7a4ae11a2952b9a1e177a1318e
3
+ metadata.gz: cf9c0a5cbffaabeba248b57a50309b3abed1c96eb1f222d8dbde3234ef0c2763
4
+ data.tar.gz: 31cd6c92355d6077705d51bff35c51fc300345b82a58a50fa9426e15301a9e73
5
5
  SHA512:
6
- metadata.gz: d4fe28bc39e3230bfaacc19e74ef2bcc2ba9a87e4bb877800b317b3b70d9c1cfc4cf8d70f1ee82253c244fd88a0997dea6530f35f055117320e1262b12985c4c
7
- data.tar.gz: b70c19972e82141c8ea88a6a376db9fa4537cbcd88330bc713b80f61786eeee55c04f89a0955e6b4306bfbf31e0a5082be30f228cb6613b3c6a305eee7e2e5e4
6
+ metadata.gz: 619abf777ca9e6829561e1d446f58a92448d991506c887a0f0f019950c2b7e897061a625d97259d8c0078f4cd4a336a13d8ba452d271e73a2709a07a9b9bcc01
7
+ data.tar.gz: 2ddd0bf8b9b9b5915e194c80f88e22656039dedd9fb97a5d23aae76a39ac469758be9c2fea8553a091fb63056eaffc9c3c5aad1b949038d432cdd155ed1d6189
data/.rubocop.yml CHANGED
@@ -7,4 +7,4 @@ inherit_from:
7
7
  # ...
8
8
 
9
9
  AllCops:
10
- TargetRubyVersion: 2.4
10
+ TargetRubyVersion: 2.5
data/Gemfile CHANGED
@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
6
6
 
7
7
  gemspec
8
8
 
9
- if File.exist? 'Gemfile.devel'
10
- eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
9
+ if File.exist? "Gemfile.devel"
10
+ eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
11
11
  end
data/Rakefile CHANGED
@@ -1,8 +1,8 @@
1
1
  require "bundler/gem_tasks"
2
2
  require "rspec/core/rake_task"
3
- require 'isodoc/gem_tasks'
3
+ require "isodoc/gem_tasks"
4
4
 
5
5
  IsoDoc::GemTasks.install
6
6
  RSpec::Core::RakeTask.new(:spec)
7
7
 
8
- task :default => :spec
8
+ task default: :spec
@@ -2,6 +2,5 @@ require "asciidoctor/ogc/converter"
2
2
 
3
3
  module Asciidoctor
4
4
  module Ogc
5
-
6
5
  end
7
6
  end
data/lib/isodoc/ogc.rb CHANGED
@@ -7,6 +7,5 @@ require "isodoc/ogc/xref"
7
7
 
8
8
  module IsoDoc
9
9
  module Ogc
10
-
11
10
  end
12
11
  end
@@ -19,7 +19,7 @@ module IsoDoc
19
19
  "user-guide" => "UG",
20
20
  "white-paper" => "WP",
21
21
  "other" => "other",
22
- }
22
+ }.freeze
23
23
 
24
24
  DOCSUBTYPE_ABBR = {
25
25
  "implementation" => "IMP",
@@ -31,7 +31,7 @@ module IsoDoc
31
31
  "profile" => "PF",
32
32
  "profile-with-extension" => "PFE",
33
33
  "general" => "GE",
34
- }
34
+ }.freeze
35
35
 
36
36
  class Metadata < IsoDoc::Metadata
37
37
  def initialize(lang, script, i18n)
@@ -53,16 +53,20 @@ module IsoDoc
53
53
  def author(isoxml, _out)
54
54
  tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
55
55
  set(:tc, tc.text) if tc
56
- authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
56
+ authors = isoxml.xpath(ns("//bibdata/contributor"\
57
+ "[role/@type = 'author']/person"))
57
58
  set(:authors, extract_person_names(authors))
58
- editors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person"))
59
+ editors = isoxml.xpath(ns("//bibdata/contributor"\
60
+ "[role/@type = 'editor']/person"))
59
61
  set(:editors, extract_person_names(editors))
60
62
  agency(isoxml)
61
63
  end
62
64
 
63
65
  def docid(isoxml, _out)
64
- set(:docnumber, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ogc-internal']"))&.text)
65
- set(:externalid, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ogc-external']"))&.text)
66
+ set(:docnumber, isoxml&.at(ns("//bibdata/docidentifier"\
67
+ "[@type = 'ogc-internal']"))&.text)
68
+ set(:externalid, isoxml&.at(ns("//bibdata/docidentifier"\
69
+ "[@type = 'ogc-external']"))&.text)
66
70
  end
67
71
 
68
72
  def unpublished(status)
@@ -78,11 +82,12 @@ module IsoDoc
78
82
 
79
83
  def url(xml, _out)
80
84
  super
81
- a = xml.at(ns("//bibdata/uri[@type = 'previous']")) and set(:previousuri, a.text)
85
+ a = xml.at(ns("//bibdata/uri[@type = 'previous']")) and
86
+ set(:previousuri, a.text)
82
87
  end
83
88
 
84
- def type_capitalise(b)
85
- b.split(/[- ]/).map do |w|
89
+ def type_capitalise(type)
90
+ type.split(/[- ]/).map do |w|
86
91
  %w(SWG).include?(w) ? w : w.capitalize
87
92
  end.join(" ")
88
93
  end
@@ -98,12 +103,12 @@ module IsoDoc
98
103
  end
99
104
  end
100
105
 
101
- def doctype_abbr(b)
102
- IsoDoc::Ogc::DOCTYPE_ABBR[b] || b
106
+ def doctype_abbr(type)
107
+ IsoDoc::Ogc::DOCTYPE_ABBR[type] || type
103
108
  end
104
109
 
105
- def docsubtype_abbr(st, t)
106
- IsoDoc::Ogc::DOCSUBTYPE_ABBR[st] || st
110
+ def docsubtype_abbr(subtype, _type)
111
+ IsoDoc::Ogc::DOCSUBTYPE_ABBR[subtype] || st
107
112
  end
108
113
 
109
114
  def status_print(status)
@@ -1720,7 +1720,7 @@
1720
1720
 
1721
1721
 
1722
1722
 
1723
-
1723
+
1724
1724
  </xsl:attribute-set><xsl:attribute-set name="example-style">
1725
1725
 
1726
1726
 
@@ -1785,6 +1785,7 @@
1785
1785
 
1786
1786
 
1787
1787
 
1788
+
1788
1789
  </xsl:attribute-set><xsl:attribute-set name="table-name-style">
1789
1790
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1790
1791
 
@@ -1806,6 +1807,8 @@
1806
1807
 
1807
1808
 
1808
1809
 
1810
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1811
+
1809
1812
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1810
1813
 
1811
1814
  <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -1856,6 +1859,7 @@
1856
1859
 
1857
1860
 
1858
1861
 
1862
+
1859
1863
  </xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
1860
1864
 
1861
1865
 
@@ -1900,6 +1904,7 @@
1900
1904
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1901
1905
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1902
1906
 
1907
+
1903
1908
  </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1904
1909
 
1905
1910
 
@@ -1907,6 +1912,7 @@
1907
1912
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1908
1913
 
1909
1914
 
1915
+
1910
1916
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1911
1917
 
1912
1918
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1965,6 +1971,7 @@
1965
1971
 
1966
1972
 
1967
1973
 
1974
+
1968
1975
 
1969
1976
 
1970
1977
 
@@ -2043,6 +2050,8 @@
2043
2050
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
2044
2051
 
2045
2052
 
2053
+ </xsl:attribute-set><xsl:attribute-set name="list-style">
2054
+
2046
2055
  </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
2047
2056
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
2048
2057
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -2091,18 +2100,18 @@
2091
2100
  <xsl:variable name="table-preamble">
2092
2101
 
2093
2102
 
2094
- <fo:block> </fo:block>
2103
+ <fo:block> </fo:block>
2095
2104
 
2096
2105
  </xsl:variable>
2097
2106
 
2098
2107
  <xsl:variable name="table">
2099
2108
 
2100
2109
  <xsl:variable name="simple-table">
2101
- <xsl:call-template name="getSimpleTable"/>
2110
+ <xsl:call-template name="getSimpleTable"/>
2102
2111
  </xsl:variable>
2103
2112
 
2104
2113
  <!-- <xsl:if test="$namespace = 'bipm'">
2105
- <fo:block>&#xA0;</fo:block>
2114
+ <fo:block>&#xA0;</fo:block>
2106
2115
  </xsl:if> -->
2107
2116
 
2108
2117
  <!-- $namespace = 'iso' or -->
@@ -2220,6 +2229,7 @@
2220
2229
 
2221
2230
 
2222
2231
 
2232
+
2223
2233
  </xsl:variable>
2224
2234
 
2225
2235
 
@@ -2358,6 +2368,9 @@
2358
2368
  <fo:block xsl:use-attribute-sets="table-name-style">
2359
2369
 
2360
2370
 
2371
+
2372
+
2373
+
2361
2374
  <xsl:choose>
2362
2375
  <xsl:when test="$continued = 'true'">
2363
2376
  <!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
@@ -2505,6 +2518,7 @@
2505
2518
  <!-- font-weight="bold" -->
2506
2519
  <fo:table-header>
2507
2520
 
2521
+
2508
2522
  <xsl:apply-templates/>
2509
2523
  </fo:table-header>
2510
2524
  </xsl:template><xsl:template name="table-header-title">
@@ -2766,6 +2780,10 @@
2766
2780
  </xsl:if>
2767
2781
 
2768
2782
 
2783
+
2784
+
2785
+
2786
+
2769
2787
  <!-- <xsl:if test="$namespace = 'bipm'">
2770
2788
  <xsl:attribute name="height">8mm</xsl:attribute>
2771
2789
  </xsl:if> -->
@@ -2855,6 +2873,9 @@
2855
2873
 
2856
2874
 
2857
2875
 
2876
+
2877
+
2878
+
2858
2879
  <xsl:if test=".//*[local-name() = 'table']">
2859
2880
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2860
2881
  </xsl:if>
@@ -3078,6 +3099,7 @@
3078
3099
 
3079
3100
 
3080
3101
 
3102
+
3081
3103
  <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
3082
3104
 
3083
3105
  <xsl:attribute name="internal-destination">
@@ -3387,6 +3409,7 @@
3387
3409
 
3388
3410
  <xsl:attribute name="min-height">8.5mm</xsl:attribute>
3389
3411
 
3412
+
3390
3413
  <fo:table-cell>
3391
3414
 
3392
3415
  <fo:block margin-top="6pt">
@@ -3405,6 +3428,7 @@
3405
3428
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3406
3429
 
3407
3430
 
3431
+
3408
3432
  <xsl:apply-templates/>
3409
3433
  <!-- <xsl:if test="$namespace = 'gb'">
3410
3434
  <xsl:if test="ancestor::*[local-name()='formula']">
@@ -3952,7 +3976,15 @@
3952
3976
  <xsl:copy>
3953
3977
  <xsl:apply-templates select="@*|node()" mode="mathml"/>
3954
3978
  </xsl:copy>
3955
- <mathml:mspace width="0.5ex"/>
3979
+ <xsl:choose>
3980
+ <!-- if in msub, then don't add space -->
3981
+ <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
3982
+ <!-- if next char in digit, don't add space -->
3983
+ <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
3984
+ <xsl:otherwise>
3985
+ <mathml:mspace width="0.5ex"/>
3986
+ </xsl:otherwise>
3987
+ </xsl:choose>
3956
3988
  </xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
3957
3989
  <xsl:variable name="target">
3958
3990
  <xsl:choose>
@@ -3976,6 +4008,7 @@
3976
4008
  </xsl:variable>
3977
4009
  <fo:inline xsl:use-attribute-sets="link-style">
3978
4010
 
4011
+
3979
4012
  <xsl:choose>
3980
4013
  <xsl:when test="$target_text = ''">
3981
4014
  <xsl:apply-templates/>
@@ -4131,6 +4164,7 @@
4131
4164
  </xsl:choose>
4132
4165
  </xsl:template><xsl:template match="*[local-name() = 'termnote']">
4133
4166
  <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
4167
+
4134
4168
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
4135
4169
 
4136
4170
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
@@ -4208,6 +4242,7 @@
4208
4242
  </xsl:call-template>
4209
4243
 
4210
4244
  <fo:block>
4245
+
4211
4246
  <xsl:apply-templates/>
4212
4247
  </fo:block>
4213
4248
  <xsl:call-template name="fn_display_figure"/>
@@ -4535,6 +4570,7 @@
4535
4570
  <xsl:if test="normalize-space() != ''">
4536
4571
  <fo:block xsl:use-attribute-sets="figure-name-style">
4537
4572
 
4573
+
4538
4574
  <xsl:apply-templates/>
4539
4575
  </fo:block>
4540
4576
  </xsl:if>
@@ -4615,6 +4651,7 @@
4615
4651
 
4616
4652
  <fo:block-container margin-left="0mm">
4617
4653
  <xsl:copy-of select="@id"/>
4654
+
4618
4655
  <xsl:if test="parent::*[local-name() = 'note']">
4619
4656
  <xsl:attribute name="margin-left">
4620
4657
  <xsl:choose>
@@ -4625,7 +4662,9 @@
4625
4662
 
4626
4663
  </xsl:if>
4627
4664
  <fo:block-container margin-left="0mm">
4628
-
4665
+
4666
+
4667
+
4629
4668
  <fo:block xsl:use-attribute-sets="sourcecode-style">
4630
4669
  <xsl:variable name="_font-size">
4631
4670
 
@@ -4654,10 +4693,14 @@
4654
4693
  </xsl:choose>
4655
4694
  </xsl:attribute>
4656
4695
  </xsl:if>
4657
- <xsl:apply-templates/>
4658
- </fo:block>
4696
+
4697
+ <xsl:apply-templates/>
4698
+ </fo:block>
4699
+
4700
+
4659
4701
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4660
4702
 
4703
+
4661
4704
  </fo:block-container>
4662
4705
  </fo:block-container>
4663
4706
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -5010,6 +5053,8 @@
5010
5053
 
5011
5054
 
5012
5055
 
5056
+
5057
+
5013
5058
  <xsl:call-template name="getTitle">
5014
5059
  <xsl:with-param name="name" select="'title-source'"/>
5015
5060
  </xsl:call-template>
@@ -5241,6 +5286,7 @@
5241
5286
  <xsl:call-template name="setId"/>
5242
5287
 
5243
5288
 
5289
+
5244
5290
  <xsl:apply-templates/>
5245
5291
  </fo:block>
5246
5292
  </xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -5629,17 +5675,17 @@
5629
5675
  <xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
5630
5676
  <xsl:choose>
5631
5677
  <xsl:when test="normalize-space($_doc_ident) != ''">
5632
- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
5678
+ <!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
5633
5679
  <xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
5634
5680
  <xsl:value-of select="$type"/><xsl:text> </xsl:text>
5635
- </xsl:if>
5681
+ </xsl:if> -->
5636
5682
  <xsl:value-of select="$_doc_ident"/>
5637
5683
  </xsl:when>
5638
5684
  <xsl:otherwise>
5639
- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
5685
+ <!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
5640
5686
  <xsl:if test="$type != ''">
5641
5687
  <xsl:value-of select="$type"/><xsl:text> </xsl:text>
5642
- </xsl:if>
5688
+ </xsl:if> -->
5643
5689
  <xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
5644
5690
  </xsl:otherwise>
5645
5691
  </xsl:choose>
@@ -6145,4 +6191,14 @@
6145
6191
  <xsl:value-of select="$align"/>
6146
6192
  </xsl:when>
6147
6193
  </xsl:choose>
6194
+ </xsl:template><xsl:template name="setTextAlignment">
6195
+ <xsl:param name="default">left</xsl:param>
6196
+ <xsl:attribute name="text-align">
6197
+ <xsl:choose>
6198
+ <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
6199
+ <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
6200
+ <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
6201
+ <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6202
+ </xsl:choose>
6203
+ </xsl:attribute>
6148
6204
  </xsl:template></xsl:stylesheet>
@@ -1720,7 +1720,7 @@
1720
1720
 
1721
1721
 
1722
1722
 
1723
-
1723
+
1724
1724
  </xsl:attribute-set><xsl:attribute-set name="example-style">
1725
1725
 
1726
1726
 
@@ -1785,6 +1785,7 @@
1785
1785
 
1786
1786
 
1787
1787
 
1788
+
1788
1789
  </xsl:attribute-set><xsl:attribute-set name="table-name-style">
1789
1790
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1790
1791
 
@@ -1806,6 +1807,8 @@
1806
1807
 
1807
1808
 
1808
1809
 
1810
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1811
+
1809
1812
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1810
1813
 
1811
1814
  <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -1856,6 +1859,7 @@
1856
1859
 
1857
1860
 
1858
1861
 
1862
+
1859
1863
  </xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
1860
1864
 
1861
1865
 
@@ -1900,6 +1904,7 @@
1900
1904
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1901
1905
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1902
1906
 
1907
+
1903
1908
  </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1904
1909
 
1905
1910
 
@@ -1907,6 +1912,7 @@
1907
1912
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1908
1913
 
1909
1914
 
1915
+
1910
1916
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1911
1917
 
1912
1918
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1965,6 +1971,7 @@
1965
1971
 
1966
1972
 
1967
1973
 
1974
+
1968
1975
 
1969
1976
 
1970
1977
 
@@ -2043,6 +2050,8 @@
2043
2050
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
2044
2051
 
2045
2052
 
2053
+ </xsl:attribute-set><xsl:attribute-set name="list-style">
2054
+
2046
2055
  </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
2047
2056
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
2048
2057
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -2091,18 +2100,18 @@
2091
2100
  <xsl:variable name="table-preamble">
2092
2101
 
2093
2102
 
2094
- <fo:block> </fo:block>
2103
+ <fo:block> </fo:block>
2095
2104
 
2096
2105
  </xsl:variable>
2097
2106
 
2098
2107
  <xsl:variable name="table">
2099
2108
 
2100
2109
  <xsl:variable name="simple-table">
2101
- <xsl:call-template name="getSimpleTable"/>
2110
+ <xsl:call-template name="getSimpleTable"/>
2102
2111
  </xsl:variable>
2103
2112
 
2104
2113
  <!-- <xsl:if test="$namespace = 'bipm'">
2105
- <fo:block>&#xA0;</fo:block>
2114
+ <fo:block>&#xA0;</fo:block>
2106
2115
  </xsl:if> -->
2107
2116
 
2108
2117
  <!-- $namespace = 'iso' or -->
@@ -2220,6 +2229,7 @@
2220
2229
 
2221
2230
 
2222
2231
 
2232
+
2223
2233
  </xsl:variable>
2224
2234
 
2225
2235
 
@@ -2358,6 +2368,9 @@
2358
2368
  <fo:block xsl:use-attribute-sets="table-name-style">
2359
2369
 
2360
2370
 
2371
+
2372
+
2373
+
2361
2374
  <xsl:choose>
2362
2375
  <xsl:when test="$continued = 'true'">
2363
2376
  <!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
@@ -2505,6 +2518,7 @@
2505
2518
  <!-- font-weight="bold" -->
2506
2519
  <fo:table-header>
2507
2520
 
2521
+
2508
2522
  <xsl:apply-templates/>
2509
2523
  </fo:table-header>
2510
2524
  </xsl:template><xsl:template name="table-header-title">
@@ -2766,6 +2780,10 @@
2766
2780
  </xsl:if>
2767
2781
 
2768
2782
 
2783
+
2784
+
2785
+
2786
+
2769
2787
  <!-- <xsl:if test="$namespace = 'bipm'">
2770
2788
  <xsl:attribute name="height">8mm</xsl:attribute>
2771
2789
  </xsl:if> -->
@@ -2855,6 +2873,9 @@
2855
2873
 
2856
2874
 
2857
2875
 
2876
+
2877
+
2878
+
2858
2879
  <xsl:if test=".//*[local-name() = 'table']">
2859
2880
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2860
2881
  </xsl:if>
@@ -3078,6 +3099,7 @@
3078
3099
 
3079
3100
 
3080
3101
 
3102
+
3081
3103
  <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
3082
3104
 
3083
3105
  <xsl:attribute name="internal-destination">
@@ -3387,6 +3409,7 @@
3387
3409
 
3388
3410
  <xsl:attribute name="min-height">8.5mm</xsl:attribute>
3389
3411
 
3412
+
3390
3413
  <fo:table-cell>
3391
3414
 
3392
3415
  <fo:block margin-top="6pt">
@@ -3405,6 +3428,7 @@
3405
3428
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3406
3429
 
3407
3430
 
3431
+
3408
3432
  <xsl:apply-templates/>
3409
3433
  <!-- <xsl:if test="$namespace = 'gb'">
3410
3434
  <xsl:if test="ancestor::*[local-name()='formula']">
@@ -3952,7 +3976,15 @@
3952
3976
  <xsl:copy>
3953
3977
  <xsl:apply-templates select="@*|node()" mode="mathml"/>
3954
3978
  </xsl:copy>
3955
- <mathml:mspace width="0.5ex"/>
3979
+ <xsl:choose>
3980
+ <!-- if in msub, then don't add space -->
3981
+ <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
3982
+ <!-- if next char in digit, don't add space -->
3983
+ <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
3984
+ <xsl:otherwise>
3985
+ <mathml:mspace width="0.5ex"/>
3986
+ </xsl:otherwise>
3987
+ </xsl:choose>
3956
3988
  </xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
3957
3989
  <xsl:variable name="target">
3958
3990
  <xsl:choose>
@@ -3976,6 +4008,7 @@
3976
4008
  </xsl:variable>
3977
4009
  <fo:inline xsl:use-attribute-sets="link-style">
3978
4010
 
4011
+
3979
4012
  <xsl:choose>
3980
4013
  <xsl:when test="$target_text = ''">
3981
4014
  <xsl:apply-templates/>
@@ -4131,6 +4164,7 @@
4131
4164
  </xsl:choose>
4132
4165
  </xsl:template><xsl:template match="*[local-name() = 'termnote']">
4133
4166
  <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
4167
+
4134
4168
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
4135
4169
 
4136
4170
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
@@ -4208,6 +4242,7 @@
4208
4242
  </xsl:call-template>
4209
4243
 
4210
4244
  <fo:block>
4245
+
4211
4246
  <xsl:apply-templates/>
4212
4247
  </fo:block>
4213
4248
  <xsl:call-template name="fn_display_figure"/>
@@ -4535,6 +4570,7 @@
4535
4570
  <xsl:if test="normalize-space() != ''">
4536
4571
  <fo:block xsl:use-attribute-sets="figure-name-style">
4537
4572
 
4573
+
4538
4574
  <xsl:apply-templates/>
4539
4575
  </fo:block>
4540
4576
  </xsl:if>
@@ -4615,6 +4651,7 @@
4615
4651
 
4616
4652
  <fo:block-container margin-left="0mm">
4617
4653
  <xsl:copy-of select="@id"/>
4654
+
4618
4655
  <xsl:if test="parent::*[local-name() = 'note']">
4619
4656
  <xsl:attribute name="margin-left">
4620
4657
  <xsl:choose>
@@ -4625,7 +4662,9 @@
4625
4662
 
4626
4663
  </xsl:if>
4627
4664
  <fo:block-container margin-left="0mm">
4628
-
4665
+
4666
+
4667
+
4629
4668
  <fo:block xsl:use-attribute-sets="sourcecode-style">
4630
4669
  <xsl:variable name="_font-size">
4631
4670
 
@@ -4654,10 +4693,14 @@
4654
4693
  </xsl:choose>
4655
4694
  </xsl:attribute>
4656
4695
  </xsl:if>
4657
- <xsl:apply-templates/>
4658
- </fo:block>
4696
+
4697
+ <xsl:apply-templates/>
4698
+ </fo:block>
4699
+
4700
+
4659
4701
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4660
4702
 
4703
+
4661
4704
  </fo:block-container>
4662
4705
  </fo:block-container>
4663
4706
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -5010,6 +5053,8 @@
5010
5053
 
5011
5054
 
5012
5055
 
5056
+
5057
+
5013
5058
  <xsl:call-template name="getTitle">
5014
5059
  <xsl:with-param name="name" select="'title-source'"/>
5015
5060
  </xsl:call-template>
@@ -5241,6 +5286,7 @@
5241
5286
  <xsl:call-template name="setId"/>
5242
5287
 
5243
5288
 
5289
+
5244
5290
  <xsl:apply-templates/>
5245
5291
  </fo:block>
5246
5292
  </xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -5629,17 +5675,17 @@
5629
5675
  <xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
5630
5676
  <xsl:choose>
5631
5677
  <xsl:when test="normalize-space($_doc_ident) != ''">
5632
- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
5678
+ <!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
5633
5679
  <xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
5634
5680
  <xsl:value-of select="$type"/><xsl:text> </xsl:text>
5635
- </xsl:if>
5681
+ </xsl:if> -->
5636
5682
  <xsl:value-of select="$_doc_ident"/>
5637
5683
  </xsl:when>
5638
5684
  <xsl:otherwise>
5639
- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
5685
+ <!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
5640
5686
  <xsl:if test="$type != ''">
5641
5687
  <xsl:value-of select="$type"/><xsl:text> </xsl:text>
5642
- </xsl:if>
5688
+ </xsl:if> -->
5643
5689
  <xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
5644
5690
  </xsl:otherwise>
5645
5691
  </xsl:choose>
@@ -6145,4 +6191,14 @@
6145
6191
  <xsl:value-of select="$align"/>
6146
6192
  </xsl:when>
6147
6193
  </xsl:choose>
6194
+ </xsl:template><xsl:template name="setTextAlignment">
6195
+ <xsl:param name="default">left</xsl:param>
6196
+ <xsl:attribute name="text-align">
6197
+ <xsl:choose>
6198
+ <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
6199
+ <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
6200
+ <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
6201
+ <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6202
+ </xsl:choose>
6203
+ </xsl:attribute>
6148
6204
  </xsl:template></xsl:stylesheet>