kramdown-rfc2629 1.3.12 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3330c913ba1b37ea44ab8809327795a034032a8c038644f589e0e7dd651b89
-  data.tar.gz: cd10426342a1efd28a7c5a9e641539a9982da6b9b4dc8568fe25504406e70efd
+  metadata.gz: fe573235c508ba9d089f72b578a53ea8507b53d82a539539228982a799e830a7
+  data.tar.gz: b7541fa31e84a9428f18541f2bef57b63984e1b3b9c193e4c28c82cdd3e2bcbb
 SHA512:
-  metadata.gz: 57cfd0d61702a4b6308ccf53407dcafd4d355fac59d01f7e36c73d287d3d4418410f7dc370c62a91870ae1af3418132aea313fab73103c9f719b14adf08dffaa
-  data.tar.gz: 04d8106f180f4b0340984a2e81bfea4736a98d16c38446d833b24588bdc5637076485c9fc5eaf89fe01b05d00a0c62242fc821a3bf20b652c1d268838158a5ec
+  metadata.gz: 754f2d2d69f025e73037aaf86b6b315eb362251b3fd1c4f070adb4c7a380d9c05bef9445c863aa0e0e4c4877d5d0eb2f0e38b5b120a9a86642969b8b81673ccf
+  data.tar.gz: 53a5b1caa470513f06a4bf28618b35f45ae2632cda64edc3e64e2e894d91e780272da81c383d0967aa6e98553f39286f4daa8ddaf97c299397e30f7d0d423a1a

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.13'
   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

@@ -37,16 +37,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, '{{')
@@ -524,6 +535,10 @@ COLORS
         end
       end
 
+      def convert_contact(el, indent, opts)
+        "<contact#{el_html_attributes(el)}/>"
+      end
+
       REFCACHEDIR = ENV["KRAMDOWN_REFCACHEDIR"] || ".refcache"
 
       # warn "*** REFCACHEDIR #{REFCACHEDIR}"

metadata

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