kramdown-rfc2629 0.13.3 → 0.13.4

data/bin/kramdown-rfc2629

@@ -51,27 +51,30 @@ def xml_from_sections(input)
           end
         else
           vps = ParameterSet.new(v)
-          erb = ERB.new <<-REFERB
+          erb = ERB.new <<-REFERB, nil, '-'
 <reference anchor="<%= k %>" <%= vps.attr("target") %>>
   <front>
-    <%= vps.ele("title") %>
+    <%= vps.ele("title") -%>
 
 <% vps.arr("author") do |au|
    aups = authorps_from_hash(au)
- %>
+ -%>
     <author <%=aups.attrs("initials", "surname", "fullname=name", "role")%>>
       <%= aups.ele("organization=org", aups.attr("abbrev=orgabbrev"), "") %>
     </author>
-<%   aups.warn_if_leftovers  %>
-<% end %>
-
-<% if date = vps[:date] %>
+<%   aups.warn_if_leftovers  -%>
+<% end -%>
+<% if date = vps[:date] -%>
     <date <%= dateattrs(date) %>/>
-<% end %>
+<% end -%>
   </front>
+<% vps.arr("seriesinfo", false) do |k, v| -%>
+  <seriesInfo name="<%=k%>" value="<%=v%>"/>
+<% end -%>
 </reference>
           REFERB
           sechash[sn.to_s] << erb.result(binding)
+          vps.warn_if_leftovers
         end
       end
     end
@@ -79,7 +82,7 @@ def xml_from_sections(input)
 
   erbfilename = File.expand_path '../../data/kramdown-rfc2629.erb', __FILE__
   erbfile = File.read(erbfilename, coding: "UTF-8")
-  erb = ERB.new(erbfile)
+  erb = ERB.new(erbfile, nil, '-')
   # remove redundant nomarkdown pop outs/pop ins as they confuse kramdown
   input = erb.result(binding).gsub(%r"{::nomarkdown}\s*{:/nomarkdown}"m, "")
   ps.warn_if_leftovers

data/data/kramdown-rfc2629.erb

@@ -3,32 +3,31 @@
 
 <!DOCTYPE rfc SYSTEM "rfc2629.dtd" [
 <% ps.arr("bibxml") do |bib|
-   tag, sys = bibtagsys(bib) %>
+   tag, sys = bibtagsys(bib) -%>
 <!ENTITY <%= tag %> SYSTEM "<%= sys %>">
-<% end %>
-<% ps.arr("entity", false) do |en, ev| %>
+<% end -%>
+<% ps.arr("entity", false) do |en, ev| -%>
 <!ENTITY <%=en%> "<%=ev%>">
-<% end %>
+<% end -%>
 ]>
 
 <rfc <%= ps.attrs("ipr", "docName=docname", "category=cat",
                   "number", "obsoletes", "updates", "seriesNo=seriesno") %>>
 
-<% ps.arr("pi", false) do |pi, val| %>
+<% ps.arr("pi", false) do |pi, val| -%>
 <?rfc <%=pi%>="<%= {true => "yes", false => "no", nil => "yes"}[val] || val %>"?>
-<% end %>
+<% end -%>
 
   <front>
     <%= ps.ele("title", ps.attr("abbrev=titleabbrev")) %>
 
 <% ps.arr("author") do |au|
    aups = authorps_from_hash(au)
- %>
-
+ -%>
     <author <%=aups.attrs("initials", "surname", "fullname=name", "role")%>>
       <%= aups.ele("organization=org", aups.attr("abbrev=orgabbrev"), "") %>
       <address>
-        <% if aups.has("street") %>
+<% if aups.has("street") -%>
         <postal>
           <%= aups.ele("street") %>
           <%= aups.ele("city") %>
@@ -36,16 +35,15 @@
           <%= aups.ele("code") %>
           <%= aups.ele("country") %>
         </postal>
-        <% end %>
+<% end -%>
         <%= aups.ele("phone") %>
         <%= aups.ele("facsimile") %>
         <%= aups.ele("email") %>
         <%= aups.ele("uri") %>
       </address>
     </author>
-
-<%   aups.warn_if_leftovers  %>
-<% end %>
+<%   aups.warn_if_leftovers  -%>
+<% end -%>
 
     <date <%= dateattrs(ps[:date]||Date.today) %>/>
 
@@ -59,18 +57,17 @@
 
     </abstract>
 
-<% sechash.keys.each do |k| %>
-<%   if k =~ /\Anote_(.*)/ %>
+<% sechash.keys.each do |k| -%>
+<%   if k =~ /\Anote_(.*)/ -%>
 
     <note title="<%= $1.gsub("_", " ")%>">
 
-<%= sechash.delete(k) %>
+<%= sechash.delete(k) -%>
 
     </note>
 
-<% end %>
-<% end %>
-
+<% end -%>
+<% end -%>
 
   </front>
 
@@ -80,29 +77,25 @@
 
   </middle>
 
-<back>
-
-<% if sh = sechash.delete("normative") %>
+  <back>
 
-  <references title='Normative References'>
+<% if sh = sechash.delete("normative") -%>
+    <references title='Normative References'>
 
 <%= sh %>
 
-  </references>
+    </references>
+<% end -%>
 
-<% end %>
-
-<% if sh = sechash.delete("informative") %>
-
-  <references title='Informative References'>
+<% if sh = sechash.delete("informative") -%>
+    <references title='Informative References'>
 
 <%= sh %>
 
-  </references>
-
-<% end %>
+    </references>
+<% end -%>
 
 <%= sechash.delete("back") %>
 
-</back>
+  </back>
 </rfc>

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '0.13.3'
+  s.version = '0.13.4'
   s.summary = "Kramdown extension for generating RFC 2629 XML."
   s.description = %{An RFC2629 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc2629.rb

@@ -177,7 +177,11 @@ module Kramdown
 
       def convert_ul(el, indent, opts)
         style = STYLES[el.type]
-        "#{' '*indent}<t><list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list></t>\n"
+        if opts[:unpacked]
+          "#{' '*indent}<list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list>\n"
+          else
+          "#{' '*indent}<t><list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list></t>\n"
+        end
       end
       alias :convert_ol :convert_ul
       alias :convert_dl :convert_ul

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70123750840660 !ruby/object:Gem::Requirement
+  requirement: &70155418327600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *70123750840660
+  version_requirements: *70155418327600
 description: ! 'An RFC2629 (XML2RFC) generating backend for Thomas Leitner''s
 
   "kramdown" markdown parser.  Mostly useful for RFC writers.'