kramdown-rfc2629 1.6.25 → 1.6.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3977e2f9efc48b95ff26f4559ac3442b2a66276d73def5ef190fac81e66c702b
-  data.tar.gz: 3d5a0bbe14f3457763cd0172d6912b32ab6ccec70e3c8106a58173587fd57b61
+  metadata.gz: 7debb198a9e9bf5c199901337cdaa69059c72345a83c18092aaa24bbc1b533b7
+  data.tar.gz: c321ce924e845f46ded79a23b1ffbc8bee52e6fb6352ec49e332b94fd63e8b1e
 SHA512:
-  metadata.gz: c085a74725465ff0cee2d1dc09af85e642b49528d45ba16be323b368c1e9106d27f2c7fbbe3ede62e5de284974d1740d273dec69e288058540bfd3d8bdffb536
-  data.tar.gz: 19e8406e4c7accbd6c90308089a2dbb155167e2ed9cb7087c6b758c47ce097c902211d107eacff6dde08e429e2b4a3efba572327c2415c57f545a645edfe778a
+  metadata.gz: 36ea96fc6d606198c451fc2fab24cf50a8472a099380c5ff82b6326aa924e55b3a3e51b9180210dd4caf97e57a8aad0c6652e12c8cd05d814b32b5511f969e25
+  data.tar.gz: 025bc51c6061f60e258f512a0a5c10710da45083408a16135ffa6d4f234e412cabc8b17e8ce98bd913ccfb5c97869a02084400d9c9917df3e49b08c7a2016c6a

data/bin/echars

@@ -1,17 +1,68 @@
 #!/usr/bin/env ruby
 require 'unicode/name'
-hist = Hash.new(0)
-ARGF.read.each_char do |c|
-  hist[c] += 1 unless c.ord.between?(32, 126)
+require 'unicode/scripts'
+require 'unicode/blocks'
+require 'json'
+require 'differ'
+module Differ
+  module Format
+    module Color
+      class << self
+        def as_change(change)                           # monkey patch
+          as_insert(change) << "\n" << as_delete(change)
+        end
+      end
+    end
+  end
+end
+
+
+def readable(c)
+  j = c.to_json
+  if j.size == 3
+    j[1...-1]
+  else
+    j
+  end
 end
-hist.delete("\n")
-cl = "*** Latin"
-hist.keys.sort.partition {|c| c =~ /\A\p{Latin}\z/}.each do |l|
-  puts cl unless l.empty?
-  l.each  do |c|
-    puts "#{c}: U+#{"%04X %4d" % [c.ord, hist[c]]
+
+def explain(s)
+  ret = ''
+  hist = Hash.new(0)
+  s.each_char do |c|
+    hist[c] += 1 unless c.ord.between?(32, 126)
+  end
+  hist.delete("\n")
+  hist.keys.sort.group_by {|c| Unicode::Blocks.block(c)}.each do |block, l|
+    scripts = Set[]
+    l.each do |c|
+      scripts << Unicode::Scripts.scripts(c)
+    end
+    ret << "*** #{block}"
+    ret << " (#{scripts.join})" if scripts.size == 1
+    ret << "\n"
+    l.each  do |c|
+      ret << "#{readable(c)}: U+#{"%04X %4d" % [c.ord, hist[c]]
                    } #{Unicode::Name.correct(c) ||
-                       Unicode::Name.label(c)}"
+                       Unicode::Name.label(c)
+                   }"
+      ret << " (#{Unicode::Scripts.scripts(c).join(", ")})" if scripts.size != 1
+      ret << "\n"
+    end
   end
-  cl = "*** Non-Latin"
+  ret
+end
+
+s = ARGF.read
+es = explain(s)
+n = s.unicode_normalize
+en = explain(n)
+if es == en
+  puts es
+else
+  puts "*** Warning: some characters are not normalized and are shown in red."
+  puts "          ...showing a normalized variant (NFC) in green."
+  puts "             Lack of normalization may or may not be a problem."
+  puts "            (Characters may appear to be under wrong block heading.)"
+  puts Differ.diff_by_line(en, es).format_as(:color)
 end

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.25'
+  s.version = '1.6.27'
   s.summary = "Kramdown extension for generating RFCXML (RFC 799x)."
   s.description = %{An RFCXML (RFC 799x) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}
@@ -9,7 +9,10 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('certified', '~> 1.0')
   s.add_dependency('json_pure', '~> 2.0')
   s.add_dependency('unicode-name', '~> 1.0')
+  s.add_dependency('unicode-blocks', '~> 1.0')
+  s.add_dependency('unicode-scripts', '~> 1.0')
   s.add_dependency('net-http-persistent', '~> 4.0')
+  s.add_dependency('differ', '~>0.1')
   s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/echars bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup bin/de-gfm)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars',

data/lib/kramdown-rfc/kdrfc-processor.rb

@@ -37,12 +37,63 @@ def process_mkd(input, output)
   end
 end
 
-def run_idnits(txt_fn)
+def run_idnits(*args)
+  if @options.remote
+    run_idnits_remotely(*args)
+  else
+    run_idnits_locally(*args)
+  end
+end
+
+def run_idnits_locally(txt_fn)
+  warn "* running idnits locally in txt #{txt_fn}" if @options.verbose
   unless system("idnits", txt_fn)
-    warn "*** problem #$? running idnits"
+    warn "*** problem #$? running idnits" if @options.verbose
+    warn "*** problem running idnits -- falling back to remote idnits processing"
+    run_idnits_remotely(txt_fn)
   end
 end
 
+# curl -s https://author-tools.ietf.org/api/idnits -X POST -F file=@draft-ietf-core-comi.txt -F hidetext=true
+IDNITS_WEBSERVICE = ENV["KRAMDOWN_IDNITS_WEBSERVICE"] ||
+                     'https://author-tools.ietf.org/api/idnits'
+
+def run_idnits_remotely(txt_fn)
+  url = URI(IDNITS_WEBSERVICE)
+  req = Net::HTTP::Post.new(url)
+  form = [["file", File.open(txt_fn),
+           {filename: "input.txt",
+            content_type: "text/plain"}],
+          ["hidetext", "true"]]
+  diag = ["url/form: ", url, form].inspect
+  req.set_form(form, 'multipart/form-data')
+  warn "* requesting idnits at #{url}" if @options.verbose
+  t0 = Time.now
+  res = persistent_http.request(url, req)
+  warn "* elapsed time: #{Time.now - t0}" if @options.verbose
+  case res
+  when Net::HTTPBadRequest
+    result = checked_json(res.body)
+    raise IOError.new("*** Remote Error: #{result["error"]}")
+  when Net::HTTPOK
+    case res.content_type
+    when 'text/plain'
+      if res.body == ''
+        raise IOError.new("*** HTTP response is empty with status #{res.code}, not written")
+      end
+      puts res.body
+    else
+      warning = "*** HTTP response has unexpected content_type #{res.content_type} with status #{res.code}, #{diag}"
+      warning << "\n"
+      warning << res.body
+      raise IOError.new(warning)
+    end
+  else
+    raise IOError.new("*** HTTP response: #{res.code}, #{diag}")
+  end
+end
+
+
 def process_xml(*args)
   if @options.remote
     process_xml_remotely(*args)
@@ -175,6 +226,8 @@ def process(fn)
     xml = "#$1.xml"
     process_mkd(fn, xml)
     process_the_xml(xml, $1) unless @options.xml_only
+  when /(.*)\.txt\z/
+    run_idnits(fn) if @options.idnits
   else
     raise ArgumentError.new("Unknown file type: #{fn}")
   end

data/lib/kramdown-rfc2629.rb

@@ -260,6 +260,9 @@ module Kramdown
         if anchor = a.delete('href')
           a['target'] = ::Kramdown::Parser::RFC2629Kramdown.idref_cleanup(anchor)
         end
+        if lang = a.delete('lang-')
+          a['xml:lang'] = lang
+        end
         if av = a.delete('noabbrev')      # pseudo attribute -> opts
           opts = opts.merge(noabbrev: TRUTHY[av]) # updated copy
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.25
+  version: 1.6.27
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-blocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-scripts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: differ
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: |-
   An RFCXML (RFC 799x) generating backend for Thomas Leitner's
   "kramdown" markdown parser.  Mostly useful for RFC writers.
@@ -157,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).