kramdown-rfc2629 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d68b8928a16df28ada77fdb50e2450845c458c0
-  data.tar.gz: 747a779389488dd339319a4b6004ab0f2fa9f562
+  metadata.gz: 78a9c4fff6a70700bc14d403bdf3e20830c07324
+  data.tar.gz: ddabb5f47e304c78faef3a7ba8f348a9b967cb2d
 SHA512:
-  metadata.gz: c3f7937f66db0c675f0c246493d0f31934f7edcf5606472b085e7dca6e385bdad8e1278c4673f06ddda430ee4159d8877a1b96696b81950aa52061b4a2f59975
-  data.tar.gz: 1b0c052acb904b08ad997d2951a5f4e0fc06b7f3404dfffd5ba235348918160da44ca0f9050e5d9fb01d92514817b165f90e4750bfc22ffd81a45a860d167b76
+  metadata.gz: 732a37a44e072a4fc308b338d6827e7c17cd1db191d45a52400737f1f0e2deac1b0b2e291aed21ddc417479093dcb1db3cc013c76ca1350f5aa54ecccb6ce408
+  data.tar.gz: 59e254c66570a77df8f3f290cf6ae519bf3a50a33717d1bfcaa6136339cd422e782389f3930c143ca0018fdb7160fe0db169c4c3a167d4c130b861c7dcfa9f17

data/bin/kramdown-rfc2629

@@ -103,10 +103,13 @@ def xml_from_sections(input)
   end
 
   stand_alone = ps[:stand_alone]
+  link_defs = {}
 
   [:normative, :informative].each do |sn|
     if refs = ps[sn]
       refs.each do |k, v|
+        href = k.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an IDREF with a number
+        link_defs[k] = ["##{href}", nil]            # allow [RFC2119] in addition to {{RFC2119}}
         if bts = bibtagsys(k)
           if v
             warn "*** redundant in #{k}: #{v.inspect}" unless v.respond_to? :to_str
@@ -165,7 +168,7 @@ def xml_from_sections(input)
     warn "*** sections left #{sechash.keys.inspect}!"
   end
 
-  [input, coding_override]
+  [input, coding_override, link_defs]
 end
 
 class ParameterSet
@@ -266,13 +269,14 @@ coding_override = :as_char
 input = ARGF.read.gsub(/\{::include\s+(.*?)\}/) {
   File.read($1).chomp
 }
+link_defs = {}
 if input =~ /\A---/        # this is a sectionized file
-  input, coding_override = xml_from_sections(input)
+  input, coding_override, link_defs = xml_from_sections(input)
 end
 if input =~ /\A<\?xml/          # if this is a whole XML file, protect it
   input = "{::nomarkdown}\n#{input}\n{:/nomarkdown}\n"
 end
-options = {input: 'RFC2629Kramdown', entity_output: coding_override}
+options = {input: 'RFC2629Kramdown', entity_output: coding_override, link_defs: link_defs}
 # warn "options: #{options.inspect}"
 doc = Kramdown::Document.new(input, options)
 $stderr.puts doc.warnings.to_yaml unless doc.warnings.empty?

data/data/kramdown-rfc2629.erb

@@ -1,5 +1,7 @@
 <?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 %> -->
 
 <!DOCTYPE rfc SYSTEM "rfc2629.dtd" [
 <% ps.arr("bibxml") do |bib|

data/kramdown-rfc2629.gemspec

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

@@ -338,7 +338,10 @@ module Kramdown
         res = inner(el, indent, opts)
         target = el.attr['target']
         if target[0] == "#"     # handle [](#foo) as xref as in RFC 7328
-          el.attr['target'] = target[1..-1]
+          el.attr['target'] = target = target[1..-1]
+          if target.downcase == res.downcase
+            res = ''            # get rid of raw anchors leaking through
+          end
           "<xref#{el_html_attributes(el)}>#{res}</xref>"
         else
           "<eref#{el_html_attributes(el)}>#{res}</eref>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown