kramdown-rfc2629 1.5.14 → 1.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3097408dcedb58eab67f2de242d7ba51f8e62e82199e9da00b6a68ca0917c3dc
-  data.tar.gz: fbcac44963fb8a7ce2df22060e624410e8f7df4c439d2e7cdcc1fcb760f3b1c4
+  metadata.gz: 1a7de9b6c78edf74415c185732e4b41a2d5685b07968bd187ce0948ea6dfd607
+  data.tar.gz: 52abd5a775d5c9922531b199fc957fbfe645621b4db3b59a624b0940ec328bf9
 SHA512:
-  metadata.gz: b79053e9e4a368ece939ef8a3cca6c8e72826dd0e35bee10a4cf1548f4e5b72d38fdf680a0ae33b17c33c24ab87335addd401d3df2d60b34476ccfb4f592a501
-  data.tar.gz: 0d1a39fbb8e26a5513deca8fdf9c844aed56cdcb27c02ab6695251bfadfbdd47721b0f3a90a2755171eb7eb58dc98629b57f8e528e0c7c00005f640a1d74bd6e
+  metadata.gz: 6a10a5fa3678b60ac5e1fa56ca42ef38529ff577e1a206c87784d9afb53d73af853ba16fbf0ec233152c55614b0ee9a22b40e332c0fd2b14bf7371333359baf7
+  data.tar.gz: 4dd3ef2b8698068f39b3e2c032f3bd76d281ac8fadb46820867b266339bee9aa86787eb0a60b72d853f03b33f0190256c4125fdf8950d8a877106dbdb855e6e3

data/data/kramdown-rfc2629.erb

@@ -42,6 +42,31 @@
 
     </abstract>
 
+<% if $options.v3 -%>
+<%  venue = ps[:venue] -%>
+<%  if venue -%>
+<%    venue = KramdownRFC::ParameterSet.new(venue) -%>
+    <note title="Discussion Venues" removeInRFC="true">
+<%   if mail = venue[:mail] -%>
+<%     mail_local, mail_host = mail.split("@", 2) -%>
+<%     mail_subdomain, mail_domain = mail_host.split(".", 2) -%>
+<%     group = venue[:group] || mail_local # XXX -%>
+<%     arch = venue[:arch] || "https://mailarchive.ietf.org/arch/browse/#{mail_local}/" -%>
+<%     GROUPS = {"ietf" => "Working ", "irtf" => "Research "} -%>
+<%     type = venue[:type] || "#{GROUPS[mail_subdomain]}Group" -%>
+      <t>Discussion of this document takes place on the
+        <%=group%> <%=type%> mailing list (<%=mail%>),
+        which is archived at <eref target="<%=arch%>"/>.</t>
+<%   end -%>
+<%   if gh = venue[:github] -%>
+      <t>Source for this draft and an issue tracker can be found at
+        <eref target="https://github.com/<%=gh%>"/>.</t>
+<%   end -%>
+    </note>
+<%  venue.warn_if_leftovers -%>
+<%  end -%>
+<% end -%>
+
 <% sechash.keys.each do |k| -%>
 <%   if k =~ /\A(to_be_removed_)?note_(.*)/ -%>
 
@@ -78,6 +103,7 @@
 {:removeinrfc: removeinrfc="true"}
 {:notoc: toc="exclude"}
 {:compact: spacing="compact"}
+{:noabbrev: noabbrev="true"}
 {::nomarkdown}
 
 <%= sechash.delete("middle") %>

data/kramdown-rfc2629.gemspec

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

@@ -226,7 +226,11 @@ module Kramdown
     )
     STUDLY_ATTR_MAP = Hash[STUDLY_ATTR.map {|s| [s.downcase, s]}]
 
-    def rfc2629_fix
+    TRUTHY = Hash.new {|h, k| k}
+    TRUTHY["false"] = false
+    TRUTHY["no"] = false
+
+    def rfc2629_fix(opts)
       if a = attr
         if anchor = a.delete('id')
           a['anchor'] = ::Kramdown::Parser::RFC2629Kramdown.idref_cleanup(anchor)
@@ -234,12 +238,16 @@ module Kramdown
         if anchor = a.delete('href')
           a['target'] = ::Kramdown::Parser::RFC2629Kramdown.idref_cleanup(anchor)
         end
+        if av = a.delete('noabbrev')      # pseudo attribute -> opts
+          opts = opts.merge(noabbrev: TRUTHY[av]) # updated copy
+        end
         attr.keys.each do |k|
           if (d = k.gsub(/_(.|$)/) { $1.upcase }) != k or d = STUDLY_ATTR_MAP[k]
             a[d] = a.delete(k)
           end
         end
       end
+      opts
     end
   end
 
@@ -294,15 +302,15 @@ module Kramdown
       end
 
       def convert1(el, indent, opts = {})
-        el.rfc2629_fix
-        send("convert_#{el.type}", el, indent, opts)
+        nopts = el.rfc2629_fix(opts)
+        send("convert_#{el.type}", el, indent, nopts)
       end
 
       def inner_a(el, indent, opts)
         indent += INDENTATION
         el.children.map do |inner_el|
-          inner_el.rfc2629_fix
-          send("convert_#{inner_el.type}", inner_el, indent, opts)
+          nopts = inner_el.rfc2629_fix(opts)
+          send("convert_#{inner_el.type}", inner_el, indent, nopts)
         end
       end
 
@@ -664,6 +672,7 @@ COLORS
           if sl = el.attr.delete('slugifiedName') # could do general name- play
             attrstring = html_attributes({'slugifiedName' => sl})
           end
+          # noabbrev: true -- Workaround for https://trac.ietf.org/trac/xml2rfc/ticket/683
           irefs = "<name#{attrstring}>#{inner(el, indent, opts.merge(noabbrev: true))}</name>" #
         else
         clean, irefs = clean_pcdata(inner_a(el, indent, opts))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.5.15
 platform: ruby
 authors:
 - Carsten Bormann