kramdown 0.9.0 → 0.10.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of kramdown might be problematic. Click here for more details.

Files changed (40) hide show
  1. data/CONTRIBUTERS +1 -1
  2. data/ChangeLog +202 -0
  3. data/VERSION +1 -1
  4. data/bin/kramdown +5 -4
  5. data/doc/default.scss.css +6 -0
  6. data/doc/default.template +9 -0
  7. data/doc/index.page +1 -1
  8. data/doc/syntax.page +1 -1
  9. data/lib/kramdown/converter/html.rb +1 -7
  10. data/lib/kramdown/converter/kramdown.rb +1 -2
  11. data/lib/kramdown/converter/latex.rb +29 -10
  12. data/lib/kramdown/options.rb +17 -1
  13. data/lib/kramdown/parser/html.rb +13 -4
  14. data/lib/kramdown/parser/kramdown/attribute_list.rb +2 -2
  15. data/lib/kramdown/parser/kramdown/autolink.rb +10 -3
  16. data/lib/kramdown/parser/kramdown/header.rb +1 -1
  17. data/lib/kramdown/parser/kramdown/html_entity.rb +2 -1
  18. data/lib/kramdown/utils/entities.rb +0 -3
  19. data/lib/kramdown/utils/html.rb +6 -3
  20. data/lib/kramdown/version.rb +1 -1
  21. data/man/man1/kramdown.1 +46 -22
  22. data/test/testcases/span/line_breaks/normal.latex +12 -0
  23. data/test/testcases/span/text_substitutions/entities.html +1 -1
  24. data/test/testcases/span/text_substitutions/entities.options +1 -0
  25. data/test/testcases/span/text_substitutions/entities_as_char.html +1 -0
  26. data/test/testcases/span/text_substitutions/entities_as_char.html.19 +1 -0
  27. data/test/testcases/span/text_substitutions/entities_as_char.options +1 -0
  28. data/test/testcases/span/text_substitutions/entities_as_char.text +1 -0
  29. data/test/testcases/span/text_substitutions/entities_as_input.html +1 -0
  30. data/test/testcases/span/text_substitutions/entities_as_input.options +1 -0
  31. data/test/testcases/span/text_substitutions/entities_as_input.text +1 -0
  32. data/test/testcases/span/text_substitutions/entities_numeric.html +1 -1
  33. data/test/testcases/span/text_substitutions/entities_numeric.options +1 -1
  34. data/test/testcases/span/text_substitutions/entities_numeric.text +1 -1
  35. data/test/testcases/span/text_substitutions/entities_symbolic.html +1 -0
  36. data/test/testcases/span/text_substitutions/entities_symbolic.options +1 -0
  37. data/test/testcases/span/text_substitutions/entities_symbolic.text +1 -0
  38. metadata +15 -8
  39. data/test/testcases/span/text_substitutions/entities.html.19 +0 -4
  40. data/test/testcases/span/text_substitutions/entities_numeric.html.19 +0 -1
data/CONTRIBUTERS CHANGED
@@ -1,5 +1,5 @@
1
1
  Count Name
2
2
  ======= ====
3
- 332 Thomas Leitner <t_leitner@gmx.at>
3
+ 351 Thomas Leitner <t_leitner@gmx.at>
4
4
  3 Ben Armston <ben.armston@googlemail.com>
5
5
  3 Alex Marandon <contact@alexmarandon.com>
data/ChangeLog CHANGED
@@ -1,3 +1,205 @@
1
+ commit 1bf361c2e7c1041aeca0526a247635f7248ed7d7
2
+ Author: Thomas Leitner <t_leitner@gmx.at>
3
+ Date: Mon Jul 19 08:48:34 2010 +0200
4
+
5
+ Updated documentation before release
6
+
7
+ doc/default.scss.css
8
+ doc/default.template
9
+ doc/index.page
10
+ doc/news/release_0_10_0.page
11
+
12
+ commit 7121d9add32c15305e86836f5eb9c1ab83c154b8
13
+ Author: Thomas Leitner <t_leitner@gmx.at>
14
+ Date: Sun Jul 18 22:44:34 2010 +0200
15
+
16
+ Fixed problem with parsing HTML a tag without href attribute
17
+
18
+ doc/news/release_0_10_0.page
19
+ lib/kramdown/parser/html.rb
20
+
21
+ commit 19809d56eabf123993742c92a50a536bec188e24
22
+ Author: Thomas Leitner <t_leitner@gmx.at>
23
+ Date: Sun Jul 18 16:13:30 2010 +0200
24
+
25
+ Fixed encoding problem of autolink start regexp under Ruby 1.9
26
+
27
+ doc/news/release_0_10_0.page
28
+ lib/kramdown/parser/kramdown/autolink.rb
29
+
30
+ commit 64ba83235ea2d8cf660ae7994f0de1ae7f0bde4d
31
+ Author: Thomas Leitner <t_leitner@gmx.at>
32
+ Date: Sat Jul 17 11:22:50 2010 +0200
33
+
34
+ Using quotation env for blockquotes with multiple children in LaTeX converter
35
+
36
+ doc/news/release_0_10_0.page
37
+ lib/kramdown/converter/latex.rb
38
+
39
+ commit a18bc07c71b80b6f322a75a17ff7147ad8b98c79
40
+ Author: Thomas Leitner <t_leitner@gmx.at>
41
+ Date: Sat Jul 17 10:09:39 2010 +0200
42
+
43
+ Fixed probem with parsing <body markdown="1"> correctly
44
+
45
+ doc/news/release_0_10_0.page
46
+ doc/syntax.page
47
+ lib/kramdown/parser/html.rb
48
+
49
+ commit f2ded4c519223fad5c86ec1942889b6852290e2e
50
+ Author: Thomas Leitner <t_leitner@gmx.at>
51
+ Date: Sat Jul 17 09:54:08 2010 +0200
52
+
53
+ Updated the LaTeX converter documentation with information about quotation marks
54
+
55
+ doc/converter/latex.page
56
+ doc/news/release_0_10_0.page
57
+
58
+ commit c4725e2cd3dda83bd4f8f246598ed16ebbc1c6dd
59
+ Author: Thomas Leitner <t_leitner@gmx.at>
60
+ Date: Sat Jul 17 09:37:38 2010 +0200
61
+
62
+ Fixed problem with smart quote after smart quote output in LaTeX converter
63
+
64
+ doc/news/release_0_10_0.page
65
+ lib/kramdown/converter/latex.rb
66
+
67
+ commit bce5c3d12db18a9e2fa134baad6a821a7573b71d
68
+ Author: Thomas Leitner <t_leitner@gmx.at>
69
+ Date: Sat Jul 17 09:29:24 2010 +0200
70
+
71
+ Added tip to LaTeX converter doc about changing header types
72
+
73
+ doc/converter/latex.page
74
+
75
+ commit f0f7f5f02b9b454399edca04c93bd81a48b945cc
76
+ Author: Thomas Leitner <t_leitner@gmx.at>
77
+ Date: Sat Jul 17 09:17:55 2010 +0200
78
+
79
+ LaTeX converter: Using figure env for outputting images that are the only child of a paragraph
80
+
81
+ doc/converter/latex.page
82
+ doc/news/release_0_10_0.page
83
+ lib/kramdown/converter/latex.rb
84
+
85
+ commit 099c9bce66ca9998b3191e39c35f1a36eca9a885
86
+ Author: Thomas Leitner <t_leitner@gmx.at>
87
+ Date: Fri Jul 9 08:22:57 2010 +0200
88
+
89
+ Updated the man page
90
+
91
+ bin/kramdown
92
+ man/man1/kramdown.1.erb
93
+
94
+ commit 07a242b43591e94abc84e61e9734feecb79c5b3e
95
+ Author: Thomas Leitner <t_leitner@gmx.at>
96
+ Date: Thu Jul 8 23:06:13 2010 +0200
97
+
98
+ Hyphens are now used instead of underscores in CLI option names
99
+
100
+ bin/kramdown
101
+ doc/news/release_0_10_0.page
102
+ man/man1/kramdown.1.erb
103
+
104
+ commit ff9d4733ce4bc198f41ccf4e30449986cb0c2d81
105
+ Author: Thomas Leitner <t_leitner@gmx.at>
106
+ Date: Thu Jul 8 22:51:29 2010 +0200
107
+
108
+ Added new option entity_output for more control over entity output
109
+
110
+ doc/converter/html.page
111
+ doc/converter/kramdown.page
112
+ doc/news/release_0_10_0.page
113
+ lib/kramdown/converter/html.rb
114
+ lib/kramdown/converter/kramdown.rb
115
+ lib/kramdown/options.rb
116
+ lib/kramdown/parser/html.rb
117
+ lib/kramdown/parser/kramdown/html_entity.rb
118
+ lib/kramdown/utils/html.rb
119
+ test/testcases/span/text_substitutions/entities.html
120
+ test/testcases/span/text_substitutions/entities.html.19
121
+ test/testcases/span/text_substitutions/entities.options
122
+ test/testcases/span/text_substitutions/entities_as_char.html
123
+ test/testcases/span/text_substitutions/entities_as_char.html.19
124
+ test/testcases/span/text_substitutions/entities_as_char.options
125
+ test/testcases/span/text_substitutions/entities_as_char.text
126
+ test/testcases/span/text_substitutions/entities_as_input.html
127
+ test/testcases/span/text_substitutions/entities_as_input.options
128
+ test/testcases/span/text_substitutions/entities_as_input.text
129
+ test/testcases/span/text_substitutions/entities_numeric.html
130
+ test/testcases/span/text_substitutions/entities_numeric.html.19
131
+ test/testcases/span/text_substitutions/entities_numeric.options
132
+ test/testcases/span/text_substitutions/entities_numeric.text
133
+ test/testcases/span/text_substitutions/entities_symbolic.html
134
+ test/testcases/span/text_substitutions/entities_symbolic.options
135
+ test/testcases/span/text_substitutions/entities_symbolic.text
136
+
137
+ commit 07ee85ff1f4e6a2b1fa2124cf025bd064a9c411f
138
+ Author: Thomas Leitner <t_leitner@gmx.at>
139
+ Date: Tue Jul 6 16:32:15 2010 +0200
140
+
141
+ Removed commented debug line
142
+
143
+ lib/kramdown/converter/kramdown.rb
144
+
145
+ commit 776dfce1cf8365023b28284c2d5e771b98161775
146
+ Author: Thomas Leitner <t_leitner@gmx.at>
147
+ Date: Tue Jul 6 16:29:37 2010 +0200
148
+
149
+ Fixed warnings and problems when running under Ruby 1.9.2-rc1
150
+
151
+ doc/news/release_0_10_0.page
152
+ lib/kramdown/parser/html.rb
153
+ lib/kramdown/parser/kramdown/attribute_list.rb
154
+ lib/kramdown/parser/kramdown/autolink.rb
155
+ lib/kramdown/parser/kramdown/header.rb
156
+
157
+ commit 681804a29cac3c53937e03d7a0c1ae79ec2b1676
158
+ Author: Thomas Leitner <t_leitner@gmx.at>
159
+ Date: Tue Jul 6 16:24:11 2010 +0200
160
+
161
+ Outputting Zcaron/zcaron always numerically
162
+
163
+ doc/news/release_0_10_0.page
164
+ lib/kramdown/utils/entities.rb
165
+
166
+ commit 72f9c38dcff208ed334f76073e9b62ee3b15d889
167
+ Author: Thomas Leitner <t_leitner@gmx.at>
168
+ Date: Tue Jul 6 16:20:01 2010 +0200
169
+
170
+ Fixed line break output in LaTeX converter
171
+
172
+ doc/news/release_0_10_0.page
173
+ lib/kramdown/converter/latex.rb
174
+ test/testcases/span/line_breaks/normal.latex
175
+
176
+ commit 52d789892cb263a8f3ed0409fe00effc281d1b61
177
+ Author: Thomas Leitner <t_leitner@gmx.at>
178
+ Date: Wed Jun 30 16:41:42 2010 +0200
179
+
180
+ LaTeX converter: outputting the element attributes on the end tags too
181
+
182
+ doc/news/release_0_10_0.page
183
+ lib/kramdown/converter/latex.rb
184
+
185
+ commit 619a59cb5e8985c583c3bb4fe041b8f640a72382
186
+ Author: Thomas Leitner <t_leitner@gmx.at>
187
+ Date: Wed Jun 30 16:36:19 2010 +0200
188
+
189
+ Removed deprecated method Converter::Html#options_for_element
190
+
191
+ doc/news/release_0_10_0.page
192
+ lib/kramdown/converter/html.rb
193
+
194
+ commit 3b0c8e29a95459cf932c761581b438a2c0349723
195
+ Author: Thomas Leitner <t_leitner@gmx.at>
196
+ Date: Wed Jun 30 16:34:51 2010 +0200
197
+
198
+ Bumped version number and added release notes file
199
+
200
+ doc/news/release_0_10_0.page
201
+ lib/kramdown/version.rb
202
+
1
203
  commit 63cc1fe8b8f5f43db99c5ef9b20daf12c16f4cd3
2
204
  Author: Thomas Leitner <t_leitner@gmx.at>
3
205
  Date: Wed Jun 23 08:47:27 2010 +0200
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.9.0
1
+ 0.10.0
data/bin/kramdown CHANGED
@@ -34,8 +34,8 @@ OptionParser.new do |opts|
34
34
  opts.separator "Command line options:"
35
35
  opts.separator ""
36
36
 
37
- opts.on("-i", "--input ARG", "Specify the input format: kramdown (default)") {|v| options[:input] = v}
38
- opts.on("-o", "--ouput ARG", "Specify the output format: html (default) or latex") {|v| format = v}
37
+ opts.on("-i", "--input ARG", "Specify the input format: kramdown (default) or html") {|v| options[:input] = v}
38
+ opts.on("-o", "--ouput ARG", "Specify the output format: html (default), kramdown or latex") {|v| format = v}
39
39
 
40
40
  opts.on("-v", "--version", "Show the version of kramdown") do
41
41
  puts Kramdown::VERSION
@@ -51,13 +51,14 @@ OptionParser.new do |opts|
51
51
  opts.separator ""
52
52
 
53
53
  Kramdown::Options.definitions.each do |n, definition|
54
+ no = n.to_s.tr('_', '-')
54
55
  if definition.type == Kramdown::Options::Boolean
55
- opts.on("--[no-]#{n}") {|v| options[n] = Kramdown::Options.parse(n, v)}
56
+ opts.on("--[no-]#{no}") {|v| options[n] = Kramdown::Options.parse(n, v)}
56
57
  else
57
58
  next if definition.type == Object
58
59
  type = definition.type
59
60
  type = String if type == Symbol
60
- opts.on("--#{n} ARG", type) {|v| options[n] = Kramdown::Options.parse(n, v)}
61
+ opts.on("--#{no} ARG", type) {|v| options[n] = Kramdown::Options.parse(n, v)}
61
62
  end
62
63
 
63
64
  definition.desc.split(/\n/).each do |line|
data/doc/default.scss.css CHANGED
@@ -29,6 +29,7 @@ body, table, code {
29
29
  background: #364147;
30
30
  background-image: -moz-linear-gradient(top, rgba(54,65,71,1), rgba(81,92,96,1));
31
31
  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(54,65,71,1)), to(rgba(81,92,96,1)));
32
+ position: relative;
32
33
  }
33
34
 
34
35
  #header {
@@ -57,6 +58,11 @@ body, table, code {
57
58
  }
58
59
  }
59
60
 
61
+ #donation {
62
+ position: absolute;
63
+ right: 10px;
64
+ bottom: 5px;
65
+ }
60
66
 
61
67
  /* menu */
62
68
  #fullnav {
data/doc/default.template CHANGED
@@ -16,6 +16,15 @@
16
16
  <div id="header">
17
17
  <h1 id="logo"><a href="{relocatable: /}" title="Homepage">kramdown <span class='slogan'>fast, pure-Ruby Markdown-superset converter</span></a></h1>
18
18
  </div>
19
+ <div id="donation">
20
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
21
+ <input type="hidden" name="cmd" value="_s-xclick" />
22
+ <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
23
+ " />
24
+ <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
25
+ <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
26
+ </form>
27
+ </div>
19
28
  </div>
20
29
  <div id="fullnav">
21
30
  <div id="nav">
data/doc/index.page CHANGED
@@ -89,7 +89,7 @@ It is probably the fastest pure-Ruby Markdown converter available (June 2010), b
89
89
  than [Maruku] and about 9x faster than [BlueFeather].
90
90
 
91
91
  <p class="a-center">
92
- The latest version of kramdown is <b>0.9.0</b> and it was released on <b>2010-06-23</b>.
92
+ The latest version of kramdown is <b>0.10.0</b> and it was released on <b>2010-07-19</b>.
93
93
  </p>
94
94
 
95
95
  [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/
data/doc/syntax.page CHANGED
@@ -868,7 +868,7 @@ Parse as raw HTML block
868
868
 
869
869
  Parse as block level elements
870
870
  :
871
- applet button blockquote colgroup dd div dl fieldset form iframe li
871
+ applet button blockquote body colgroup dd div dl fieldset form iframe li
872
872
  map noscript object ol table tbody thead tfoot tr td ul
873
873
 
874
874
  Parse as span level elements
data/lib/kramdown/converter/html.rb CHANGED
@@ -31,12 +31,6 @@ module Kramdown
31
31
 
32
32
  include ::Kramdown::Utils::HTML
33
33
 
34
- # DEPRECATED: use #html_attributes
35
- def options_for_element(el)
36
- warn("DEPRECATION WARNING: this method will be deprecated in the next release, use #html_attributes instead")
37
- html_attributes(el)
38
- end
39
-
40
34
  # :stopdoc:
41
35
 
42
36
  # Defines the amount of indentation used when nesting HTML tags.
@@ -270,7 +264,7 @@ module Kramdown
270
264
  alias :convert_strong :convert_em
271
265
 
272
266
  def convert_entity(el, indent, opts)
273
- entity_to_str(el.value)
267
+ entity_to_str(el.value, el.options[:original])
274
268
  end
275
269
 
276
270
  TYPOGRAPHIC_SYMS = {
data/lib/kramdown/converter/kramdown.rb CHANGED
@@ -55,7 +55,6 @@ module Kramdown
55
55
  result = ''
56
56
  el.children.each_with_index do |inner_el, index|
57
57
  options = opts.dup
58
- #p [index, inner_el]
59
58
  options[:index] = index
60
59
  options[:prev] = (index == 0 ? nil : el.children[index-1])
61
60
  options[:next] = (index == el.children.length - 1 ? nil : el.children[index+1])
@@ -317,7 +316,7 @@ module Kramdown
317
316
  end
318
317
 
319
318
  def convert_entity(el, opts)
320
- entity_to_str(el.value)
319
+ entity_to_str(el.value, el.options[:original])
321
320
  end
322
321
 
323
322
  TYPOGRAPHIC_SYMS = {
data/lib/kramdown/converter/latex.rb CHANGED
@@ -46,8 +46,10 @@ module Kramdown
46
46
 
47
47
  def inner(el, opts)
48
48
  result = ''
49
- el.children.each do |inner_el|
50
- result << send("convert_#{inner_el.type}", inner_el, opts)
49
+ options = opts.dup.merge(:parent => el)
50
+ el.children.each_with_index do |inner_el, index|
51
+ options[:index] = index
52
+ result << send("convert_#{inner_el.type}", inner_el, options)
51
53
  end
52
54
  result
53
55
  end
@@ -65,7 +67,16 @@ module Kramdown
65
67
  end
66
68
 
67
69
  def convert_p(el, opts)
68
- "#{inner(el, opts)}\n\n"
70
+ if el.children.size == 1 && el.children.first.type == :img && !(img = convert_img(el.children.first, opts)).empty?
71
+ convert_standalone_image(el, opts, img)
72
+ else
73
+ "#{inner(el, opts)}\n\n"
74
+ end
75
+ end
76
+
77
+ def convert_standalone_image(el, opts, img)
78
+ attrs = attribute_list(el)
79
+ "\\begin{figure}#{attrs}\n\\begin{center}\n#{img}\n\\end{center}\n\\caption{#{escape(el.children.first.options[:attr]['alt'])}}\n\\end{figure}#{attrs}\n"
69
80
  end
70
81
 
71
82
  def convert_codeblock(el, opts)
@@ -75,18 +86,20 @@ module Kramdown
75
86
  result = "\\lstset{showspaces=%s,showtabs=%s}\n" % (show_whitespace ? ['true', 'true'] : ['false', 'false'])
76
87
  result += "\\lstset{language=#{lang}}\n" if lang
77
88
  result += "\\lstset{basicstyle=\\ttfamily\\footnotesize}\\lstset{columns=fixed,frame=tlbr}\n"
78
- "#{result}\\begin{lstlisting}#{attribute_list(el)}\n#{el.value}\n\\end{lstlisting}\n"
89
+ attrs = attribute_list(el)
90
+ "#{result}\\begin{lstlisting}#{attrs}\n#{el.value}\n\\end{lstlisting}#{attrs}\n"
79
91
  else
80
92
  "\\begin{verbatim}#{el.value}\\end{verbatim}\n"
81
93
  end
82
94
  end
83
95
 
84
96
  def latex_environment(type, el, text)
85
- "\\begin{#{type}}#{attribute_list(el)}\n#{text}\n\\end{#{type}}\n"
97
+ attrs = attribute_list(el)
98
+ "\\begin{#{type}}#{attrs}\n#{text}\n\\end{#{type}}#{attrs}\n"
86
99
  end
87
100
 
88
101
  def convert_blockquote(el, opts)
89
- latex_environment('quote', el, inner(el, opts))
102
+ latex_environment(el.children.size > 1 ? 'quotation' : 'quote', el, inner(el, opts))
90
103
  end
91
104
 
92
105
  HEADER_TYPES = {
@@ -109,7 +122,8 @@ module Kramdown
109
122
  end
110
123
 
111
124
  def convert_hr(el, opts)
112
- "\\begin{center}#{attribute_list(el)}\n\\rule{3in}{0.4pt}\n\\end{center}\n"
125
+ attrs = attribute_list(el)
126
+ "\\begin{center}#{attrs}\n\\rule{3in}{0.4pt}\n\\end{center}#{attrs}\n"
113
127
  end
114
128
 
115
129
  def convert_ul(el, opts)
@@ -163,7 +177,8 @@ module Kramdown
163
177
 
164
178
  def convert_table(el, opts)
165
179
  align = el.options[:alignment].map {|a| TABLE_ALIGNMENT_CHAR[a]}.join('|')
166
- "\\begin{tabular}{|#{align}|}#{attribute_list(el)}\n\\hline\n#{inner(el, opts)}\\hline\n\\end{tabular}\n\n"
180
+ attrs = attribute_list(el)
181
+ "\\begin{tabular}{|#{align}|}#{attrs}\n\\hline\n#{inner(el, opts)}\\hline\n\\end{tabular}#{attrs}\n\n"
167
182
  end
168
183
 
169
184
  def convert_thead(el, opts)
@@ -192,7 +207,9 @@ module Kramdown
192
207
  end
193
208
 
194
209
  def convert_br(el, opts)
195
- "\\newline\n"
210
+ res = "\\newline"
211
+ res += "\n" if (c = opts[:parent].children[opts[:index]+1]) && (c.type != :text || c.value !~ /^\s*\n/)
212
+ res
196
213
  end
197
214
 
198
215
  def convert_a(el, opts)
@@ -507,7 +524,9 @@ module Kramdown
507
524
 
508
525
  SMART_QUOTE_SYMS = {:lsquo => '`', :rsquo => '\'', :ldquo => '``', :rdquo => '\'\''}
509
526
  def convert_smart_quote(el, opts)
510
- SMART_QUOTE_SYMS[el.value]
527
+ res = SMART_QUOTE_SYMS[el.value]
528
+ res += "{}" if (nel = opts[:parent].children[opts[:index]+1]) && nel.type == :smart_quote
529
+ res
511
530
  end
512
531
 
513
532
  def convert_math(el, opts)
data/lib/kramdown/options.rb CHANGED
@@ -263,10 +263,26 @@ Used by: HTML converter
263
263
  EOF
264
264
 
265
265
  define(:numeric_entities, Boolean, false, <<EOF)
266
- Defines whether entities are output using names or numeric values
266
+ DEPRECATED: Defines whether entities are output using names or numeric values
267
+
268
+ Note that this option is deprecated and replaced by the entities option.
269
+ This option will be removed in a future release.
267
270
 
268
271
  Default: false
269
272
  Used by: HTML converter, kramdown converter
273
+ EOF
274
+
275
+ define(:entity_output, Symbol, :as_char, <<EOF)
276
+ Defines how entities are output
277
+
278
+ The possible values are :as_input (entities are output in the same
279
+ form as found in the input), :numeric (entities are output in numeric
280
+ form), :symbolic (entities are output in symbolic form if possible) or
281
+ :as_char (entities are output as characters if possible, only available
282
+ on Ruby 1.9).
283
+
284
+ Default: :as_char
285
+ Used by: HTML converter, kramdown converter
270
286
  EOF
271
287
 
272
288
  define(:toc_depth, Integer, 0, <<EOF)
data/lib/kramdown/parser/html.rb CHANGED
@@ -40,10 +40,10 @@ module Kramdown
40
40
  HTML_ATTRIBUTE_RE = /\s*(#{REXML::Parsers::BaseParser::UNAME_STR})\s*=\s*(["'])(.*?)\2/m
41
41
  HTML_TAG_RE = /<((?>#{REXML::Parsers::BaseParser::UNAME_STR}))\s*((?>\s+#{REXML::Parsers::BaseParser::UNAME_STR}\s*=\s*(["']).*?\3)*)\s*(\/)?>/m
42
42
  HTML_TAG_CLOSE_RE = /<\/(#{REXML::Parsers::BaseParser::NAME_STR})\s*>/m
43
- HTML_ENTITY_RE = /&([\w:][\-\w\d\.:]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
43
+ HTML_ENTITY_RE = /&([\w:][\-\w\.:]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
44
44
 
45
45
 
46
- HTML_PARSE_AS_BLOCK = %w{applet button blockquote colgroup dd div dl fieldset form iframe li
46
+ HTML_PARSE_AS_BLOCK = %w{applet button blockquote body colgroup dd div dl fieldset form iframe li
47
47
  map noscript object ol table tbody thead tfoot tr td ul}
48
48
  HTML_PARSE_AS_SPAN = %w{a abbr acronym address b bdo big cite caption del dfn dt em
49
49
  h1 h2 h3 h4 h5 h6 i ins kbd label legend optgroup p q rb rbc
@@ -170,7 +170,7 @@ module Kramdown
170
170
  div li dd blockquote figure figcaption td th fieldset form}
171
171
  STRIP_WHITESPACE = %w{address article aside blockquote body caption dd div dl dt fieldset figcaption form footer
172
172
  header h1 h2 h3 h4 h5 h6 legend li nav p section td th}
173
- SIMPLE_ELEMENTS = %w{em strong blockquote hr br a img p thead tbody tfoot tr td th ul ol dl li dl dt dd}
173
+ SIMPLE_ELEMENTS = %w{em strong blockquote hr br img p thead tbody tfoot tr td th ul ol dl li dl dt dd}
174
174
 
175
175
  def initialize(doc)
176
176
  @doc = doc
@@ -242,7 +242,7 @@ module Kramdown
242
242
  elsif %w{mdash ndash hellip laquo raquo}.include?(val)
243
243
  Element.new(:typographic_sym, val.intern)
244
244
  else
245
- Element.new(:entity, entity(val))
245
+ Element.new(:entity, entity(val), :original => src.matched)
246
246
  end
247
247
  else
248
248
  result << Element.new(:text, src.scan(/.*/m))
@@ -315,6 +315,15 @@ module Kramdown
315
315
  el.children.each {|c| extract_text(c, raw)}
316
316
  end
317
317
 
318
+ def convert_a(el)
319
+ if el.options[:attr].has_key?('href')
320
+ set_basics(el, :a, :span)
321
+ process_children(el)
322
+ else
323
+ process_html_element(el, false)
324
+ end
325
+ end
326
+
318
327
  def convert_h1(el)
319
328
  set_basics(el, :header, :block, :level => el.value[1..1].to_i)
320
329
  extract_text(el, el.options[:raw_text] = '')
data/lib/kramdown/parser/kramdown/attribute_list.rb CHANGED
@@ -48,9 +48,9 @@ module Kramdown
48
48
  end
49
49
 
50
50
 
51
- ALD_ID_CHARS = /[\w\d-]/
51
+ ALD_ID_CHARS = /[\w-]/
52
52
  ALD_ANY_CHARS = /\\\}|[^\}]/
53
- ALD_ID_NAME = /(?:\w|\d)#{ALD_ID_CHARS}*/
53
+ ALD_ID_NAME = /\w#{ALD_ID_CHARS}*/
54
54
  ALD_TYPE_KEY_VALUE_PAIR = /(#{ALD_ID_NAME})=("|')((?:\\\}|\\\2|[^\}\2])*?)\2/
55
55
  ALD_TYPE_CLASS_NAME = /\.(#{ALD_ID_NAME})/
56
56
  ALD_TYPE_ID_NAME = /#(#{ALD_ID_NAME})/
data/lib/kramdown/parser/kramdown/autolink.rb CHANGED
@@ -25,11 +25,18 @@ module Kramdown
25
25
  class Kramdown
26
26
 
27
27
  if RUBY_VERSION == '1.8.5'
28
- ACHARS = '\x80-\xFF'
28
+ ACHARS = '\w\x80-\xFF'
29
+ elsif RUBY_VERSION < '1.9.0'
30
+ ACHARS = '\w'
29
31
  else
30
- ACHARS = ''
32
+ ACHARS = '[[:alnum:]]'
33
+ end
34
+ AUTOLINK_START_STR = "<((mailto|https?|ftps?):.+?|[-.#{ACHARS}]+@[-#{ACHARS}]+(\.[-#{ACHARS}]+)*\.[a-z]+)>"
35
+ if RUBY_VERSION < '1.9.0'
36
+ AUTOLINK_START = /#{AUTOLINK_START_STR}/u
37
+ else
38
+ AUTOLINK_START = /#{AUTOLINK_START_STR}/
31
39
  end
32
- AUTOLINK_START = /<((mailto|https?|ftps?):.+?|[-.\w#{ACHARS}]+@[-\w#{ACHARS}]+(\.[-\w#{ACHARS}]+)*\.[a-z]+)>/u
33
40
 
34
41
  # Parse the autolink at the current location.
35
42
  def parse_autolink
data/lib/kramdown/parser/kramdown/header.rb CHANGED
@@ -24,7 +24,7 @@ module Kramdown
24
24
  module Parser
25
25
  class Kramdown
26
26
 
27
- HEADER_ID=/(?:[ \t]\{#((?:\w|\d)[\w\d-]*)\})?/
27
+ HEADER_ID=/(?:[ \t]\{#(\w[\w-]*)\})?/
28
28
  SETEXT_HEADER_START = /^(#{OPT_SPACE}[^ \t].*?)#{HEADER_ID}[ \t]*?\n(-|=)+\s*?\n/
29
29
 
30
30
  # Parse the Setext header at the current location.
data/lib/kramdown/parser/kramdown/html_entity.rb CHANGED
@@ -29,7 +29,8 @@ module Kramdown
29
29
  # Parse the HTML entity at the current location.
30
30
  def parse_html_entity
31
31
  @src.pos += @src.matched_size
32
- @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity(@src[1] || (@src[2] && @src[2].to_i) || @src[3].hex))
32
+ @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity(@src[1] || (@src[2] && @src[2].to_i) || @src[3].hex),
33
+ :original => @src.matched)
33
34
  end
34
35
  define_parser(:html_entity, Kramdown::Parser::Html::Constants::HTML_ENTITY_RE, '&')
35
36
 
data/lib/kramdown/utils/entities.rb CHANGED
@@ -275,8 +275,6 @@ module Kramdown
275
275
  [8218, 'sbquo'],
276
276
  [402, 'fnof'],
277
277
  [8222, 'bdquo'],
278
- [381, 'Zcaron'],
279
- [382, 'zcaron'],
280
278
 
281
279
  [128, 8364],
282
280
  [130, 8218],
@@ -318,7 +316,6 @@ module Kramdown
318
316
  if data.kind_of?(String)
319
317
  ENTITY_MAP[code_point] = ENTITY_MAP[data] = Entity.new(code_point, data)
320
318
  else
321
- raise "No entity object for code point #{data} found" unless ENTITY_MAP.has_key?(data)
322
319
  ENTITY_MAP[code_point] = ENTITY_MAP[data]
323
320
  end
324
321
  end
data/lib/kramdown/utils/html.rb CHANGED
@@ -27,10 +27,13 @@ module Kramdown
27
27
  module HTML
28
28
 
29
29
  # Convert the +entity+ to a string.
30
- def entity_to_str(e)
31
- if RUBY_VERSION >= '1.9' && (c = e.char.encode(@doc.parse_infos[:encoding]) rescue nil) && !ESCAPE_MAP.has_key?(c)
30
+ def entity_to_str(e, original = nil)
31
+ if RUBY_VERSION >= '1.9' && @doc.options[:entity_output] == :as_char &&
32
+ (c = e.char.encode(@doc.parse_infos[:encoding]) rescue nil) && !ESCAPE_MAP.has_key?(c)
32
33
  c
33
- elsif @doc.options[:numeric_entities] || e.name.nil?
34
+ elsif (@doc.options[:entity_output] == :as_input || @doc.options[:entity_output] == :as_char) && original
35
+ original
36
+ elsif @doc.options[:entity_output] == :numeric || e.name.nil?
34
37
  "&##{e.code_point};"
35
38
  else
36
39
  "&#{e.name};"
data/lib/kramdown/version.rb CHANGED
@@ -23,6 +23,6 @@
23
23
  module Kramdown
24
24
 
25
25
  # The kramdown version.
26
- VERSION = '0.9.0'
26
+ VERSION = '0.10.0'
27
27
 
28
28
  end
data/man/man1/kramdown.1 CHANGED
@@ -1,4 +1,4 @@
1
- .TH "KRAMDOWN" 1 "February 2010"
1
+ .TH "KRAMDOWN" 1 "July 2010"
2
2
  .SH NAME
3
3
  kramdown \- a fast, pure-Ruby Markdown-superset converter
4
4
  .SH SYNOPSIS
@@ -6,9 +6,10 @@ kramdown \- a fast, pure-Ruby Markdown-superset converter
6
6
  [\fIoptions\fR]
7
7
  [\fIFILE\fR ...]
8
8
  .SH DESCRIPTION
9
- kramdown parses a superset of Markdown and converts it to different output formats. It is supports
10
- standard Markdown (with some minor modifications) and various extensions like tables and definition
11
- lists.
9
+ kramdown is primarily used for parsing a superset of Markdown and converting it to different output
10
+ formats. It supports standard Markdown (with some minor modifications) and various extensions like
11
+ tables and definition lists. Due to its modular architecture it also allows other input formats than
12
+ Markdown, for example, HTML.
12
13
 
13
14
  If \fIFILE\fR is not specified, kramdown reads from the standard input. The result is written to the
14
15
  standard output.
@@ -18,8 +19,11 @@ used directly by the kramdown binary. The second set of options controls how kra
18
19
  converts its input.
19
20
  .SH OPTIONS
20
21
  .TP
21
- .B \-f, \-\-format ARG
22
- Specify the output format. Available output formats: html (this is the default) or latex.
22
+ .B \-i, \-\-input ARG
23
+ Specify the input format. Available input formats: kramdown (this is the default) or html.
24
+ .TP
25
+ .B \-o, \-\-output ARG
26
+ Specify the output format. Available output formats: html (this is the default), kramdown or latex.
23
27
  .TP
24
28
  .B \-v, \-\-version
25
29
  Show the version of kramdown.
@@ -53,7 +57,7 @@ Used by: all converters
53
57
 
54
58
 
55
59
  .TP
56
- .B \-\-[no\-]auto_ids
60
+ .B \-\-[no\-]auto-ids
57
61
 
58
62
  Use automatic header ID generation
59
63
 
@@ -65,7 +69,7 @@ Used by: HTML/Latex converter
65
69
 
66
70
 
67
71
  .TP
68
- .B \-\-auto_id_prefix ARG
72
+ .B \-\-auto-id-prefix ARG
69
73
 
70
74
  Prefix used for automatically generated heaer IDs
71
75
 
@@ -79,7 +83,7 @@ Used by: HTML/Latex converter
79
83
 
80
84
 
81
85
  .TP
82
- .B \-\-[no\-]parse_block_html
86
+ .B \-\-[no\-]parse-block-html
83
87
 
84
88
  Process kramdown syntax in block HTML tags
85
89
 
@@ -93,7 +97,7 @@ Used by: kramdown parser
93
97
 
94
98
 
95
99
  .TP
96
- .B \-\-[no\-]parse_span_html
100
+ .B \-\-[no\-]parse-span-html
97
101
 
98
102
  Process kramdown syntax in span HTML tags
99
103
 
@@ -105,7 +109,7 @@ Used by: kramdown parser
105
109
 
106
110
 
107
111
  .TP
108
- .B \-\-[no\-]html_to_native
112
+ .B \-\-[no\-]html-to-native
109
113
 
110
114
  Convert HTML elements to native elements
111
115
 
@@ -122,7 +126,7 @@ Used by: kramdown parser
122
126
 
123
127
 
124
128
  .TP
125
- .B \-\-footnote_nr ARG
129
+ .B \-\-footnote-nr ARG
126
130
 
127
131
  The number of the first footnote
128
132
 
@@ -134,7 +138,7 @@ Used by: HTML converter
134
138
 
135
139
 
136
140
  .TP
137
- .B \-\-coderay_wrap ARG
141
+ .B \-\-coderay-wrap ARG
138
142
 
139
143
  Defines how the highlighted code should be wrapped
140
144
 
@@ -145,7 +149,7 @@ Used by: HTML converter
145
149
 
146
150
 
147
151
  .TP
148
- .B \-\-coderay_line_numbers ARG
152
+ .B \-\-coderay-line-numbers ARG
149
153
 
150
154
  Defines how and if line numbers should be shown
151
155
 
@@ -157,7 +161,7 @@ Used by: HTML converter
157
161
 
158
162
 
159
163
  .TP
160
- .B \-\-coderay_line_number_start ARG
164
+ .B \-\-coderay-line-number-start ARG
161
165
 
162
166
  The start value for the line numbers
163
167
 
@@ -166,7 +170,7 @@ Used by: HTML converter
166
170
 
167
171
 
168
172
  .TP
169
- .B \-\-coderay_tab_width ARG
173
+ .B \-\-coderay-tab-width ARG
170
174
 
171
175
  The tab width used in highlighted code
172
176
 
@@ -174,7 +178,7 @@ Used by: HTML converter
174
178
 
175
179
 
176
180
  .TP
177
- .B \-\-coderay_bold_every ARG
181
+ .B \-\-coderay-bold-every ARG
178
182
 
179
183
  Defines how often a line number should be made bold
180
184
 
@@ -183,7 +187,7 @@ Used by: HTML converter
183
187
 
184
188
 
185
189
  .TP
186
- .B \-\-coderay_css ARG
190
+ .B \-\-coderay-css ARG
187
191
 
188
192
  Defines how the highlighted code gets styled
189
193
 
@@ -196,16 +200,34 @@ Used by: HTML converter
196
200
 
197
201
 
198
202
  .TP
199
- .B \-\-[no\-]numeric_entities
203
+ .B \-\-[no\-]numeric-entities
204
+
205
+ DEPRECATED: Defines whether entities are output using names or numeric values
200
206
 
201
- Defines whether entities are output using names or numeric values
207
+ Note that this option is deprecated and replaced by the entities option.
208
+ This option will be removed in a future release.
202
209
 
203
210
  Default: false
204
211
  Used by: HTML converter, kramdown converter
205
212
 
206
213
 
207
214
  .TP
208
- .B \-\-toc_depth ARG
215
+ .B \-\-entity-output ARG
216
+
217
+ Defines how entities are output
218
+
219
+ The possible values are :as_input (entities are output in the same
220
+ form as found in the input), :numeric (entities are output in numeric
221
+ form), :symbolic (entities are output in symbolic form if possible) or
222
+ :as_char (entities are output as characters if possible, only available
223
+ on Ruby 1.9).
224
+
225
+ Default: :as_char
226
+ Used by: HTML converter, kramdown converter
227
+
228
+
229
+ .TP
230
+ .B \-\-toc-depth ARG
209
231
 
210
232
  Defines the maximum level of headers which will be used to generate the table of
211
233
  contents. For instance, with a value of 2, toc entries will be generated for h1
@@ -215,8 +237,10 @@ Default: 0
215
237
  Used by: HTML/Latex converter
216
238
 
217
239
 
240
+ .SH EXIT STATUS
241
+ The exit status is 0 if no error happened. Otherwise it is 1.
218
242
  .SH SEE ALSO
219
- The kramdown website, http://kramdown.rubyforge.org/ for more information, especially on the support
243
+ The kramdown website, http://kramdown.rubyforge.org/ for more information, especially on the supported
220
244
  input syntax.
221
245
  .SH AUTHOR
222
246
  kramdown was written by Thomas Leitner <t_leitner@gmx.at>.
data/test/testcases/span/line_breaks/normal.latex ADDED
@@ -0,0 +1,12 @@
1
+ This is a line\newline
2
+ with a line break.
3
+
4
+ This is a line
5
+ without a line break.
6
+
7
+ This is a line \newline
8
+ with a line\textbackslash{} \newline
9
+ break.
10
+
11
+ Line break on last line.
12
+
data/test/testcases/span/text_substitutions/entities.html CHANGED
@@ -1,4 +1,4 @@
1
1
  <p>This is the A&amp;O. &copy; 2008 by me
2
2
  As well \&amp; as this. Some &#343; other
3
- values may &#175; may also show but
3
+ values may &#xAF; may also show but
4
4
  not st. like &amp;#xYZ;.</p>
data/test/testcases/span/text_substitutions/entities.options ADDED
@@ -0,0 +1 @@
1
+ :entity_output: :as_input
data/test/testcases/span/text_substitutions/entities_as_char.html ADDED
@@ -0,0 +1 @@
1
+ <p>This is the A&amp;O. &copy; 2008 by me &#343; and &#x3bb;</p>
data/test/testcases/span/text_substitutions/entities_as_char.html.19 ADDED
@@ -0,0 +1 @@
1
+ <p>This is the A&amp;O. © 2008 by me ŗ and λ</p>
data/test/testcases/span/text_substitutions/entities_as_char.options ADDED
@@ -0,0 +1 @@
1
+ :entity_output: :as_char
data/test/testcases/span/text_substitutions/entities_as_char.text ADDED
@@ -0,0 +1 @@
1
+ This is the A&O. &copy; 2008 by me &#343; and &#x3bb;
data/test/testcases/span/text_substitutions/entities_as_input.html ADDED
@@ -0,0 +1 @@
1
+ <p>This is the A&amp;O. &copy; 2008 by me &#343; and &#x3bb;</p>
data/test/testcases/span/text_substitutions/entities_as_input.options ADDED
@@ -0,0 +1 @@
1
+ :entity_output: :as_input
data/test/testcases/span/text_substitutions/entities_as_input.text ADDED
@@ -0,0 +1 @@
1
+ This is the A&O. &copy; 2008 by me &#343; and &#x3bb;
data/test/testcases/span/text_substitutions/entities_numeric.html CHANGED
@@ -1 +1 @@
1
- <p>This is the A&amp;O. &#169; 2008 by me &#343;</p>
1
+ <p>This is the A&amp;O. &#169; 2008 by me &#343; and &#955;</p>
data/test/testcases/span/text_substitutions/entities_numeric.options CHANGED
@@ -1 +1 @@
1
- :numeric_entities: true
1
+ :entity_output: :numeric
data/test/testcases/span/text_substitutions/entities_numeric.text CHANGED
@@ -1 +1 @@
1
- This is the A&O. &copy; 2008 by me &#343;
1
+ This is the A&O. &copy; 2008 by me &#343; and &#x3bb;
data/test/testcases/span/text_substitutions/entities_symbolic.html ADDED
@@ -0,0 +1 @@
1
+ <p>This is the A&amp;O. &copy; 2008 by me &#343; and &lambda;</p>
data/test/testcases/span/text_substitutions/entities_symbolic.options ADDED
@@ -0,0 +1 @@
1
+ :entity_output: :symbolic
data/test/testcases/span/text_substitutions/entities_symbolic.text ADDED
@@ -0,0 +1 @@
1
+ This is the A&O. &copy; 2008 by me &#343; and &#x3bb;
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kramdown
3
3
  version: !ruby/object:Gem::Version
4
- hash: -4204154198824919856
5
4
  prerelease: false
6
5
  segments:
7
6
  - 0
8
- - 9
7
+ - 10
9
8
  - 0
10
- version: 0.9.0
9
+ version: 0.10.0
11
10
  platform: ruby
12
11
  authors:
13
12
  - Thomas Leitner
@@ -15,7 +14,7 @@ autorequire:
15
14
  bindir: bin
16
15
  cert_chain: []
17
16
 
18
- date: 2010-06-23 00:00:00 +02:00
17
+ date: 2010-07-19 00:00:00 +02:00
19
18
  default_executable: kramdown
20
19
  dependencies: []
21
20
 
@@ -164,6 +163,7 @@ files:
164
163
  - test/testcases/span/01_link/image_in_a.html
165
164
  - test/testcases/span/01_link/link_defs.html
166
165
  - test/testcases/span/01_link/imagelinks.text
166
+ - test/testcases/span/line_breaks/normal.latex
167
167
  - test/testcases/span/line_breaks/normal.html
168
168
  - test/testcases/span/line_breaks/normal.text
169
169
  - test/testcases/span/extension/comment.text
@@ -178,19 +178,28 @@ files:
178
178
  - test/testcases/span/ial/simple.text
179
179
  - test/testcases/span/math/normal.html
180
180
  - test/testcases/span/math/normal.text
181
- - test/testcases/span/text_substitutions/entities.html.19
181
+ - test/testcases/span/text_substitutions/entities_as_input.options
182
182
  - test/testcases/span/text_substitutions/typography.html
183
183
  - test/testcases/span/text_substitutions/entities.html
184
184
  - test/testcases/span/text_substitutions/greaterthan.html
185
185
  - test/testcases/span/text_substitutions/lowerthan.text
186
186
  - test/testcases/span/text_substitutions/entities_numeric.options
187
187
  - test/testcases/span/text_substitutions/lowerthan.html
188
+ - test/testcases/span/text_substitutions/entities_as_char.html
189
+ - test/testcases/span/text_substitutions/entities_symbolic.options
190
+ - test/testcases/span/text_substitutions/entities.options
188
191
  - test/testcases/span/text_substitutions/entities_numeric.text
192
+ - test/testcases/span/text_substitutions/entities_symbolic.text
193
+ - test/testcases/span/text_substitutions/entities_as_char.html.19
194
+ - test/testcases/span/text_substitutions/entities_as_char.text
195
+ - test/testcases/span/text_substitutions/entities_as_char.options
189
196
  - test/testcases/span/text_substitutions/typography.text
190
197
  - test/testcases/span/text_substitutions/entities.text
198
+ - test/testcases/span/text_substitutions/entities_symbolic.html
191
199
  - test/testcases/span/text_substitutions/entities_numeric.html
192
200
  - test/testcases/span/text_substitutions/typography.html.19
193
- - test/testcases/span/text_substitutions/entities_numeric.html.19
201
+ - test/testcases/span/text_substitutions/entities_as_input.text
202
+ - test/testcases/span/text_substitutions/entities_as_input.html
194
203
  - test/testcases/span/text_substitutions/greaterthan.text
195
204
  - test/testcases/span/02_emphasis/errors.text
196
205
  - test/testcases/span/02_emphasis/normal.html
@@ -425,7 +434,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
425
434
  requirements:
426
435
  - - ">="
427
436
  - !ruby/object:Gem::Version
428
- hash: -947233339962908927
429
437
  segments:
430
438
  - 0
431
439
  version: "0"
@@ -434,7 +442,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
434
442
  requirements:
435
443
  - - ">="
436
444
  - !ruby/object:Gem::Version
437
- hash: -947233339962908927
438
445
  segments:
439
446
  - 0
440
447
  version: "0"
data/test/testcases/span/text_substitutions/entities.html.19 DELETED
@@ -1,4 +0,0 @@
1
- <p>This is the A&amp;O. © 2008 by me
2
- As well \&amp; as this. Some ŗ other
3
- values may ¯ may also show but
4
- not st. like &amp;#xYZ;.</p>
data/test/testcases/span/text_substitutions/entities_numeric.html.19 DELETED
@@ -1 +0,0 @@
1
- <p>This is the A&amp;O. © 2008 by me ŗ</p>