kramdown-rfc2629 1.5.8 → 1.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae2496e99617a40af73396c192f95468dc6121cf70c5e922f99a6b556845b9b
-  data.tar.gz: dc169593b56f2f5fe7c8aa4e0856235fbe8d30ee4305b2d9683bf48738602b9e
+  metadata.gz: 7bb5b3f39e014d065b0dd2b72bd851804856c97610b1e24f863bd4c7c48a5c71
+  data.tar.gz: '09f66a0f2557a18c023d0d991d009a5fe48568a7fd4c20a39540d111d4610c02'
 SHA512:
-  metadata.gz: 7700dc39c4cd1d577dce2b3247b8ccd69f162a8c07054fc07ad3c624e40cc1001b3c7d62caf61998ae604262c5a922b755d0982ca9c359c5d0f90e0fc7c93805
-  data.tar.gz: ad59b578ac48256e82068806ebb1a8fad4f61f4b8849f25a18875378103f0d91e4595877979fce2af76225d3c6c9043cd833de7102782af8c9dd4c7343474f45
+  metadata.gz: 8a18e3db3281a30d45d60cf2f7e82f1addece4ff7867c70db1bfa104cbb015d416475659d677525ac50cc99ee83f46c874fddaba1bc04aa5109752bc7de56a6d
+  data.tar.gz: f3f0e0da73244c8c78cdf1148b5036e412dbb95bd0e6d743b0d262bb5d52a2e595ef982433f527dd0ecabba2e75a544da0c17990943382fd67c21fda140adacc

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.8'
+  s.version = '1.5.12'
   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-rfc/refxml.rb

@@ -51,10 +51,6 @@ module KramdownRFC
     # -- only works for people with exactly one last name and uncomplicated first names
     if n = aups.rest["name"]
       n = n.split
-      if s = aups.rest["surname"]
-        s = s.split
-        # XXX remove s from n; use n[0..-2] otherwise.
-      end
       aups.rest["initials"] ||= n[0..-2].map(&:chr).join('.') << '.'
       aups.rest["surname"] ||= n[-1]
     end

data/lib/kramdown-rfc2629.rb

@@ -455,9 +455,28 @@ COLORS
         dont_clean = false
         dont_check = false
         case t
+        when "protocol", "protocol-goat", "protocol-aasvg"
+          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
+          elsif t == "protocol-aasvg"
+            result1, err, _s = Open3.capture3("aasvg", 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
+        when "aasvg"
+          result1, err, _s = Open3.capture3("aasvg", stdin_data: result);
+          dont_clean = true
         when "ditaa"        # XXX: This needs some form of option-setting
           result1, err, _s = Open3.capture3("ditaa #{file.path} --svg -o -", stdin_data: result);
         when "mscgen"
@@ -487,15 +506,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
@@ -547,13 +568,20 @@ COLORS
             end
           end
           case t
-          when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt", 
-               "railroad", "railroad-utf8", "mermaid", "math"
+          when "aasvg", "ditaa", "goat",
+               "math", "mermaid",  "mscgen",
+               "plantuml", "plantuml-utxt",
+               "protocol", "protocol-aasvg", "protocol-goat",
+               "railroad", "railroad-utf8"
             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 +1028,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 +1061,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.8
+  version: 1.5.12
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown