asciidoctor-gb 0.3.4 → 0.3.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/gb/isodoc.rng +43 -25
  3. data/lib/asciidoctor/gb/isostandard.rng +8 -8
  4. data/lib/asciidoctor/gb/section_input.rb +1 -1
  5. data/lib/asciidoctor/gb/validate.rb +2 -2
  6. data/lib/asciidoctor/gb/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a27bbb1d084ffa183532aa1bca44b2e8b0e749821f0b10af1805820cb3704d0a
4
- data.tar.gz: 2bd6177218a0ba3968d6ef53d55d0caca3bf114f33cc782f0208586d37f30e99
3
+ metadata.gz: e9213a1bd7d6f3ee41636366ddf0d10eb4e062d54a576e5f4759d4e85941e21e
4
+ data.tar.gz: 27bf85a798034864204eb6cb4cf5b1ae1ff89a01d1dd9152fdb2a6081e73e70c
5
5
  SHA512:
6
- metadata.gz: 1a30114bd166879703086331bfc2e255e783cef6298a70dec943f8b796694e319a53c0dacfabbeb5c1f2b2dd4cd1eb3aa373d748acd5e34acaa58f702677fe30
7
- data.tar.gz: bc416feab8820719d17216872cd9152b6cf80bc748532e6a14369149ceb39e21a791884b8f1bd95e3a676966b45cf5be075a2383cc97882c8e20bffa2214a491
6
+ metadata.gz: 76443a422963f885da61d8266753d17ce8e6176ae38e051d375c4d2282d44c53a231298f732e97d3593e197db881ccef543cd08e1aaf0780a6b39aca354c0a43
7
+ data.tar.gz: eb97aeb9db37f6692e6ca3a6fea18e653728930fa801f41814e8000b7a2b4d65d00975685f97f526eabf1f1a8c074fcb16ba6fbcb2e21f1477d05ef3e7293910
data/lib/asciidoctor/gb/isodoc.rng CHANGED
@@ -18,7 +18,21 @@
18
18
  of this.
19
19
  -->
20
20
  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
21
- <include href="biblio.rng"/>
21
+ <include href="biblio.rng">
22
+ <define name="status">
23
+ <element name="status">
24
+ <choice>
25
+ <value>proposal</value>
26
+ <value>working_draft</value>
27
+ <value>committee_draft</value>
28
+ <value>draft_standard</value>
29
+ <value>final_draft</value>
30
+ <value>published</value>
31
+ <value>withdrawn</value>
32
+ </choice>
33
+ </element>
34
+ </define>
35
+ </include>
22
36
  <start>
23
37
  <ref name="standard-document"/>
24
38
  </start>
@@ -28,9 +42,10 @@
28
42
  <optional>
29
43
  <ref name="version"/>
30
44
  </optional>
31
- <oneOrMore>
32
- <ref name="sections"/>
33
- </oneOrMore>
45
+ <optional>
46
+ <ref name="preface"/>
47
+ </optional>
48
+ <ref name="sections"/>
34
49
  <zeroOrMore>
35
50
  <ref name="annex"/>
36
51
  </zeroOrMore>
@@ -44,11 +59,6 @@
44
59
  <ref name="BibData"/>
45
60
  </element>
46
61
  </define>
47
- <define name="status">
48
- <element name="status">
49
- <ref name="FormattedString"/>
50
- </element>
51
- </define>
52
62
  <define name="version">
53
63
  <element name="version">
54
64
  <optional>
@@ -77,6 +87,13 @@
77
87
  <text/>
78
88
  </element>
79
89
  </define>
90
+ <define name="preface">
91
+ <element name="preface">
92
+ <oneOrMore>
93
+ <ref name="content"/>
94
+ </oneOrMore>
95
+ </element>
96
+ </define>
80
97
  <define name="sections">
81
98
  <element name="sections">
82
99
  <oneOrMore>
@@ -104,7 +121,9 @@
104
121
  </define>
105
122
  <define name="section-title">
106
123
  <element name="title">
107
- <text/>
124
+ <zeroOrMore>
125
+ <ref name="TextElement"/>
126
+ </zeroOrMore>
108
127
  </element>
109
128
  </define>
110
129
  <define name="content">
@@ -324,7 +343,7 @@
324
343
  <attribute name="id">
325
344
  <data type="ID"/>
326
345
  </attribute>
327
- <ref name="BasicBlock"/>
346
+ <ref name="paragraph"/>
328
347
  </element>
329
348
  </define>
330
349
  <define name="termsource">
@@ -423,7 +442,7 @@
423
442
  <data type="ID"/>
424
443
  </attribute>
425
444
  <oneOrMore>
426
- <ref name="paragraph-with-footnote"/>
445
+ <ref name="paragraph"/>
427
446
  </oneOrMore>
428
447
  </element>
429
448
  </define>
@@ -690,21 +709,20 @@
690
709
  <ref name="tname"/>
691
710
  </optional>
692
711
  <choice>
693
- <oneOrMore>
712
+ <ref name="image"/>
713
+ <zeroOrMore>
694
714
  <ref name="figure"/>
695
- </oneOrMore>
696
- <group>
697
- <zeroOrMore>
698
- <ref name="TextElement"/>
699
- </zeroOrMore>
700
- <zeroOrMore>
701
- <ref name="note"/>
702
- </zeroOrMore>
703
- <optional>
704
- <ref name="dl"/>
705
- </optional>
706
- </group>
715
+ </zeroOrMore>
707
716
  </choice>
717
+ <zeroOrMore>
718
+ <ref name="fn"/>
719
+ </zeroOrMore>
720
+ <optional>
721
+ <ref name="dl"/>
722
+ </optional>
723
+ <zeroOrMore>
724
+ <ref name="note"/>
725
+ </zeroOrMore>
708
726
  </element>
709
727
  </define>
710
728
  <define name="TextElement">
data/lib/asciidoctor/gb/isostandard.rng CHANGED
@@ -681,6 +681,14 @@
681
681
  <ref name="paragraph"/>
682
682
  </element>
683
683
  </define>
684
+ <define name="preface">
685
+ <element name="preface">
686
+ <ref name="foreword"/>
687
+ <optional>
688
+ <ref name="introduction"/>
689
+ </optional>
690
+ </element>
691
+ </define>
684
692
  </include>
685
693
  <!-- end overrides -->
686
694
  <!--
@@ -706,14 +714,6 @@
706
714
  <ref name="bibliography"/>
707
715
  </element>
708
716
  </define>
709
- <define name="preface">
710
- <element name="preface">
711
- <ref name="foreword"/>
712
- <optional>
713
- <ref name="introduction"/>
714
- </optional>
715
- </element>
716
- </define>
717
717
  <define name="bibliography">
718
718
  <element name="bibliography">
719
719
  <oneOrMore>
data/lib/asciidoctor/gb/section_input.rb CHANGED
@@ -21,7 +21,7 @@ module Asciidoctor
21
21
  end
22
22
 
23
23
  def section(node)
24
- a = { id: Asciidoctor::ISO::Utils::anchor_or_uuid(node) }
24
+ a = { id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node) }
25
25
  noko do |xml|
26
26
  case sectiontype(node)
27
27
  when "引言", "introduction" then
data/lib/asciidoctor/gb/validate.rb CHANGED
@@ -103,9 +103,9 @@ module Asciidoctor
103
103
 
104
104
  def norm_bibitem_style(root)
105
105
  root.xpath(NORM_BIBITEMS).each do |b|
106
- if b.at(Asciidoctor::ISO::Cleanup::ISO_PUBLISHER_XPATH).nil?
106
+ if b.at(Asciidoctor::Standoc::Converter::ISO_PUBLISHER_XPATH).nil?
107
107
  unless /^#{GBCODE}(?![A-Z])/.match? b.at("./docidentifier").text
108
- Asciidoctor::ISO::Utils::warning(b, NORM_ISO_WARN, b.text)
108
+ Asciidoctor::Standoc::Utils::warning(b, NORM_ISO_WARN, b.text)
109
109
  end
110
110
  end
111
111
  end
data/lib/asciidoctor/gb/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Asciidoctor
2
2
  module Gb
3
- VERSION = "0.3.4"
3
+ VERSION = "0.3.5"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asciidoctor-gb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-08-08 00:00:00.000000000 Z
11
+ date: 2018-08-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor-iso