metanorma-ribose 1.6.16 → 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: 15cc3c5ccba05fef79b07e6ccb7e83c61660ab0427c06e7a822d4cbca06a03bf
4
- data.tar.gz: 30dcf9307e57ded58f56732c46928a1765e2178d21c2ecb61cd5d1bc9953e106
3
+ metadata.gz: ec0381c2c878fcff5149713b72a97ca307ba2927e82b4d33509212f259a273d4
4
+ data.tar.gz: 6d3bdf802016fe64073caffd40783dc254c841647a3f16b06967fd574567bbcf
5
5
  SHA512:
6
- metadata.gz: 48502a8f19547c1bf522e1a5d2700ef65cbecb383a2066cd4e54048f4943d975a078170675c02e6e793ad30a2c442837f2130d81ffd0e654ba736da90a39337d
7
- data.tar.gz: cbe70e64b6aeceab8dac66dcb0c5f01678406abe61e92ac5aee38a950996bd86f2f6dd183764e7ca036d66ee47cae4d7c5873391854b551391f98c10a13ed389
6
+ metadata.gz: fd40c1bf2c10cdadf30d814501239f49194809f0e7e639281c8d4ee74b157bb774faafcdd36990d27e3900cb7c685ce04cd3b47f59d6fca458b525dd80724dd8
7
+ data.tar.gz: b1b471a53a188794f9be2bc1826d8a6f340b1778afca82e86c4fcd3fb5b1cb95998fb267994434700a910b9c593fdec8906833b772f9409f2b01a38fabd81ad8
@@ -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">
@@ -115,6 +115,13 @@ a.FootnoteRef + a.FootnoteRef:before {
115
115
  content: ", ";
116
116
  vertical-align: super; }
117
117
 
118
+ .addition {
119
+ color: blue; }
120
+
121
+ .deletion {
122
+ color: red;
123
+ text-decoration: line-through; }
124
+
118
125
  #standard-band {
119
126
  background-color: #0AC442; }
120
127
 
@@ -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
  <xsl:variable name="pageWidth" select="'210mm'"/>
10
11
  <xsl:variable name="pageHeight" select="'297mm'"/>
@@ -1394,7 +1395,7 @@
1394
1395
 
1395
1396
  </xsl:attribute-set><xsl:attribute-set name="admitted-style">
1396
1397
 
1397
-
1398
+
1398
1399
  </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1399
1400
 
1400
1401
  </xsl:attribute-set><xsl:attribute-set name="definition-style">
@@ -1402,6 +1403,12 @@
1402
1403
  <xsl:attribute name="space-after">6pt</xsl:attribute>
1403
1404
 
1404
1405
 
1406
+ </xsl:attribute-set><xsl:attribute-set name="add-style">
1407
+ <xsl:attribute name="color">red</xsl:attribute>
1408
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1409
+ </xsl:attribute-set><xsl:attribute-set name="del-style">
1410
+ <xsl:attribute name="color">red</xsl:attribute>
1411
+ <xsl:attribute name="text-decoration">line-through</xsl:attribute>
1405
1412
  </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
1406
1413
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1407
1414
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -2744,8 +2751,12 @@
2744
2751
  <fo:inline text-decoration="underline">
2745
2752
  <xsl:apply-templates/>
2746
2753
  </fo:inline>
2754
+ </xsl:template><xsl:template match="*[local-name()='add']">
2755
+ <fo:inline xsl:use-attribute-sets="add-style">
2756
+ <xsl:apply-templates/>
2757
+ </fo:inline>
2747
2758
  </xsl:template><xsl:template match="*[local-name()='del']">
2748
- <fo:inline font-size="10pt" color="red" text-decoration="line-through">
2759
+ <fo:inline xsl:use-attribute-sets="del-style">
2749
2760
  <xsl:apply-templates/>
2750
2761
  </fo:inline>
2751
2762
  </xsl:template><xsl:template match="*[local-name()='hi']">
@@ -3365,22 +3376,37 @@
3365
3376
  <xsl:apply-templates/>
3366
3377
  </fo:block>
3367
3378
  </xsl:template><xsl:template match="*[local-name() = 'image']">
3368
- <fo:block xsl:use-attribute-sets="image-style">
3369
-
3370
-
3371
- <xsl:variable name="src">
3372
- <xsl:choose>
3373
- <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
3374
- <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
3375
- </xsl:when>
3376
- <xsl:otherwise>
3377
- <xsl:value-of select="@src"/>
3378
- </xsl:otherwise>
3379
- </xsl:choose>
3380
- </xsl:variable>
3381
-
3382
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
3383
- </fo:block>
3379
+ <xsl:choose>
3380
+ <xsl:when test="ancestor::*[local-name() = 'title']">
3381
+ <fo:inline padding-left="1mm" padding-right="1mm">
3382
+ <xsl:variable name="src">
3383
+ <xsl:call-template name="image_src"/>
3384
+ </xsl:variable>
3385
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
3386
+ </fo:inline>
3387
+ </xsl:when>
3388
+ <xsl:otherwise>
3389
+ <fo:block xsl:use-attribute-sets="image-style">
3390
+
3391
+ <xsl:variable name="src">
3392
+ <xsl:call-template name="image_src"/>
3393
+ </xsl:variable>
3394
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
3395
+ </fo:block>
3396
+ </xsl:otherwise>
3397
+ </xsl:choose>
3398
+ </xsl:template><xsl:template name="image_src">
3399
+ <xsl:choose>
3400
+ <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
3401
+ <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
3402
+ </xsl:when>
3403
+ <xsl:when test="not(starts-with(@src, 'data:'))">
3404
+ <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
3405
+ </xsl:when>
3406
+ <xsl:otherwise>
3407
+ <xsl:value-of select="@src"/>
3408
+ </xsl:otherwise>
3409
+ </xsl:choose>
3384
3410
  </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">
3385
3411
  <xsl:apply-templates mode="contents"/>
3386
3412
  <xsl:text> </xsl:text>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "1.6.16"
3
+ VERSION = "1.7.0".freeze
4
4
  end
5
5
  end
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
28
28
  spec.require_paths = ["lib"]
29
29
  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
30
30
 
31
- spec.add_dependency 'metanorma-generic', '~> 1.9.0'
31
+ spec.add_dependency 'metanorma-generic', '~> 1.10.0'
32
32
 
33
33
  spec.add_development_dependency "byebug", "~> 9.1"
34
34
  spec.add_development_dependency "sassc", "2.4.0"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ribose
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.16
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: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.9.0
19
+ version: 1.10.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.9.0
26
+ version: 1.10.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement