kramdown-rfc2629 1.5.7 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5fb1bbe625f32a0996caf7953ccdfb120dc675f98e3629ec4f0b1eb778952e2
-  data.tar.gz: 89b8e32c14263fb7ac0dc4ccd34f7cdbe9c0c264bce65e10f36c12fd9fda68a9
+  metadata.gz: b7bd20857db1f9901f6d430b02e257edb1190309b715abe1c0e914cac126a06c
+  data.tar.gz: 57d1fe042574bc981df911c4043a9dbb96c26e970a35693601911f564c974f3f
 SHA512:
-  metadata.gz: ff5b6843cfd27a6195c4a8a3a9735c8c180be6d376799d68c09ddbfcdd55919f33ed75ab6ae4e826252e2fdfc2b1c3c1ce91a548954ec9e8a4669e580c05ab6e
-  data.tar.gz: a7c3f4fe40f33059be269ffd6342b46e924b93751d43da1cb71ba356a1bec3e550a026bf2f6f6da0505813a0ab97ed845d40cad9cda411b2ff11cc95d138218d
+  metadata.gz: bc64c6f45a3c3a0b30a9514c10f33a383d95f3ef7ac8e640f62bee7b6265fb83a8b76bf87d9dac03e84e2c07305af2f85985069e64db30de68760b41b9dbe459
+  data.tar.gz: f9fb4f647903103a05d3c0b73592fc73e4eea8e489018a0105e9eb8e4aac332d82a2a9e89df660e7e5fbdf1908d5014dc6f20915668ec103ddb6fdf969a5c9e4

data/bin/kramdown-rfc-cache-i-d-bibxml

@@ -87,9 +87,9 @@ active_names.each do |name|
       FileUtils.touch(name0)    # because name1 already exists, we believe name0 is fresh
     else
       begin
-        url0 = "https://datatracker.ietf.org/doc/bibxml3/draft-#{namepart}/xml"
+        url0 = "https://datatracker.ietf.org/doc/bibxml3/draft-#{namepart}.xml"
         get_and_write_resource_persistently(url0, name0) # get name0 first
-        url1 = "https://datatracker.ietf.org/doc/bibxml3/draft-#{namepart}-#{version}/xml"
+        url1 = "https://datatracker.ietf.org/doc/bibxml3/draft-#{namepart}-#{version}.xml"
         get_and_write_resource_persistently(url1, name1) # then name1 to mark this as updated
       rescue => e
         warn "*** #{name0}: #{e}"

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.7'
+  s.version = '1.5.11'
   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

@@ -455,6 +455,19 @@ COLORS
         dont_clean = false
         dont_check = false
         case t
+        when "protocol", "protocol-goat"
+          cmdparm = result.lines.map(&:strip).select {|x| x != ''}.join(',')
+          result, err, _s = Open3.capture3("protocol #{Shellwords.escape(cmdparm)}", stdin_data: '')
+          if t == "protocol-goat"
+            file.unlink
+            file = Tempfile.new("kramdown-rfc")
+            file.write(result)
+            file.close
+            result1, err, _s = Open3.capture3("goat #{file.path}", stdin_data: result);
+            dont_clean = true
+          else
+            result1 = nil
+          end
         when "goat"
           result1, err, _s = Open3.capture3("goat #{file.path}", stdin_data: result);
           dont_clean = true
@@ -487,15 +500,17 @@ COLORS
         # warn ["text:", result.inspect]
         # warn ["svg:", result1.inspect]
         file.unlink
-        result1 = svg_clean(result1) unless dont_clean
-        unless dont_check
-          result1, err, _s = Open3.capture3("svgcheck -Xqa", stdin_data: result1);
-          # warn ["svgcheck:", result1.inspect]
-          capture_croak("svgcheck", err)
-        end
-        if result1 == ''
-          warn "*** could not create svg for #{result.inspect[0...20]}..."
-          exit 65 # EX_DATAERR
+        if result1
+          result1 = svg_clean(result1) unless dont_clean
+          unless dont_check
+            result1, err, _s = Open3.capture3("svgcheck -Xqa", stdin_data: result1);
+            # warn ["svgcheck:", result1.inspect]
+            capture_croak("svgcheck", err)
+          end
+          if result1 == ''
+            warn "*** could not create svg for #{result.inspect[0...20]}..."
+            exit 65 # EX_DATAERR
+          end
         end
         [result, result1]       # text, svg
       end
@@ -548,12 +563,17 @@ COLORS
           end
           case t
           when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt", 
-               "railroad", "railroad-utf8", "mermaid", "math"
+               "railroad", "railroad-utf8", "mermaid", "protocol", "protocol-goat",
+               "math"
             if gi
               warn "*** Can't set GI #{gi} for composite SVG artset"
             end
             result, result1 = memoize(:svg_tool_process, t, result)
+            if result1          # refactor!
             "#{' '*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.merge("type"=> "ascii-art"))}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
+            end
           else
             gi ||= (
               if !$options.v3 || !t || ARTWORK_TYPES.include?(t) || artwork_attr["align"]
@@ -1000,7 +1020,7 @@ COLORS
           anchor = ::Kramdown::Parser::RFC2629Kramdown.idref_cleanup(anchor)
           anchor.gsub!('/', '_')              # should take out all illegals
           to_insert = ""
-          src.scan(/(W3C|3GPP|[A-Z-]+)[.]?([A-Za-z_0-9.\/\+-]+)/) do |t, n|
+          src.scan(/(W3C|3GPP|[A-Z-]+)[.]?([A-Za-z_0-9.\(\)\/\+-]+)/) do |t, n|
             fn = "reference.#{t}.#{n}.xml"
             sub, ttl, _can_anchor, altproc = XML_RESOURCE_ORG_MAP[t]
             ttl ||= KRAMDOWN_REFCACHETTL  # everything but RFCs might change a lot
@@ -1033,6 +1053,8 @@ COLORS
                                                 %{https://www.ietf.org/archive/id/}) if t == "I-D"
                   }
                 end
+              elsif t == "IANA"
+                d.root.attributes["target"].sub!(%r{\Ahttp://www.iana.org/assignments/}, 'https://www.iana.org/assignments/')
               end
               to_insert = d.to_s
             rescue Exception => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.11
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown