kramdown-rfc2629 1.5.18 → 1.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1899e3dda0205ba1affda979ec1e972a27fc7d13ae721737e14cf4ab737b13ff
-  data.tar.gz: 442106a989c71107a357d7c0bfec6ed9cf6b51c23cbfe870c81a26adc4542438
+  metadata.gz: 4a589f2a63da88b17cc5b56af63afe5a0faa9e7aae446f99b0a14aed7876e22d
+  data.tar.gz: 693ce583c48dbe4768727d684f3aa303436ad46bf824f291a9f0b3d63063d62c
 SHA512:
-  metadata.gz: 1072b3d275c6ff6692bdc2cb3e666ac76f3c4838d6978b822c034b6ac4c70bf29a5d0be20aad42881bd9dcdf1ef5b69decb59114ecbfbb4457988ef0b0a2f3aa
-  data.tar.gz: 81360978cd5ff6692263c0b0b3aff2780b0b806ed83edd2d96ac40e5f705120ed54a529b874a51b27d25be10b44f14fd4bb84a7d7fe067dd3b2b73e4e1234714
+  metadata.gz: 965e4be16c1a7b5f372a911d861d5bfca8fdca3ebc999b1e61feb1aaabb003b3504f882f28224185ec497777eba1c4e6aa1be98890cf9f05ae0493b9b5d146a5
+  data.tar.gz: 4b9a3ec95bc29455192af45e0dac1701b2e76f934816746edea7b57ffca1001f23ed11df91b710398a60356297e955807d9e5d912298eb320ebb62daab17302c

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,36 @@
 <% 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_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] || escape_html(val.to_s, :attribute)
+-%>
+<?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")) %>
 

data/kramdown-rfc2629.gemspec

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

@@ -13,6 +13,9 @@ module KramdownRFC
     def [](pn)
       @f.delete(pn.to_s)
     end
+    def []=(pn, val)
+      @f[pn] = val
+    end
     def has(pn)
       @f[pn.to_s]
     end

metadata

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