kramdown-rfc2629 0.13.3 → 0.13.4
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/kramdown-rfc2629 +12 -9
- data/data/kramdown-rfc2629.erb +26 -33
- data/kramdown-rfc2629.gemspec +1 -1
- data/lib/kramdown-rfc2629.rb +5 -1
- metadata +4 -4
data/bin/kramdown-rfc2629
CHANGED
@@ -51,27 +51,30 @@ def xml_from_sections(input)
|
|
51
51
|
end
|
52
52
|
else
|
53
53
|
vps = ParameterSet.new(v)
|
54
|
-
erb = ERB.new <<-REFERB
|
54
|
+
erb = ERB.new <<-REFERB, nil, '-'
|
55
55
|
<reference anchor="<%= k %>" <%= vps.attr("target") %>>
|
56
56
|
<front>
|
57
|
-
<%= vps.ele("title")
|
57
|
+
<%= vps.ele("title") -%>
|
58
58
|
|
59
59
|
<% vps.arr("author") do |au|
|
60
60
|
aups = authorps_from_hash(au)
|
61
|
-
|
61
|
+
-%>
|
62
62
|
<author <%=aups.attrs("initials", "surname", "fullname=name", "role")%>>
|
63
63
|
<%= aups.ele("organization=org", aups.attr("abbrev=orgabbrev"), "") %>
|
64
64
|
</author>
|
65
|
-
<% aups.warn_if_leftovers
|
66
|
-
<% end
|
67
|
-
|
68
|
-
<% if date = vps[:date] %>
|
65
|
+
<% aups.warn_if_leftovers -%>
|
66
|
+
<% end -%>
|
67
|
+
<% if date = vps[:date] -%>
|
69
68
|
<date <%= dateattrs(date) %>/>
|
70
|
-
<% end
|
69
|
+
<% end -%>
|
71
70
|
</front>
|
71
|
+
<% vps.arr("seriesinfo", false) do |k, v| -%>
|
72
|
+
<seriesInfo name="<%=k%>" value="<%=v%>"/>
|
73
|
+
<% end -%>
|
72
74
|
</reference>
|
73
75
|
REFERB
|
74
76
|
sechash[sn.to_s] << erb.result(binding)
|
77
|
+
vps.warn_if_leftovers
|
75
78
|
end
|
76
79
|
end
|
77
80
|
end
|
@@ -79,7 +82,7 @@ def xml_from_sections(input)
|
|
79
82
|
|
80
83
|
erbfilename = File.expand_path '../../data/kramdown-rfc2629.erb', __FILE__
|
81
84
|
erbfile = File.read(erbfilename, coding: "UTF-8")
|
82
|
-
erb = ERB.new(erbfile)
|
85
|
+
erb = ERB.new(erbfile, nil, '-')
|
83
86
|
# remove redundant nomarkdown pop outs/pop ins as they confuse kramdown
|
84
87
|
input = erb.result(binding).gsub(%r"{::nomarkdown}\s*{:/nomarkdown}"m, "")
|
85
88
|
ps.warn_if_leftovers
|
data/data/kramdown-rfc2629.erb
CHANGED
@@ -3,32 +3,31 @@
|
|
3
3
|
|
4
4
|
<!DOCTYPE rfc SYSTEM "rfc2629.dtd" [
|
5
5
|
<% ps.arr("bibxml") do |bib|
|
6
|
-
tag, sys = bibtagsys(bib)
|
6
|
+
tag, sys = bibtagsys(bib) -%>
|
7
7
|
<!ENTITY <%= tag %> SYSTEM "<%= sys %>">
|
8
|
-
<% end
|
9
|
-
<% ps.arr("entity", false) do |en, ev|
|
8
|
+
<% end -%>
|
9
|
+
<% ps.arr("entity", false) do |en, ev| -%>
|
10
10
|
<!ENTITY <%=en%> "<%=ev%>">
|
11
|
-
<% end
|
11
|
+
<% end -%>
|
12
12
|
]>
|
13
13
|
|
14
14
|
<rfc <%= ps.attrs("ipr", "docName=docname", "category=cat",
|
15
15
|
"number", "obsoletes", "updates", "seriesNo=seriesno") %>>
|
16
16
|
|
17
|
-
<% ps.arr("pi", false) do |pi, val|
|
17
|
+
<% ps.arr("pi", false) do |pi, val| -%>
|
18
18
|
<?rfc <%=pi%>="<%= {true => "yes", false => "no", nil => "yes"}[val] || val %>"?>
|
19
|
-
<% end
|
19
|
+
<% end -%>
|
20
20
|
|
21
21
|
<front>
|
22
22
|
<%= ps.ele("title", ps.attr("abbrev=titleabbrev")) %>
|
23
23
|
|
24
24
|
<% ps.arr("author") do |au|
|
25
25
|
aups = authorps_from_hash(au)
|
26
|
-
|
27
|
-
|
26
|
+
-%>
|
28
27
|
<author <%=aups.attrs("initials", "surname", "fullname=name", "role")%>>
|
29
28
|
<%= aups.ele("organization=org", aups.attr("abbrev=orgabbrev"), "") %>
|
30
29
|
<address>
|
31
|
-
|
30
|
+
<% if aups.has("street") -%>
|
32
31
|
<postal>
|
33
32
|
<%= aups.ele("street") %>
|
34
33
|
<%= aups.ele("city") %>
|
@@ -36,16 +35,15 @@
|
|
36
35
|
<%= aups.ele("code") %>
|
37
36
|
<%= aups.ele("country") %>
|
38
37
|
</postal>
|
39
|
-
|
38
|
+
<% end -%>
|
40
39
|
<%= aups.ele("phone") %>
|
41
40
|
<%= aups.ele("facsimile") %>
|
42
41
|
<%= aups.ele("email") %>
|
43
42
|
<%= aups.ele("uri") %>
|
44
43
|
</address>
|
45
44
|
</author>
|
46
|
-
|
47
|
-
<%
|
48
|
-
<% end %>
|
45
|
+
<% aups.warn_if_leftovers -%>
|
46
|
+
<% end -%>
|
49
47
|
|
50
48
|
<date <%= dateattrs(ps[:date]||Date.today) %>/>
|
51
49
|
|
@@ -59,18 +57,17 @@
|
|
59
57
|
|
60
58
|
</abstract>
|
61
59
|
|
62
|
-
<% sechash.keys.each do |k|
|
63
|
-
<% if k =~ /\Anote_(.*)/
|
60
|
+
<% sechash.keys.each do |k| -%>
|
61
|
+
<% if k =~ /\Anote_(.*)/ -%>
|
64
62
|
|
65
63
|
<note title="<%= $1.gsub("_", " ")%>">
|
66
64
|
|
67
|
-
<%= sechash.delete(k)
|
65
|
+
<%= sechash.delete(k) -%>
|
68
66
|
|
69
67
|
</note>
|
70
68
|
|
71
|
-
<% end
|
72
|
-
<% end
|
73
|
-
|
69
|
+
<% end -%>
|
70
|
+
<% end -%>
|
74
71
|
|
75
72
|
</front>
|
76
73
|
|
@@ -80,29 +77,25 @@
|
|
80
77
|
|
81
78
|
</middle>
|
82
79
|
|
83
|
-
<back>
|
84
|
-
|
85
|
-
<% if sh = sechash.delete("normative") %>
|
80
|
+
<back>
|
86
81
|
|
87
|
-
|
82
|
+
<% if sh = sechash.delete("normative") -%>
|
83
|
+
<references title='Normative References'>
|
88
84
|
|
89
85
|
<%= sh %>
|
90
86
|
|
91
|
-
|
87
|
+
</references>
|
88
|
+
<% end -%>
|
92
89
|
|
93
|
-
<%
|
94
|
-
|
95
|
-
<% if sh = sechash.delete("informative") %>
|
96
|
-
|
97
|
-
<references title='Informative References'>
|
90
|
+
<% if sh = sechash.delete("informative") -%>
|
91
|
+
<references title='Informative References'>
|
98
92
|
|
99
93
|
<%= sh %>
|
100
94
|
|
101
|
-
|
102
|
-
|
103
|
-
<% end %>
|
95
|
+
</references>
|
96
|
+
<% end -%>
|
104
97
|
|
105
98
|
<%= sechash.delete("back") %>
|
106
99
|
|
107
|
-
</back>
|
100
|
+
</back>
|
108
101
|
</rfc>
|
data/kramdown-rfc2629.gemspec
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
spec = Gem::Specification.new do |s|
|
2
2
|
s.name = 'kramdown-rfc2629'
|
3
|
-
s.version = '0.13.
|
3
|
+
s.version = '0.13.4'
|
4
4
|
s.summary = "Kramdown extension for generating RFC 2629 XML."
|
5
5
|
s.description = %{An RFC2629 (XML2RFC) generating backend for Thomas Leitner's
|
6
6
|
"kramdown" markdown parser. Mostly useful for RFC writers.}
|
data/lib/kramdown-rfc2629.rb
CHANGED
@@ -177,7 +177,11 @@ module Kramdown
|
|
177
177
|
|
178
178
|
def convert_ul(el, indent, opts)
|
179
179
|
style = STYLES[el.type]
|
180
|
-
|
180
|
+
if opts[:unpacked]
|
181
|
+
"#{' '*indent}<list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list>\n"
|
182
|
+
else
|
183
|
+
"#{' '*indent}<t><list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list></t>\n"
|
184
|
+
end
|
181
185
|
end
|
182
186
|
alias :convert_ol :convert_ul
|
183
187
|
alias :convert_dl :convert_ul
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kramdown-rfc2629
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.13.
|
4
|
+
version: 0.13.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-01-
|
12
|
+
date: 2012-01-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: kramdown
|
16
|
-
requirement: &
|
16
|
+
requirement: &70155418327600 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,7 +21,7 @@ dependencies:
|
|
21
21
|
version: '0.13'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70155418327600
|
25
25
|
description: ! 'An RFC2629 (XML2RFC) generating backend for Thomas Leitner''s
|
26
26
|
|
27
27
|
"kramdown" markdown parser. Mostly useful for RFC writers.'
|