kramdown-rfc2629 1.5.17 → 1.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437ec106fe0458259c9f776fb89ed2993ffea7a466a66f087cb2dd4a460616b3
-  data.tar.gz: 255a5c80a71f8e5447c59a557b58c8ccbb6bc4ad503f838650a6e5c49083b0fb
+  metadata.gz: a2f9b627799934e130561b80d0625ee127bb67e340742ab9df6f309f069d2487
+  data.tar.gz: fd3bb7cbbe1a54316d809844f12070836e18c5eb38286a00fc322c915bebd363
 SHA512:
-  metadata.gz: d2a9724e14f28a37f6426b1173b25941a7fe1ed113be1a7c45da2e1bc855ae367723a5bf92c515ad6dd7da95d6616c91c8d16de51f366c0ec4c20417073c0ac8
-  data.tar.gz: '088030252b477385ecfa4447a4b76a472f8fbe33b0104c680feb8ea6493b4fe72334c087ec2321bfc567901595a3113750757fb35a7d69e794ef25c30071c435'
+  metadata.gz: 1d588638f3ae60b71555a23236546f0639f612774e38d8325515d9304154038cbedba463fa2c3fe3dedf028ab1b44ee9386325215114ef9a8a5c11029d57d9a6
+  data.tar.gz: 6307e13b08a45165813ceec0ea1cc5e5cc9e788fcdc0024fee168979e87803eac96dca878288b7eee628f5a167a35c1079dcc1c411b2ad88fda0fcf11757eaf7

data/README.md

@@ -28,7 +28,8 @@ structure provided by kramdown.  `bin/kramdown-rfc2629` started out as
 a simple command-line program showing how to use this, but can now do
 much more (see below).
 
-To use kramdown-rfc2629, you'll need a Ruby 2.x, and maybe
+To use kramdown-rfc2629, you'll need Ruby (at least version 2.3, but
+preferably a current version), and maybe
 [XML2RFC][] if you want to see the fruits of your work.
 
     kramdown-rfc2629 mydraft.mkd >mydraft.xml

data/data/kramdown-rfc2629.erb

@@ -12,14 +12,37 @@
 <% end -%>
 ]>
 
-<% ps.arr("pi", false) do |pi, val| -%>
-<?rfc <%=pi%>="<%= {true => "yes", false => "no", nil => "yes"}[val] || val %>"?>
+<%
+  ps.rest.fetch("consensus") do
+    # consensus not given -- default intelligently
+    cat = ps.has("category") || ps.has("cat")
+    MUST_CONSENSUS = {"std" => true, "bcp" => true}
+    ps["consensus"] = true if MUST_CONSENSUS[cat]
+  end
+  rfcattrs = ps.attrs("ipr", "docName=docname", "category=cat",
+                      "consensus", "submissionType=submissiontype", "xml:lang=lang",
+                      "number", "obsoletes", "updates", "seriesNo=seriesno")
+  TRUE_FALSE = {nil => "true", false => "false", true => "true",
+                "yes" => "true", "no" => "false"}
+  YES_NO = {"true" => "yes", "false" => "no"}
+  pis = KramdownRFC::ParameterSet.new({})
+  ps.arr("pi", false) do |pi, val|
+    pis[pi] = TRUE_FALSE[val] || val
+  end
+  if $options.v3
+    piattrs = pis.attrs("tocDepth=tocdepth", "tocInclude=toc",
+                        "sortRefs=sortrefs", "symRefs=symrefs", "indexInclude=index")
+    if piattrs != ""
+      rfcattrs << " " << piattrs
+    end
+  end
+  pis.rest.each do |pi, val|
+    v = YES_NO[val] || pis.escattr(val)
+-%>
+<?rfc <%=pi%>="<%=v%>"?>
 <% end -%>
 
-<rfc <%= ps.attrs("ipr", "docName=docname", "category=cat",
-                  "consensus", "submissionType=submissiontype", "xml:lang=lang",
-                  "number", "obsoletes", "updates", "seriesNo=seriesno") %>>
-
+<rfc <%=rfcattrs%>>
   <front>
     <%= ps.ele("title", ps.attr("abbrev=titleabbrev")) %>
 
@@ -46,15 +69,24 @@
 <%  venue = ps[:venue] -%>
 <%  if venue -%>
 <%    venue = KramdownRFC::ParameterSet.new(venue) -%>
-    <note title="Discussion Venues" removeInRFC="true">
+    <note title="About This Document" removeInRFC="true">
+<%   if (dn = ps.av[:docName]) &&
+       (dt = dn.rpartition('-')[0]) != ""
+-%>
+      <t>
+<%   if latest = venue[:latest] -%>
+        The latest revision of this draft can be found at <eref target="<%=latest%>"/>.
+<%   end -%>
+        Status information for this document may be found at <eref target="https://datatracker.ietf.org/doc/<%=dt%>/"/>.
+      </t>
+<%   end -%>
 <%   mail = venue[:mail] -%>
 <%   homepage = venue[:home] -%>
 <%   gtype = venue[:type] -%>
 <%   if mail || homepage -%>
       <t>
 <%   end -%>
-<%   if mail -%>
-<%     mail_local, mail_host = mail.split("@", 2) -%>
+<%   if mail && (mail_local, mail_host = mail.split("@", 2)) && mail_host -%>
 <%     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}/" -%>
@@ -74,6 +106,7 @@
       <t>Source for this draft and an issue tracker can be found at
         <eref target="<%=repo%>"/>.</t>
 <%   end -%>
+<%= venue.ele("t=text", nil, nil, true) -%>
     </note>
 <%  venue.warn_if_leftovers -%>
 <%  end -%>

data/kramdown-rfc2629.gemspec

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

@@ -7,10 +7,15 @@ module KramdownRFC
     def initialize(y)
       raise "*** invalid parameter set #{y.inspect}" unless Hash === y
       @f = y
+      @av = {}
     end
+    attr :av
     def [](pn)
       @f.delete(pn.to_s)
     end
+    def []=(pn, val)
+      @f[pn] = val
+    end
     def has(pn)
       @f[pn.to_s]
     end
@@ -24,10 +29,11 @@ module KramdownRFC
     end
     def attr(pn)
       val, an = van(pn)
+      @av[an.intern] = val
       %{#{an}="#{escattr(val)}"}    if val
     end
     def attrs(*pns)
-      pns.map{ |pn| attr(pn) }.compact.join(" ")
+      pns.map{ |pn| attr(pn) if pn }.compact.join(" ")
     end
     def ele(pn, attr=nil, defcontent=nil, markdown=false)
       val, an = van(pn)
@@ -59,5 +65,4 @@ module KramdownRFC
     end
   end
 
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.5.21
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown