metanorma-m3aawg 1.6.9 → 1.7.0

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: 5c3ccfbc9324c4503bcc379ef0e9b7de9f4b947c292eeda04cf69f8e0b9b3d28
4
- data.tar.gz: 9b5bb67a578bc4e8e2832ab422028ffede8b0588ef3cdc40e34186590a8e7fea
3
+ metadata.gz: bc7991b7bd553af372574f9a78596cf638ef4a4919290be6bf0f98c2fa7155e6
4
+ data.tar.gz: 2d289669a14fa8cb6c94375a4df3f887d69e90d4617ce50a8af8e474810aad0c
5
5
  SHA512:
6
- metadata.gz: '018a04109bf285e6eaab13f8a8e945a2ec34db99734ef401816bc467086e368bbbed2c6d947e33e73cb184150b92430b941fd3a62e55c6d481a6047a0ebacb27'
7
- data.tar.gz: 55f84c4b92fa2e5faeddaba6a429cf164400985af30272f9920b1333485e5867c101bdf0095c72bcd596f7dd3267d2c0c9a2e1a70c9c181c44dbcec4e31cdb59
6
+ metadata.gz: dc480555dc1b1450c352deb9f1da12078a8fd5c69252fe52f786e6421fb434cc32dc7aa9b249855dc0741a58722b1f552b79f9411fc811d35ce5e144b0995b66
7
+ data.tar.gz: 10b194a23da33487a692537c15cb2dbfeaac1cc89cf31ce9320f29c95e3ea991242ddfe5bc186606fcb1c448d8773141a94ea98100927a617276f7ee351b1f47
@@ -86,6 +86,35 @@
86
86
  <text/>
87
87
  </element>
88
88
  </define>
89
+ <define name="erefType">
90
+ <optional>
91
+ <attribute name="normative">
92
+ <data type="boolean"/>
93
+ </attribute>
94
+ </optional>
95
+ <attribute name="citeas"/>
96
+ <attribute name="type">
97
+ <ref name="ReferenceFormat"/>
98
+ </attribute>
99
+ <optional>
100
+ <attribute name="alt"/>
101
+ </optional>
102
+ <optional>
103
+ <attribute name="case">
104
+ <choice>
105
+ <value>capital</value>
106
+ <value>lowercase</value>
107
+ </choice>
108
+ </attribute>
109
+ </optional>
110
+ <optional>
111
+ <attribute name="droploc">
112
+ <data type="boolean"/>
113
+ </attribute>
114
+ </optional>
115
+ <ref name="CitationType"/>
116
+ <text/>
117
+ </define>
89
118
  <define name="ul">
90
119
  <element name="ul">
91
120
  <attribute name="id">
@@ -775,6 +804,78 @@
775
804
  <ref name="paragraph"/>
776
805
  </element>
777
806
  </define>
807
+ <define name="em">
808
+ <element name="em">
809
+ <zeroOrMore>
810
+ <choice>
811
+ <ref name="PureTextElement"/>
812
+ <ref name="stem"/>
813
+ <ref name="index"/>
814
+ </choice>
815
+ </zeroOrMore>
816
+ </element>
817
+ </define>
818
+ <define name="strong">
819
+ <element name="strong">
820
+ <zeroOrMore>
821
+ <choice>
822
+ <ref name="PureTextElement"/>
823
+ <ref name="stem"/>
824
+ <ref name="index"/>
825
+ </choice>
826
+ </zeroOrMore>
827
+ </element>
828
+ </define>
829
+ <define name="tt">
830
+ <element name="tt">
831
+ <zeroOrMore>
832
+ <choice>
833
+ <ref name="PureTextElement"/>
834
+ <ref name="index"/>
835
+ </choice>
836
+ </zeroOrMore>
837
+ </element>
838
+ </define>
839
+ <define name="keyword">
840
+ <element name="keyword">
841
+ <zeroOrMore>
842
+ <choice>
843
+ <ref name="PureTextElement"/>
844
+ <ref name="index"/>
845
+ </choice>
846
+ </zeroOrMore>
847
+ </element>
848
+ </define>
849
+ <define name="strike">
850
+ <element name="strike">
851
+ <zeroOrMore>
852
+ <choice>
853
+ <ref name="PureTextElement"/>
854
+ <ref name="index"/>
855
+ </choice>
856
+ </zeroOrMore>
857
+ </element>
858
+ </define>
859
+ <define name="underline">
860
+ <element name="underline">
861
+ <zeroOrMore>
862
+ <choice>
863
+ <ref name="PureTextElement"/>
864
+ <ref name="index"/>
865
+ </choice>
866
+ </zeroOrMore>
867
+ </element>
868
+ </define>
869
+ <define name="smallcap">
870
+ <element name="smallcap">
871
+ <zeroOrMore>
872
+ <choice>
873
+ <ref name="PureTextElement"/>
874
+ <ref name="index"/>
875
+ </choice>
876
+ </zeroOrMore>
877
+ </element>
878
+ </define>
778
879
  </include>
779
880
  <!-- end overrides -->
780
881
  <define name="colgroup">
@@ -793,7 +894,35 @@
793
894
  <value>internal</value>
794
895
  </define>
795
896
  <define name="TextElement" combine="choice">
796
- <ref name="concept"/>
897
+ <choice>
898
+ <ref name="concept"/>
899
+ <ref name="add"/>
900
+ <ref name="del"/>
901
+ </choice>
902
+ </define>
903
+ <define name="add">
904
+ <element name="add">
905
+ <choice>
906
+ <ref name="PureTextElement"/>
907
+ <ref name="eref"/>
908
+ <ref name="stem"/>
909
+ <ref name="keyword"/>
910
+ <ref name="xref"/>
911
+ <ref name="hyperlink"/>
912
+ </choice>
913
+ </element>
914
+ </define>
915
+ <define name="del">
916
+ <element name="del">
917
+ <choice>
918
+ <ref name="PureTextElement"/>
919
+ <ref name="eref"/>
920
+ <ref name="stem"/>
921
+ <ref name="keyword"/>
922
+ <ref name="xref"/>
923
+ <ref name="hyperlink"/>
924
+ </choice>
925
+ </element>
797
926
  </define>
798
927
  <define name="concept">
799
928
  <element name="concept">
@@ -122,6 +122,13 @@ a.FootnoteRef + a.FootnoteRef:before {
122
122
  content: ", ";
123
123
  vertical-align: super; }
124
124
 
125
+ .addition {
126
+ color: blue; }
127
+
128
+ .deletion {
129
+ color: red;
130
+ text-decoration: line-through; }
131
+
125
132
  #standard-band {
126
133
  background-color: #0AC442; }
127
134
 
@@ -5,6 +5,7 @@
5
5
  <xsl:param name="svg_images"/>
6
6
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
7
7
  <xsl:variable name="images" select="document($svg_images)"/>
8
+ <xsl:param name="basepath"/>
8
9
 
9
10
 
10
11
 
@@ -1367,12 +1368,18 @@
1367
1368
 
1368
1369
  </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1369
1370
 
1370
-
1371
+
1371
1372
  </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1372
1373
 
1373
1374
  </xsl:attribute-set><xsl:attribute-set name="definition-style">
1374
1375
 
1375
1376
 
1377
+ </xsl:attribute-set><xsl:attribute-set name="add-style">
1378
+ <xsl:attribute name="color">red</xsl:attribute>
1379
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1380
+ </xsl:attribute-set><xsl:attribute-set name="del-style">
1381
+ <xsl:attribute name="color">red</xsl:attribute>
1382
+ <xsl:attribute name="text-decoration">line-through</xsl:attribute>
1376
1383
  </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
1377
1384
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1378
1385
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -2726,8 +2733,12 @@
2726
2733
  <fo:inline text-decoration="underline">
2727
2734
  <xsl:apply-templates/>
2728
2735
  </fo:inline>
2736
+ </xsl:template><xsl:template match="*[local-name()='add']">
2737
+ <fo:inline xsl:use-attribute-sets="add-style">
2738
+ <xsl:apply-templates/>
2739
+ </fo:inline>
2729
2740
  </xsl:template><xsl:template match="*[local-name()='del']">
2730
- <fo:inline font-size="10pt" color="red" text-decoration="line-through">
2741
+ <fo:inline xsl:use-attribute-sets="del-style">
2731
2742
  <xsl:apply-templates/>
2732
2743
  </fo:inline>
2733
2744
  </xsl:template><xsl:template match="*[local-name()='hi']">
@@ -3345,22 +3356,37 @@
3345
3356
  <xsl:apply-templates/>
3346
3357
  </fo:block>
3347
3358
  </xsl:template><xsl:template match="*[local-name() = 'image']">
3348
- <fo:block xsl:use-attribute-sets="image-style">
3349
-
3350
-
3351
- <xsl:variable name="src">
3352
- <xsl:choose>
3353
- <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
3354
- <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
3355
- </xsl:when>
3356
- <xsl:otherwise>
3357
- <xsl:value-of select="@src"/>
3358
- </xsl:otherwise>
3359
- </xsl:choose>
3360
- </xsl:variable>
3361
-
3362
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
3363
- </fo:block>
3359
+ <xsl:choose>
3360
+ <xsl:when test="ancestor::*[local-name() = 'title']">
3361
+ <fo:inline padding-left="1mm" padding-right="1mm">
3362
+ <xsl:variable name="src">
3363
+ <xsl:call-template name="image_src"/>
3364
+ </xsl:variable>
3365
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
3366
+ </fo:inline>
3367
+ </xsl:when>
3368
+ <xsl:otherwise>
3369
+ <fo:block xsl:use-attribute-sets="image-style">
3370
+
3371
+ <xsl:variable name="src">
3372
+ <xsl:call-template name="image_src"/>
3373
+ </xsl:variable>
3374
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
3375
+ </fo:block>
3376
+ </xsl:otherwise>
3377
+ </xsl:choose>
3378
+ </xsl:template><xsl:template name="image_src">
3379
+ <xsl:choose>
3380
+ <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
3381
+ <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
3382
+ </xsl:when>
3383
+ <xsl:when test="not(starts-with(@src, 'data:'))">
3384
+ <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
3385
+ </xsl:when>
3386
+ <xsl:otherwise>
3387
+ <xsl:value-of select="@src"/>
3388
+ </xsl:otherwise>
3389
+ </xsl:choose>
3364
3390
  </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
3365
3391
  <xsl:apply-templates mode="contents"/>
3366
3392
  <xsl:text> </xsl:text>
@@ -5,6 +5,7 @@
5
5
  <xsl:param name="svg_images"/>
6
6
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
7
7
  <xsl:variable name="images" select="document($svg_images)"/>
8
+ <xsl:param name="basepath"/>
8
9
 
9
10
 
10
11
 
@@ -1367,12 +1368,18 @@
1367
1368
 
1368
1369
  </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1369
1370
 
1370
-
1371
+
1371
1372
  </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1372
1373
 
1373
1374
  </xsl:attribute-set><xsl:attribute-set name="definition-style">
1374
1375
 
1375
1376
 
1377
+ </xsl:attribute-set><xsl:attribute-set name="add-style">
1378
+ <xsl:attribute name="color">red</xsl:attribute>
1379
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1380
+ </xsl:attribute-set><xsl:attribute-set name="del-style">
1381
+ <xsl:attribute name="color">red</xsl:attribute>
1382
+ <xsl:attribute name="text-decoration">line-through</xsl:attribute>
1376
1383
  </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
1377
1384
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1378
1385
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -2726,8 +2733,12 @@
2726
2733
  <fo:inline text-decoration="underline">
2727
2734
  <xsl:apply-templates/>
2728
2735
  </fo:inline>
2736
+ </xsl:template><xsl:template match="*[local-name()='add']">
2737
+ <fo:inline xsl:use-attribute-sets="add-style">
2738
+ <xsl:apply-templates/>
2739
+ </fo:inline>
2729
2740
  </xsl:template><xsl:template match="*[local-name()='del']">
2730
- <fo:inline font-size="10pt" color="red" text-decoration="line-through">
2741
+ <fo:inline xsl:use-attribute-sets="del-style">
2731
2742
  <xsl:apply-templates/>
2732
2743
  </fo:inline>
2733
2744
  </xsl:template><xsl:template match="*[local-name()='hi']">
@@ -3345,22 +3356,37 @@
3345
3356
  <xsl:apply-templates/>
3346
3357
  </fo:block>
3347
3358
  </xsl:template><xsl:template match="*[local-name() = 'image']">
3348
- <fo:block xsl:use-attribute-sets="image-style">
3349
-
3350
-
3351
- <xsl:variable name="src">
3352
- <xsl:choose>
3353
- <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
3354
- <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
3355
- </xsl:when>
3356
- <xsl:otherwise>
3357
- <xsl:value-of select="@src"/>
3358
- </xsl:otherwise>
3359
- </xsl:choose>
3360
- </xsl:variable>
3361
-
3362
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
3363
- </fo:block>
3359
+ <xsl:choose>
3360
+ <xsl:when test="ancestor::*[local-name() = 'title']">
3361
+ <fo:inline padding-left="1mm" padding-right="1mm">
3362
+ <xsl:variable name="src">
3363
+ <xsl:call-template name="image_src"/>
3364
+ </xsl:variable>
3365
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
3366
+ </fo:inline>
3367
+ </xsl:when>
3368
+ <xsl:otherwise>
3369
+ <fo:block xsl:use-attribute-sets="image-style">
3370
+
3371
+ <xsl:variable name="src">
3372
+ <xsl:call-template name="image_src"/>
3373
+ </xsl:variable>
3374
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
3375
+ </fo:block>
3376
+ </xsl:otherwise>
3377
+ </xsl:choose>
3378
+ </xsl:template><xsl:template name="image_src">
3379
+ <xsl:choose>
3380
+ <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
3381
+ <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
3382
+ </xsl:when>
3383
+ <xsl:when test="not(starts-with(@src, 'data:'))">
3384
+ <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
3385
+ </xsl:when>
3386
+ <xsl:otherwise>
3387
+ <xsl:value-of select="@src"/>
3388
+ </xsl:otherwise>
3389
+ </xsl:choose>
3364
3390
  </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
3365
3391
  <xsl:apply-templates mode="contents"/>
3366
3392
  <xsl:text> </xsl:text>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3AAWG
3
- VERSION = "1.6.9"
3
+ VERSION = "1.7.0".freeze
4
4
  end
5
5
  end
@@ -1,4 +1,4 @@
1
- lib = File.expand_path("../lib", __FILE__)
1
+ lib = File.expand_path("lib", __dir__)
2
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
3
  require "metanorma/m3aawg/version"
4
4
 
@@ -31,16 +31,16 @@ Gem::Specification.new do |spec|
31
31
  spec.add_dependency "htmlentities", "~> 4.3.4"
32
32
  spec.add_dependency "thread_safe"
33
33
 
34
- spec.add_dependency "metanorma-generic", "~> 1.9.0"
34
+ spec.add_dependency "metanorma-generic", "~> 1.10.0"
35
35
 
36
36
  spec.add_development_dependency "byebug", "~> 9.1"
37
- spec.add_development_dependency "sassc", "~> 2.4.0"
38
37
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
39
38
  spec.add_development_dependency "guard", "~> 2.14"
40
39
  spec.add_development_dependency "guard-rspec", "~> 4.7"
41
40
  spec.add_development_dependency "rake", "~> 13.0"
42
41
  spec.add_development_dependency "rspec", "~> 3.6"
43
42
  spec.add_development_dependency "rubocop", "~> 1.5.2"
43
+ spec.add_development_dependency "sassc", "~> 2.4.0"
44
44
  spec.add_development_dependency "simplecov", "~> 0.15"
45
45
  spec.add_development_dependency "timecop", "~> 0.9"
46
46
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-m3aawg
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.9
4
+ version: 1.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-03-29 00:00:00.000000000 Z
11
+ date: 2021-04-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.9.0
47
+ version: 1.10.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.9.0
54
+ version: 1.10.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: byebug
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '9.1'
69
- - !ruby/object:Gem::Dependency
70
- name: sassc
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - "~>"
74
- - !ruby/object:Gem::Version
75
- version: 2.4.0
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - "~>"
81
- - !ruby/object:Gem::Version
82
- version: 2.4.0
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: equivalent-xml
85
71
  requirement: !ruby/object:Gem::Requirement
@@ -164,6 +150,20 @@ dependencies:
164
150
  - - "~>"
165
151
  - !ruby/object:Gem::Version
166
152
  version: 1.5.2
153
+ - !ruby/object:Gem::Dependency
154
+ name: sassc
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - "~>"
158
+ - !ruby/object:Gem::Version
159
+ version: 2.4.0
160
+ type: :development
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - "~>"
165
+ - !ruby/object:Gem::Version
166
+ version: 2.4.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: simplecov
169
169
  requirement: !ruby/object:Gem::Requirement