metanorma-cc 1.7.10 → 1.8.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c5917448961cb03e62b3e84cf77d6043603b1279117ae65c54e3e9a0267473f9
4
- data.tar.gz: 104e9178cf81e181efde8093cb9fceb16b1897f53be84d3bc189905b1fe5aa18
3
+ metadata.gz: a3f0001744462f6a12891ef4f0b288ff8b2a9a04b4c74c843e24cc4508fc0a45
4
+ data.tar.gz: 831870abd5cce8c14e1a4ed2d14561e188b1ec59311795bb7849b9badbc01e0f
5
5
  SHA512:
6
- metadata.gz: 30647ff3165903705e9a448bf8516e760fa86528363f5b0a5ce1fe2d7ff7b3ed3c36c44d1afb1651bb8129b61f675905fb5529b7630fd10d0674c7f491d81e96
7
- data.tar.gz: a7e9487a6f81635e740f2af07c6a6abe3bbe7b4ae348198319cac24d25290db5f50cde43d0752ce7a6f9bfb309c971d569b6d9a224168df02ddb174e6cb68bc4
6
+ metadata.gz: 928dfb9b3cb2ce5b99ffc4c31cce6456695542470acc26ef51ffddcde4ae493f362f5c5a6c2eacf97e5226cf393f3dcf781b866f3ec885397d40ef5223de6fda
7
+ data.tar.gz: 3c2ad0815ec8ee15565256f32b8f55b22c8ecbc95d4df5a16d1874afab0c822f2621620ac00468cc6a47fbe7a15d29bab47ad5efba9097f8424bfd469e53484b
data/docs/quickstart.adoc CHANGED
@@ -19,7 +19,7 @@ Assuming you have Docker installed, it’s as easy as:
19
19
 
20
20
  [source,console]
21
21
  --
22
- docker pull ribose/metanorma
22
+ docker pull metanorma/metanorma
23
23
  --
24
24
 
25
25
 
@@ -38,7 +38,7 @@ To compile the document, run the Docker container as follows:
38
38
 
39
39
  [source,console]
40
40
  --
41
- docker run -v "$(pwd)":/metanorma/ -w /metanorma ribose/metanorma metanorma -t csd -x xml,html,pdf,doc rfc6350.adoc
41
+ docker run -v "$(pwd)":/metanorma/ -w /metanorma metanorma/metanorma metanorma -t csd -x xml,html,pdf,doc rfc6350.adoc
42
42
  --
43
43
 
44
44
  NOTE: If you use Metanorma-CLI instead of Docker,
@@ -624,6 +624,9 @@
624
624
  <choice>
625
625
  <ref name="PureTextElement"/>
626
626
  <ref name="stem"/>
627
+ <ref name="eref"/>
628
+ <ref name="xref"/>
629
+ <ref name="hyperlink"/>
627
630
  </choice>
628
631
  </zeroOrMore>
629
632
  </element>
@@ -634,6 +637,9 @@
634
637
  <choice>
635
638
  <ref name="PureTextElement"/>
636
639
  <ref name="stem"/>
640
+ <ref name="eref"/>
641
+ <ref name="xref"/>
642
+ <ref name="hyperlink"/>
637
643
  </choice>
638
644
  </zeroOrMore>
639
645
  </element>
@@ -641,7 +647,12 @@
641
647
  <define name="tt">
642
648
  <element name="tt">
643
649
  <zeroOrMore>
644
- <ref name="PureTextElement"/>
650
+ <choice>
651
+ <ref name="PureTextElement"/>
652
+ <ref name="eref"/>
653
+ <ref name="xref"/>
654
+ <ref name="hyperlink"/>
655
+ </choice>
645
656
  </zeroOrMore>
646
657
  </element>
647
658
  </define>
@@ -822,7 +833,9 @@
822
833
  <attribute name="alt"/>
823
834
  </optional>
824
835
  <ref name="CitationType"/>
825
- <text/>
836
+ <oneOrMore>
837
+ <ref name="PureTextElement"/>
838
+ </oneOrMore>
826
839
  </define>
827
840
  <define name="hyperlink">
828
841
  <element name="link">
@@ -835,7 +848,9 @@
835
848
  <optional>
836
849
  <attribute name="alt"/>
837
850
  </optional>
838
- <text/>
851
+ <oneOrMore>
852
+ <ref name="PureTextElement"/>
853
+ </oneOrMore>
839
854
  </element>
840
855
  </define>
841
856
  <define name="xref">
@@ -849,7 +864,9 @@
849
864
  <optional>
850
865
  <attribute name="alt"/>
851
866
  </optional>
852
- <text/>
867
+ <oneOrMore>
868
+ <ref name="PureTextElement"/>
869
+ </oneOrMore>
853
870
  </element>
854
871
  </define>
855
872
  <define name="fn">
@@ -4,7 +4,7 @@ require "isodoc/cc/word_convert"
4
4
  require "isodoc/cc/presentation_xml_convert"
5
5
  require "metanorma/cc"
6
6
  require "asciidoctor/standoc/converter"
7
- require 'asciidoctor/generic/converter'
7
+ require "asciidoctor/generic/converter"
8
8
  require_relative "validate_section"
9
9
 
10
10
  module Asciidoctor
@@ -21,27 +21,28 @@ module Asciidoctor
21
21
 
22
22
  def metadata_committee(node, xml)
23
23
  return unless node.attr("technical-committee")
24
+
24
25
  xml.editorialgroup do |a|
25
26
  a.committee node.attr("technical-committee"),
26
- **attr_code(type: node.attr("technical-committee-type"))
27
+ **attr_code(type: node.attr("technical-committee-type"))
27
28
  i = 2
28
- while node.attr("technical-committee_#{i}") do
29
+ while node.attr("technical-committee_#{i}")
29
30
  a.committee node.attr("technical-committee_#{i}"),
30
- **attr_code(type: node.attr("technical-committee-type_#{i}"))
31
+ **attr_code(type: node.attr("technical-committee-type_#{i}"))
31
32
  i += 1
32
33
  end
33
34
  end
34
35
  end
35
36
 
36
37
  def outputs(node, ret)
37
- File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
38
- presentation_xml_converter(node).convert(@filename + ".xml")
39
- html_converter(node).convert(@filename + ".presentation.xml",
40
- nil, false, "#{@filename}.html")
41
- doc_converter(node).convert(@filename + ".presentation.xml",
42
- nil, false, "#{@filename}.doc")
43
- pdf_converter(node)&.convert(@filename + ".presentation.xml",
44
- nil, false, "#{@filename}.pdf")
38
+ File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
39
+ presentation_xml_converter(node).convert(@filename + ".xml")
40
+ html_converter(node).convert(@filename + ".presentation.xml",
41
+ nil, false, "#{@filename}.html")
42
+ doc_converter(node).convert(@filename + ".presentation.xml",
43
+ nil, false, "#{@filename}.doc")
44
+ pdf_converter(node)&.convert(@filename + ".presentation.xml",
45
+ nil, false, "#{@filename}.pdf")
45
46
  end
46
47
 
47
48
  def html_converter(node)
@@ -50,6 +51,7 @@ module Asciidoctor
50
51
 
51
52
  def pdf_converter(node)
52
53
  return if node.attr("no-pdf")
54
+
53
55
  IsoDoc::CC::PdfConvert.new(html_extract_attributes(node))
54
56
  end
55
57