metanorma-m3d 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +1 -1
  3. data/lib/asciidoctor/m3d/biblio.rng +33 -51
  4. data/lib/asciidoctor/m3d/isodoc.rng +6 -1
  5. data/lib/asciidoctor/m3d/isostandard.rng +3 -10
  6. data/lib/isodoc/m3d/html/htmlstyle.scss +1 -1
  7. data/lib/isodoc/m3d/html/m3d.scss +38 -0
  8. data/lib/isodoc/m3d/m3dhtmlconvert.rb +2 -2
  9. data/lib/isodoc/m3d/m3dpdfconvert.rb +2 -2
  10. data/lib/isodoc/m3d/m3dwordconvert.rb +1 -1
  11. data/lib/metanorma/m3d/version.rb +1 -1
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ed7bc22b06882c1e9a052a1d16021239cc54359746e8eaaa22b85d1d49ae3763
4
- data.tar.gz: dd1e5137a56af52f5d82d8d670b015e68ae65544648ab9cbb28e64683a2bd7ca
3
+ metadata.gz: 6131eec8449a38233d4083a799eb00bd33ae67e90f53e5cdb8df0a7d84efcf94
4
+ data.tar.gz: 16b4ce44dae95a5adcb3026f31dd76a5428292bcdd2d3e0c9cb0635482676ce8
5
5
  SHA512:
6
- metadata.gz: 51be469af6b74d87cad871d3352cfac17062d22baf58950842f9491de04f4293efb381c43b1c971a0a1348cd4ccda1bd55630cbb49db9d605422acf926f32dcc
7
- data.tar.gz: dabfbb05c1425752982da0ec764b3bc81b9cb670f4f19840737254bc0b3ee74c2e4ac26474951573bd93be1023b58f76627eeffa19487ca3c529086825df55cb
6
+ metadata.gz: d4e00f1260ee9ba8e3efc8f0ef6ceba2354feedf74953cde19564f15d0b67a43ce1977ecbac0af6dab2e5d7b40171cc396c75320652068c92f89999bd0f4cef1
7
+ data.tar.gz: 1374576732f1ca8f9db5db4df7d3083c7d95893821948acf372679285edbd938d08b8cdf69b4b07eb50a59a455400844eb1d77f9f8cadf6b6341b5262c9d87d0
data/README.adoc CHANGED
@@ -1,4 +1,4 @@
1
- = AsciiM3D: Asciidoctor processor for Ribose Standard Documents (M3D)
1
+ = Metanorma processor for M3AAWG documents (M3D)
2
2
 
3
3
  image:https://img.shields.io/gem/v/metanorma-m3d.svg["Gem Version", link="https://rubygems.org/gems/metanorma-m3d"]
4
4
  image:https://img.shields.io/travis/riboseinc/metanorma-m3d/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-m3d"]
data/lib/asciidoctor/m3d/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/m3d/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/m3d/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/isodoc/m3d/html/htmlstyle.scss CHANGED
@@ -594,7 +594,7 @@ p.Biblio, p.NormRef {
594
594
  overflow: auto;
595
595
  }
596
596
 
597
- .FigureTitle {
597
+ .FigureTitle, .SourceTitle, .AdmonitionTitle {
598
598
  font-weight: 700;
599
599
  font-size: 1em;
600
600
  text-align: center;
data/lib/isodoc/m3d/html/m3d.scss CHANGED
@@ -51,6 +51,44 @@ p.FigureTitle
51
51
  mso-fareast-font-family:$bodyfont;
52
52
  mso-bidi-font-family:$bodyfont;
53
53
  mso-ansi-language:EN-GB;}
54
+ p.SourceTitle
55
+ {mso-style-unhide:no;
56
+ mso-style-qformat:yes;
57
+ mso-style-parent:"";
58
+ margin-top:0cm;
59
+ margin-right:0cm;
60
+ margin-bottom:6.0pt;
61
+ margin-left:0cm;
62
+ text-align:center;
63
+ line-height:12.0pt;
64
+ page-break-before:avoid;
65
+ mso-pagination:widow-orphan;
66
+ tab-stops:20.15pt;
67
+ font-size:11.0pt;
68
+ font-family:$bodyfont;
69
+ font-weight:bold;
70
+ mso-fareast-font-family:$bodyfont;
71
+ mso-bidi-font-family:$bodyfont;
72
+ mso-ansi-language:EN-GB;}
73
+ p.AdmonitionTitle
74
+ {mso-style-unhide:no;
75
+ mso-style-qformat:yes;
76
+ mso-style-parent:"";
77
+ margin-top:0cm;
78
+ margin-right:0cm;
79
+ margin-bottom:6.0pt;
80
+ margin-left:0cm;
81
+ text-align:center;
82
+ line-height:12.0pt;
83
+ page-break-after:avoid;
84
+ mso-pagination:widow-orphan;
85
+ tab-stops:20.15pt;
86
+ font-size:11.0pt;
87
+ font-family:$bodyfont;
88
+ font-weight:bold;
89
+ mso-fareast-font-family:$bodyfont;
90
+ mso-bidi-font-family:$bodyfont;
91
+ mso-ansi-language:EN-GB;}
54
92
  p.TableTitle
55
93
  {mso-style-unhide:no;
56
94
  mso-style-qformat:yes;
data/lib/isodoc/m3d/m3dhtmlconvert.rb CHANGED
@@ -10,8 +10,8 @@ module IsoDoc
10
10
  class HtmlConvert < IsoDoc::HtmlConvert
11
11
  def add_image(filenames)
12
12
  filenames.each do |filename|
13
- FileUtils.cp html_doc_path(filename), filename
14
- @files_to_delete << filename
13
+ FileUtils.cp html_doc_path(filename), File.join(@localdir, filename)
14
+ @files_to_delete << File.join(@localdir, filename)
15
15
  end
16
16
  end
17
17
 
data/lib/isodoc/m3d/m3dpdfconvert.rb CHANGED
@@ -10,8 +10,8 @@ module IsoDoc
10
10
  class PdfConvert < IsoDoc::PdfConvert
11
11
  def add_image(filenames)
12
12
  filenames.each do |filename|
13
- FileUtils.cp html_doc_path(filename), filename
14
- @files_to_delete << filename
13
+ FileUtils.cp html_doc_path(filename), File.join(@localdir, filename)
14
+ @files_to_delete << File.join(@localdir, filename)
15
15
  end
16
16
  end
17
17
 
data/lib/isodoc/m3d/m3dwordconvert.rb CHANGED
@@ -14,7 +14,7 @@ module IsoDoc
14
14
  end
15
15
 
16
16
  def convert1(docxml, filename, dir)
17
- FileUtils.cp html_doc_path("logo.jpg"), "logo.jpg"
17
+ FileUtils.cp html_doc_path("logo.jpg"), File.join(@localdir, "logo.jpg")
18
18
  super
19
19
  end
20
20
 
data/lib/metanorma/m3d/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3d
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-m3d
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: asciidoctor