asciidoctor-gb 0.3.1 → 0.3.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a3e9ad8796eb1e2a3ffe4403f9d6b4b936b06bd831796ab37d8286b7e2f94607
4
- data.tar.gz: 5dd921064ac73351c6650ad15b4ff5e49c716935e2e14d8243f10c05dbdc7169
3
+ metadata.gz: 2f95843bd4c0dc4eea97ff106631da38431667b93a7abfb58728fe968c4b5006
4
+ data.tar.gz: faac2fff0908ebc6e4406ddb1f7cb60a7aef34c800757b8cceeb061e58fbab2a
5
5
  SHA512:
6
- metadata.gz: 8c2afec17c99a8dad6e68837d20504b17ff62348853bf23c3c08d3954c7bd288049df0911ce98fd0efb36953c0f1fcf66305edb8c25e12d557b3c69741239bdb
7
- data.tar.gz: c2bc4e33529e45741d06a98ce7cd34550cf82a79b86d848c5f33b9a6d34712ca681f535b2819be310ba5f5b7346f86d6195b906f2c40d1e2a3b3ec6dae6b79ce
6
+ metadata.gz: bf33482865dd9fb29d0eb62b636126e1b82b336ac277d952dd291a6ef2e4a0da476f797a447d04a587822662c3051832de1006b9b6d2959d6004b2149e142791
7
+ data.tar.gz: 002b9ee560f3c75feb82975058d40a1bb05a5d7f117c7b4ae49c84f886f40714631e122c22ee66d70e4bcc1f787157cd6194deb38d94d4acd37048a17ae9d749
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- asciidoctor-gb (0.3.0)
4
+ asciidoctor-gb (0.3.1)
5
5
  asciidoctor-iso (>= 0.9.0)
6
6
  gbbib
7
7
  isodoc (>= 0.8.0)
@@ -14,7 +14,7 @@ GEM
14
14
  httpclient (~> 2.8, >= 2.8.3)
15
15
  json (>= 1.5.1)
16
16
  asciidoctor (1.5.7.1)
17
- asciidoctor-csand (0.3.0)
17
+ asciidoctor-csand (0.3.1)
18
18
  asciidoctor (~> 1.5.7)
19
19
  asciidoctor-iso (>= 0.9.0)
20
20
  asciimath
@@ -27,16 +27,16 @@ GEM
27
27
  ruby-xslt
28
28
  thread_safe
29
29
  uuidtools
30
- asciidoctor-csd (0.4.0)
30
+ asciidoctor-csd (0.4.1)
31
31
  asciidoctor-iso (>= 0.9.0)
32
32
  isodoc (>= 0.8.0)
33
- asciidoctor-iso (0.9.1)
33
+ asciidoctor-iso (0.9.3)
34
34
  asciidoctor (~> 1.5.7)
35
35
  iso-bib-item (~> 0.1.6)
36
- isobib (~> 0.1.6)
36
+ isobib (~> 0.1.8)
37
37
  isodoc (>= 0.8)
38
38
  ruby-jing
39
- asciidoctor-m3d (0.3.1)
39
+ asciidoctor-m3d (0.3.2)
40
40
  asciidoctor (~> 1.5.7)
41
41
  asciidoctor-iso (>= 0.9.0)
42
42
  asciimath
@@ -111,14 +111,14 @@ GEM
111
111
  htmlentities (4.3.4)
112
112
  httpclient (2.8.3)
113
113
  image_size (2.0.0)
114
- iso-bib-item (0.1.8)
114
+ iso-bib-item (0.1.10)
115
115
  duplicate
116
116
  isoics (~> 0.1.6)
117
117
  nokogiri
118
- isobib (0.1.7)
118
+ isobib (0.1.9)
119
119
  algoliasearch
120
- iso-bib-item (~> 0.1.2)
121
- isodoc (0.8)
120
+ iso-bib-item (~> 0.1.10)
121
+ isodoc (0.8.1)
122
122
  asciimath
123
123
  html2doc (>= 0.7.1)
124
124
  htmlentities (~> 4.3.4)
@@ -140,7 +140,7 @@ GEM
140
140
  rb-inotify (~> 0.9, >= 0.9.7)
141
141
  ruby_dep (~> 1.2)
142
142
  lumberjack (1.0.13)
143
- metanorma (0.2.3)
143
+ metanorma (0.2.4)
144
144
  asciidoctor-csand (>= 0.3.0)
145
145
  asciidoctor-csd (>= 0.4.0)
146
146
  asciidoctor-gb (>= 0.3.0)
@@ -37,7 +37,7 @@
37
37
  <define name="edition">
38
38
  <a:documentation>ISO-15924: Latn</a:documentation>
39
39
  <element name="edition">
40
- <data type="int"/>
40
+ <text/>
41
41
  </element>
42
42
  </define>
43
43
  <define name="LocalizedString">
@@ -102,9 +102,12 @@
102
102
  <attribute name="type">
103
103
  <choice>
104
104
  <value>author</value>
105
- <value>edition</value>
105
+ <value>performer</value>
106
106
  <value>publisher</value>
107
- <text/>
107
+ <value>editor</value>
108
+ <value>adapter</value>
109
+ <value>translator</value>
110
+ <value>distributor</value>
108
111
  </choice>
109
112
  </attribute>
110
113
  </optional>
@@ -145,18 +148,26 @@
145
148
  </define>
146
149
  <define name="fullname">
147
150
  <element name="name">
151
+ <choice>
152
+ <group>
153
+ <zeroOrMore>
154
+ <ref name="prefix"/>
155
+ </zeroOrMore>
156
+ <zeroOrMore>
157
+ <ref name="forename"/>
158
+ </zeroOrMore>
159
+ <zeroOrMore>
160
+ <ref name="initial"/>
161
+ </zeroOrMore>
162
+ <ref name="surname"/>
163
+ <zeroOrMore>
164
+ <ref name="addition"/>
165
+ </zeroOrMore>
166
+ </group>
167
+ <ref name="completeName"/>
168
+ </choice>
148
169
  <zeroOrMore>
149
- <ref name="prefix"/>
150
- </zeroOrMore>
151
- <zeroOrMore>
152
- <ref name="forename"/>
153
- </zeroOrMore>
154
- <zeroOrMore>
155
- <ref name="initial"/>
156
- </zeroOrMore>
157
- <ref name="surname"/>
158
- <zeroOrMore>
159
- <ref name="addition"/>
170
+ <ref name="biblionote"/>
160
171
  </zeroOrMore>
161
172
  </element>
162
173
  </define>
@@ -185,6 +196,11 @@
185
196
  <ref name="LocalizedString"/>
186
197
  </element>
187
198
  </define>
199
+ <define name="completeName">
200
+ <element name="completename">
201
+ <ref name="LocalizedString"/>
202
+ </element>
203
+ </define>
188
204
  <define name="affiliation">
189
205
  <element name="affiliation">
190
206
  <optional>
@@ -209,6 +225,9 @@
209
225
  <define name="organization">
210
226
  <element name="organization">
211
227
  <ref name="orgname"/>
228
+ <optional>
229
+ <ref name="subdivision"/>
230
+ </optional>
212
231
  <optional>
213
232
  <ref name="abbreviation"/>
214
233
  </optional>
@@ -228,6 +247,11 @@
228
247
  <ref name="LocalizedString"/>
229
248
  </element>
230
249
  </define>
250
+ <define name="subdivision">
251
+ <element name="subdivision">
252
+ <ref name="LocalizedString"/>
253
+ </element>
254
+ </define>
231
255
  <define name="abbreviation">
232
256
  <element name="abbreviation">
233
257
  <ref name="LocalizedString"/>
@@ -346,19 +370,21 @@
346
370
  </define>
347
371
  <define name="locality">
348
372
  <element name="locality">
349
- <!-- attribute type { ( "section" | "clause" | "part" | "paragraph" | "chapter" | "page" | "whole" | "table" | "annex" | "figure" | "note" | "example" | ("locality:", text) ) }, -->
350
- <attribute name="type">
351
- <ref name="LocalityType"/>
352
- </attribute>
353
- <ref name="referenceFrom"/>
354
- <optional>
355
- <ref name="referenceTo"/>
356
- </optional>
373
+ <ref name="BibItemLocality"/>
357
374
  </element>
358
375
  </define>
376
+ <define name="BibItemLocality">
377
+ <attribute name="type">
378
+ <ref name="LocalityType"/>
379
+ </attribute>
380
+ <ref name="referenceFrom"/>
381
+ <optional>
382
+ <ref name="referenceTo"/>
383
+ </optional>
384
+ </define>
359
385
  <define name="LocalityType">
360
386
  <data type="string">
361
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|locality:[a-zA-Z0-9_]+</param>
387
+ <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
362
388
  </data>
363
389
  </define>
364
390
  <define name="referenceFrom">
@@ -398,6 +424,18 @@
398
424
  <value>techreport</value>
399
425
  <value>standard</value>
400
426
  <value>unpublished</value>
427
+ <value>map</value>
428
+ <value>electronic resource</value>
429
+ <value>audiovisual</value>
430
+ <value>film</value>
431
+ <value>video</value>
432
+ <value>broadcast</value>
433
+ <value>graphic work</value>
434
+ <value>music</value>
435
+ <value>patent</value>
436
+ <value>inbook</value>
437
+ <value>incollection</value>
438
+ <value>inproceedings</value>
401
439
  </choice>
402
440
  </define>
403
441
  <define name="BibliographicItem">
@@ -442,20 +480,41 @@
442
480
  <optional>
443
481
  <ref name="status"/>
444
482
  </optional>
445
- <zeroOrMore>
483
+ <optional>
446
484
  <ref name="copyright"/>
447
- </zeroOrMore>
485
+ </optional>
448
486
  <zeroOrMore>
449
487
  <ref name="docrelation"/>
450
488
  </zeroOrMore>
489
+ <zeroOrMore>
490
+ <ref name="series"/>
491
+ </zeroOrMore>
492
+ <optional>
493
+ <ref name="medium"/>
494
+ </optional>
495
+ <zeroOrMore>
496
+ <ref name="bplace"/>
497
+ </zeroOrMore>
498
+ <zeroOrMore>
499
+ <ref name="extent"/>
500
+ </zeroOrMore>
501
+ <zeroOrMore>
502
+ <ref name="accesslocation"/>
503
+ </zeroOrMore>
504
+ <optional>
505
+ <ref name="bclassification"/>
506
+ </optional>
507
+ <optional>
508
+ <ref name="validity"/>
509
+ </optional>
451
510
  </define>
452
511
  <define name="btitle">
453
512
  <element name="title">
454
- <ref name="FormattedString"/>
513
+ <ref name="TypedTitleString"/>
455
514
  </element>
456
515
  </define>
457
516
  <define name="bsource">
458
- <element name="source">
517
+ <element name="link">
459
518
  <ref name="TypedUri"/>
460
519
  </element>
461
520
  </define>
@@ -469,12 +528,68 @@
469
528
  <ref name="TypedUri"/>
470
529
  </element>
471
530
  </define>
531
+ <define name="validity">
532
+ <element name="validity">
533
+ <optional>
534
+ <ref name="validityBegins"/>
535
+ </optional>
536
+ <optional>
537
+ <ref name="validityEnds"/>
538
+ </optional>
539
+ <optional>
540
+ <ref name="validityRevision"/>
541
+ </optional>
542
+ </element>
543
+ </define>
544
+ <define name="validityBegins">
545
+ <element name="validityBegins">
546
+ <data type="dateTime"/>
547
+ </element>
548
+ </define>
549
+ <define name="validityEnds">
550
+ <element name="validityEnds">
551
+ <data type="dateTime"/>
552
+ </element>
553
+ </define>
554
+ <define name="validityRevision">
555
+ <element name="revision">
556
+ <data type="dateTime"/>
557
+ </element>
558
+ </define>
559
+ <define name="TypedTitleString">
560
+ <optional>
561
+ <attribute name="type">
562
+ <ref name="TitleType"/>
563
+ </attribute>
564
+ </optional>
565
+ <ref name="FormattedString"/>
566
+ </define>
567
+ <define name="TitleType">
568
+ <choice>
569
+ <value>alternative</value>
570
+ <value>original</value>
571
+ <value>unofficial</value>
572
+ <value>subtitle</value>
573
+ <value>main</value>
574
+ </choice>
575
+ </define>
472
576
  <define name="TypedUri">
473
577
  <optional>
474
578
  <attribute name="type"/>
475
579
  </optional>
476
580
  <data type="anyURI"/>
477
581
  </define>
582
+ <define name="DateType">
583
+ <optional>
584
+ <attribute name="text"/>
585
+ </optional>
586
+ <optional>
587
+ <choice>
588
+ <data type="gYear"/>
589
+ <data type="date"/>
590
+ </choice>
591
+ </optional>
592
+ </define>
478
593
  <define name="bdate">
479
594
  <element name="date">
480
595
  <attribute name="type">
@@ -487,9 +602,10 @@
487
602
  <value>confirmed</value>
488
603
  <value>updated</value>
489
604
  <value>issued</value>
605
+ <value>transmitted</value>
606
+ <value>copied</value>
490
607
  </choice>
491
608
  </attribute>
492
- <!-- ( ( bfrom, bto? ) | date_on ) -->
493
609
  <choice>
494
610
  <group>
495
611
  <element name="from">
@@ -516,35 +632,126 @@
516
632
  </choice>
517
633
  </element>
518
634
  </define>
519
- <define name="bfrom">
520
- <element name="from">
635
+ <define name="docidentifier">
636
+ <element name="docidentifier">
637
+ <optional>
638
+ <attribute name="type"/>
639
+ </optional>
640
+ <text/>
641
+ </element>
642
+ </define>
643
+ <define name="bclassification">
644
+ <element name="classification">
645
+ <optional>
646
+ <attribute name="type"/>
647
+ </optional>
648
+ <text/>
649
+ </element>
650
+ </define>
651
+ <define name="bplace">
652
+ <element name="place">
653
+ <text/>
654
+ </element>
655
+ </define>
656
+ <define name="medium">
657
+ <element name="medium">
658
+ <optional>
659
+ <ref name="form"/>
660
+ </optional>
661
+ <optional>
662
+ <ref name="size"/>
663
+ </optional>
664
+ <optional>
665
+ <ref name="scale"/>
666
+ </optional>
667
+ </element>
668
+ </define>
669
+ <define name="form">
670
+ <element name="form">
671
+ <text/>
672
+ </element>
673
+ </define>
674
+ <define name="size">
675
+ <element name="size">
676
+ <text/>
677
+ </element>
678
+ </define>
679
+ <define name="scale">
680
+ <element name="scale">
681
+ <text/>
682
+ </element>
683
+ </define>
684
+ <define name="accesslocation">
685
+ <element name="accesslocation">
686
+ <text/>
687
+ </element>
688
+ </define>
689
+ <define name="extent">
690
+ <element name="extent">
691
+ <ref name="BibItemLocality"/>
692
+ </element>
693
+ </define>
694
+ <define name="series">
695
+ <element name="series">
696
+ <optional>
697
+ <attribute name="type">
698
+ <choice>
699
+ <value>main</value>
700
+ <value>alt</value>
701
+ </choice>
702
+ </attribute>
703
+ </optional>
521
704
  <choice>
522
- <data type="gYear"/>
523
- <data type="date"/>
705
+ <ref name="btitle"/>
706
+ <ref name="formattedref"/>
524
707
  </choice>
708
+ <ref name="bplace"/>
709
+ <ref name="seriesorganization"/>
710
+ <optional>
711
+ <ref name="abbreviation"/>
712
+ </optional>
713
+ <optional>
714
+ <ref name="seriesfrom"/>
715
+ </optional>
716
+ <optional>
717
+ <ref name="seriesto"/>
718
+ </optional>
719
+ <optional>
720
+ <ref name="seriesnumber"/>
721
+ </optional>
722
+ <optional>
723
+ <ref name="seriespartnumber"/>
724
+ </optional>
525
725
  </element>
526
726
  </define>
527
- <define name="bto">
528
- <element name="to">
727
+ <define name="seriesorganization">
728
+ <element name="organization">
729
+ <text/>
730
+ </element>
731
+ </define>
732
+ <define name="seriesfrom">
733
+ <element name="from">
529
734
  <choice>
735
+ <data type="dateTime"/>
530
736
  <data type="gYear"/>
531
- <data type="date"/>
532
737
  </choice>
533
738
  </element>
534
739
  </define>
535
- <define name="date_on">
536
- <element name="on">
740
+ <define name="seriesto">
741
+ <element name="to">
537
742
  <choice>
743
+ <data type="dateTime"/>
538
744
  <data type="gYear"/>
539
- <data type="date"/>
540
745
  </choice>
541
746
  </element>
542
747
  </define>
543
- <define name="docidentifier">
544
- <element name="docidentifier">
545
- <optional>
546
- <attribute name="type"/>
547
- </optional>
748
+ <define name="seriesnumber">
749
+ <element name="number">
750
+ <text/>
751
+ </element>
752
+ </define>
753
+ <define name="seriespartnumber">
754
+ <element name="partnumber">
548
755
  <text/>
549
756
  </element>
550
757
  </define>
@@ -586,17 +793,18 @@
586
793
  <element name="relation">
587
794
  <attribute name="type">
588
795
  <choice>
589
- <value>parent</value>
590
- <value>child</value>
591
796
  <value>obsoletes</value>
592
797
  <value>updates</value>
593
798
  <value>updatedBy</value>
594
799
  <value>complements</value>
595
800
  <value>derivedFrom</value>
801
+ <value>translatedFrom</value>
596
802
  <value>adoptedFrom</value>
597
803
  <value>equivalent</value>
598
804
  <value>identical</value>
599
805
  <value>nonequivalent</value>
806
+ <value>includedIn</value>
807
+ <value>includes</value>
600
808
  </choice>
601
809
  </attribute>
602
810
  <element name="bibitem">
@@ -7,7 +7,7 @@ require_relative "./section_input.rb"
7
7
  require_relative "./front.rb"
8
8
  require_relative "./validate.rb"
9
9
  require "pp"
10
- require "byebug"
10
+ # require "byebug"
11
11
 
12
12
  module Asciidoctor
13
13
  module Gb
@@ -135,7 +135,7 @@ module Asciidoctor
135
135
  en.traverse do |c|
136
136
  c.text? && c.content = c.text.gsub(HAN_TEXT, "").gsub(/^\s*/, "")
137
137
  end
138
- zh.traverse do |c|
138
+ zh.traverse do |c|
139
139
  c.text? && c.content = c.text.gsub(ROMAN_TEXT, "").gsub(/^\s*/, "")
140
140
  end
141
141
  end
@@ -217,7 +217,7 @@ module Asciidoctor
217
217
  owner = xmldoc.at("//contributor[role/@type = 'issuer']/organization/name")
218
218
  owner.content = agency
219
219
  xmldoc.xpath("//gbcommittee").each do |c|
220
- xmldoc.at("//bibdata/contributor").next =
220
+ xmldoc.at("//bibdata/contributor").next =
221
221
  "<contributor><role type='technical-committee'/><organization>"\
222
222
  "<name>#{c.text}</name></organization></contributor>"
223
223
  end
@@ -998,7 +998,7 @@
998
998
  <ref name="formattedref"/>
999
999
  </optional>
1000
1000
  <zeroOrMore>
1001
- <ref name="source"/>
1001
+ <ref name="bsource"/>
1002
1002
  </zeroOrMore>
1003
1003
  <zeroOrMore>
1004
1004
  <ref name="docidentifier"/>
@@ -1,5 +1,5 @@
1
1
  module Asciidoctor
2
2
  module Gb
3
- VERSION = "0.3.1"
3
+ VERSION = "0.3.2"
4
4
  end
5
5
  end
@@ -11,10 +11,10 @@ module Metanorma
11
11
  end
12
12
 
13
13
  def output_formats
14
- {
14
+ super.merge(
15
15
  html: "html",
16
16
  doc: "doc"
17
- }
17
+ )
18
18
  end
19
19
 
20
20
  def version
@@ -31,9 +31,10 @@ module Metanorma
31
31
  IsoDoc::Gb::HtmlConvert.new(options).convert(outname, isodoc_node)
32
32
  when :doc
33
33
  IsoDoc::Gb::WordConvert.new(options).convert(outname, isodoc_node)
34
+ else
35
+ super
34
36
  end
35
37
  end
36
-
37
38
  end
38
39
  end
39
40
  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.1
4
+ version: 0.3.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: 2018-07-02 00:00:00.000000000 Z
11
+ date: 2018-07-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor-iso
@@ -356,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
356
356
  version: '0'
357
357
  requirements: []
358
358
  rubyforge_project:
359
- rubygems_version: 2.7.6
359
+ rubygems_version: 2.7.7
360
360
  signing_key:
361
361
  specification_version: 4
362
362
  summary: asciidoctor-gb lets you write GB standards in AsciiDoc.