kramdown-rfc2629 1.7.17 → 1.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52b682df54c2649c4ef7f2d2e08652c3709866207eab40c6fd40d667b4a00693
-  data.tar.gz: dba5488edbd5881fa69f5bca0b98db2347500fc34aa2fcdb33d71ba881f9596c
+  metadata.gz: f9d9adbae37a16a29017726ef2040d260eb1a2cce9d00ff807828c84275d87eb
+  data.tar.gz: 6018923d328495fb77b78886e467d9c24267bc563d37c71dd527c11c7ee1e709
 SHA512:
-  metadata.gz: 9d4215bd5369fa73c6618101ae5c5e242ad3a1c6b6a586a588a81d8a31441efda575b3e1135be88c5204e7f81b744b744346086ea06dfb8b61b9a7eaf193c427
-  data.tar.gz: db9621882c176186a9d407c38a0d573e849de7f6eac7483a7a666c788b9a14b3662faedb48a43796caad7a50b9b65c0f48cb4d523dae1e88c1fa940c582fc1d7
+  metadata.gz: 5f9e4452395530cd215d5fa3f1c701cd393091424e25e42b564f26c55eb2e6d7601e5da7e87dee2cc6587041b960a76c0aa449277b4ac323b4dc4238a595d3af
+  data.tar.gz: d7e408eca15365eb9b8c653dcd3f3dc78a040e6dc599a8e959e7e8ac59e0c630b196d716511ed345547aa5cc1707a1bf2af6a972d83dbeae3fa6ebbebc3ab8b1

data/README.md

@@ -667,7 +667,7 @@ made it possible to license kramdown-rfc under the same license.
 [RFC 2629]: https://www.rfc-editor.org/rfc/rfc2629.html
 [RFC 7749]: https://www.rfc-editor.org/rfc/rfc7749.html
 [RFC 7991]: https://www.rfc-editor.org/rfc/rfc7991.html
-[v3]: https://xml2rfc.tools.ietf.org/xml2rfc-doc.html
+[v3]: https://authors.ietf.org/rfcxml-vocabulary
 [markdown]: http://en.wikipedia.org/wiki/Markdown
 [IETF]: http://www.ietf.org
 [Miek Gieben]: http://www.miek.nl/

data/data/kramdown-rfc2629.erb

@@ -163,6 +163,7 @@
 {:/nomarkdown}
 {:quote: gi="blockquote"}
 {:aside: gi="aside"}
+{:cref: gi="cref"}
 {:markers: sourcecode-markers="true"}
 {:unnumbered: numbered="false"}
 {:vspace: vspace="0"}
@@ -182,22 +183,34 @@
     <displayreference target="<%=k%>" to="<%=v%>"/>
 <% end -%>
 
-<% if sh = sechash.delete("normative") -%>
+<% shn = sechash.delete("normative")
+   shi = sechash.delete("informative")
+   shc = shn && shi
+   if shc
+-%>
+<references title='References' anchor="sec-combined-references">
+<% end -%>
+
+<% if shn -%>
     <references title='Normative References' anchor="sec-normative-references">
 
-<%= sh %>
+<%= shn %>
 
     </references>
 <% end -%>
 
-<% if sh = sechash.delete("informative") -%>
+<% if shi -%>
     <references title='Informative References' anchor="sec-informative-references">
 
-<%= sh %>
+<%= shi %>
 
     </references>
 <% end -%>
 
+<% if shc -%>
+</references>
+<% end -%>
+
 <%= sechash.delete("back") %>
 <% sh = sechash.delete("contributor") -%>
 <% consec = ps.has("contributor") -%>
@@ -212,6 +225,7 @@
 <%= sh -%>
 <% if $options.v3 && consec
      ps.arr("contributor") do |au|
+      if Hash === au
        aups = KramdownRFC::authorps_from_hash(au)
    -%>
 <%= KramdownRFC::person_element_from_aups("contact", aups) -%>
@@ -224,7 +238,17 @@
 CONTRIBUTION
     end -%>
 <%   aups.warn_if_leftovers  -%>
+<%   else -%>
+<%=  <<TEXT
+{:/nomarkdown}
+
+#{au}
+
+{::nomarkdown}
+TEXT
+-%>
 <%   end -%>
+<%  end -%>
 <% end -%>
     </section>
 <% end -%>

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.7.17'
+  s.version = '1.7.19'
   s.summary = "Kramdown extension for generating RFCXML (RFC 799x)."
   s.description = %{An RFCXML (RFC 799x) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc/command.rb

@@ -70,8 +70,8 @@ end
 def boilerplate(key)
   ret = ''
   case key.downcase
-  when /\Abcp14(info)?(\+)?(-tagged)?(-bcp)?\z/i
-    #            $1    $2     $3       $4
+  when /\Abcp14(info)?(\+)?(-tagged)?(-bcp(14)?)?\z/i
+    #            $1    $2     $3       $4  $5
     if $1
       ret << <<RFC8174ise
 Although this document is not an IETF Standards Track publication, it
@@ -110,11 +110,19 @@ PLUS
 TAGGED
     end
     if $4                       # experimental; idnits complains:
+      if $5
+      #  ** The document contains RFC2119-like boilerplate, but doesn't seem to
+      #     mention RFC 2119.  The boilerplate contains a reference [BCP14], but that
+      #     reference does not seem to mention RFC 2119 either.
+        ret.sub!("BCP 14 {{!RFC2119}} {{!RFC8174}}",
+                 "{{!BCP14}} ({{RFC2119}}) ({{RFC8174}})")
+      else
       #  ** The document seems to lack a both a reference to RFC 2119 and the
       #     recommended RFC 2119 boilerplate, even if it appears to use RFC 2119
       #     keywords -- however, there's a paragraph with a matching beginning.
       #     Boilerplate error?
-      ret.sub!("{{!RFC2119}} {{!RFC8174}}", "{{!BCP14}}")
+        ret.sub!("{{!RFC2119}} {{!RFC8174}}", "{{!BCP14}}")
+      end
     end
     ret
   when /\Arfc\s*7942(info)?\z/i
@@ -376,6 +384,7 @@ def xml_from_sections(input)
     v.gsub!(/{{(#{
       spacify_re(XSR_PREFIX)
     })?([\w.\/_\-]+@)?(?:([?!])(-)?|(-))([\w._\-]+)(?:=([\w.\/_\-]+))?(#{
+    #  2                 3     4    5   6              7
       XREF_TXT_SUFFIX
     })?(#{
       spacify_re(XSR_SUFFIX)
@@ -459,6 +468,9 @@ def xml_from_sections(input)
             sechash[sn.to_s] << %{&#{bts};\n} # ???
           end
         else
+          if v.nil? && (bri = bibref.to_i) != 0
+            v = bri
+          end # hack in {{?Err6543=8610}}
           if v && Integer === v
             case href
             when /\AErr(.*)/
@@ -478,7 +490,7 @@ def xml_from_sections(input)
             end
           end
           unless v && Hash === v
-            warn "*** don't know how to expand ref #{k}"
+            warn "*** don't know how to expand ref #{k} #{v.inspect}"
             next
           end
           if bts && !v.delete("override")

data/lib/kramdown-rfc2629.rb

@@ -32,6 +32,7 @@ class Object
 end
 
 module Kramdown
+  RFCXML_SPAN_ELEMENTS = Set.new(Kramdown::Parser::Html::Constants::HTML_SPAN_ELEMENTS)
 
   Kramdown::Options.define(:ol_start_at_first_marker, Kramdown::Options::Boolean, false, <<~EOF)
       If this option is `true`, an ordered list (<ol) will use the
@@ -620,11 +621,23 @@ COLORS
           outpath = file.path + ".svg"
           result1 = File.read(outpath) rescue '' # don't die before providing error message
           File.unlink(outpath) rescue nil        # ditto
-        when "plantuml", "plantuml-utxt"
+        when "plantuml", "plantuml-utxt", "plantuml-ascii-art"
+          if t == "plantuml-ascii-art"
+            result, ascii_art = result.split(/^~{3,} ascii-art\n/, 2)
+            unless ascii_art
+              warn "*** Didn't find ascii-art in plantuml-ascii-art #{result.inspect}"
+              ascii_art = result.to_s
+            end
+          end
           plantuml = "@startuml\n#{result}\n@enduml"
           result1, err, _s = Open3.capture3("plantuml -pipe -tsvg#{svg_opt}", stdin_data: plantuml);
-          result, err1, _s = Open3.capture3("plantuml -pipe -tutxt#{txt_opt}", stdin_data: plantuml) if t == "plantuml-utxt"
-          err << err1.to_s
+          case t
+          when "plantuml-utxt"
+            result, err1, _s = Open3.capture3("plantuml -pipe -tutxt#{txt_opt}", stdin_data: plantuml)
+            err << err1.to_s
+          when "plantuml-ascii-art"
+            result = ascii_art
+          end
         when "railroad", "railroad-utf8"
           result1, err1, _s = Open3.capture3("kgt -l abnf -e svg#{svg_opt}", stdin_data: result);
           result1 = svg_clean_kgt(result1); dont_clean = true
@@ -718,7 +731,7 @@ COLORS
           case t
           when "aasvg", "ditaa", "goat",
                "math", "math-asciitex", "mermaid",  "mscgen",
-               "plantuml", "plantuml-utxt",
+               "plantuml", "plantuml-utxt", "plantuml-ascii-art",
                "protocol", "protocol-aasvg", "protocol-goat",
                "railroad", "railroad-utf8"
             if gi
@@ -837,7 +850,12 @@ COLORS
         if $options.v3
           gi = el.attr.delete('gi')
           if gi && gi != 'ul'
-            "#{' '*indent}<#{gi}#{el_html_attributes(el)}>\n#{text}#{' '*indent}</#{gi}>\n"
+            if RFCXML_SPAN_ELEMENTS === gi
+              text.sub!(/\A\s*<t>(.*)<\/t>\s*\z/) {$1} # XXX unwrap inner text from block
+              "#{' '*indent}<t><#{gi}#{el_html_attributes(el)}>#{text}</#{gi}></t>\n"
+            else
+              "#{' '*indent}<#{gi}#{el_html_attributes(el)}>\n#{text}#{' '*indent}</#{gi}>\n"
+            end
           else
             "#{' '*indent}<ul#{el_html_attributes_with(el, {"empty" => 'true'})}><li>\n#{text}#{' '*indent}</li></ul>\n"
           end
@@ -876,6 +894,9 @@ COLORS
         clean = ''
         parts.each do |p|
           next if p.empty?
+          if p == "<br />"
+            p = "\u2028"        # XXX
+          end
           d = REXML::Document.new("<foo>#{p}</foo>")
           t = REXML::XPath.each(d.root, "//text()").to_a.join
           if t != p

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.17
+  version: 1.7.19
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).