metanorma-generic 2.2.4 → 2.3.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: c46eb512e0606d0174540bb516ef208a7980b205d343ec3da8aadfbaac95c007
4
- data.tar.gz: 34ce3a2bc7b44064fa61e3b2eadfcbd6169421429aceafa6259ef20e684a2060
3
+ metadata.gz: 0dd504b980d302a384bf30ad0cb8bb27f187872d50aebd306a589dddfed2bb1b
4
+ data.tar.gz: d5bbbc40fa58ea157bf1c2e04653031598fd4c3c5639930863ee3c00e4213973
5
5
  SHA512:
6
- metadata.gz: b0d3770ca3f7a517a0fdbf80bdbefe8f52c6fb4091b1c845562da05434a6db5e6f5a5389cd6560eb2da9c9ca60faa11eec68abb831afc4cb846e2ad9fb2d905f
7
- data.tar.gz: 4a31f80596daacf518ca9c1a12cf7204d3dbdd8099bc582ebdc18a770bcbd2e394da33b759cbe411572d1c7be3209b2b9e25a7e0855274c2368f0ed53c6896ed
6
+ metadata.gz: 2d4f3a66ff3d2b843dd8b0f7da4cef54047f3b5c6a6ebfff78e60e398e8a60e299295b93bbacbc87899ff017c9c6d69b27a9b3d7227f251bf7db952545ec5dbd
7
+ data.tar.gz: 400488911c1e7a003ad49d38e162c93dd2ef8eb2c8e5113554424ce1b322ffd9747917360c718c42c75e4029a767fd7fc7cd103112a11f77e74a793230871ceb
data/.gitignore CHANGED
@@ -3,7 +3,6 @@
3
3
  .rubocop-https--*
4
4
 
5
5
  /.rspec_status
6
- /Gemfile.devel
7
6
  /Gemfile.lock
8
7
  /coverage/
9
8
  /test.doc
@@ -14,7 +14,7 @@ module IsoDoc
14
14
  h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
15
15
  d["id"] = h2["id"]
16
16
  d.children.first.previous =
17
- "<strong>#{h2.remove.children.to_xml}</strong>&#xa0;"
17
+ "<strong>#{to_xml(h2.remove.children)}</strong>&#xa0;"
18
18
  end
19
19
  docxml
20
20
  end
@@ -568,6 +568,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
568
568
  {mso-style-priority:39;
569
569
  mso-style-unhide:no;
570
570
  mso-style-next:Normal;
571
+ mso-style-name:"TOC 1";
571
572
  margin-top:6.0pt;
572
573
  margin-right:25.0pt;
573
574
  margin-bottom:0cm;
@@ -589,6 +590,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
589
590
  {mso-style-noshow:yes;
590
591
  mso-style-priority:39;
591
592
  mso-style-unhide:no;
593
+ mso-style-name:"TOC 2";
592
594
  mso-style-parent:"TOC 1";
593
595
  mso-style-next:Normal;
594
596
  margin-top:0cm;
@@ -612,6 +614,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
612
614
  {mso-style-noshow:yes;
613
615
  mso-style-priority:39;
614
616
  mso-style-unhide:no;
617
+ mso-style-name:"TOC 3";
615
618
  mso-style-parent:"TOC 2";
616
619
  mso-style-next:Normal;
617
620
  margin-top:0cm;
@@ -631,6 +634,150 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
631
634
  mso-ansi-language:EN-GB;
632
635
  font-weight:bold;
633
636
  mso-bidi-font-weight:normal;}
637
+ p.MsoToc4, li.MsoToc4, div.MsoToc4
638
+ {mso-style-noshow:yes;
639
+ mso-style-priority:39;
640
+ mso-style-unhide:no;
641
+ mso-style-name:"TOC 4";
642
+ mso-style-parent:"TOC 3";
643
+ mso-style-next:Normal;
644
+ margin-top:0cm;
645
+ margin-right:25.0pt;
646
+ margin-bottom:0cm;
647
+ margin-left:36.0pt;
648
+ margin-bottom:.0001pt;
649
+ text-indent:-36.0pt;
650
+ line-height:12.0pt;
651
+ mso-pagination:widow-orphan;
652
+ mso-hyphenate:none;
653
+ tab-stops:20.15pt 47.9pt right dotted 487.6pt;
654
+ font-size:10.5pt;
655
+ font-family:$bodyfont;
656
+ mso-fareast-font-family:$bodyfont;
657
+ mso-bidi-font-family:$bodyfont;
658
+ mso-ansi-language:EN-GB;
659
+ font-weight:bold;
660
+ mso-bidi-font-weight:normal;}
661
+ p.MsoToc5, li.MsoToc5, div.MsoToc5
662
+ {mso-style-noshow:yes;
663
+ mso-style-priority:39;
664
+ mso-style-unhide:no;
665
+ mso-style-name:"TOC 5";
666
+ mso-style-parent:"TOC 4";
667
+ mso-style-next:Normal;
668
+ margin-top:0cm;
669
+ margin-right:25.0pt;
670
+ margin-bottom:0cm;
671
+ margin-left:36.0pt;
672
+ margin-bottom:.0001pt;
673
+ text-indent:-36.0pt;
674
+ line-height:12.0pt;
675
+ mso-pagination:widow-orphan;
676
+ mso-hyphenate:none;
677
+ tab-stops:20.15pt 47.9pt right dotted 487.6pt;
678
+ font-size:10.5pt;
679
+ font-family:$bodyfont;
680
+ mso-fareast-font-family:$bodyfont;
681
+ mso-bidi-font-family:$bodyfont;
682
+ mso-ansi-language:EN-GB;
683
+ font-weight:bold;
684
+ mso-bidi-font-weight:normal;}
685
+ p.MsoToc6, li.MsoToc6, div.MsoToc6
686
+ {mso-style-noshow:yes;
687
+ mso-style-priority:39;
688
+ mso-style-unhide:no;
689
+ mso-style-name:"TOC 6";
690
+ mso-style-parent:"TOC 5";
691
+ mso-style-next:Normal;
692
+ margin-top:0cm;
693
+ margin-right:25.0pt;
694
+ margin-bottom:0cm;
695
+ margin-left:36.0pt;
696
+ margin-bottom:.0001pt;
697
+ text-indent:-36.0pt;
698
+ line-height:12.0pt;
699
+ mso-pagination:widow-orphan;
700
+ mso-hyphenate:none;
701
+ tab-stops:20.15pt 55.0pt right dotted 487.6pt;
702
+ font-size:10.5pt;
703
+ font-family:$bodyfont;
704
+ mso-fareast-font-family:$bodyfont;
705
+ mso-bidi-font-family:$bodyfont;
706
+ mso-ansi-language:EN-GB;
707
+ font-weight:bold;
708
+ mso-bidi-font-weight:normal;}
709
+ p.MsoToc7, li.MsoToc7, div.MsoToc7
710
+ {mso-style-noshow:yes;
711
+ mso-style-priority:39;
712
+ mso-style-unhide:no;
713
+ mso-style-name:"TOC 7";
714
+ mso-style-parent:"TOC 6";
715
+ mso-style-next:Normal;
716
+ margin-top:0cm;
717
+ margin-right:25.0pt;
718
+ margin-bottom:0cm;
719
+ margin-left:36.0pt;
720
+ margin-bottom:.0001pt;
721
+ text-indent:-36.0pt;
722
+ line-height:12.0pt;
723
+ mso-pagination:widow-orphan;
724
+ mso-hyphenate:none;
725
+ tab-stops:20.15pt 62.7pt right dotted 487.6pt;
726
+ font-size:10.5pt;
727
+ font-family:$bodyfont;
728
+ mso-fareast-font-family:$bodyfont;
729
+ mso-bidi-font-family:$bodyfont;
730
+ mso-ansi-language:EN-GB;
731
+ font-weight:bold;
732
+ mso-bidi-font-weight:normal;}
733
+ p.MsoToc8, li.MsoToc8, div.MsoToc8
734
+ {mso-style-noshow:yes;
735
+ mso-style-priority:39;
736
+ mso-style-unhide:no;
737
+ mso-style-name:"TOC 8";
738
+ mso-style-parent:"TOC 7";
739
+ mso-style-next:Normal;
740
+ margin-top:0cm;
741
+ margin-right:25.0pt;
742
+ margin-bottom:0cm;
743
+ margin-left:36.0pt;
744
+ margin-bottom:.0001pt;
745
+ text-indent:-36.0pt;
746
+ line-height:12.0pt;
747
+ mso-pagination:widow-orphan;
748
+ mso-hyphenate:none;
749
+ tab-stops:20.15pt 70.3pt right dotted 487.6pt;
750
+ font-size:10.5pt;
751
+ font-family:$bodyfont;
752
+ mso-fareast-font-family:$bodyfont;
753
+ mso-bidi-font-family:$bodyfont;
754
+ mso-ansi-language:EN-GB;
755
+ font-weight:bold;
756
+ mso-bidi-font-weight:normal;}
757
+ p.MsoToc9, li.MsoToc9, div.MsoToc9
758
+ {mso-style-noshow:yes;
759
+ mso-style-priority:39;
760
+ mso-style-unhide:no;
761
+ mso-style-name:"TOC 9";
762
+ mso-style-parent:"TOC 8";
763
+ mso-style-next:Normal;
764
+ margin-top:0cm;
765
+ margin-right:25.0pt;
766
+ margin-bottom:0cm;
767
+ margin-left:36.0pt;
768
+ margin-bottom:.0001pt;
769
+ text-indent:-36.0pt;
770
+ line-height:12.0pt;
771
+ mso-pagination:widow-orphan;
772
+ mso-hyphenate:none;
773
+ tab-stops:20.15pt 78.0pt right dotted 487.6pt;
774
+ font-size:10.5pt;
775
+ font-family:$bodyfont;
776
+ mso-fareast-font-family:$bodyfont;
777
+ mso-bidi-font-family:$bodyfont;
778
+ mso-ansi-language:EN-GB;
779
+ font-weight:bold;
780
+ mso-bidi-font-weight:normal;}
634
781
  span.MsoFootnoteReference
635
782
  {mso-style-priority:99;
636
783
  vertical-align:super;}
@@ -8,7 +8,7 @@ module IsoDoc
8
8
  def annex1(elem)
9
9
  lbl = @xrefs.anchor(elem["id"], :label)
10
10
  if t = elem.at(ns("./title"))
11
- t.children = "<strong>#{t.children.to_xml}</strong>"
11
+ t.children = "<strong>#{to_xml(t.children)}</strong>"
12
12
  end
13
13
  prefix_name(elem, "<br/>", lbl, "title")
14
14
  end
@@ -683,6 +683,9 @@
683
683
  </define>
684
684
  <define name="underline">
685
685
  <element name="underline">
686
+ <optional>
687
+ <attribute name="style"/>
688
+ </optional>
686
689
  <zeroOrMore>
687
690
  <ref name="PureTextElement"/>
688
691
  </zeroOrMore>
@@ -0,0 +1,164 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <!--
4
+ Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
5
+ of relaton
6
+
7
+ Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
8
+ (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
9
+ -->
10
+ <include href="biblio.rng">
11
+ <define name="BibData">
12
+ <ref name="BibliographicItem"/>
13
+ <optional>
14
+ <ref name="ext"/>
15
+ </optional>
16
+ </define>
17
+ </include>
18
+ <define name="ext">
19
+ <element name="ext">
20
+ <ref name="BibDataExtensionType"/>
21
+ </element>
22
+ </define>
23
+ <define name="BibDataExtensionType">
24
+ <optional>
25
+ <attribute name="schema-version"/>
26
+ </optional>
27
+ <ref name="doctype"/>
28
+ <optional>
29
+ <ref name="docsubtype"/>
30
+ </optional>
31
+ <optional>
32
+ <ref name="editorialgroup"/>
33
+ </optional>
34
+ <zeroOrMore>
35
+ <ref name="ics"/>
36
+ </zeroOrMore>
37
+ <zeroOrMore>
38
+ <ref name="structuredidentifier"/>
39
+ </zeroOrMore>
40
+ </define>
41
+ <define name="doctype">
42
+ <element name="doctype">
43
+ <optional>
44
+ <attribute name="abbreviation"/>
45
+ </optional>
46
+ <ref name="DocumentType"/>
47
+ </element>
48
+ </define>
49
+ <define name="DocumentType">
50
+ <text/>
51
+ </define>
52
+ <define name="docsubtype">
53
+ <element name="subdoctype">
54
+ <ref name="DocumentSubtype"/>
55
+ </element>
56
+ </define>
57
+ <define name="DocumentSubtype">
58
+ <text/>
59
+ </define>
60
+ <define name="editorialgroup">
61
+ <element name="editorialgroup">
62
+ <oneOrMore>
63
+ <ref name="technical-committee"/>
64
+ </oneOrMore>
65
+ </element>
66
+ </define>
67
+ <define name="technical-committee">
68
+ <element name="technical-committee">
69
+ <ref name="IsoWorkgroup"/>
70
+ </element>
71
+ </define>
72
+ <define name="IsoWorkgroup">
73
+ <optional>
74
+ <attribute name="number"/>
75
+ </optional>
76
+ <optional>
77
+ <attribute name="type"/>
78
+ </optional>
79
+ <optional>
80
+ <attribute name="identifier"/>
81
+ </optional>
82
+ <optional>
83
+ <attribute name="prefix"/>
84
+ </optional>
85
+ <text/>
86
+ </define>
87
+ <define name="ics">
88
+ <element name="ics">
89
+ <element name="code">
90
+ <text/>
91
+ </element>
92
+ <optional>
93
+ <element name="text">
94
+ <text/>
95
+ </element>
96
+ </optional>
97
+ </element>
98
+ </define>
99
+ <define name="structuredidentifier">
100
+ <element name="structuredidentifier">
101
+ <optional>
102
+ <attribute name="type"/>
103
+ </optional>
104
+ <oneOrMore>
105
+ <element name="agency">
106
+ <text/>
107
+ </element>
108
+ </oneOrMore>
109
+ <optional>
110
+ <element name="class">
111
+ <text/>
112
+ </element>
113
+ </optional>
114
+ <element name="docnumber">
115
+ <text/>
116
+ </element>
117
+ <optional>
118
+ <element name="partnumber">
119
+ <text/>
120
+ </element>
121
+ </optional>
122
+ <optional>
123
+ <element name="edition">
124
+ <text/>
125
+ </element>
126
+ </optional>
127
+ <optional>
128
+ <element name="version">
129
+ <text/>
130
+ </element>
131
+ </optional>
132
+ <optional>
133
+ <element name="supplementtype">
134
+ <text/>
135
+ </element>
136
+ </optional>
137
+ <optional>
138
+ <element name="supplementnumber">
139
+ <text/>
140
+ </element>
141
+ </optional>
142
+ <optional>
143
+ <element name="amendment">
144
+ <text/>
145
+ </element>
146
+ </optional>
147
+ <optional>
148
+ <element name="corrigendum">
149
+ <text/>
150
+ </element>
151
+ </optional>
152
+ <optional>
153
+ <element name="language">
154
+ <text/>
155
+ </element>
156
+ </optional>
157
+ <optional>
158
+ <element name="year">
159
+ <text/>
160
+ </element>
161
+ </optional>
162
+ </element>
163
+ </define>
164
+ </grammar>
@@ -1152,7 +1152,7 @@
1152
1152
  <data type="boolean"/>
1153
1153
  </attribute>
1154
1154
  </optional>
1155
- <ref name="BibliographicItem"/>
1155
+ <ref name="ReducedBibliographicItem"/>
1156
1156
  </element>
1157
1157
  </define>
1158
1158
  <define name="image" combine="choice">
@@ -2653,6 +2653,7 @@
2653
2653
  <value>full</value>
2654
2654
  <value>short</value>
2655
2655
  <value>id</value>
2656
+ <value>modspec</value>
2656
2657
  </choice>
2657
2658
  </define>
2658
2659
  <define name="erefTypeWithConnective">
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.2.4".freeze
3
+ VERSION = "2.3.0".freeze
4
4
  end
5
5
  end
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
28
28
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
29
29
 
30
30
  spec.add_dependency "htmlentities", "~> 4.3.4"
31
- spec.add_dependency "metanorma-standoc", "~> 2.2.4"
31
+ spec.add_dependency "metanorma-standoc", "~> 2.3.0"
32
32
  spec.add_dependency "ruby-jing"
33
33
 
34
34
  spec.add_development_dependency "debug"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-generic
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.4
4
+ version: 2.3.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: 2022-11-07 00:00:00.000000000 Z
11
+ date: 2022-12-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.2.4
33
+ version: 2.3.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.2.4
40
+ version: 2.3.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-jing
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -236,6 +236,7 @@ files:
236
236
  - lib/metanorma-generic.rb
237
237
  - lib/metanorma/generic.rb
238
238
  - lib/metanorma/generic/basicdoc.rng
239
+ - lib/metanorma/generic/biblio-standoc.rng
239
240
  - lib/metanorma/generic/biblio.rng
240
241
  - lib/metanorma/generic/converter.rb
241
242
  - lib/metanorma/generic/fonts_manifest.yaml
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
267
268
  - !ruby/object:Gem::Version
268
269
  version: '0'
269
270
  requirements: []
270
- rubygems_version: 3.3.7
271
+ rubygems_version: 3.3.26
271
272
  signing_key:
272
273
  specification_version: 4
273
274
  summary: Metanorma template gem for customisation.