kramdown-rfc2629 1.5.9 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27ae2945d8f8d2f4458d2140929d60507bb980a7b925c607a2cdfd32a57c3e37
-  data.tar.gz: 79cbaf64a1ad74f32a1ddda9b7138254cc13f199a03f05f2cdf9871606f03365
+  metadata.gz: 44da042356d9bc536e5c05d3256718ed025a7d83a1678fa66ee86078daeaf440
+  data.tar.gz: 5ee1e04e156d30c36c070828f41ed382fb46a13a43310f8c6a2b5a597cb2fe4f
 SHA512:
-  metadata.gz: 00550b5de6d254e67f9515592397caff9c70b8401249ea5095249a6fe366d616102ccc8cf49a56cea67923374f50c9d19b3586cdce2887e7ae8586e822c6b889
-  data.tar.gz: 80b19ec4713317c626286a623b49beed601f4fae698a0d8ecaeaad3087f6e3c9828bb0d1c8d917cc6f944dd9b25f93cad942bb6239c200d680c1b3d89dfa6506
+  metadata.gz: 1ce55d74b92191986255d87e27f1891a4f60f7eb68fe4baff5ea0eedd264a76511870b5817bae23d6b76e553143621b9ab570c658cb6b197735c501b470cfc7a
+  data.tar.gz: 8f044f904be1ef0f9d56bd430a7104d5e522b630cae07a318ef98c862639393350099148ecdb2dd1a3a027a2da627489aae1b7dcb64c1c9cbd60b7f56ca09541

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.9'
+  s.version = '1.5.13'
   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"]
@@ -618,7 +646,7 @@ COLORS
           if sl = el.attr.delete('slugifiedName') # could do general name- play
             attrstring = html_attributes({'slugifiedName' => sl})
           end
-          irefs = "<name#{attrstring}>#{inner(el, indent, opts)}</name>" #
+          irefs = "<name#{attrstring}>#{inner(el, indent, opts.merge(noabbrev: true))}</name>" #
         else
         clean, irefs = clean_pcdata(inner_a(el, indent, opts))
         el.attr['title'] = clean
@@ -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
@@ -1205,13 +1233,30 @@ COLORS
       end
 
       def convert_abbreviation(el, indent, opts) # XXX: This is wrong
+        if opts[:noabbrev]
+          return el.value
+        end
+
         title = @root.options[:abbrev_defs][el.value]
         title = nil if title.empty?
         value = el.value
-        if item = title
-          if item == "<bcp14>" && $options.v3
-            return "<bcp14>#{el.value}</bcp14>"
+
+        if title == "<bcp14>" && $options.v3
+          return "<bcp14>#{value}</bcp14>"
+        end
+
+        if title && title[0] == "#"
+          target, title = title.split(' ', 2)
+          if target == "#"
+            target = value
+          else
+            target = target[1..]
           end
+        else
+          target = nil
+        end
+
+        if item = title
           m = title.scan(Parser::RFC2629Kramdown::IREF_START)
           if m.empty?
             subitem = value
@@ -1222,7 +1267,11 @@ COLORS
           item = value
         end
         iref ||= "<iref#{html_attributes(item: item, subitem: subitem)}/>"
-        "#{el.value}#{iref}"
+        if target
+          "<xref#{html_attributes(target: target, format: "none")}>#{value}</xref>#{iref}"
+        else
+          "#{value}#{iref}"
+        end
       end
 
       def convert_root(el, indent, opts)

metadata

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