kramdown-rfc2629 1.0.30 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7bc8abb77836597a85d3759acc1b9c967ab08b9
-  data.tar.gz: 0f0936ec35dcaa2f17fcad200b8078a5280d4f6d
+  metadata.gz: fcc80ff8452a6c29a365f184426a4a9d2d346e92
+  data.tar.gz: ffc0f0ba4f64bd1e51c33f5c8b1756c6dada5277
 SHA512:
-  metadata.gz: d4ff0aa08e50fa874c90c83eaaacc8239ee3d313f1862d6f0f40d4aced3761bc727e52f4f2fc48aab71354a5b0d1fa377d4f5ac4266c4036f2325d707988d788
-  data.tar.gz: 76ca0282a1f3aa15ab0b72c61bd17b1865ec703cc54820e1926dc1d8c1516c59d9103ffccb2bfd099ba68a2a759f607c1fe6cd9d13d8867dfbf0f54bc35822f2
+  metadata.gz: 58829e34c29a6834597576892379a486996833fda2ca5ed61be70aa1adf9e1acc924a2fba4de4f76ec282a55d3997581def245c005dbf1e3f763d3b23a92258b
+  data.tar.gz: d59d551ce80cc1b38a14ff13064cf25a751b01e2a96de052341d3ec2c7e5e68a1f21d4278533e7e2e0a494013c86b247abeef91ef978177febef525a2f68cda0

data/README.md

@@ -234,6 +234,22 @@ 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.31:)
+The kramdown `smart_quotes` feature can be controlled better.
+By default, it is on (with default kramdown settings), unless `coding:
+us-ascii` is in effect, when it is off by default.
+It also can be explicitly set on (`true`) or off (`false`) in the YAML
+header, or to a specific value (an array of four kramdown entity names
+or character numbers).  E.g., for a German text (that is not intended
+to become an Internet-Draft), one might write:
+
+```yaml
+smart_quotes: [sbquo, lsquo, bdquo, ldquo]
+pi:
+  topblock: no
+  private: yes
+```
+
 (1.0.30:)
 kramdown-rfc now uses kramdown 1.10, which leads to two notable updates:
 

data/bin/kramdown-rfc2629

@@ -22,7 +22,8 @@ def xml_from_sections(input)
   # 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
+  coding_override = ps.has(:coding)
+  smart_quotes = ps[:smart_quotes]
 
   # all the other sections are put in a Hash, possibly concatenated from parts there
   sechash = Hash.new{ |h,k| h[k] = ""}
@@ -173,7 +174,7 @@ def xml_from_sections(input)
     warn "*** sections left #{sechash.keys.inspect}!"
   end
 
-  [input, coding_override, link_defs]
+  [input, coding_override, link_defs, smart_quotes]
 end
 
 class ParameterSet
@@ -277,6 +278,23 @@ def dateattrs(date)
   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
+
 coding_override = :as_char
 input = ARGF.read
 if input[0] == "\uFEFF"
@@ -286,18 +304,37 @@ end
 input.gsub!(/^\{::include\s+(.*?)\}/) {
   File.read($1).chomp
 } unless ENV["KRAMDOWN_SAFE"]
+if input =~ /[\t]/
+   warn "*** Input contains HT (\"tab\") characters. Undefined behavior will ensue."
+   input = expand_tabs(input)
+end
 link_defs = {}
 if input =~ /\A---/        # this is a sectionized file
-  input, coding_override, link_defs = xml_from_sections(input)
+  input, target_coding, link_defs, smart_quotes = 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, link_defs: link_defs}
-case coding_override
-when :symbolic
-  options[:smart_quotes] = ["'".ord, "'".ord, '"'.ord, '"'.ord]
+if target_coding && target_coding =~ /ascii/ && smart_quotes.nil?
+  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 target_coding
+  input = input.encode(Encoding.find(target_coding), fallback: FALLBACK)
+end
+
 # warn "options: #{options.inspect}"
 doc = Kramdown::Document.new(input, options)
 $stderr.puts doc.warnings.to_yaml unless doc.warnings.empty?

data/data/encoding-fallbacks.txt

@@ -0,0 +1,161 @@
+00a1 !
+00a2 [cents]
+00a3 GBP
+00a4 [currency units]
+00a5 JPY
+00a6 |
+00a7 S.
+00a9 (C)
+00aa a
+00ab <<
+00ac [not]
+00ae (R)
+00af _
+00b0 o
+00b1 +/-
+00b2 ^2
+00b3 ^3
+00b4 '
+00b5 [micro]
+00b6 P.
+00b7 .
+00b8 ,
+00b9 ^1
+00ba o
+00bb >>
+00bc 1/4
+00bd 1/2
+00be 3/4
+00bf ?
+00c0 A
+00c1 A
+00c2 A
+00c3 A
+00c4 Ae
+00c5 Ae
+00c6 AE
+00c7 C
+00c8 E
+00c9 E
+00ca E
+00cb E
+00cc I
+00cd I
+00ce I
+00cf I
+00d0 [ETH]
+00d1 N
+00d2 O
+00d3 O
+00d4 O
+00d5 O
+00d6 Oe
+00d7 x
+00d8 Oe
+00d9 U
+00da U
+00db U
+00dc Ue
+00dd Y
+00de [THORN]
+00df ss
+00e0 a
+00e1 a
+00e2 a
+00e3 a
+00e4 ae
+00e5 ae
+00e6 ae
+00e7 c
+00e8 e
+00e9 e
+00ea e
+00eb e
+00ec i
+00ed i
+00ee i
+00ef i
+00f0 [eth]
+00f1 n
+00f2 o
+00f3 o
+00f4 o
+00f5 o
+00f6 oe
+00f7 /
+00f8 oe
+00f9 u
+00fa u
+00fb u
+00fc ue
+00fd y
+00fe [thorn]
+00ff y
+0152 OE
+0153 oe
+0161 s
+0178 Y
+0192 f
+02dc ~
+2002
+2003
+2009
+2013 --
+2014 ---
+2018 '
+2019 '
+201a '
+201c "
+201d "
+201e "
+2020 *!*
+2021 *!!*
+2022 o
+2026 ...
+2030 [/1000]
+2032 '
+2039 <
+203a >
+2044 /
+20ac EUR
+2122 [TM]
+2190 <--
+2192 -->
+2194 <->
+21d0 <==
+21d2 ==>
+21d4 <=>
+2212 -
+2217 *
+2264 <=
+2265 >=
+2329 <
+232a >
+0021 !
+0023 #
+0024 $
+0025 %
+0028 (
+0029 )
+002a *
+002b +
+002c ,
+002d -
+002e .
+002f /
+003a :
+003b ;
+003d =
+003f ?
+0040 @
+005b [
+005d ]
+005e ^
+005f _
+0060 `
+007b {
+007c |
+007d }
+017d Z
+017e z
+2010 -

data/kramdown-rfc2629.gemspec

@@ -1,11 +1,11 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.0.30'
+  s.version = '1.0.31'
   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.}
-  s.add_dependency('kramdown', '~> 1.10.0')
-  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kramdown-rfc2629 data/kramdown-rfc2629.erb)
+  s.add_dependency('kramdown', '~> 1.11.0')
+  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kramdown-rfc2629 data/kramdown-rfc2629.erb data/encoding-fallbacks.txt)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc2629']
   s.default_executable = 'kramdown-rfc2629'

data/lib/kramdown-rfc2629.rb

@@ -11,7 +11,7 @@
 
 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
-gem 'kramdown', '~> 1.10.0'
+gem 'kramdown', '~> 1.11.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
@@ -549,7 +549,7 @@ module Kramdown
       end
 
       def convert_smart_quote(el, indent, opts)
-        entity_to_str(::Kramdown::Utils::Entities.entity(el.value.to_s))
+        entity_to_str(smart_quote_entity(el))
       end
 
       def convert_math(el, indent, opts) # XXX: This is wrong

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.31
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 description: |-
   An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
   "kramdown" markdown parser.  Mostly useful for RFC writers.
@@ -36,6 +36,7 @@ files:
 - LICENSE
 - README.md
 - bin/kramdown-rfc2629
+- data/encoding-fallbacks.txt
 - data/kramdown-rfc2629.erb
 - kramdown-rfc2629.gemspec
 - lib/kramdown-rfc2629.rb
@@ -59,9 +60,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.
 test_files: []
-has_rdoc: