kramdown-rfc2629 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f43b8d0d98aa61a451d6e85635aaa71e5a48820a679c5d7338f41dac367995a
-  data.tar.gz: 93e1654b15e3c5c226dc00f562fa95c4e6ca41f348af2d64e5f2c410dc6d3f1f
+  metadata.gz: 3cdf03ff424a3911001953ad3890547406acc73568b3f6a3a474b5e0cb2a2ead
+  data.tar.gz: 1b444ffd149931d0bc83a79d94d2eb8862d90f2bd3b4534194928146db6d5939
 SHA512:
-  metadata.gz: e44c716d95d3d05ac48f1da768241cdd2dcc8472d3ab9b56f4515a17f6e2798b183e21cce8086c0cdb81691c730f0330c95dcdf54e5f6ec06938298012e67f6d
-  data.tar.gz: 4176998414bed9502ff2d8a8114dfed8b7a3abee0032546aa9c64d50ba3095b6b75b84df3045235716d104e053060b49c34e6552862659c1a9171a74fc7b5c07
+  metadata.gz: 316a02ae7a37a32c6f875175d38b18d34a2104b812ea6a46889f33e65df84dfcc66458bdfbf26a577fa634766d2d37150ad2b4938b90f3e153cb092457d2a64a
+  data.tar.gz: 4a456d50fe6eed21d68229a2647a4ede87e4e5189c434e2167a02c7a8f1e5b0534dfd2cc0c6aed46262acbc2d9aaa97e67f0082a7088c715f1c9baef7e7ec002

data/bin/kdrfc

@@ -29,10 +29,10 @@ def process_xml(*args)
   end
 end
 
-def process_xml_locally(input, output)
+def process_xml_locally(input, output, *flags)
   warn "* converting locally from xml #{input} to txt #{output}" if $options.verbose
   begin
-    o, s = Open3.capture2("xml2rfc", *v3_flag?, input)
+    o, s = Open3.capture2("xml2rfc", *v3_flag?, *flags, input)
     puts o
     if s.success?
       warn "* #{output} written" if $options.verbose
@@ -83,6 +83,7 @@ require 'optparse'
 require 'ostruct'
 
 $options = OpenStruct.new
+$options.txt = true             # default
 op = OptionParser.new do |opts|
   opts.banner = "Usage: kdrfc [options] file.md|file.mkd|file.xml"
 
@@ -95,6 +96,12 @@ op = OptionParser.new do |opts|
   opts.on("-x", "--[no-]xml", "Convert to xml only") do |v|
     $options.xml_only = v
   end
+  opts.on("-h", "--[no-]html", "Convert to html as well") do |v|
+    $options.html = v
+  end
+  opts.on("-t", "--[no-]txt", "Convert to txt as well") do |v|
+    $options.txt = v
+  end
   opts.on("-3", "--[no-]v3", "Use RFCXML v3 processing rules") do |v|
     $options.v3 = v
   end
@@ -108,13 +115,15 @@ when 1
   when /(.*)\.xml\z/
     if $options.xml_only
       warn "*** You already have XML"
-    else
-      process_xml(fn, "#$1.txt")
+    else                        # FIXME: copy/paste
+      process_xml(fn, "#$1.txt") unless $options.xml_only or not $options.txt
+      process_xml(fn, "#$1.html", "--html") unless $options.xml_only or not $options.html
     end
   when /(.*)\.mk?d\z/
     xml = "#$1.xml"
     process_mkd(fn, xml)
-    process_xml(xml, "#$1.txt") unless $options.xml_only
+    process_xml(xml, "#$1.txt") unless $options.xml_only or not $options.txt
+    process_xml(xml, "#$1.html", "--html") unless $options.xml_only or not $options.html
   else
     warn "Unknown file type: #{fn}"
     exit 1

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.1'
+  s.version = '1.3.2'
   s.summary = "Kramdown extension for generating RFC 7749 XML."
   s.description = %{An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc2629.rb

@@ -172,11 +172,12 @@ module Kramdown
           "#{' '*indent}<t>#{result}</t>\n"
         else
           artwork_attr = {}
+          t = nil
           if blockclass
             classes = blockclass.split(' ')
             classes.each do |cl|
               if md = cl.match(/\Alanguage-(.*)/)
-                artwork_attr["type"] = md[1] # XXX overwrite
+                t = artwork_attr["type"] = md[1] # XXX overwrite
               else
                 $stderr.puts "*** Unimplemented block class: #{cl}"
               end
@@ -192,7 +193,21 @@ module Kramdown
               artwork_attr[md[1]] = v
             end
           end
-          "#{' '*indent}<figure#{el_html_attributes(el)}><artwork#{html_attributes(artwork_attr)}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
+          case t
+          when "goat"
+            require 'tempfile'
+            file = Tempfile.new("kramdown-rfc")
+            file.write(result)
+            file.close
+            result1, _s = Open3.capture2("goat #{file.path}", stdin_data: result);
+            # warn ["goat:", result1.inspect]
+            file.unlink
+            result1, _s = Open3.capture2("svgcheck -qa", stdin_data: result1);
+            # warn ["svgcheck:", result1.inspect]
+            "#{' '*indent}<figure#{el_html_attributes(el)}><artset><artwork #{html_attributes(artwork_attr.merge("type"=> "svg"))}>#{result1.sub(/.*?<svg/m, "<svg")}</artwork><artwork #{html_attributes(artwork_attr.merge("type"=> "ascii-art"))}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></artset></figure>\n"
+          else
+            "#{' '*indent}<figure#{el_html_attributes(el)}><artwork#{html_attributes(artwork_attr)}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Carsten Bormann