kramdown-rfc2629 1.5.22 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fd02030501ff7ce234af8b2f2412b5c1372c8e865b368db995ab0a32347dc0
-  data.tar.gz: 31d7f8eed4b7adc64e8ff4458368e1380351089aa44478faf2987a78239d5cae
+  metadata.gz: e14f146c7079e4611aa6ddf79f706ef0fddb168e1bb510c278ead6c93595b99a
+  data.tar.gz: efa3c83941f0eaa68e82d9d2bbe554826f70bee1469498e870506f006806bcf8
 SHA512:
-  metadata.gz: a39fa3bf7a2703f958dbc443d1d8d850a0a89ec9797f619218e921cdadd372e4466f628a1a3dbf13f178163a16f92141026ac34bfd52c82f1950fd3780d187aa
-  data.tar.gz: f02da291a9a611a4cb21097c2f31ee490a6327558cf1d66018279c89ef5f56f4ad87884046b19e44d347d5946346d0108a017e19aabb6b0db180f53a9847430a
+  metadata.gz: 54b21302c63267ecf9eaf845d67927c8f7f7dc78b4608c545fb6487274a507980695512d21397fa54c7700c3659600229c6dc0cab4964e2c8e9a471da9b51e00
+  data.tar.gz: '093aaa4efee63f5a103fba961072413884170bbcf13bb402b3ea40f36d1af1843d0b170be57d257dbf94f7b05bb6dc1e38df6a76abee06a5c475517fdd843d62'

data/README.md

@@ -48,6 +48,19 @@ is provided by `kdrfc`:
 
     kdrfc -r mydraft.mkd
 
+# Versions of RFCXML
+
+Since RFC 8650, RFCs are using an updated grammar as defined in RFC
+7991 to 7998 and further updated informally since, colloquially called "[v3][]".
+As RFC 2629 is no longer the governing standard, kramdown-rfc2629 is
+now called kramdown-rfc.  The latter command defaults to v3 processing
+rules; from 2022-02-22T22:02:22 on, kramdown-rfc2629 does as well (1.6.1).
+(-3/--v3 and -2/--v2 select v3 and v2 explicitly; the latter should
+only be needed if there is a reason to to make a document look
+like it's 2016.)
+
+[v3]: https://xml2rfc.tools.ietf.org/xml2rfc-doc.html
+
 # Examples
 
 For historical interest

data/bin/kdrfc

@@ -51,9 +51,26 @@ BANNER
   opts.on("-3", "--[no-]v3", "Use RFCXML v3 processing rules") do |v|
     kdrfc.options.v3 = v
   end
+  opts.on("-2", "--[no-]v2", "Use RFCXML v2 processing rules") do |v|
+    kdrfc.options.v2 = v
+  end
 end
 op.parse!
 
+
+if kdrfc.options.v2 && kdrfc.options.v3
+  warn "*** can't have v2 and eat v3 cake"
+  kdrfc.options.v2 = false
+end
+
+if kdrfc.options.v3.nil? && !kdrfc.options.v2
+  if Time.now.to_i >= 1645567342 # Time.parse("2022-02-22T22:02:22Z").to_i
+    kdrfc.options.v3 = true           # new default from the above date
+  end
+end
+
+warn "*** v2 #{kdrfc.options.v2.inspect} v3 #{kdrfc.options.v3.inspect}" if kdrfc.options.verbose
+
 case ARGV.size
 when 1
   fn = ARGV[0]

data/bin/kramdown-rfc

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'ostruct'
+
+$options ||= OpenStruct.new
+
+$options.v3 = true
+require 'kramdown-rfc/command'
+

data/bin/kramdown-rfc2629

@@ -1,528 +1,4 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'kramdown-rfc2629'
-require 'kramdown-rfc/parameterset'
-require 'kramdown-rfc/refxml'
-require 'kramdown-rfc/rfc8792'
-require 'yaml'
-require 'kramdown-rfc/erb'
-require 'date'
+require 'kramdown-rfc/command'
 
-# try to get this from gemspec.
-KDRFC_VERSION=Gem.loaded_specs["kramdown-rfc2629"].version rescue "unknown-version"
-
-Encoding.default_external = "UTF-8" # wake up, smell the coffee
-
-# Note that this doesn't attempt to handle HT characters
-def remove_indentation(s)
-  l = s.lines
-  indent = l.grep(/\S/).map {|l| l[/^\s*/].size}.min
-  l.map {|li| li.sub(/^ {0,#{indent}}/, "")}.join
-end
-
-def add_quote(s)
-  l = s.lines
-  l.map {|li| "> #{li}"}.join
-end
-
-def process_chunk(s, dedent, fold, quote)
-  s = remove_indentation(s) if dedent
-  s = fold8792_1(s) if fold
-  s = add_quote(s) if quote
-  s
-end
-
-def boilerplate(key)
-  case key.downcase
-  when /\Abcp14(info)?(\+)?(-tagged)?\z/i
-    ret = ''
-    if $1
-      ret << <<RFC8174ise
-Although this document is not an IETF Standards Track publication, it
-adopts the conventions for normative language to provide clarity of
-instructions to the implementer.
-RFC8174ise
-    end
-    ret << <<RFC8174
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
-NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED",
-"MAY", and "OPTIONAL" in this document are to be interpreted as
-described in BCP 14 {{!RFC2119}} {{!RFC8174}} when, and only when, they
-appear in all capitals, as shown here.
-RFC8174
-    if $2
-      ret << <<PLUS
-These words may also appear in this document in
-lower case as plain English words, absent their normative meanings.
-PLUS
-    end
-    if $3
-      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}"
-    "{::boilerplate #{key}}"
-  end
-end
-
-def do_the_tls_dance
-  begin
-    require 'openssl'
-    File.open(OpenSSL::X509::DEFAULT_CERT_FILE) do end
-    # This guards against having an unreadable cert file (yes, that appears to happen a lot).
-  rescue
-    if Dir[File.join(OpenSSL::X509::DEFAULT_CERT_DIR, "*.pem")].empty?
-      # This guards against having no certs at all, not against missing the right one for IETF.
-      # Oh well.
-      warn "** Configuration problem with OpenSSL certificate store."
-      warn "**   You may want to examine #{OpenSSL::X509::DEFAULT_CERT_FILE}"
-      warn "**    and #{OpenSSL::X509::DEFAULT_CERT_DIR}."
-      warn "**   Activating suboptimal workaround."
-      warn "**   Occasionally run `certified-update` to maintain that workaround."
-      require 'certified'
-    end
-  end
-end
-
-RE_NL = /(?:\n|\r|\r\n)/
-RE_SECTION = /---(?: +(\w+)(-?))?\s*#{RE_NL}(.*?#{RE_NL})(?=---(?:\s+\w+-?)?\s*#{RE_NL}|\Z)/m
-
-NMDTAGS = ["{:/nomarkdown}\n\n", "\n\n{::nomarkdown}\n"]
-
-NORMINFORM = { "!" => :normative, "?" => :informative }
-
-def yaml_load(input, *args)
-  if YAML.respond_to?(:safe_load)
-    begin
-      YAML.safe_load(input, *args)
-    rescue ArgumentError
-      YAML.safe_load(input, permitted_classes: args[0], permitted_symbols: args[1], aliases: args[2])
-    end
-  else
-    YAML.load(input)
-  end
-end
-
-def process_kramdown_options(coding_override = nil,
-                             smart_quotes = nil, typographic_symbols = nil,
-                             header_kramdown_options = nil)
-
-  ascii_target = coding_override && coding_override =~ /ascii/
-  suppress_typography = ascii_target || $options.v3
-  entity_output = ascii_target ? :numeric : :as_char;
-
-  options = {input: 'RFC2629Kramdown', entity_output: entity_output, link_defs: {}}
-
-  if smart_quotes.nil? && suppress_typography
-    smart_quotes = false
-  end
-  if smart_quotes == false
-    smart_quotes = ["'".ord, "'".ord, '"'.ord, '"'.ord]
-  end
-  case smart_quotes
-  when Array
-    options[:smart_quotes] = smart_quotes
-  when nil, true
-    # nothin
-  else
-    warn "*** Can't deal with smart_quotes value #{smart_quotes.inspect}"
-  end
-
-  if typographic_symbols.nil? && suppress_typography
-    typographic_symbols = false
-  end
-  if typographic_symbols == false
-    typographic_symbols = Hash[::Kramdown::Parser::Kramdown::TYPOGRAPHIC_SYMS.map { |k, v|
-                                 if Symbol === v
-                                   [v.intern, k]
-                                 end
-                               }.compact]
-  end
-  # warn [:TYPOGRAPHIC_SYMBOLS, typographic_symbols].to_yaml
-  case typographic_symbols
-  when Hash
-    options[:typographic_symbols] = typographic_symbols
-  when nil, true
-    # nothin
-  else
-    warn "*** Can't deal with typographic_symbols value #{typographic_symbols.inspect}"
-  end
-
-  if header_kramdown_options
-    options.merge! header_kramdown_options
-  end
-
-  $global_markdown_options = options   # For nested calls in bibref annotation processing and xref text
-
-  options
-end
-
-XREF_SECTIONS_RE = ::Kramdown::Parser::RFC2629Kramdown::SECTIONS_RE
-XSR_PREFIX = "#{XREF_SECTIONS_RE} of "
-XSR_SUFFIX = ", (#{XREF_SECTIONS_RE})| \\((#{XREF_SECTIONS_RE})\\)"
-XREF_TXT = ::Kramdown::Parser::RFC2629Kramdown::XREF_TXT
-XREF_TXT_SUFFIX = " \\(#{XREF_TXT}\\)"
-
-def spacify_re(s)
-  s.gsub(' ', '[\u00A0\s]+')
-end
-
-def xml_from_sections(input)
-
-  unless ENV["KRAMDOWN_NO_SOURCE"]
-    require 'kramdown-rfc/gzip-clone'
-    require 'base64'
-    compressed_input = Gzip.compress(input)
-    $source = Base64.encode64(compressed_input)
-  end
-
-  sections = input.scan(RE_SECTION)
-  # resulting in an array; each section is [section-label, nomarkdown-flag, section-text]
-
-  # the first section is a YAML with front matter parameters (don't put a label here)
-  # We put back the "---" plus gratuitous blank lines to hack the line number in errors
-  yaml_in = input[/---\s*/] << sections.shift[2]
-  ps = KramdownRFC::ParameterSet.new(yaml_load(yaml_in, [Date], [], true))
-
-  coding_override = ps.has(:coding)
-  smart_quotes = ps[:smart_quotes]
-  typographic_symbols = ps[:typographic_symbols]
-  header_kramdown_options = ps[:kramdown_options]
-
-  kramdown_options = process_kramdown_options(coding_override,
-                                              smart_quotes, typographic_symbols,
-                                              header_kramdown_options)
-
-  # all the other sections are put in a Hash, possibly concatenated from parts there
-  sechash = Hash.new{ |h,k| h[k] = ""}
-  snames = []                   # a stack of section names
-  sections.each do |sname, nmdflag, text|
-    # warn [:SNAME, sname, nmdflag, text[0..10]].inspect
-    nmdin, nmdout = {
-      "-" => ["", ""],          # stay in nomarkdown
-      "" => NMDTAGS, # pop out temporarily
-    }[nmdflag || ""]
-    if sname
-      snames << sname           # "--- label" -> push label (now current)
-    else
-      snames.pop                # just "---" -> pop label (previous now current)
-    end
-    sechash[snames.last] << "#{nmdin}#{text}#{nmdout}"
-  end
-
-  ref_replacements = { }
-  anchor_to_bibref = { }
-
-  [:ref, :normative, :informative].each do |sn|
-    if refs = ps.has(sn)
-      warn "*** bad section #{sn}: #{refs.inspect}" unless refs.respond_to? :each
-      refs.each do |k, v|
-        if v.respond_to? :to_str
-          if bibtagsys(v)       # enable "foo: RFC4711" as a custom anchor definition
-            anchor_to_bibref[k] = v.to_str
-          end
-          ref_replacements[v.to_str] = k
-        end
-        if Hash === v
-          if aliasname = v.delete("-")
-            ref_replacements[aliasname] = k
-          end
-          if bibref = v.delete("=")
-            anchor_to_bibref[k] = bibref
-          end
-        end
-      end
-    end
-  end
-  open_refs = ps[:ref] || { }       # consumed
-
-  norm_ref = { }
-
-  # convenience replacement of {{-coap}} with {{I-D.ietf-core-coap}}
-  # collect normative/informative tagging {{!RFC2119}} {{?RFC4711}}
-  sechash.each do |k, v|
-    next if k == "fluff"
-    v.gsub!(/{{(#{
-      spacify_re(XSR_PREFIX)
-    })?(?:([?!])(-)?|(-))([\w._\-]+)(?:=([\w.\/_\-]+))?(#{
-      XREF_TXT_SUFFIX
-    })?(#{
-      spacify_re(XSR_SUFFIX)
-    })?}}/) do |match|
-      xsr_prefix = $1
-      norminform = $2
-      replacing = $3 || $4
-      word = $5
-      bibref = $6
-      xrt_suffix = $7
-      xsr_suffix = $8
-      if replacing
-        if new = ref_replacements[word]
-          word = new
-        else
-          warn "*** no alias replacement for {{-#{word}}}"
-          word = "-#{word}"
-        end
-      end       # now, word is the anchor
-      if bibref
-        if old = anchor_to_bibref[word]
-          if bibref != old
-            warn "*** conflicting definitions for xref #{word}: #{old} != #{bibref}"
-          end
-        else
-          anchor_to_bibref[word] = bibref
-        end
-      end
-
-      # things can be normative in one place and informative in another -> normative
-      # collect norm/inform above and assign it by priority here
-      if norminform
-        norm_ref[word] ||= norminform == '!' # one normative ref is enough
-      end
-      "{{#{xsr_prefix}#{word}#{xrt_suffix}#{xsr_suffix}}}"
-    end
-  end
-
-  [:normative, :informative].each do |k|
-    ps.rest[k.to_s] ||= { }
-  end
-
-  norm_ref.each do |k, v|
-    # could check bibtagsys here: needed if open_refs is nil or string
-    target = ps.has(v ? :normative : :informative)
-    warn "*** overwriting #{k}" if target.has_key?(k)
-    target[k] = open_refs[k] # add reference to normative/informative
-  end
-  # note that unused items from ref are considered OK, therefore no check for that here
-
-  # also should allow norm/inform check of other references
-  # {{?coap}} vs. {{!coap}} vs. {{-coap}} (undecided)
-  # or {{?-coap}} vs. {{!-coap}} vs. {{-coap}} (undecided)
-  # could require all references to be decided by a global flag
-  overlap = [:normative, :informative].map { |s| (ps.has(s) || { }).keys }.reduce(:&)
-  unless overlap.empty?
-    warn "*** #{overlap.join(', ')}: both normative and informative"
-  end
-
-  stand_alone = ps[:stand_alone]
-
-  [:normative, :informative].each do |sn|
-    if refs = ps[sn]
-      refs.each do |k, v|
-        href = ::Kramdown::Parser::RFC2629Kramdown.idref_cleanup(k)
-        kramdown_options[:link_defs][k] = ["##{href}", nil]   # allow [RFC2119] in addition to {{RFC2119}}
-
-        bibref = anchor_to_bibref[k] || k
-        bts, url = bibtagsys(bibref, k, stand_alone)
-        if bts && (!v || v == {} || v.respond_to?(:to_str))
-          if stand_alone
-            a = %{{: anchor="#{k}"}}
-            sechash[sn.to_s] << %{\n#{NMDTAGS[0]}\n![:include:](#{bts})#{a}\n#{NMDTAGS[1]}\n}
-          else
-            bts.gsub!('/', '_')
-            (ps.rest["bibxml"] ||= []) << [bts, url]
-            sechash[sn.to_s] << %{&#{bts};\n} # ???
-          end
-        else
-          unless v && Hash === v
-            warn "*** don't know how to expand ref #{k}"
-            next
-          end
-          if bts && !v.delete("override")
-            warn "*** warning: explicit settings completely override canned bibxml in reference #{k}"
-          end
-          sechash[sn.to_s] << KramdownRFC::ref_to_xml(href, v)
-        end
-      end
-    end
-  end
-
-  erbfilename = File.expand_path '../../data/kramdown-rfc2629.erb', __FILE__
-  erbfile = File.read(erbfilename, coding: "UTF-8")
-  erb = ERB.trim_new(erbfile, '-')
-  # 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
-  sechash.delete("fluff")       # fluff is a "commented out" section
-  if !sechash.empty?            # any sections unused by the ERb file?
-    warn "*** sections left #{sechash.keys.inspect}!"
-  end
-
-  [input, kramdown_options, coding_override]
-end
-
-XML_RESOURCE_ORG_PREFIX = Kramdown::Converter::Rfc2629::XML_RESOURCE_ORG_PREFIX
-
-# return XML entity name, url, rewrite_anchor flag
-def bibtagsys(bib, anchor=nil, stand_alone=true)
-  if bib =~ /\Arfc(\d+)/i
-    rfc4d = "%04d" % $1.to_i
-    [bib.upcase,
-     "#{XML_RESOURCE_ORG_PREFIX}/bibxml/reference.RFC.#{rfc4d}.xml"]
-  elsif $options.v3 && bib =~ /\A(bcp|std)(\d+)/i
-    n4d = "%04d" % $2.to_i
-    [bib.upcase,
-     "#{XML_RESOURCE_ORG_PREFIX}/bibxml-rfcsubseries-new/reference.#{$1.upcase}.#{n4d}.xml"]
-  elsif bib =~ /\A([-A-Z0-9]+)\./ &&
-        (xro = Kramdown::Converter::Rfc2629::XML_RESOURCE_ORG_MAP[$1])
-    dir, _ttl, rewrite_anchor = xro
-    bib1 = ::Kramdown::Parser::RFC2629Kramdown.idref_cleanup(bib)
-    if anchor && bib1 != anchor
-      if rewrite_anchor
-        a = %{?anchor=#{anchor}}
-      else
-        if !stand_alone
-          warn "*** selecting a custom anchor '#{anchor}' for '#{bib1}' requires stand_alone mode"
-          warn "    the output will need manual editing to correct this"
-        end
-      end
-    end
-    [bib1,
-     "#{XML_RESOURCE_ORG_PREFIX}/#{dir}/reference.#{bib}.xml#{a}"]
-  end
-end
-
-def read_encodings
-  encfilename = File.expand_path '../../data/encoding-fallbacks.txt', __FILE__
-  encfile = File.read(encfilename, coding: "UTF-8")
-  Hash[encfile.lines.map{|l|
-         l.chomp!;
-         x, s = l.split(" ", 2)
-         [x.hex.chr(Encoding::UTF_8), s || " "]}]
-end
-
-FALLBACK = read_encodings
-
-def expand_tabs(s, tab_stops = 8)
-  s.gsub(/([^\t\n]*)\t/) do
-    $1 + " " * (tab_stops - ($1.size % tab_stops))
-  end
-end
-
-
-require 'optparse'
-require 'ostruct'
-
-$options = OpenStruct.new
-op = OptionParser.new do |opts|
-  opts.banner = <<BANNER
-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}"
-    exit
-  end
-  opts.on("-H", "--help", "Show option summary and exit") do |v|
-    puts opts
-    exit
-  end
-  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-    $options.verbose = v
-  end
-  opts.on("-3", "--[no-]v3", "Use RFCXML v3 processing rules") do |v|
-    $options.v3 = v
-  end
-end
-op.parse!
-
-if $options.verbose && $options.v3
-  warn "*** not much RFCXMLv3 stuff implemented yet"
-end
-
-input = ARGF.read
-if input[0] == "\uFEFF"
-   warn "*** There is a leading byte order mark. Ignored."
-   input[0..0] = ''
-end
-if input[-1] != "\n"
-  # warn "*** added missing newline at end"
-  input << "\n"                 # fix #26
-end
-input.gsub!(/^\{::include((?:-[a-z]+)*)\s+(.*?)\}/) {
-  include_flags = $1
-  fn = [$2]
-  chunks = false
-  dedent = false
-  fold = false
-  quote = false
-  include_flags.split("-") do |flag|
-    case flag
-    when ""
-    when "quote"
-      quote = true
-    when "dedent"
-      dedent = true
-    when "fold"
-      fold = true
-    when "all", "last"
-      fn = fn.flat_map{|n| Dir[n]}
-      fn = [fn.last] if flag == "last"
-      chunks = fn.map{ |f|
-        ret = process_chunk(File.read(f), dedent, fold, quote)
-        dedent = false; quote = false
-        ret
-      }
-    else
-      warn "** unknown include flag #{flag}"
-    end
-  end
-  chunks = fn.map{|f| File.read(f)} unless chunks # no all/last
-  chunks = chunks.map {|ch| process_chunk(ch, dedent, fold, quote)}
-  chunks.join.chomp
-} unless ENV["KRAMDOWN_SAFE"]
-input.gsub!(/^\{::boilerplate\s+(.*?)\}/) {
-  boilerplate($1)
-}
-if input =~ /[\t]/
-   warn "*** Input contains HT (\"tab\") characters. Undefined behavior will ensue."
-   input = expand_tabs(input)
-end
-
-if input =~ /\A---/        # this is a sectionized file
-  do_the_tls_dance unless ENV["KRAMDOWN_DONT_VERIFY_HTTPS"]
-  input, options, coding_override = xml_from_sections(input)
-else
-  options = process_kramdown_options # all default
-end
-if input =~ /\A<\?xml/          # if this is a whole XML file, protect it
-  input = "{::nomarkdown}\n#{input}\n{:/nomarkdown}\n"
-end
-
-if coding_override
-  input = input.encode(Encoding.find(coding_override), fallback: FALLBACK)
-end
-
-# 1.4.17: because of UTF-8 bibxml files, kramdown always needs to see UTF-8 (!)
-if input.encoding != Encoding::UTF_8
-  input = input.encode(Encoding::UTF_8)
-end
-
-# warn "options: #{options.inspect}"
-doc = Kramdown::Document.new(input, options)
-$stderr.puts doc.warnings.to_yaml unless doc.warnings.empty?
-output = doc.to_rfc2629
-
-if coding_override
-  output = output.encode(Encoding.find(coding_override), fallback: FALLBACK)
-end
-
-puts output

data/data/kramdown-rfc2629.erb

@@ -1,9 +1,18 @@
 <?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 <%=
-    Gem.loaded_specs["kramdown-rfc2629"].version rescue nil %> -->
-
+    Gem.loaded_specs["kramdown-rfc2629"].version rescue nil 
+    %> (Ruby <%= RUBY_VERSION %>) -->
+
+<% if $options.v3 %>
+<!DOCTYPE rfc <%= ps["doctype-reference"] %> [
+  <!ENTITY nbsp    "&#160;">
+  <!ENTITY zwsp   "&#8203;">
+  <!ENTITY nbhy   "&#8209;">
+  <!ENTITY wj     "&#8288;">
+<% else %>
 <!DOCTYPE rfc SYSTEM "rfc2629.dtd" [
+<% end %>
 <% ps.arr("bibxml") do |tag, sys| -%>
 <!ENTITY <%= tag %> SYSTEM "<%= sys %>">
 <% end -%>
@@ -86,7 +95,10 @@
 <%   if mail || homepage -%>
       <t>
 <%   end -%>
-<%   if mail && (mail_local, mail_host = mail.split("@", 2)) && mail_host -%>
+<%   if mail
+       mail_local, mail_host = mail.split("@", 2)
+     end
+     if mail_host -%>
 <%     mail_subdomain, mail_domain = mail_host.split(".", 2) -%>
 <%     group = venue[:group] || mail_local # XXX -%>
 <%     arch = venue[:arch] || "https://mailarchive.ietf.org/arch/browse/#{mail_local}/" -%>
@@ -194,6 +206,7 @@
     <<CONTRIBUTION
 {:/nomarkdown}
 #{contrib}
+
 {::nomarkdown}
 CONTRIBUTION
     end -%>

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.5.22'
+  s.version = '1.6.1'
   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.}
@@ -8,9 +8,9 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('kramdown-parser-gfm', '~> 1.1')
   s.add_dependency('certified', '~> 1.0')
   s.add_dependency('json_pure', '~> 2.0')
-  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/de-gfm)
+  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/de-gfm)
   s.require_path = 'lib'
-  s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown',
+  s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown',
                    'kdrfc', 'kramdown-rfc-cache-i-d-bibxml',
                    'kramdown-rfc-cache-subseries-bibxml', 'de-gfm']
   s.required_ruby_version = '>= 2.3.0'