kramdown-rfc2629 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f88f8eb021656a068385c1a1a8b787c118311ce1
-  data.tar.gz: 678962ddf03478ae2d357489e53a5edcd940161c
+  metadata.gz: 698548620d4e748036b15cd0e162b8678014def9
+  data.tar.gz: 8bcc1949c2e8c8b5fee322813f831733bd0453fe
 SHA512:
-  metadata.gz: 60d4fe36fe9524b4ffd1ee036a63a6d5751d54fb0aa30214fc98d2700035bad413ea54d3196326e39d7591104568ee1e899ee4ff090b353e2dce32035168a3dd
-  data.tar.gz: f4b4c59aa1551921d9b4eb375af87f847ad3b21eefdefda350223fd859fdf10e7dfec7326313c046aea807a0072deaeece1dd344f5770b3492d927eca8c7429b
+  metadata.gz: 31a5dda70d77db73ad469c68f4937fa8cd9e1c671b03e42823c41b3c921fd68850c31dd672e9af41602832bd306a796327f9b1472c1646e4c2b32bd1ce0dae22
+  data.tar.gz: 1b13002f217a086b7cebf14e1a46a679ac83952e4121cb2035c33b074202bad70258504b74d459829d02bd12ff886c42ceed0a8847012c76e3c2f26e190593b8

data/README.md

@@ -14,9 +14,12 @@ their work in markdown.
 # Usage
 
 Start by installing the kramdown-rfc2629 gem (this automatically
-installs kramdown version 1.4.x as well):
+installs kramdown version 1.6.x as well):
 
-    sudo gem install kramdown-rfc2629
+    gem install kramdown-rfc2629
+
+(Add a `sudo` and a space in front of that command if you don't have
+all the permissions needed.)
 
 The guts of kramdown-rfc2629 are in one Ruby file,
 `lib/kramdown-rfc2629.rb` --- this melds nicely into the extension
@@ -215,6 +218,39 @@ special support in XML2RFC), and HTML syntax of course.
 A number of more esoteric features have recently been added.  
 (The minimum required version for each full feature is indicated.)
 
+(1.0.23:)
+Move up to kramdown 1.6.0.  This inherits a number of fixes and one
+nice feature:
+Markdown footnote definitions that turn into `cref`s can have their
+attributes in the footnote definition:
+
+```markdown
+{:cabo: source="cabo"}
+
+(This section to be removed by the RFC editor.)[^1]
+
+[^1]: here is my editorial comment: warble warble.
+{:cabo}
+
+Another questionable paragraph.[^2]
+
+[^2]: so why not delete it?
+{: source="observer"}
+```
+
+(1.0.23:)
+As before, IAL attributes on a codeblock go to the figure element.
+Language attributes on the code block now become the artwork type, and any
+attribute with a name that starts "artwork-" is moved over to the artwork.
+So this snippet now does the obvious things:
+
+```markdown
+~~~ abnf
+a = b / %s"foo" / %x0D.0A
+~~~
+{: artwork-align="center" artwork-name="syntax"}
+```
+
 (1.0.22:)
 Index entries can be created with `(((item)))` or
 `(((item, subitem)))`; use quotes for weird entries: `(((",", comma)))`.
@@ -239,7 +275,8 @@ index entries instead (third example).
 (1.0.20:)
 As an alternative referencing syntax for references with text,
 `{{ref}}` can be expressed as `[text](#ref)`.  As a special case, a
-simple `[ref]` is interpreted as `[](#ref)`.  This syntax does not
+simple `[ref]` is interpreted as `[](#ref)` (except that the latter
+syntax is not actually allowed by kramdown).  This syntax does not
 allow for automatic entry of items as normative/informative.
 
 (1.0.16:) Markdown footnotes are converted into `cref`s (XML2RFC formal
@@ -321,11 +358,13 @@ note that this creates ugly blank space in some HTML converters).
 
 The code is not very polished, but now quite stable; it has been successfully used for a
 number of non-trivial Internet-Drafts and RFCs.  You probably still need to
-skim [RFC 2629][] if you want to write an Internet-Draft, but you
+skim [RFC 2629][] (or the more current [Internet-Draft][IAB-RFCXMLv2]) if you want to write an Internet-Draft, but you
 don't really need to understand XML very much.  Knowing the basics of
 YAML helps with the metadata (but you'll understand it from the
 examples).
 
+[IAB-RFCXMLv2]: https://tools.ietf.org/html/draft-iab-xml2rfcv2-00
+
 # Upconversion
 
 If you have an old RFC and want to convert it to markdown, try just

data/kramdown-rfc2629.gemspec

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

data/lib/kramdown-rfc2629.rb

@@ -11,8 +11,10 @@
 
 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
-gem 'kramdown', '~> 1.5.0'
+gem 'kramdown', '~> 1.6.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
 
 require 'rexml/parsers/baseparser'
 
@@ -25,6 +27,7 @@ end
 module Kramdown
 
   module Parser
+
     class RFC2629Kramdown < Kramdown
 
       def initialize(*doc)
@@ -166,14 +169,28 @@ module Kramdown
           }.compact.join("\n")
           "#{' '*indent}<t>#{result}</t>\n"
         else
+          artwork_attr = {}
           if blockclass
-            $stderr.puts "*** Unimplemented block class: #{blockclass}"
+            classes = blockclass.split(' ')
+            classes.each do |cl|
+              if md = cl.match(/\Alanguage-(.*)/)
+                artwork_attr["type"] = md[1] # XXX overwrite
+              else
+                $stderr.puts "*** Unimplemented block class: #{cl}"
+              end
+            end
           end
           # compensate for XML2RFC idiosyncracy by insisting on a blank line
           unless el.attr.delete('tight')
             result[0,0] = "\n" unless result[0,1] == "\n"
           end
-          "#{' '*indent}<figure#{el_html_attributes(el)}><artwork><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
+          el.attr.each do |k, v|
+            if md = k.match(/\Aartwork-(.*)/)
+              el.attr.delete(k)
+              artwork_attr[md[1]] = v
+            end
+          end
+          "#{' '*indent}<figure#{el_html_attributes(el)}><artwork#{html_attributes(artwork_attr)}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 description: |-
   An RFC2629 (XML2RFC) generating backend for Thomas Leitner's
   "kramdown" markdown parser.  Mostly useful for RFC writers.
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Kramdown extension for generating RFC 2629 XML.