metanorma-cc 2.1.1 → 2.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/cc/cc.standard.xsl +530 -249
  3. data/lib/isodoc/cc/html/cc.css +18 -11
  4. data/lib/isodoc/cc/html/cc.scss +16 -8
  5. data/lib/isodoc/cc/html/htmlstyle.css +6 -0
  6. data/lib/isodoc/cc/html/htmlstyle.scss +1 -0
  7. data/lib/isodoc/cc/presentation_xml_convert.rb +4 -5
  8. data/lib/metanorma/cc/biblio.rng +134 -39
  9. data/lib/metanorma/cc/isodoc.rng +32 -0
  10. data/lib/metanorma/cc/version.rb +1 -1
  11. metadata +3 -5
  12. data/docs/navigation.adoc +0 -8
  13. data/docs/quickstart.adoc +0 -368
data/lib/isodoc/cc/html/cc.css CHANGED
@@ -111,7 +111,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
111
111
  mso-bidi-font-family: {{bodyfont}};
112
112
  mso-ansi-language: EN-GB; }
113
113
 
114
- p.TableTitle {
114
+ p.TableTitle, p.ListTitle {
115
115
  mso-style-unhide: no;
116
116
  mso-style-qformat: yes;
117
117
  mso-style-parent: "";
@@ -142,13 +142,16 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
142
142
  line-height: 12.0pt;
143
143
  mso-pagination: widow-orphan;
144
144
  tab-stops: 20.15pt;
145
- font-size: {{smallerfontsize}};
146
145
  mso-bidi-font-size: 11.0pt;
147
146
  font-family: {{bodyfont}};
148
147
  mso-fareast-font-family: {{bodyfont}};
149
148
  mso-bidi-font-family: {{bodyfont}};
150
149
  mso-ansi-language: EN-GB; }
151
150
 
151
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
152
+ font-size: {{smallerfontsize}};
153
+ font-family: {{bodyfont}}; }
154
+
152
155
  p.ANNEX, li.ANNEX, div.ANNEX {
153
156
  mso-style-name: ANNEX;
154
157
  mso-style-priority: 10;
@@ -495,12 +498,14 @@ p.Quote, li.Quote, div.Quote {
495
498
  line-height: 12.0pt;
496
499
  mso-pagination: widow-orphan;
497
500
  tab-stops: 20.15pt;
498
- font-size: {{normalfontsize}};
499
- font-family: {{bodyfont}};
500
501
  mso-fareast-font-family: {{bodyfont}};
501
502
  mso-bidi-font-family: {{bodyfont}};
502
503
  mso-ansi-language: EN-GB; }
503
504
 
505
+ p.Quote, li.Quote {
506
+ font-size: {{normalfontsize}};
507
+ font-family: {{bodyfont}}; }
508
+
504
509
  p.QuoteAttribution {
505
510
  text-align: right;
506
511
  mso-style-priority: 99;
@@ -530,8 +535,6 @@ p.Admonition, li.Admonition, div.Admonition {
530
535
  mso-border-themecolor: accent1;
531
536
  padding: 0cm;
532
537
  mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
533
- font-size: 12.0pt;
534
- font-family: {{bodyfont}};
535
538
  mso-ascii-font-family: {{bodyfont}};
536
539
  mso-ascii-theme-font: minor-latin;
537
540
  mso-fareast-font-family: {{bodyfont}};
@@ -542,7 +545,11 @@ p.Admonition, li.Admonition, div.Admonition {
542
545
  mso-bidi-theme-font: minor-bidi;
543
546
  color: #4472C4;
544
547
  mso-themecolor: accent1;
545
- mso-ansi-language: EN-AU;
548
+ mso-ansi-language: EN-AU; }
549
+
550
+ p.Admonition, li.Admonition {
551
+ font-size: 12.0pt;
552
+ font-family: {{bodyfont}};
546
553
  font-style: italic; }
547
554
 
548
555
  p.Code, li.Code, div.Code {
@@ -767,7 +774,9 @@ aside {
767
774
 
768
775
  p.example, li.example, td.example {
769
776
  margin-right: 0pt;
770
- margin-left: 0pt; }
777
+ margin-left: 0pt;
778
+ font-size: {{smallerfontsize}};
779
+ font-family: {{bodyfont}}; }
771
780
 
772
781
  div.example {
773
782
  margin-top: 0cm;
@@ -776,9 +785,7 @@ div.example {
776
785
  margin-left: 36.0pt; }
777
786
 
778
787
  p.example, li.example, div.example, td.example {
779
- mso-pagination: none;
780
- font-size: {{smallerfontsize}};
781
- font-family: {{bodyfont}}; }
788
+ mso-pagination: none; }
782
789
 
783
790
  td.example p.MsoListParagraph {
784
791
  font-size: {{smallerfontsize}}; }
data/lib/isodoc/cc/html/cc.scss CHANGED
@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle
105
105
  mso-fareast-font-family:$bodyfont;
106
106
  mso-bidi-font-family:$bodyfont;
107
107
  mso-ansi-language:EN-GB;}
108
- p.TableTitle
108
+ p.TableTitle, p.ListTitle
109
109
  {mso-style-unhide:no;
110
110
  mso-style-qformat:yes;
111
111
  mso-style-parent:"";
@@ -135,12 +135,15 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
135
135
  line-height:12.0pt;
136
136
  mso-pagination:widow-orphan;
137
137
  tab-stops:20.15pt;
138
- font-size:$smallerfontsize;
139
138
  mso-bidi-font-size:11.0pt;
140
139
  font-family:$bodyfont;
141
140
  mso-fareast-font-family:$bodyfont;
142
141
  mso-bidi-font-family:$bodyfont;
143
142
  mso-ansi-language:EN-GB;}
143
+ p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
144
+ font-size:$smallerfontsize;
145
+ font-family:$bodyfont;
146
+ }
144
147
  p.ANNEX, li.ANNEX, div.ANNEX
145
148
  {mso-style-name:ANNEX;
146
149
  mso-style-priority:10;
@@ -472,11 +475,13 @@ p.Quote, li.Quote, div.Quote
472
475
  line-height:12.0pt;
473
476
  mso-pagination:widow-orphan;
474
477
  tab-stops:20.15pt;
475
- font-size:$normalfontsize;
476
- font-family:$bodyfont;
477
478
  mso-fareast-font-family:$bodyfont;
478
479
  mso-bidi-font-family:$bodyfont;
479
480
  mso-ansi-language:EN-GB;}
481
+ p.Quote, li.Quote {
482
+ font-size:$normalfontsize;
483
+ font-family:$bodyfont;
484
+ }
480
485
  p.QuoteAttribution
481
486
  {text-align:right;
482
487
  mso-style-priority:99;
@@ -506,8 +511,6 @@ p.Admonition, li.Admonition, div.Admonition
506
511
  mso-border-themecolor:accent1;
507
512
  padding:0cm;
508
513
  mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
509
- font-size:12.0pt;
510
- font-family:$bodyfont;
511
514
  mso-ascii-font-family:$bodyfont;
512
515
  mso-ascii-theme-font:minor-latin;
513
516
  mso-fareast-font-family:$bodyfont;
@@ -519,6 +522,10 @@ p.Admonition, li.Admonition, div.Admonition
519
522
  color:#4472C4;
520
523
  mso-themecolor:accent1;
521
524
  mso-ansi-language:EN-AU;
525
+ }
526
+ p.Admonition, li.Admonition {
527
+ font-size:12.0pt;
528
+ font-family:$bodyfont;
522
529
  font-style:italic;}
523
530
  p.Code, li.Code, div.Code
524
531
  {mso-style-name:Code;
@@ -722,6 +729,8 @@ margin-left: -36.0pt;
722
729
  p.example, li.example, td.example {
723
730
  margin-right: 0pt;
724
731
  margin-left: 0pt;
732
+ font-size:$smallerfontsize;
733
+ font-family:$bodyfont;
725
734
  }
726
735
 
727
736
  div.example {
@@ -733,8 +742,7 @@ div.example {
733
742
 
734
743
  p.example, li.example, div.example, td.example {
735
744
  mso-pagination:none;
736
- font-size:$smallerfontsize;
737
- font-family:$bodyfont;}
745
+ }
738
746
 
739
747
  td.example p.MsoListParagraph {
740
748
  font-size: $smallerfontsize;
data/lib/isodoc/cc/html/htmlstyle.css CHANGED
@@ -904,6 +904,12 @@ pre {
904
904
  font-size: 1em;
905
905
  text-align: center; }
906
906
 
907
+ .ListTitle {
908
+ font-weight: 700;
909
+ font-size: 1em;
910
+ text-align: center;
911
+ text-align: left; }
912
+
907
913
  .Note, .Admonition {
908
914
  color: #47430c;
909
915
  padding: 0.25em;
data/lib/isodoc/cc/html/htmlstyle.scss CHANGED
@@ -251,6 +251,7 @@ pre {
251
251
  @include recommendationBlock();
252
252
  }
253
253
 
254
+ @include listBlock();
254
255
 
255
256
  .Note, .Admonition {
256
257
  color: #47430c;
data/lib/isodoc/cc/presentation_xml_convert.rb CHANGED
@@ -5,16 +5,15 @@ require "isodoc"
5
5
  module IsoDoc
6
6
  module CC
7
7
  class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
8
- def annex1(f)
9
- lbl = @xrefs.anchor(f['id'], :label)
10
- if t = f.at(ns("./title"))
8
+ def annex1(elem)
9
+ lbl = @xrefs.anchor(elem["id"], :label)
10
+ if t = elem.at(ns("./title"))
11
11
  t.children = "<strong>#{t.children.to_xml}</strong>"
12
12
  end
13
- prefix_name(f, "<br/>", lbl, "title")
13
+ prefix_name(elem, "<br/>", lbl, "title")
14
14
  end
15
15
 
16
16
  include Init
17
17
  end
18
18
  end
19
19
  end
20
-
data/lib/metanorma/cc/biblio.rng CHANGED
@@ -614,12 +614,103 @@
614
614
  <optional>
615
615
  <ref name="fetched"/>
616
616
  </optional>
617
- <choice>
618
- <oneOrMore>
619
- <ref name="btitle"/>
620
- </oneOrMore>
617
+ <optional>
621
618
  <ref name="formattedref"/>
622
- </choice>
619
+ </optional>
620
+ <oneOrMore>
621
+ <ref name="btitle"/>
622
+ </oneOrMore>
623
+ <zeroOrMore>
624
+ <ref name="bsource"/>
625
+ </zeroOrMore>
626
+ <oneOrMore>
627
+ <ref name="docidentifier"/>
628
+ </oneOrMore>
629
+ <optional>
630
+ <ref name="docnumber"/>
631
+ </optional>
632
+ <zeroOrMore>
633
+ <ref name="bdate"/>
634
+ </zeroOrMore>
635
+ <zeroOrMore>
636
+ <ref name="contributor"/>
637
+ </zeroOrMore>
638
+ <optional>
639
+ <ref name="edition"/>
640
+ </optional>
641
+ <zeroOrMore>
642
+ <ref name="version"/>
643
+ </zeroOrMore>
644
+ <zeroOrMore>
645
+ <ref name="biblionote"/>
646
+ </zeroOrMore>
647
+ <zeroOrMore>
648
+ <ref name="language"/>
649
+ </zeroOrMore>
650
+ <zeroOrMore>
651
+ <ref name="script"/>
652
+ </zeroOrMore>
653
+ <zeroOrMore>
654
+ <ref name="bibabstract"/>
655
+ </zeroOrMore>
656
+ <optional>
657
+ <ref name="status"/>
658
+ </optional>
659
+ <zeroOrMore>
660
+ <ref name="copyright"/>
661
+ </zeroOrMore>
662
+ <zeroOrMore>
663
+ <ref name="docrelation"/>
664
+ </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="series"/>
667
+ </zeroOrMore>
668
+ <optional>
669
+ <ref name="medium"/>
670
+ </optional>
671
+ <zeroOrMore>
672
+ <ref name="bplace"/>
673
+ </zeroOrMore>
674
+ <zeroOrMore>
675
+ <ref name="bprice"/>
676
+ </zeroOrMore>
677
+ <zeroOrMore>
678
+ <ref name="extent"/>
679
+ </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
683
+ <zeroOrMore>
684
+ <ref name="accesslocation"/>
685
+ </zeroOrMore>
686
+ <zeroOrMore>
687
+ <ref name="license"/>
688
+ </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="bclassification"/>
691
+ </zeroOrMore>
692
+ <zeroOrMore>
693
+ <ref name="bkeyword"/>
694
+ </zeroOrMore>
695
+ <optional>
696
+ <ref name="validity"/>
697
+ </optional>
698
+ </define>
699
+ <define name="ReducedBibliographicItem">
700
+ <optional>
701
+ <attribute name="type">
702
+ <ref name="BibItemType"/>
703
+ </attribute>
704
+ </optional>
705
+ <optional>
706
+ <ref name="fetched"/>
707
+ </optional>
708
+ <optional>
709
+ <ref name="formattedref"/>
710
+ </optional>
711
+ <zeroOrMore>
712
+ <ref name="btitle"/>
713
+ </zeroOrMore>
623
714
  <zeroOrMore>
624
715
  <ref name="bsource"/>
625
716
  </zeroOrMore>
@@ -638,9 +729,9 @@
638
729
  <optional>
639
730
  <ref name="edition"/>
640
731
  </optional>
641
- <optional>
732
+ <zeroOrMore>
642
733
  <ref name="version"/>
643
- </optional>
734
+ </zeroOrMore>
644
735
  <zeroOrMore>
645
736
  <ref name="biblionote"/>
646
737
  </zeroOrMore>
@@ -833,6 +924,12 @@
833
924
  <data type="boolean"/>
834
925
  </attribute>
835
926
  </optional>
927
+ <optional>
928
+ <attribute name="language"/>
929
+ </optional>
930
+ <optional>
931
+ <attribute name="script"/>
932
+ </optional>
836
933
  <text/>
837
934
  </element>
838
935
  </define>
@@ -986,36 +1083,34 @@
986
1083
  <ref name="SeriesType"/>
987
1084
  </attribute>
988
1085
  </optional>
989
- <choice>
1086
+ <optional>
990
1087
  <ref name="formattedref"/>
991
- <group>
992
- <ref name="btitle"/>
993
- <optional>
994
- <ref name="bplace"/>
995
- </optional>
996
- <optional>
997
- <ref name="seriesorganization"/>
998
- </optional>
999
- <optional>
1000
- <ref name="abbreviation"/>
1001
- </optional>
1002
- <optional>
1003
- <ref name="seriesfrom"/>
1004
- </optional>
1005
- <optional>
1006
- <ref name="seriesto"/>
1007
- </optional>
1008
- <optional>
1009
- <ref name="seriesnumber"/>
1010
- </optional>
1011
- <optional>
1012
- <ref name="seriespartnumber"/>
1013
- </optional>
1014
- <optional>
1015
- <ref name="seriesrun"/>
1016
- </optional>
1017
- </group>
1018
- </choice>
1088
+ </optional>
1089
+ <ref name="btitle"/>
1090
+ <optional>
1091
+ <ref name="bplace"/>
1092
+ </optional>
1093
+ <optional>
1094
+ <ref name="seriesorganization"/>
1095
+ </optional>
1096
+ <optional>
1097
+ <ref name="abbreviation"/>
1098
+ </optional>
1099
+ <optional>
1100
+ <ref name="seriesfrom"/>
1101
+ </optional>
1102
+ <optional>
1103
+ <ref name="seriesto"/>
1104
+ </optional>
1105
+ <optional>
1106
+ <ref name="seriesnumber"/>
1107
+ </optional>
1108
+ <optional>
1109
+ <ref name="seriespartnumber"/>
1110
+ </optional>
1111
+ <optional>
1112
+ <ref name="seriesrun"/>
1113
+ </optional>
1019
1114
  </element>
1020
1115
  </define>
1021
1116
  <define name="SeriesType">
@@ -1174,7 +1269,7 @@
1174
1269
  </element>
1175
1270
  </optional>
1176
1271
  <element name="bibitem">
1177
- <ref name="BibliographicItem"/>
1272
+ <ref name="ReducedBibliographicItem"/>
1178
1273
  </element>
1179
1274
  <choice>
1180
1275
  <zeroOrMore>
@@ -1199,9 +1294,9 @@
1199
1294
  <optional>
1200
1295
  <ref name="revision-date"/>
1201
1296
  </optional>
1202
- <zeroOrMore>
1297
+ <optional>
1203
1298
  <ref name="draft"/>
1204
- </zeroOrMore>
1299
+ </optional>
1205
1300
  </element>
1206
1301
  </define>
1207
1302
  <define name="vedition">
data/lib/metanorma/cc/isodoc.rng CHANGED
@@ -69,6 +69,17 @@
69
69
  </zeroOrMore>
70
70
  </element>
71
71
  </define>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
72
83
  <define name="index">
73
84
  <element name="index">
74
85
  <optional>
@@ -116,6 +127,11 @@
116
127
  <data type="boolean"/>
117
128
  </attribute>
118
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
119
135
  <ref name="BibliographicItem"/>
120
136
  </element>
121
137
  </define>
@@ -282,6 +298,9 @@
282
298
  <ref name="MultilingualRenderingType"/>
283
299
  </attribute>
284
300
  </optional>
301
+ <optional>
302
+ <ref name="tname"/>
303
+ </optional>
285
304
  <oneOrMore>
286
305
  <ref name="ul_li"/>
287
306
  </oneOrMore>
@@ -324,6 +343,9 @@
324
343
  </choice>
325
344
  </attribute>
326
345
  </optional>
346
+ <optional>
347
+ <ref name="tname"/>
348
+ </optional>
327
349
  <oneOrMore>
328
350
  <ref name="li"/>
329
351
  </oneOrMore>
@@ -360,6 +382,9 @@
360
382
  <ref name="MultilingualRenderingType"/>
361
383
  </attribute>
362
384
  </optional>
385
+ <optional>
386
+ <ref name="tname"/>
387
+ </optional>
363
388
  <oneOrMore>
364
389
  <ref name="dt"/>
365
390
  <ref name="dd"/>
@@ -694,6 +719,9 @@
694
719
  <optional>
695
720
  <attribute name="tag"/>
696
721
  </optional>
722
+ <optional>
723
+ <attribute name="type"/>
724
+ </optional>
697
725
  <optional>
698
726
  <attribute name="multilingual-rendering">
699
727
  <ref name="MultilingualRenderingType"/>
@@ -729,6 +757,9 @@
729
757
  <optional>
730
758
  <attribute name="tag"/>
731
759
  </optional>
760
+ <optional>
761
+ <attribute name="type"/>
762
+ </optional>
732
763
  <optional>
733
764
  <attribute name="multilingual-rendering">
734
765
  <ref name="MultilingualRenderingType"/>
@@ -2050,6 +2081,7 @@
2050
2081
  <value>compare</value>
2051
2082
  <value>contrast</value>
2052
2083
  <value>see</value>
2084
+ <value>seealso</value>
2053
2085
  </choice>
2054
2086
  </define>
2055
2087
  <define name="deprecates">
data/lib/metanorma/cc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module CC
3
- VERSION = "2.1.1".freeze
3
+ VERSION = "2.1.4".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-cc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.1
4
+ version: 2.1.4
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-05-16 00:00:00.000000000 Z
11
+ date: 2022-07-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -188,8 +188,6 @@ files:
188
188
  - bin/console
189
189
  - bin/rspec
190
190
  - bin/setup
191
- - docs/navigation.adoc
192
- - docs/quickstart.adoc
193
191
  - lib/isodoc/cc/base_convert.rb
194
192
  - lib/isodoc/cc/cc.standard.xsl
195
193
  - lib/isodoc/cc/html/_coverpage.css
@@ -250,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
250
248
  - !ruby/object:Gem::Version
251
249
  version: '0'
252
250
  requirements: []
253
- rubygems_version: 3.3.9
251
+ rubygems_version: 3.3.16
254
252
  signing_key:
255
253
  specification_version: 4
256
254
  summary: metanorma-cc lets you write CalConnect standards in AsciiDoc.
data/docs/navigation.adoc DELETED
@@ -1,8 +0,0 @@
1
- ---
2
- items:
3
- - title: Introduction
4
- items:
5
- - { title: Quickstart, path: quickstart/ }
6
- ---
7
-
8
- = Navigation