kramdown-rfc2629 1.5.1 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296e6b41d770f71cc7266daefdbef48425bd7b050ae3be467badabf1f2f8453d
-  data.tar.gz: 12ca2cd06a9d6911f4f4db728210909ccb23a44563c4ae8ac5beaaf044fb550e
+  metadata.gz: 241fa7d714b5ba3a4bc0060d59d9ae2e2241b4777a60023126570e6f48bdf26f
+  data.tar.gz: b51688aab8adba3ad3b351ecb7d15f52ab71acf70d0c4d27ab72f8ec4d377995
 SHA512:
-  metadata.gz: b8adf6c1c27f37b30468b6c593f3faa334adfba8953f99160ac842bfcc98bb7dde0ef02e36ea65450b9ea519ac46a200e5631c9a3bd5832296ef78b7aa18fb8a
-  data.tar.gz: ee84d6769775ea513fea5240bdf1d552f7a724213840363d76a0510a53d9cae8ae56dd2de342f6b1540f5e2c5f9fe085b53ad7e4ca9ccd15ee598798f7a2be65
+  metadata.gz: fdde5cb2f7a8288476259eaa03216c12f1ed231c10275bd3a5b7679d64cbb23b65e00afa3e06dc497a028ffc0997c039f3e909c6ad661d0244208f3fa08c1f03
+  data.tar.gz: 16e3c5e17dd0d7b383c0cd875ea55572ccf8b6c6c1875436873cbbd93d9ab64171e9b93561b5a7f1d8c5ceb301adde38132a2ff10e8e70f66f783a7aade16d37

data/bin/kramdown-rfc2629

@@ -12,6 +12,24 @@ KDRFC_VERSION=Gem.loaded_specs["kramdown-rfc2629"].version rescue "unknown-versi
 
 Encoding.default_external = "UTF-8" # wake up, smell the coffee
 
+# Note that this doesn't attempt to handle HT characters
+def remove_indentation(s)
+  l = s.lines
+  indent = l.grep(/\S/).map {|l| l[/^\s*/].size}.min
+  l.map {|li| li.sub(/^ {0,#{indent}}/, "")}.join
+end
+
+def add_quote(s)
+  l = s.lines
+  l.map {|li| "> #{li}"}.join
+end
+
+def process_chunk(s, dedent, quote)
+  s = remove_indentation(s) if dedent
+  s = add_quote(s) if quote
+  s
+end
+
 def boilerplate(key)
   case key.downcase
   when /\Abcp14(info)?(\+)?(-tagged)?\z/i
@@ -437,8 +455,34 @@ if input[-1] != "\n"
   # warn "*** added missing newline at end"
   input << "\n"                 # fix #26
 end
-input.gsub!(/^\{::include\s+(.*?)\}/) {
-  File.read($1).chomp
+input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
+  include_flags = $1
+  fn = [$2]
+  chunks = false
+  dedent = false
+  quote = false
+  include_flags.split("-") do |flag|
+    case flag
+    when ""
+    when "quote"
+      quote = true
+    when "dedent"
+      dedent = true
+    when "all", "last"
+      fn = fn.flat_map{|n| Dir[n]}
+      fn = [fn.last] if flag == "last"
+      chunks = fn.map{ |f|
+        ret = process_chunk(File.read(f), dedent, quote)
+        dedent = false; quote = false
+        ret
+      }
+    else
+      warn "** unknown include flag #{flag}"
+    end
+  end
+  chunks = fn.map{|f| File.read(f)} unless chunks # no all/last
+  chunks = chunks.map {|ch| process_chunk(ch, dedent, quote)}
+  chunks.join.chomp
 } unless ENV["KRAMDOWN_SAFE"]
 input.gsub!(/^\{::boilerplate\s+(.*?)\}/) {
   boilerplate($1)

data/data/kramdown-rfc2629.erb

@@ -69,6 +69,17 @@
 
   <middle>
 
+{:/nomarkdown}
+{:quote: gi="blockquote"}
+{:aside: gi="aside"}
+{:markers: sourcecode-markers="true"}
+{:unnumbered: numbered="false"}
+{:vspace: vspace="0"}
+{:removeinrfc: removeinrfc="true"}
+{:notoc: toc="exclude"}
+{:compact: spacing="compact"}
+{::nomarkdown}
+
 <%= sechash.delete("middle") %>
 
   </middle>

data/kramdown-rfc2629.gemspec

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

@@ -57,17 +57,35 @@ module KramdownRFC
     aups
   end
 
+  # The below anticipates the "postalLine" changes.
+  # If a postalLine is used (abbreviated "postal" in YAML),
+  # non-postalLine elements are appended as further postalLines.
+  # This prepares for how "country" is expected to be handled
+  # specially with the next schema update.
+  # So an address is now best keyboarded as:
+  #   postal:
+  #     - Foo Street
+  #     - 28359 Bar
+  #   country: Germany
+
   PERSON_ERB = <<~ERB
     <<%= element_name%> <%=aups.attrs("initials", "surname", "fullname=name", "role")%>>
       <%= aups.ele("organization=org", aups.attrs("abbrev=orgabbrev",
                                                   *[$options.v3 && "ascii=orgascii"]), "") %>
       <address>
-<% postal = %w{street city region code country}.select{|gi| aups.has(gi)}
-   if postal != [] -%>
+<% postal_elements = %w{extaddr pobox street cityarea city region code sortingcode country postal}.select{|gi| aups.has(gi)}
+   if postal_elements != [] -%>
         <postal>
-<%   postal.each do |gi| -%>
+<% if pl = postal_elements.delete("postal") -%>
+          <%= aups.ele("postalLine=postal") %>
+<%   postal_elements.each do |gi| -%>
+          <%= aups.ele("postalLine=" << gi) %>
+<%   end -%>
+<% else -%>
+<%   postal_elements.each do |gi| -%>
           <%= aups.ele(gi) %>
 <%   end -%>
+<% end -%>
         </postal>
 <% end -%>
 <% %w{phone facsimile email uri}.select{|gi| aups.has(gi)}.each do |gi| -%>

data/lib/kramdown-rfc2629.rb

@@ -128,9 +128,14 @@ module Kramdown
             when /\A(.*) \((#{SECTIONS_RE})\)\z/
               href = $1
               handle_bares($2, attr, "parens", href)
-            when /\A(#{XREF_BASE})<(.+)\z/
-              href = $2
-              attr['section'] = $1
+            when /#{XREF_RE_M}<(.+)\z/
+              href = $3
+              if $2
+                attr['section'] = $2
+                attr['relative'] = "#" << $1
+              else
+                attr['section'] = $1
+              end
               attr['sectionFormat'] = 'bare'
             when /\A<<(.+)\z/
               href = $1
@@ -374,8 +379,20 @@ COLORS
         end
       end
 
+      SVG_NAMESPACES = {"xmlns"=>"http://www.w3.org/2000/svg",
+                        "xlink"=>"http://www.w3.org/1999/xlink"}
+
       def svg_clean_kgt(s)
         d = REXML::Document.new(s)
+        REXML::XPath.each(d.root, "/xmlns:svg", SVG_NAMESPACES) do |x|
+          if (w = x.attributes["width"]) && (h = x.attributes["height"])
+            x.attributes["viewBox"] = "0 0 %d %d" % [w, h]
+          end
+          if x.attributes["viewBox"]
+            x.attributes["width"] = nil
+            x.attributes["height"] = nil
+          end
+        end
         REXML::XPath.each(d.root, "//rect|//line|//path") do |x|
           x.attributes["fill"] = "none"
           x.attributes["stroke"] = "black"
@@ -548,8 +565,17 @@ COLORS
 
       def convert_blockquote(el, indent, opts)
         text = inner(el, indent, opts)
+        if $options.v3
+          gi = el.attr.delete('gi')
+          if gi && gi != 'ul'
+            "#{' '*indent}<#{gi}#{el_html_attributes(el)}>\n#{text}#{' '*indent}</#{gi}>\n"
+          else
+            "#{' '*indent}<ul#{el_html_attributes_with(el, {"empty" => 'true'})}><li>\n#{text}#{' '*indent}</li></ul>\n"
+          end
+        else
         text = "<t></t>" unless text =~ /</ # empty block quote
         "#{' '*indent}<t><list style='empty'#{el_html_attributes(el)}>\n#{text}#{' '*indent}</list></t>\n"
+        end
       end
 
       def end_sections(to_level, indent)

metadata

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