metanorma-gb 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +1 -1
  3. data/lib/asciidoctor/gb/biblio.rng +33 -51
  4. data/lib/asciidoctor/gb/isodoc.rng +6 -1
  5. data/lib/asciidoctor/gb/isostandard.rng +3 -10
  6. data/lib/asciidoctor/gb/section_input.rb +1 -1
  7. data/lib/isodoc/gb/html/gb.scss +36 -0
  8. data/lib/isodoc/gb/html/htmlcompliantstyle.scss +1 -1
  9. data/lib/isodoc/gb/html/htmlstyle.scss +1 -1
  10. data/lib/metanorma/gb/version.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0fa00c3a02c9d6753b8771b41e21597463f2818a51b46d13d06ae363218d7294
4
- data.tar.gz: 8f1e3e91f1ff42b55c486500ae9fd0f607162a7e80b51a4bf6492acdaf7d203a
3
+ metadata.gz: bcfcbd68294d7ee29096d3e154044ce82839b7a5166e769dfc348ed3d3e1cbdd
4
+ data.tar.gz: cfe3e79b23c285fecbe5325f3c9620a8a6b71207dd9f99e7a6737a06b5dd3fb7
5
5
  SHA512:
6
- metadata.gz: d276c1646f6725dee680b78f68ea8cdfbab98e768d75bd8974f84e9541bfa7eef519ae9c01328a9dddf33a0737bcb725cc99a49e3cdc1f36ca7fcb9b072e33c7
7
- data.tar.gz: ce876766862afa463e1b8c145faf10ea78fdd3f7fde03a2b1515519f482ad702b2a2b85c9514ca7c4a9061ef74c9075003bfc11ec6d72f426c6499bd70a055d8
6
+ metadata.gz: 7a528a9350b513dadac7739975ed4133f20dcf33b081abf1e73e7739262c983d238353f5f342afda75571bc5b14cca17308afe5f35e8f92976a5a79b744f5029
7
+ data.tar.gz: 904ee8bcb56e70dacbb543c9834785a1719f2be931618d08e746acaddffa7a13476a88f0d7d82a6b3fc4626da08b3aba935f3a84452ee850853dac2e93fa6d4c
data/README.adoc CHANGED
@@ -7,7 +7,7 @@ image:https://codeclimate.com/github/riboseinc/metanorma-gb/badges/gpa.svg["Code
7
7
  == Functionality
8
8
 
9
9
  This gem generates
10
- https://en.wikipedia.org/wiki/Guobiao_standards[Guibiao standards]
10
+ https://en.wikipedia.org/wiki/Guobiao_standards[Guobiao standards]
11
11
  (Chinese national standards), using AsciiDoc.
12
12
 
13
13
  This gem implements the https://github.com/riboseinc/gbdoc[GbDoc] data model,
data/lib/asciidoctor/gb/biblio.rng CHANGED
@@ -18,6 +18,21 @@
18
18
  of this.
19
19
  -->
20
20
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
21
+ <!--
22
+ https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
23
+ iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
24
+ Somewhat dumbed down for XSD regex:
25
+ -->
26
+ <define name="ISO8601DateTime">
27
+ <data type="string">
28
+ <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+)?)?((:?)[0-5]\d([.,]\d+)?)?([zZ]|([\+\-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?</param>
29
+ </data>
30
+ </define>
31
+ <define name="ISO8601Date">
32
+ <data type="string">
33
+ <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
34
+ </data>
35
+ </define>
21
36
  <define name="status">
22
37
  <element name="status">
23
38
  <ref name="LocalizedString"/>
@@ -375,10 +390,7 @@
375
390
  </define>
376
391
  <define name="date">
377
392
  <element name="date">
378
- <choice>
379
- <data type="gYear"/>
380
- <data type="date"/>
381
- </choice>
393
+ <ref name="ISO8601Date"/>
382
394
  </element>
383
395
  </define>
384
396
  <define name="locality">
@@ -561,10 +573,7 @@
561
573
  </define>
562
574
  <define name="fetched">
563
575
  <element name="fetched">
564
- <choice>
565
- <data type="dateTime"/>
566
- <data type="date"/>
567
- </choice>
576
+ <ref name="ISO8601DateTime"/>
568
577
  </element>
569
578
  </define>
570
579
  <define name="validity">
@@ -582,26 +591,17 @@
582
591
  </define>
583
592
  <define name="validityBegins">
584
593
  <element name="validityBegins">
585
- <choice>
586
- <data type="dateTime"/>
587
- <data type="date"/>
588
- </choice>
594
+ <ref name="ISO8601DateTime"/>
589
595
  </element>
590
596
  </define>
591
597
  <define name="validityEnds">
592
598
  <element name="validityEnds">
593
- <choice>
594
- <data type="dateTime"/>
595
- <data type="date"/>
596
- </choice>
599
+ <ref name="ISO8601DateTime"/>
597
600
  </element>
598
601
  </define>
599
602
  <define name="validityRevision">
600
603
  <element name="revision">
601
- <choice>
602
- <data type="dateTime"/>
603
- <data type="date"/>
604
- </choice>
604
+ <ref name="ISO8601DateTime"/>
605
605
  </element>
606
606
  </define>
607
607
  <define name="TypedTitleString">
@@ -632,10 +632,7 @@
632
632
  <attribute name="text"/>
633
633
  </optional>
634
634
  <optional>
635
- <choice>
636
- <data type="gYear"/>
637
- <data type="date"/>
638
- </choice>
635
+ <ref name="ISO8601Date"/>
639
636
  </optional>
640
637
  </define>
641
638
  <define name="bdate">
@@ -660,25 +657,16 @@
660
657
  <choice>
661
658
  <group>
662
659
  <element name="from">
663
- <choice>
664
- <data type="gYear"/>
665
- <data type="date"/>
666
- </choice>
660
+ <ref name="ISO8601Date"/>
667
661
  </element>
668
662
  <optional>
669
663
  <element name="to">
670
- <choice>
671
- <data type="gYear"/>
672
- <data type="date"/>
673
- </choice>
664
+ <ref name="ISO8601Date"/>
674
665
  </element>
675
666
  </optional>
676
667
  </group>
677
668
  <element name="on">
678
- <choice>
679
- <data type="gYear"/>
680
- <data type="date"/>
681
- </choice>
669
+ <ref name="ISO8601Date"/>
682
670
  </element>
683
671
  </choice>
684
672
  </element>
@@ -791,20 +779,12 @@
791
779
  </define>
792
780
  <define name="seriesfrom">
793
781
  <element name="from">
794
- <choice>
795
- <data type="dateTime"/>
796
- <data type="date"/>
797
- <data type="gYear"/>
798
- </choice>
782
+ <ref name="ISO8601Date"/>
799
783
  </element>
800
784
  </define>
801
785
  <define name="seriesto">
802
786
  <element name="to">
803
- <choice>
804
- <data type="dateTime"/>
805
- <data type="date"/>
806
- <data type="gYear"/>
807
- </choice>
787
+ <ref name="ISO8601Date"/>
808
788
  </element>
809
789
  </define>
810
790
  <define name="seriesnumber">
@@ -899,7 +879,7 @@
899
879
  </define>
900
880
  <define name="revision-date">
901
881
  <element name="revision-date">
902
- <data type="date"/>
882
+ <ref name="ISO8601Date"/>
903
883
  </element>
904
884
  </define>
905
885
  <define name="draft">
@@ -922,10 +902,12 @@
922
902
  <define name="AnyElement">
923
903
  <element>
924
904
  <anyName/>
925
- <choice>
926
- <text/>
927
- <ref name="AnyElement"/>
928
- </choice>
905
+ <oneOrMore>
906
+ <choice>
907
+ <text/>
908
+ <ref name="AnyElement"/>
909
+ </choice>
910
+ </oneOrMore>
929
911
  </element>
930
912
  </define>
931
913
  </grammar>
data/lib/asciidoctor/gb/isodoc.rng CHANGED
@@ -927,7 +927,12 @@
927
927
  <value>AsciiMath</value>
928
928
  </choice>
929
929
  </attribute>
930
- <text/>
930
+ <oneOrMore>
931
+ <choice>
932
+ <text/>
933
+ <ref name="AnyElement"/>
934
+ </choice>
935
+ </oneOrMore>
931
936
  </element>
932
937
  </define>
933
938
  <define name="annotation">
data/lib/asciidoctor/gb/isostandard.rng CHANGED
@@ -250,24 +250,17 @@
250
250
  <choice>
251
251
  <group>
252
252
  <element name="from">
253
- <choice>
254
- <data type="gYear"/>
255
- <data type="date"/>
256
- </choice>
253
+ <ref name="ISO8601Date"/>
257
254
  </element>
258
255
  <optional>
259
256
  <element name="to">
260
- <choice>
261
- <data type="gYear"/>
262
- <data type="date"/>
263
- </choice>
257
+ <ref name="ISO8601Date"/>
264
258
  </element>
265
259
  </optional>
266
260
  </group>
267
261
  <element name="on">
268
262
  <choice>
269
- <data type="gYear"/>
270
- <data type="date"/>
263
+ <ref name="ISO8601Date"/>
271
264
  <value>--</value>
272
265
  </choice>
273
266
  </element>
data/lib/asciidoctor/gb/section_input.rb CHANGED
@@ -49,7 +49,7 @@ module Asciidoctor
49
49
  else
50
50
  if @term_def then term_def_subclause_parse(a, xml, node)
51
51
  elsif @biblio then bibliography_parse(a, xml, node)
52
- elsif node.attr("style") == "bibliography" && node.level == 1
52
+ elsif node.attr("style") == "bibliography"
53
53
  bibliography_parse(a, xml, node)
54
54
  elsif node.attr("style") == "appendix" && node.level == 1
55
55
  annex_parse(a, xml, node)
data/lib/isodoc/gb/html/gb.scss CHANGED
@@ -50,6 +50,42 @@ p.FigureTitle
50
50
  mso-fareast-font-family:$headerfont;
51
51
  mso-bidi-font-family:$headerfont;
52
52
  mso-ansi-language:EN-GB;}
53
+ p.SourceTitle
54
+ {mso-style-unhide:no;
55
+ mso-style-qformat:yes;
56
+ mso-style-parent:"";
57
+ margin-top:0cm;
58
+ margin-right:0cm;
59
+ margin-bottom:12.0pt;
60
+ margin-left:0cm;
61
+ text-align:center;
62
+ line-height:12.0pt;
63
+ page-break-before:avoid;
64
+ mso-pagination:widow-orphan;
65
+ tab-stops:20.15pt;
66
+ font-size:10.5pt;
67
+ font-family:$headerfont;
68
+ mso-fareast-font-family:$headerfont;
69
+ mso-bidi-font-family:$headerfont;
70
+ mso-ansi-language:EN-GB;}
71
+ p.AdmonitionTitle
72
+ {mso-style-unhide:no;
73
+ mso-style-qformat:yes;
74
+ mso-style-parent:"";
75
+ margin-top:0cm;
76
+ margin-right:0cm;
77
+ margin-bottom:12.0pt;
78
+ margin-left:0cm;
79
+ text-align:center;
80
+ line-height:12.0pt;
81
+ page-break-after:avoid;
82
+ mso-pagination:widow-orphan;
83
+ tab-stops:20.15pt;
84
+ font-size:10.5pt;
85
+ font-family:$headerfont;
86
+ mso-fareast-font-family:$headerfont;
87
+ mso-bidi-font-family:$headerfont;
88
+ mso-ansi-language:EN-GB;}
53
89
  p.TableTitle
54
90
  {mso-style-unhide:no;
55
91
  mso-style-qformat:yes;
data/lib/isodoc/gb/html/htmlcompliantstyle.scss CHANGED
@@ -1038,7 +1038,7 @@ margin: 2em 0 1em 0;
1038
1038
  overflow: auto;
1039
1039
  }
1040
1040
 
1041
- .figure-title, .FigureTitle {
1041
+ .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle {
1042
1042
  font-weight: 700;
1043
1043
  font-size: 1em;
1044
1044
  text-align: center;
data/lib/isodoc/gb/html/htmlstyle.scss CHANGED
@@ -834,7 +834,7 @@ margin: 2em 0 1em 0;
834
834
  overflow: auto;
835
835
  }
836
836
 
837
- .figure-title, .FigureTitle {
837
+ .figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle {
838
838
  font-weight: 700;
839
839
  font-size: 1em;
840
840
  text-align: center;
data/lib/metanorma/gb/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Gb
3
- VERSION = "1.1.1"
3
+ VERSION = "1.1.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-gb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-01-31 00:00:00.000000000 Z
11
+ date: 2019-02-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso