kramdown-rfc2629 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3efa3808f2f38df0f1fedac366aa64a6687e9248
-  data.tar.gz: 9f187fbe91281d7fac747b8a32532cc3b5fd1e01
+  metadata.gz: 54c66628e2c25917324ce21fc33042dac1bce686
+  data.tar.gz: 9ed9fa9632764192f8f63f6beb32b15780eb1065
 SHA512:
-  metadata.gz: 2a16e27dd737f475610c1998e56117783fe26b86903c84babddfd44b74108fb8e353f81e345b3903c9bb4b0756cfbe711a5333815afb2b7071311418ff7cdc91
-  data.tar.gz: 956c0614ef8389ae73c7a9b2d4d0d2627116b9df505b68b2d1468fbaf16a3b691df642f83bde46af12d8e0d36e4b4b3422bffeb7c992e4ee2068f198955738cb
+  metadata.gz: 6e2998562be631b313be4742a482ad9bf9df8592b8b15b074efeb70d0e9198a3f0ffb24ee5f18e9b5e443d3286bf0037612f80afb9e28952efd4ded6b3f4b735
+  data.tar.gz: 4d012c373dd07b4367faea46e69dcb67661dc80bcb7406383846a6cb0ca70e696b3107e6deadfbc04f55431b163ba4fe775e45fa1504cbcca2e757552fecdf7d

data/bin/kramdown-rfc2629

@@ -175,6 +175,8 @@ def xml_from_sections(input)
           if bts && !v.delete("override")
             warn "*** warning: explicit settings completely override canned bibxml in reference #{k}"
           end
+          options = {input: 'RFC2629Kramdown', entity_output: coding_override, link_defs: link_defs}
+          $global_markdown_options = options # For recursive calls in bibref annotation processing.
           sechash[sn.to_s] << KramdownRFC::ref_to_xml(k, v)
         end
       end

data/kramdown-rfc2629.gemspec

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

@@ -29,11 +29,19 @@ module KramdownRFC
     def attrs(*pns)
       pns.map{ |pn| attr(pn) }.compact.join(" ")
     end
-    def ele(pn, attr=nil, defcontent=nil)
+    def ele(pn, attr=nil, defcontent=nil, markdown=false)
       val, an = van(pn)
       val ||= defcontent
       Array(val).map do |val1|
-        %{<#{[an, *Array(attr).map(&:to_s)].join(" ").strip}>#{escape_html(val1.to_s.strip)}</#{an}>}
+        v = val1.to_s.strip
+        if markdown             # Uuh.  Heavy coupling.
+          doc = Kramdown::Document.new(v, $global_markdown_options)
+          $stderr.puts doc.warnings.to_yaml unless doc.warnings.empty?
+          contents = doc.to_rfc2629[3..-6] # skip <t>...</t>\n
+        else
+          contents = escape_html(v)
+        end
+        %{<#{[an, *Array(attr).map(&:to_s)].join(" ").strip}>#{contents}</#{an}>}
       end.join(" ")
     end
     def arr(an, converthash=true, must_have_one=false, &block)

data/lib/kramdown-rfc/refxml.rb

@@ -29,7 +29,7 @@ module KramdownRFC
 <% vps.arr("format", false) do |k, v| -%>
   <format type="<%=escattr(k)%>" target="<%=escattr(v)%>"/>
 <% end -%>
-<%= vps.ele("annotation=ann") -%>
+<%= vps.ele("annotation=ann", nil, nil, true) -%>
 </reference>
     REFERB
     ret = erb.result(binding)

metadata

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