kramdown-rfc2629 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57df3f27d6d000562d03f985dc891fe74f347fa4
-  data.tar.gz: 072195d9032c685855ae86d519f2222fa64d3f07
+  metadata.gz: e7c5ddf316ea84b1de6f2ffd16a773e0bbcf5849
+  data.tar.gz: f925558c2e8faa8eda467cba5d4a63b56403ceaa
 SHA512:
-  metadata.gz: f7abb9e0af9fee9f99376973ab21bef6cd0f94994d25fe4d0a2f2cf4210410e541fdf166ba4b01248c652518f131062465bbd82efdf65359e1b4566a6b9f7e74
-  data.tar.gz: 714c6786daf0e777e4a3c70f3b207a5838ed2c2cd7628197acb5e1097f791218ddd2f55d20f8862fcd37a44ab25aaad3fe809efeaca57139d56cbba470ccad7d
+  metadata.gz: 2269314b10a3a436dcad7f85b12e81fda55948c1d3ce04b48eead0d54afc8b4080468f55663d5b139bb21d0510075370a45c9e908fb272d3c74b30c747929891
+  data.tar.gz: b3e24004d7f0979c46ce5e472f0d6c05bb67b7c6edfe805ed6727a99aac96a807d7564b8e7074fe016ec6a06e6c09568e5101460f7df33425a2efe67073fc689

data/bin/kramdown-rfc2629

@@ -220,12 +220,11 @@ def bibtagsys(bib)
     rfc4d = "%04d" % $1.to_i
     [bib.upcase,
      "http://xml.resource.org/public/rfc/bibxml/reference.RFC.#{rfc4d}.xml"]
-  elsif bib =~ /\AI-D\./i
-    [bib,
-     "http://xml.resource.org/public/rfc/bibxml3/reference.#{bib}.xml"]
-  elsif bib =~ /\AW3C\./i
-    [bib,
-     "http://xml.resource.org/public/rfc/bibxml4/reference.#{bib}.xml"]
+  elsif bib =~ /\A([-A-Z0-9]+)\./ &&
+        dir = Kramdown::Converter::Rfc2629::XML_RESOURCE_ORG_MAP[$1]
+    bib1 = bib.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an ID with a number
+    [bib1,
+     "http://xml.resource.org/public/rfc/#{dir}/reference.#{bib}.xml"]
   end
 end
 

data/kramdown-rfc2629.gemspec

@@ -1,10 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.0.8'
+  s.version = '1.0.9'
   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.}
-  s.add_dependency('kramdown', '~> 1.2.0')
+  s.add_dependency('kramdown', '~> 1.3.0')
   s.files = Dir['lib/**/*.rb'] + %w(README.md kramdown-rfc2629.gemspec bin/kramdown-rfc2629 data/kramdown-rfc2629.erb)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc2629']

data/lib/kramdown-rfc2629.rb

@@ -13,7 +13,7 @@
 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
 # this version also works with kramdown 0.12, 0.13, 0.14, but 1.x has the right license
-gem 'kramdown', '~> 1.2.0'
+gem 'kramdown', '~> 1.3.0'
 require 'kramdown'
 
 require 'rexml/parsers/baseparser'
@@ -42,6 +42,7 @@ module Kramdown
       def parse_xref
         @src.pos += @src.matched_size
         href = @src[1]
+        href = href.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an IDREF with a number
         el = Element.new(:xref, nil, {'target' => href})
         @tree.children << el
       end
@@ -366,6 +367,20 @@ module Kramdown
         File.read(fn)
       end
 
+      XML_RESOURCE_ORG_MAP = {
+        "RFC" => "bibxml", "I-D" => "bibxml3", "W3C" => "bibxml4", "3GPP" => "bibxml5",
+        "ANSI" => "bibxml2",
+        "CCITT" => "bibxml2",
+        "FIPS" => "bibxml2",
+        "IANA" => "bibxml2",
+        "IEEE" => "bibxml2",
+        "ISO" => "bibxml2",
+        "ITU" => "bibxml2",
+        "NIST" => "bibxml2",
+        "OASIS" => "bibxml2",
+        "PKCS" => "bibxml2",
+      }
+
       def convert_img(el, indent, opts) # misuse the tag!
         if a = el.attr
           alt = a.delete('alt').strip
@@ -376,14 +391,15 @@ module Kramdown
         end
         if alt == ":include:"   # Really bad misuse of tag...
           to_insert = ""
-          anchor.scan(/(W3C|[A-Z-]+)[.]?([A-Za-z0-9-]+)/) do |t, n|
+          anchor.scan(/(W3C|3GPP|[A-Z-]+)[.]?([A-Za-z0-9.-]+)/) do |t, n|
             fn = "reference.#{t}.#{n}.xml"
-            sub = { "RFC" => "bibxml", "I-D" => "bibxml3", "W3C" => "bibxml4" }[t]
+            sub = XML_RESOURCE_ORG_MAP[t]
             puts "Huh: ${fn}" unless sub
             url = "http://xml.resource.org/public/rfc/#{sub}/#{fn}"
             to_insert = get_and_cache_resource(url)
           end
-          to_insert.gsub(/<\?xml version='1.0' encoding='UTF-8'\?>/, '')
+          to_insert.gsub(/<\?xml version=["']1.0["'] encoding=["']UTF-8["']\?>/, '').
+            gsub(/(anchor=["'])([0-9])/) { "#{$1}_#{$2}"} # can't start an ID with a number
         else
           "<xref#{el_html_attributes(el)}>#{alt}</xref>"
         end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 description: |-
   An RFC2629 (XML2RFC) generating backend for Thomas Leitner's
   "kramdown" markdown parser.  Mostly useful for RFC writers.
@@ -33,11 +33,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/kramdown-rfc2629.rb
 - README.md
-- kramdown-rfc2629.gemspec
 - bin/kramdown-rfc2629
 - data/kramdown-rfc2629.erb
+- kramdown-rfc2629.gemspec
+- lib/kramdown-rfc2629.rb
 homepage: http://github.com/cabo/kramdown-rfc2629
 licenses:
 - MIT
@@ -48,18 +48,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - wget
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Kramdown extension for generating RFC 2629 XML.