kramdown-rfc2629 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7cb03b26cc3280334da9e30264652850c904f4
-  data.tar.gz: 593ed4923195d254b3c27ace03e09a9e24a22f0e
+  metadata.gz: 5d68b8928a16df28ada77fdb50e2450845c458c0
+  data.tar.gz: 747a779389488dd339319a4b6004ab0f2fa9f562
 SHA512:
-  metadata.gz: 6403e62c32307c3e66b93d7c130f6efe5b7ccc3587da9ba7f075a206820b476699ecf0dd1e83ae4bb815dbea94b7ada550a8f838ef6c395c08170df36a113352
-  data.tar.gz: 9698f63a545f44d08ddcd97aac1baf282b1171da5627e840a1be8a833ed8147e04f47b67d727feb1832786085670e9bf5e384ab253e89d9ea9f230cac7aa7c16
+  metadata.gz: c3f7937f66db0c675f0c246493d0f31934f7edcf5606472b085e7dca6e385bdad8e1278c4673f06ddda430ee4159d8877a1b96696b81950aa52061b4a2f59975
+  data.tar.gz: 1b0c052acb904b08ad997d2951a5f4e0fc06b7f3404dfffd5ba235348918160da44ca0f9050e5d9fb01d92514817b165f90e4750bfc22ffd81a45a860d167b76

data/README.md

@@ -98,6 +98,21 @@ or
         country: Finland
         phone: "+358407796297"
         email: zach@sensinode.com
+      -
+        role: editor
+        ins: P. Thubert
+        name: Pascal Thubert
+        org: Cisco Systems
+        abbrev: Cisco
+        street:
+        - Village d'Entreprises Green Side
+        - 400, Avenue de Roumanille
+        - Batiment T3
+        city: Biot - Sophia Antipolis
+        code: '06410'
+        country: FRANCE
+        phone: "+33 4 97 23 26 34"
+        email: pthubert@cisco.com
 
 (the hash keys are the XML GIs from RFC 2629, with a flattened
 structure.  As RFC 2629 requires giving both the name and
@@ -105,6 +120,10 @@ surname/initials, we use `ins` as an abbreviation for
 "initials/surname".  Yes, the toolchain is Unicode-capable, even if
 the final RFC output is still in ASCII.)
 
+Note that the YAML header needs to be syntactically valid YAML.
+Where there is a potential for triggering some further YAML feature, a
+string should be put in quotes (like the "+358407796297" above, which
+might otherwise be interpreted as a number, losing the + sign).
 
 ## References
 
@@ -133,6 +152,7 @@ spell it out like this:
       RFC1925:
       WEI:
         title: "6LoWPAN: the Wireless Embedded Internet"
+        # see the quotes above?  Needed because of the embedded colon.
         author:
           -
             ins: Z. Shelby
@@ -149,6 +169,7 @@ spell it out like this:
           Information Technology — ASN.1 encoding rules:
           Specification of Basic Encoding Rules (BER), Canonical Encoding
           Rules (CER) and Distinguished Encoding Rules (DER)
+        # YAML's ">" syntax used above is a good way to write longer titles
         author:
           org: International Telecommunications Union
         date: 1994
@@ -210,9 +231,8 @@ verbose (this syntax is now also supported in kramdown-rfc2629).
 
 # License
 
-With kramdown version 1.0, kramdown itself now is MIT licensed, so it
-is finally possible to license kramdown-rfc2629 under the same
-license.
+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/
 [stupid]: http://tools.ietf.org/id/draft-hartke-xmpp-stupid-00

data/bin/kramdown-rfc2629

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.9
+#!/usr/bin/env ruby2.1
 # -*- coding: utf-8 -*-
 require 'kramdown-rfc2629'
 require 'yaml'
@@ -19,7 +19,9 @@ def xml_from_sections(input)
   # 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)
-  ps = ParameterSet.new(YAML.load(sections.shift[2]))
+  # We put back the "---" plus gratuitous blank lines to hack the line number in errors
+  yaml_in = input[/---\s*/] << sections.shift[2]
+  ps = ParameterSet.new(YAML.load(yaml_in))
   coding_override = (ps.has(:coding) =~ /ascii/i) ? :symbolic : :as_char
 
   # all the other sections are put in a Hash, possibly concatenated from parts there

data/kramdown-rfc2629.gemspec

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

@@ -303,9 +303,13 @@ module Kramdown
         if alignment = opts[:table_alignment]
           alignment = alignment.shift
           if cols = opts[:table_cols].shift
-            md = cols.match(/(\d*)(.*)/)
-            widthopt = "width='#{md[1]}' " if md[1].to_i != 0
-            alignment = COLS_ALIGN[md[2]] || :left
+            md = cols.match(/(\d*(|em|[%*]))([lrc])/)
+            if md[1].to_i != 0
+              widthval = md[1]
+              widthval << "em" if md[2].empty?
+              widthopt = "width='#{widthval}' "
+            end
+            alignment = COLS_ALIGN[md[3]] || :left
           end
         end
         res = inner(el, indent, opts)
@@ -488,7 +492,7 @@ module Kramdown
       end
 
       def convert_abbreviation(el, indent, opts) # XXX: This is wrong
-        title = @doc.parse_infos[:abbrev_defs][el.value]
+        title = @root.options[:abbrev_defs][el.value]
         title = nil if title.empty?
         "<abbr#{title ? " title=\"#{title}\"" : ''}>#{el.value}</abbr>"
       end

metadata

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