kramdown-rfc2629 1.6.6 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0665cf9a250a3ccecfd5ffb7c58f2443e8b21e518972714d22098142fef1de8e
-  data.tar.gz: 24dca25b6ced5deca65ad0baab89eb74e606683b0e2c08afb7de88cdbfc4d5bc
+  metadata.gz: a5efefbd462f83ca8a6028732587b93cdcb325dced1d3517c431951a460935ba
+  data.tar.gz: 5e419a6c6450b96ef213aa875beb1ebd2a8fab50a7dfbbe3c75f551fd40fb160
 SHA512:
-  metadata.gz: 4c579b8fec2e8b0c1aa2b749cbdcc1b70fb850db6d6ca6162b5045c31b8848a780e72ae26bcf9551987002681513d276b04bdc734c5030e068dafca11fd53a19
-  data.tar.gz: e73d2deed187c22f5f74c2664981fd65e23fa6e83b3ae3779221fe59dc361a3c0807fff74f4155055043fff603c6a29dfb35b8fba7689cf7d5d8f432908eed21
+  metadata.gz: c7f4b69d71d42913d164727465b4e998a58ef5df9378e563030ec9edea6028ea55908c41fca51aa6db760d806fa80372a71a83a5b3a134a294b90bc3ad99e5ae
+  data.tar.gz: a22265e02addd8fefcc79b40acd864df936147d9c0e3004916e8f0c5649d719970e4a19772f47a70d92051efa50f0dcde2771d7f8994c15536d8ed8d8143fd19

data/bin/de-gfm

@@ -5,19 +5,22 @@ Encoding.default_external = "UTF-8" # wake up, smell the coffee
 require 'kramdown'
 require 'kramdown-parser-gfm'
 
-if ARGV[0] == '-k'              # kramdown
-  MARKDOWN_BR = "\\\\\n"
+options = ''
+while /\A-([4bck]+)\z/ === ARGV[0]
   ARGV.shift
+  options << $1
+end
+
+if /k/ === options              # kramdown
+  MARKDOWN_BR = "\\\\\n"
 end
 
-if ARGV[0] == '-c'              # commonmark
+if /c/ === options              # commonmark
   MARKDOWN_BR = "\\\n"
-  ARGV.shift
 end
 
-if ARGV[0] == '-b'              # universal HTML
+if /b/ === options              # universal HTML
   MARKDOWN_BR = "<br/>\n"
-  ARGV.shift
 end
 
 MARKDOWN_BR ||= "  \n"          # original Gruber
@@ -37,4 +40,9 @@ module Kramdown
   end
 end
 
-puts Kramdown::Document.new(ARGF.read, input: 'GFM', gfm_quirks: 'paragraph_end').to_kramdown
+list_indent = 2
+list_indent = 4 if /4/ === options
+
+doc = Kramdown::Document.new(ARGF.read, input: 'GFM', gfm_quirks: 'paragraph_end',
+                             list_indent: list_indent)
+puts doc.to_kramdown

data/data/kramdown-rfc2629.erb

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="<%=ps[:coding]||"UTF-8"%>"?>
   <?xml-stylesheet type="text/xsl" href="rfc2629.xslt" ?>
-  <!-- generated by https://github.com/cabo/kramdown-rfc2629 version <%=
+  <!-- generated by https://github.com/cabo/kramdown-rfc version <%=
     Gem.loaded_specs["kramdown-rfc2629"].version rescue nil 
     %> (Ruby <%= RUBY_VERSION %>) -->
 
@@ -29,7 +29,7 @@
     ps["consensus"] = true if MUST_CONSENSUS[cat]
   end
   rfcattrs = ps.attrs("ipr", "docName=docname", "category=cat",
-                      "consensus", "submissionType=submissiontype", "xml:lang=lang",
+                      "consensus", "submissionType=submissiontype=stream", "xml:lang=lang",
                       "number", "obsoletes", "updates", "seriesNo=seriesno")
   TRUE_FALSE = {nil => "true", false => "false", true => "true",
                 "yes" => "true", "no" => "false"}

data/kramdown-rfc2629.gemspec

@@ -1,10 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.6'
+  s.version = '1.6.9'
   s.summary = "Kramdown extension for generating RFCXML (RFC 799x)."
   s.description = %{An RFCXML (RFC 799x) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}
-  s.add_dependency('kramdown', '~> 2.3.0')
+  s.add_dependency('kramdown', '~> 2.4.0')
   s.add_dependency('kramdown-parser-gfm', '~> 1.1')
   s.add_dependency('certified', '~> 1.0')
   s.add_dependency('json_pure', '~> 2.0')
@@ -18,6 +18,6 @@ spec = Gem::Specification.new do |s|
   #  s.has_rdoc = true
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"
-  s.homepage = "http://github.com/cabo/kramdown-rfc2629"
+  s.homepage = "http://github.com/cabo/kramdown-rfc"
   s.license = 'MIT'
 end

data/lib/kramdown-rfc/command.rb

@@ -485,7 +485,7 @@ Usage: kramdown-rfc2629 [options] file.md|file.mkd > file.xml
 Version: #{KDRFC_VERSION}
 BANNER
   opts.on("-V", "--version", "Show version and exit") do |v|
-    puts "kramdown-rfc2629 #{KDRFC_VERSION}"
+    puts "kramdown-rfc #{KDRFC_VERSION}"
     exit
   end
   opts.on("-H", "--help", "Show option summary and exit") do |v|

data/lib/kramdown-rfc/parameterset.rb

@@ -27,13 +27,15 @@ module KramdownRFC
     def has(pn)
       @f[pn.to_s]
     end
+    def has?(pn)
+      @f.key?(pn.to_s)
+    end
     def escattr(str)
       escape_html(str.to_s, :attribute)
     end
-    def van(pn)                   # pn is a parameter name, possibly with an =alias
-      an, pn = pn.to_s.split("=")
-      pn ||= an
-      [self[pn] || self[an], an]
+    def van(pn)         # pn is a parameter name, possibly with =aliases
+      names = pn.to_s.split("=")
+      [self[names.reverse.find{|nm| has?(nm)}], names.first]
     end
     def attr(pn)
       val, an = van(pn)

data/lib/kramdown-rfc2629.rb

@@ -12,7 +12,7 @@ require 'shellwords'
 
 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
-gem 'kramdown', '~> 2.3.0'
+gem 'kramdown', '~> 2.4.0'
 require 'kramdown'
 my_span_elements =  %w{list figure xref eref iref cref spanx vspace}
 Kramdown::Parser::Html::Constants::HTML_SPAN_ELEMENTS.concat my_span_elements
@@ -113,7 +113,7 @@ module Kramdown
         end
       end
 
-      XREF_START = /\{\{(?:(?:\{(.*?)\}(?:\{(.*?)\})?)|(\X*?))((?:\}\})|\})/u
+      XREF_START = /\{\{(?:(?:\{(.*?\n??.*?)\}(?:\{(.*?\n??.*?)\})?)|(\X*?))((?:\}\})|\})/u
 
       # Introduce new {{target}} syntax for empty xrefs, which would
       # otherwise be an ugly ![!](target) or ![ ](target)
@@ -124,9 +124,9 @@ module Kramdown
           warn "*** #{@src[0]}: unmatched braces #{@src[4].inspect}"
         end
         if contact_name = @src[1]
-          attr = {'fullname' => contact_name}
+          attr = {'fullname' => contact_name.gsub("\n", " ")}
           if ascii_name = @src[2]
-            attr["asciiFullname"] = ascii_name
+            attr["asciiFullname"] = ascii_name.gsub("\n", " ")
           end
           el = Element.new(:contact, nil, attr)
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.9
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ files:
 - lib/kramdown-rfc/refxml.rb
 - lib/kramdown-rfc/rfc8792.rb
 - lib/kramdown-rfc2629.rb
-homepage: http://github.com/cabo/kramdown-rfc2629
+homepage: http://github.com/cabo/kramdown-rfc
 licenses:
 - MIT
 metadata: {}
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).