kramdown-rfc2629 1.3.12 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3330c913ba1b37ea44ab8809327795a034032a8c038644f589e0e7dd651b89
-  data.tar.gz: cd10426342a1efd28a7c5a9e641539a9982da6b9b4dc8568fe25504406e70efd
+  metadata.gz: eaff5274766d9c9fe2de618bc8ed0f2d86cb1a7a9413e0de92568e1cdca2df30
+  data.tar.gz: e519ff100dbfbbae7881100d023ee2f370805d84c7ee9e49beadfa99b02a72d7
 SHA512:
-  metadata.gz: 57cfd0d61702a4b6308ccf53407dcafd4d355fac59d01f7e36c73d287d3d4418410f7dc370c62a91870ae1af3418132aea313fab73103c9f719b14adf08dffaa
-  data.tar.gz: 04d8106f180f4b0340984a2e81bfea4736a98d16c38446d833b24588bdc5637076485c9fc5eaf89fe01b05d00a0c62242fc821a3bf20b652c1d268838158a5ec
+  metadata.gz: b178e930deec32e6951277d9162453643be47fd6b87719f517ed05dd87c3e63414e7b3db1ed2258edf52b6b82fd11f07d371276c9624f17a43a3b721fef21ad6
+  data.tar.gz: 22d55e1830b09db10b297700021b98d110204414b79225509b59818a2feefb48a4fed9a8be2b4cfe23547f788a63f3fc7fa7535c9a027fa059ada59dd77b6d72

data/README.md

@@ -351,7 +351,7 @@ generate XML2RFCv2 XML instead of kramdown-rfc YAML.
 (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.
+us-ascii` is in effect (1.3.14: or --v3 is given), in which case 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

data/bin/kramdown-rfc2629

@@ -87,6 +87,7 @@ def xml_from_sections(input)
   ps = KramdownRFC::ParameterSet.new(yaml_load(yaml_in, [Date], [], true))
   coding_override = ps.has(:coding)
   smart_quotes = ps[:smart_quotes]
+  typographic_symbols = ps[:typographic_symbols]
   kramdown_options = ps[:kramdown_options]
 
   # all the other sections are put in a Hash, possibly concatenated from parts there
@@ -237,7 +238,7 @@ def xml_from_sections(input)
     warn "*** sections left #{sechash.keys.inspect}!"
   end
 
-  [input, coding_override, link_defs, smart_quotes, kramdown_options]
+  [input, coding_override, link_defs, smart_quotes, typographic_symbols, kramdown_options]
 end
 
 XML_RESOURCE_ORG_PREFIX = Kramdown::Converter::Rfc2629::XML_RESOURCE_ORG_PREFIX
@@ -339,14 +340,16 @@ end
 link_defs = {}
 if input =~ /\A---/        # this is a sectionized file
   do_the_tls_dance unless ENV["KRAMDOWN_DONT_VERIFY_HTTPS"]
-  input, target_coding, link_defs, smart_quotes, kramdown_options = xml_from_sections(input)
+  input, target_coding, link_defs, smart_quotes, typographic_symbols, kramdown_options = 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}
-if target_coding && target_coding =~ /ascii/ && smart_quotes.nil?
-  smart_quotes = false
+if smart_quotes.nil?
+  if (target_coding && target_coding =~ /ascii/) || $options.v3
+     smart_quotes = false
+  end
 end
 if smart_quotes == false
   smart_quotes = ["'".ord, "'".ord, '"'.ord, '"'.ord]
@@ -359,6 +362,28 @@ when nil, true
 else
   warn "*** Can't deal with smart_quotes value #{smart_quotes.inspect}"
 end
+if typographic_symbols.nil?
+  if (target_coding && target_coding =~ /ascii/) || $options.v3
+     typographic_symbols = false
+  end
+end
+if typographic_symbols == false
+  typographic_symbols = Hash[::Kramdown::Parser::Kramdown::TYPOGRAPHIC_SYMS.map { |k, v|
+                               if Symbol === v
+                                 [v.intern, k]
+                               end
+                             }.compact]
+end
+# warn [:TYPOGRAPHIC_SYMBOLS, typographic_symbols].to_yaml
+case typographic_symbols
+when Hash
+  options[:typographic_symbols] = typographic_symbols
+when nil, true
+  # nothin
+else
+  warn "*** Can't deal with typographic_symbols value #{typographic_symbols.inspect}"
+end
+
 if kramdown_options
   options.merge! kramdown_options
 end

data/kramdown-rfc2629.gemspec

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

data/lib/kramdown-rfc2629.rb

@@ -8,6 +8,7 @@
 # This derived work is also licensed under the MIT license, see LICENSE.
 #++
 #
+require 'shellwords'
 
 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
@@ -37,16 +38,27 @@ module Kramdown
         @span_parsers.unshift(:iref)
       end
 
-      XREF_START = /\{\{(.*?)\}\}/u
+      XREF_START = /\{\{(?:(?:\{(.*?)\}(?:\{(.*?)\})?)|(.*?))((?:\}\})|\})/u
 
       # Introduce new {{target}} syntax for empty xrefs, which would
       # otherwise be an ugly ![!](target) or ![ ](target)
       # (I'd rather use [[target]], but that somehow clashes with links.)
       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})
+        unless @src[4] == "}}"
+          warn "*** #{@src[0]}: unmatched braces #{@src[4].inspect}"
+        end
+        if contact_name = @src[1]
+          attr = {'fullname' => contact_name}
+          if ascii_name = @src[2]
+            attr["asciiFullname"] = ascii_name
+          end
+          el = Element.new(:contact, nil, attr)
+        else
+          href = @src[3]
+          href = href.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an IDREF with a number
+          el = Element.new(:xref, nil, {'target' => href})
+        end
         @tree.children << el
       end
       define_parser(:xref, XREF_START, '{{')
@@ -245,13 +257,16 @@ COLORS
           plantuml = "@startuml\n#{result}\n@enduml"
           result1, _s = Open3.capture2("plantuml -pipe -tsvg", stdin_data: plantuml);
           result, _s = Open3.capture2("plantuml -pipe -tutxt", stdin_data: plantuml) if t == "plantuml-utxt"
+        when "math"
+          result1, _s = Open3.capture2("tex2svg --font STIX #{Shellwords.escape(' ' << result)}");
+          result, _s = Open3.capture2("asciitex -f #{file.path}")
         end
         # warn ["goat:", result1.inspect]
         file.unlink
         result1 = svg_clean(result1) unless t == "goat"
         result1, _s = Open3.capture2("svgcheck -qa", stdin_data: result1);
         # warn ["svgcheck:", result1.inspect]
-        [result, result1]
+        [result, result1]       # text, svg
       end
 
       def convert_codeblock(el, indent, opts)
@@ -298,7 +313,7 @@ COLORS
             end
           end
           case t
-          when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt", "mermaid"
+          when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt", "mermaid", "math"
             result, result1 = memoize(:svg_tool_process, t, result)
             "#{' '*indent}<figure#{el_html_attributes(el)}><artset><artwork #{html_attributes(artwork_attr.merge("type"=> "svg"))}>#{result1.sub(/.*?<svg/m, "<svg")}</artwork><artwork #{html_attributes(artwork_attr.merge("type"=> "ascii-art"))}><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></artset></figure>\n"
           else
@@ -403,7 +418,7 @@ COLORS
         vspace = opts[:vspace]
         vspaceel = "<vspace blankLines='#{vspace}'/>" if vspace
         ht = escape_html(inner(el, indent, opts), :attribute) # XXX this may leave gunk
-        "#{close}#{' '*indent}<t#{el_html_attributes(el)} hangText='#{ht}'>#{vspaceel}\n"
+        "#{close}#{' '*indent}<t#{el_html_attributes(el)} hangText=\"#{ht}\">#{vspaceel}\n"
       end
 
       HTML_TAGS_WITH_BODY=['div', 'script']
@@ -524,6 +539,10 @@ COLORS
         end
       end
 
+      def convert_contact(el, indent, opts)
+        "<contact#{el_html_attributes(el)}/>"
+      end
+
       REFCACHEDIR = ENV["KRAMDOWN_REFCACHEDIR"] || ".refcache"
 
       # warn "*** REFCACHEDIR #{REFCACHEDIR}"
@@ -710,7 +729,11 @@ COLORS
         :raquo => [::Kramdown::Utils::Entities.entity('raquo')]
       }
       def convert_typographic_sym(el, indent, opts)
-        TYPOGRAPHIC_SYMS[el.value].map {|e| entity_to_str(e)}.join('')
+        if (result = @options[:typographic_symbols][el.value])
+          escape_html(result, :text)
+        else
+          TYPOGRAPHIC_SYMS[el.value].map {|e| entity_to_str(e) }.join('')
+        end
       end
 
       def convert_smart_quote(el, indent, opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.17
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown