kramdown-rfc2629 1.4.1 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e810a295696230d06daa18981cff3c92ad0913175b717027788ee41351d4df6f
-  data.tar.gz: 5d5db17408cc47211883b0d95071139d47fb7fd8d8391cb9eff59217e81c330d
+  metadata.gz: 4b0564f81e1af0b8fd748342c07d417a7d24a5eee8ec5a6cd64f79234ebc192a
+  data.tar.gz: 2f9e7421b5355b608bc5a41174317bccd4b55e95f1c2089228517003572f19e5
 SHA512:
-  metadata.gz: 30d01f719beb7b67932396d4e28f6e1c4f9446029e04555706089e33615c305a673443922927136dad47f974c5c45cd871655a778c97347fa40a6f5454df7970
-  data.tar.gz: ef7be0d8a0b914f67a871e813533ad5eee7280bb31d67047d688ddf164ce124763653980b6c097f4be596be4211d32062efae15e5726d90618aca709cc63a462
+  metadata.gz: e0aa2949a7d5d28eacdceff68e37fae0338a7f92abab5ed21fcb99414042c528521d844d8e92d14202a0b914eec685149c69dcbdb53d3089a0f72723872d4b63
+  data.tar.gz: 9424d9efbe85b3ca435ff1691f052097b579ff02247af53a5b463b2eb3cf50bed3761ad4386d87a93df32e6b9a87a4924e1c47eaae0e01b2163473a9e65bf950

data/README.md

@@ -616,7 +616,7 @@ Other human-oriented markup input languages that are being used for authoring RF
 Since kramdown version 1.0, kramdown itself is MIT licensed, which
 made it possible to license kramdown-rfc2629 under the same license.
 
-[kramdown]: http://kramdown.rubyforge.org/
+[kramdown]: https://kramdown.gettalong.org
 [kdsyntax]: http://kramdown.gettalong.org/syntax.html
 [kdsyntax-ial]: http://kramdown.gettalong.org/syntax.html#inline-attribute-lists
 [stupid]: http://tools.ietf.org/id/draft-hartke-xmpp-stupid-00

data/bin/doilit

@@ -75,7 +75,11 @@ ARGV.each do |doi|
   if (ct = cite["container-title"]) && ct != []
     info = []
     if v = cite["volume"]
-      info << "Vol. #{v}"
+      vi = "vol. #{v}"
+      if (v = cite["journal-issue"]) && (issue = v["issue"])
+        vi << ", no. #{issue}"
+      end
+      info << vi
     end
     if p = cite["page"]
       info << "pp. #{p}"

data/bin/kdrfc

@@ -127,6 +127,9 @@ BANNER
   opts.on("-p", "--[no-]prep", "Convert xml to prepped xml") do |v|
     $options.prep = v
   end
+  opts.on("-P", "--[no-]pdf", "Convert xml to PDF") do |v|
+    $options.pdf = v
+  end
   opts.on("-c", "--[no-]convert", "Convert xml to v3 xml") do |v|
     $options.v2v3 = v
   end
@@ -150,6 +153,7 @@ def process_the_xml(fn, base)
   process_xml(fn, "#{base}.v2v3.xml", "--v2v3") if $options.v2v3
   process_xml(fn, "#{base}.txt") if $options.txt || $options.idnits
   process_xml(fn, "#{base}.html", "--html") if $options.html
+  process_xml(fn, "#{base}.pdf", "--pdf") if $options.pdf
   run_idnits("#{base}.txt") if $options.idnits
 end
 

data/bin/kramdown-rfc2629

@@ -14,7 +14,7 @@ Encoding.default_external = "UTF-8" # wake up, smell the coffee
 
 def boilerplate(key)
   case key.downcase
-  when /\Abcp14(\+)?\z/i
+  when /\Abcp14(\+)?(-tagged)?\z/i
     ret = <<RFC8174
 The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
 NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED",
@@ -28,6 +28,26 @@ These words may also appear in this document in
 lower case as plain English words, absent their normative meanings.
 PLUS
     end
+    if $2
+      if $options.v3
+        ret << <<TAGGED
+
+*[MUST]: <bcp14>
+*[MUST NOT]: <bcp14>
+*[REQUIRED]: <bcp14>
+*[SHALL]: <bcp14>
+*[SHALL NOT]: <bcp14>
+*[SHOULD]: <bcp14>
+*[SHOULD NOT]: <bcp14>
+*[RECOMMENDED]: <bcp14>
+*[NOT RECOMMENDED]: <bcp14>
+*[MAY]: <bcp14>
+*[OPTIONAL]: <bcp14>
+TAGGED
+      else
+        warn "** need --v3 to tag bcp14"
+      end
+    end
     ret
   else
     warn "** Unknwon boilerplate key: #{key}"

data/data/encoding-fallbacks.txt

@@ -1,3 +1,4 @@
+00a0  
 00a1 !
 00a2 [cents]
 00a3 GBP

data/kramdown-rfc2629.gemspec

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

@@ -32,6 +32,7 @@ module KramdownRFC
   <format type="<%=escattr(k)%>" target="<%=escattr(v)%>"/>
 <% end -%>
 <%= vps.ele("annotation=ann", nil, nil, true) -%>
+<%= vps.ele("refcontent=rc", nil, nil, true) -%>
 </reference>
     REFERB
     ret = erb.result(binding)

data/lib/kramdown-rfc2629.rb

@@ -102,10 +102,16 @@ module Kramdown
             when /\A(.*) \((#{SECTIONS_RE})\)\z/
               href = $1
               handle_bares($2, attr, "parens", href)
-            when /\A([\w.]+)<(.*)\z/
+            when /\A([\w.]+)<(.+)\z/
               href = $2
               attr['section'] = $1
               attr['sectionFormat'] = 'bare'
+            when /\A<<(.+)\z/
+              href = $1
+              attr['format'] = 'title'
+            when /\A<(.+)\z/
+              href = $1
+              attr['format'] = 'counter'
             end
           end
           href = href.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an IDREF with a number
@@ -399,7 +405,7 @@ COLORS
         # warn ["goat:", result1.inspect]
         file.unlink
         result1 = svg_clean(result1) unless t == "goat"
-        result1, err, _s = Open3.capture3("svgcheck -qa", stdin_data: result1);
+        result1, err, _s = Open3.capture3("svgcheck -Xqa", stdin_data: result1);
         capture_croak("svgcheck", err)
         # warn ["svgcheck:", result1.inspect]
         if result1 == ''
@@ -698,7 +704,11 @@ COLORS
       end
 
       def convert_br(el, indent, opts)
-        "<vspace />"
+        if $options.v3
+          "<br />"
+        else
+          "<vspace />"
+        end
       end
 
       def convert_a(el, indent, opts)
@@ -903,7 +913,7 @@ COLORS
                   }
                 else
                   REXML::XPath.each(d.root, "/reference/format") { |x|
-                    x.attributes["target"].sub!(%r{https?://www.ietf.org/internet-drafts/}, 
+                    x.attributes["target"].sub!(%r{https?://www.ietf.org/internet-drafts/},
                                                 %{https://www.ietf.org/archive/id/}) if t == "I-D"
                   }
                 end
@@ -1069,6 +1079,9 @@ COLORS
         title = nil if title.empty?
         value = el.value
         if item = title
+          if item == "<bcp14>" && $options.v3
+            return "<bcp14>#{el.value}</bcp14>"
+          end
           m = title.scan(Parser::RFC2629Kramdown::IREF_START)
           if m.empty?
             subitem = value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.