##// END OF EJS Templates
Fixed: Double-dash results in strikethrough text (#5122)....
Jean-Philippe Lang -
r3491:533590c29cf3
parent child
Show More
@@ -1,1191 +1,1193
1 1 # vim:ts=4:sw=4:
2 2 # = RedCloth - Textile and Markdown Hybrid for Ruby
3 3 #
4 4 # Homepage:: http://whytheluckystiff.net/ruby/redcloth/
5 5 # Author:: why the lucky stiff (http://whytheluckystiff.net/)
6 6 # Copyright:: (cc) 2004 why the lucky stiff (and his puppet organizations.)
7 7 # License:: BSD
8 8 #
9 9 # (see http://hobix.com/textile/ for a Textile Reference.)
10 10 #
11 11 # Based on (and also inspired by) both:
12 12 #
13 13 # PyTextile: http://diveintomark.org/projects/textile/textile.py.txt
14 14 # Textism for PHP: http://www.textism.com/tools/textile/
15 15 #
16 16 #
17 17
18 18 # = RedCloth
19 19 #
20 20 # RedCloth is a Ruby library for converting Textile and/or Markdown
21 21 # into HTML. You can use either format, intermingled or separately.
22 22 # You can also extend RedCloth to honor your own custom text stylings.
23 23 #
24 24 # RedCloth users are encouraged to use Textile if they are generating
25 25 # HTML and to use Markdown if others will be viewing the plain text.
26 26 #
27 27 # == What is Textile?
28 28 #
29 29 # Textile is a simple formatting style for text
30 30 # documents, loosely based on some HTML conventions.
31 31 #
32 32 # == Sample Textile Text
33 33 #
34 34 # h2. This is a title
35 35 #
36 36 # h3. This is a subhead
37 37 #
38 38 # This is a bit of paragraph.
39 39 #
40 40 # bq. This is a blockquote.
41 41 #
42 42 # = Writing Textile
43 43 #
44 44 # A Textile document consists of paragraphs. Paragraphs
45 45 # can be specially formatted by adding a small instruction
46 46 # to the beginning of the paragraph.
47 47 #
48 48 # h[n]. Header of size [n].
49 49 # bq. Blockquote.
50 50 # # Numeric list.
51 51 # * Bulleted list.
52 52 #
53 53 # == Quick Phrase Modifiers
54 54 #
55 55 # Quick phrase modifiers are also included, to allow formatting
56 56 # of small portions of text within a paragraph.
57 57 #
58 58 # \_emphasis\_
59 59 # \_\_italicized\_\_
60 60 # \*strong\*
61 61 # \*\*bold\*\*
62 62 # ??citation??
63 63 # -deleted text-
64 64 # +inserted text+
65 65 # ^superscript^
66 66 # ~subscript~
67 67 # @code@
68 68 # %(classname)span%
69 69 #
70 70 # ==notextile== (leave text alone)
71 71 #
72 72 # == Links
73 73 #
74 74 # To make a hypertext link, put the link text in "quotation
75 75 # marks" followed immediately by a colon and the URL of the link.
76 76 #
77 77 # Optional: text in (parentheses) following the link text,
78 78 # but before the closing quotation mark, will become a Title
79 79 # attribute for the link, visible as a tool tip when a cursor is above it.
80 80 #
81 81 # Example:
82 82 #
83 83 # "This is a link (This is a title) ":http://www.textism.com
84 84 #
85 85 # Will become:
86 86 #
87 87 # <a href="http://www.textism.com" title="This is a title">This is a link</a>
88 88 #
89 89 # == Images
90 90 #
91 91 # To insert an image, put the URL for the image inside exclamation marks.
92 92 #
93 93 # Optional: text that immediately follows the URL in (parentheses) will
94 94 # be used as the Alt text for the image. Images on the web should always
95 95 # have descriptive Alt text for the benefit of readers using non-graphical
96 96 # browsers.
97 97 #
98 98 # Optional: place a colon followed by a URL immediately after the
99 99 # closing ! to make the image into a link.
100 100 #
101 101 # Example:
102 102 #
103 103 # !http://www.textism.com/common/textist.gif(Textist)!
104 104 #
105 105 # Will become:
106 106 #
107 107 # <img src="http://www.textism.com/common/textist.gif" alt="Textist" />
108 108 #
109 109 # With a link:
110 110 #
111 111 # !/common/textist.gif(Textist)!:http://textism.com
112 112 #
113 113 # Will become:
114 114 #
115 115 # <a href="http://textism.com"><img src="/common/textist.gif" alt="Textist" /></a>
116 116 #
117 117 # == Defining Acronyms
118 118 #
119 119 # HTML allows authors to define acronyms via the tag. The definition appears as a
120 120 # tool tip when a cursor hovers over the acronym. A crucial aid to clear writing,
121 121 # this should be used at least once for each acronym in documents where they appear.
122 122 #
123 123 # To quickly define an acronym in Textile, place the full text in (parentheses)
124 124 # immediately following the acronym.
125 125 #
126 126 # Example:
127 127 #
128 128 # ACLU(American Civil Liberties Union)
129 129 #
130 130 # Will become:
131 131 #
132 132 # <acronym title="American Civil Liberties Union">ACLU</acronym>
133 133 #
134 134 # == Adding Tables
135 135 #
136 136 # In Textile, simple tables can be added by seperating each column by
137 137 # a pipe.
138 138 #
139 139 # |a|simple|table|row|
140 140 # |And|Another|table|row|
141 141 #
142 142 # Attributes are defined by style definitions in parentheses.
143 143 #
144 144 # table(border:1px solid black).
145 145 # (background:#ddd;color:red). |{}| | | |
146 146 #
147 147 # == Using RedCloth
148 148 #
149 149 # RedCloth is simply an extension of the String class, which can handle
150 150 # Textile formatting. Use it like a String and output HTML with its
151 151 # RedCloth#to_html method.
152 152 #
153 153 # doc = RedCloth.new "
154 154 #
155 155 # h2. Test document
156 156 #
157 157 # Just a simple test."
158 158 #
159 159 # puts doc.to_html
160 160 #
161 161 # By default, RedCloth uses both Textile and Markdown formatting, with
162 162 # Textile formatting taking precedence. If you want to turn off Markdown
163 163 # formatting, to boost speed and limit the processor:
164 164 #
165 165 # class RedCloth::Textile.new( str )
166 166
167 167 class RedCloth3 < String
168 168
169 169 VERSION = '3.0.4'
170 170 DEFAULT_RULES = [:textile, :markdown]
171 171
172 172 #
173 173 # Two accessor for setting security restrictions.
174 174 #
175 175 # This is a nice thing if you're using RedCloth for
176 176 # formatting in public places (e.g. Wikis) where you
177 177 # don't want users to abuse HTML for bad things.
178 178 #
179 179 # If +:filter_html+ is set, HTML which wasn't
180 180 # created by the Textile processor will be escaped.
181 181 #
182 182 # If +:filter_styles+ is set, it will also disable
183 183 # the style markup specifier. ('{color: red}')
184 184 #
185 185 attr_accessor :filter_html, :filter_styles
186 186
187 187 #
188 188 # Accessor for toggling hard breaks.
189 189 #
190 190 # If +:hard_breaks+ is set, single newlines will
191 191 # be converted to HTML break tags. This is the
192 192 # default behavior for traditional RedCloth.
193 193 #
194 194 attr_accessor :hard_breaks
195 195
196 196 # Accessor for toggling lite mode.
197 197 #
198 198 # In lite mode, block-level rules are ignored. This means
199 199 # that tables, paragraphs, lists, and such aren't available.
200 200 # Only the inline markup for bold, italics, entities and so on.
201 201 #
202 202 # r = RedCloth.new( "And then? She *fell*!", [:lite_mode] )
203 203 # r.to_html
204 204 # #=> "And then? She <strong>fell</strong>!"
205 205 #
206 206 attr_accessor :lite_mode
207 207
208 208 #
209 209 # Accessor for toggling span caps.
210 210 #
211 211 # Textile places `span' tags around capitalized
212 212 # words by default, but this wreaks havoc on Wikis.
213 213 # If +:no_span_caps+ is set, this will be
214 214 # suppressed.
215 215 #
216 216 attr_accessor :no_span_caps
217 217
218 218 #
219 219 # Establishes the markup predence. Available rules include:
220 220 #
221 221 # == Textile Rules
222 222 #
223 223 # The following textile rules can be set individually. Or add the complete
224 224 # set of rules with the single :textile rule, which supplies the rule set in
225 225 # the following precedence:
226 226 #
227 227 # refs_textile:: Textile references (i.e. [hobix]http://hobix.com/)
228 228 # block_textile_table:: Textile table block structures
229 229 # block_textile_lists:: Textile list structures
230 230 # block_textile_prefix:: Textile blocks with prefixes (i.e. bq., h2., etc.)
231 231 # inline_textile_image:: Textile inline images
232 232 # inline_textile_link:: Textile inline links
233 233 # inline_textile_span:: Textile inline spans
234 234 # glyphs_textile:: Textile entities (such as em-dashes and smart quotes)
235 235 #
236 236 # == Markdown
237 237 #
238 238 # refs_markdown:: Markdown references (for example: [hobix]: http://hobix.com/)
239 239 # block_markdown_setext:: Markdown setext headers
240 240 # block_markdown_atx:: Markdown atx headers
241 241 # block_markdown_rule:: Markdown horizontal rules
242 242 # block_markdown_bq:: Markdown blockquotes
243 243 # block_markdown_lists:: Markdown lists
244 244 # inline_markdown_link:: Markdown links
245 245 attr_accessor :rules
246 246
247 247 # Returns a new RedCloth object, based on _string_ and
248 248 # enforcing all the included _restrictions_.
249 249 #
250 250 # r = RedCloth.new( "h1. A <b>bold</b> man", [:filter_html] )
251 251 # r.to_html
252 252 # #=>"<h1>A &lt;b&gt;bold&lt;/b&gt; man</h1>"
253 253 #
254 254 def initialize( string, restrictions = [] )
255 255 restrictions.each { |r| method( "#{ r }=" ).call( true ) }
256 256 super( string )
257 257 end
258 258
259 259 #
260 260 # Generates HTML from the Textile contents.
261 261 #
262 262 # r = RedCloth.new( "And then? She *fell*!" )
263 263 # r.to_html( true )
264 264 # #=>"And then? She <strong>fell</strong>!"
265 265 #
266 266 def to_html( *rules )
267 267 rules = DEFAULT_RULES if rules.empty?
268 268 # make our working copy
269 269 text = self.dup
270 270
271 271 @urlrefs = {}
272 272 @shelf = []
273 273 textile_rules = [:block_textile_table, :block_textile_lists,
274 274 :block_textile_prefix, :inline_textile_image, :inline_textile_link,
275 275 :inline_textile_code, :inline_textile_span, :glyphs_textile]
276 276 markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
277 277 :block_markdown_bq, :block_markdown_lists,
278 278 :inline_markdown_reflink, :inline_markdown_link]
279 279 @rules = rules.collect do |rule|
280 280 case rule
281 281 when :markdown
282 282 markdown_rules
283 283 when :textile
284 284 textile_rules
285 285 else
286 286 rule
287 287 end
288 288 end.flatten
289 289
290 290 # standard clean up
291 291 incoming_entities text
292 292 clean_white_space text
293 293
294 294 # start processor
295 295 @pre_list = []
296 296 rip_offtags text
297 297 no_textile text
298 298 escape_html_tags text
299 299 hard_break text
300 300 unless @lite_mode
301 301 refs text
302 302 # need to do this before text is split by #blocks
303 303 block_textile_quotes text
304 304 blocks text
305 305 end
306 306 inline text
307 307 smooth_offtags text
308 308
309 309 retrieve text
310 310
311 311 text.gsub!( /<\/?notextile>/, '' )
312 312 text.gsub!( /x%x%/, '&#38;' )
313 313 clean_html text if filter_html
314 314 text.strip!
315 315 text
316 316
317 317 end
318 318
319 319 #######
320 320 private
321 321 #######
322 322 #
323 323 # Mapping of 8-bit ASCII codes to HTML numerical entity equivalents.
324 324 # (from PyTextile)
325 325 #
326 326 TEXTILE_TAGS =
327 327
328 328 [[128, 8364], [129, 0], [130, 8218], [131, 402], [132, 8222], [133, 8230],
329 329 [134, 8224], [135, 8225], [136, 710], [137, 8240], [138, 352], [139, 8249],
330 330 [140, 338], [141, 0], [142, 0], [143, 0], [144, 0], [145, 8216], [146, 8217],
331 331 [147, 8220], [148, 8221], [149, 8226], [150, 8211], [151, 8212], [152, 732],
332 332 [153, 8482], [154, 353], [155, 8250], [156, 339], [157, 0], [158, 0], [159, 376]].
333 333
334 334 collect! do |a, b|
335 335 [a.chr, ( b.zero? and "" or "&#{ b };" )]
336 336 end
337 337
338 338 #
339 339 # Regular expressions to convert to HTML.
340 340 #
341 341 A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/
342 342 A_VLGN = /[\-^~]/
343 343 C_CLAS = '(?:\([^)]+\))'
344 344 C_LNGE = '(?:\[[^\[\]]+\])'
345 345 C_STYL = '(?:\{[^}]+\})'
346 346 S_CSPN = '(?:\\\\\d+)'
347 347 S_RSPN = '(?:/\d+)'
348 348 A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)"
349 349 S = "(?:#{S_CSPN}?#{S_RSPN}|#{S_RSPN}?#{S_CSPN}?)"
350 350 C = "(?:#{C_CLAS}?#{C_STYL}?#{C_LNGE}?|#{C_STYL}?#{C_LNGE}?#{C_CLAS}?|#{C_LNGE}?#{C_STYL}?#{C_CLAS}?)"
351 351 # PUNCT = Regexp::quote( '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~' )
352 352 PUNCT = Regexp::quote( '!"#$%&\'*+,-./:;=?@\\^_`|~' )
353 353 PUNCT_NOQ = Regexp::quote( '!"#$&\',./:;=?@\\`|' )
354 354 PUNCT_Q = Regexp::quote( '*-_+^~%' )
355 355 HYPERLINK = '(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)'
356 356
357 357 # Text markup tags, don't conflict with block tags
358 358 SIMPLE_HTML_TAGS = [
359 359 'tt', 'b', 'i', 'big', 'small', 'em', 'strong', 'dfn', 'code',
360 360 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'br',
361 361 'br', 'map', 'q', 'sub', 'sup', 'span', 'bdo'
362 362 ]
363 363
364 364 QTAGS = [
365 365 ['**', 'b', :limit],
366 366 ['*', 'strong', :limit],
367 367 ['??', 'cite', :limit],
368 368 ['-', 'del', :limit],
369 369 ['__', 'i', :limit],
370 370 ['_', 'em', :limit],
371 371 ['%', 'span', :limit],
372 372 ['+', 'ins', :limit],
373 373 ['^', 'sup', :limit],
374 374 ['~', 'sub', :limit]
375 375 ]
376 376 QTAGS_JOIN = QTAGS.map {|rc, ht, rtype| Regexp::quote rc}.join('|')
377 377
378 378 QTAGS.collect! do |rc, ht, rtype|
379 379 rcq = Regexp::quote rc
380 380 re =
381 381 case rtype
382 382 when :limit
383 383 /(^|[>\s\(]) # sta
384 (?!\-\-)
384 385 (#{QTAGS_JOIN}|) # oqs
385 386 (#{rcq}) # qtag
386 387 (\w|[^\s].*?[^\s]) # content
388 (?!\-\-)
387 389 #{rcq}
388 390 (#{QTAGS_JOIN}|) # oqa
389 391 (?=[[:punct:]]|\s|\)|$)/x
390 392 else
391 393 /(#{rcq})
392 394 (#{C})
393 395 (?::(\S+))?
394 396 (\w|[^\s\-].*?[^\s\-])
395 397 #{rcq}/xm
396 398 end
397 399 [rc, ht, re, rtype]
398 400 end
399 401
400 402 # Elements to handle
401 403 GLYPHS = [
402 404 # [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
403 405 # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
404 406 # [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
405 407 # [ /\'/, '&#8216;' ], # single opening
406 408 # [ /</, '&lt;' ], # less-than
407 409 # [ />/, '&gt;' ], # greater-than
408 410 # [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
409 411 # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
410 412 # [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
411 413 # [ /"/, '&#8220;' ], # double opening
412 414 # [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
413 415 # [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
414 416 # [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
415 417 # [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
416 418 # [ /\s->\s/, ' &rarr; ' ], # right arrow
417 419 # [ /\s-\s/, ' &#8211; ' ], # en dash
418 420 # [ /(\d+) ?x ?(\d+)/, '\1&#215;\2' ], # dimension sign
419 421 # [ /\b ?[(\[]TM[\])]/i, '&#8482;' ], # trademark
420 422 # [ /\b ?[(\[]R[\])]/i, '&#174;' ], # registered
421 423 # [ /\b ?[(\[]C[\])]/i, '&#169;' ] # copyright
422 424 ]
423 425
424 426 H_ALGN_VALS = {
425 427 '<' => 'left',
426 428 '=' => 'center',
427 429 '>' => 'right',
428 430 '<>' => 'justify'
429 431 }
430 432
431 433 V_ALGN_VALS = {
432 434 '^' => 'top',
433 435 '-' => 'middle',
434 436 '~' => 'bottom'
435 437 }
436 438
437 439 #
438 440 # Flexible HTML escaping
439 441 #
440 442 def htmlesc( str, mode=:Quotes )
441 443 if str
442 444 str.gsub!( '&', '&amp;' )
443 445 str.gsub!( '"', '&quot;' ) if mode != :NoQuotes
444 446 str.gsub!( "'", '&#039;' ) if mode == :Quotes
445 447 str.gsub!( '<', '&lt;')
446 448 str.gsub!( '>', '&gt;')
447 449 end
448 450 str
449 451 end
450 452
451 453 # Search and replace for Textile glyphs (quotes, dashes, other symbols)
452 454 def pgl( text )
453 455 #GLYPHS.each do |re, resub, tog|
454 456 # next if tog and method( tog ).call
455 457 # text.gsub! re, resub
456 458 #end
457 459 text.gsub!(/\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/) do |m|
458 460 "<acronym title=\"#{htmlesc $2}\">#{$1}</acronym>"
459 461 end
460 462 end
461 463
462 464 # Parses Textile attribute lists and builds an HTML attribute string
463 465 def pba( text_in, element = "" )
464 466
465 467 return '' unless text_in
466 468
467 469 style = []
468 470 text = text_in.dup
469 471 if element == 'td'
470 472 colspan = $1 if text =~ /\\(\d+)/
471 473 rowspan = $1 if text =~ /\/(\d+)/
472 474 style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
473 475 end
474 476
475 477 style << "#{ htmlesc $1 };" if text.sub!( /\{([^}]*)\}/, '' ) && !filter_styles
476 478
477 479 lang = $1 if
478 480 text.sub!( /\[([^)]+?)\]/, '' )
479 481
480 482 cls = $1 if
481 483 text.sub!( /\(([^()]+?)\)/, '' )
482 484
483 485 style << "padding-left:#{ $1.length }em;" if
484 486 text.sub!( /([(]+)/, '' )
485 487
486 488 style << "padding-right:#{ $1.length }em;" if text.sub!( /([)]+)/, '' )
487 489
488 490 style << "text-align:#{ h_align( $& ) };" if text =~ A_HLGN
489 491
490 492 cls, id = $1, $2 if cls =~ /^(.*?)#(.*)$/
491 493
492 494 atts = ''
493 495 atts << " style=\"#{ style.join }\"" unless style.empty?
494 496 atts << " class=\"#{ cls }\"" unless cls.to_s.empty?
495 497 atts << " lang=\"#{ lang }\"" if lang
496 498 atts << " id=\"#{ id }\"" if id
497 499 atts << " colspan=\"#{ colspan }\"" if colspan
498 500 atts << " rowspan=\"#{ rowspan }\"" if rowspan
499 501
500 502 atts
501 503 end
502 504
503 505 TABLE_RE = /^(?:table(_?#{S}#{A}#{C})\. ?\n)?^(#{A}#{C}\.? ?\|.*?\|)(\n\n|\Z)/m
504 506
505 507 # Parses a Textile table block, building HTML from the result.
506 508 def block_textile_table( text )
507 509 text.gsub!( TABLE_RE ) do |matches|
508 510
509 511 tatts, fullrow = $~[1..2]
510 512 tatts = pba( tatts, 'table' )
511 513 tatts = shelve( tatts ) if tatts
512 514 rows = []
513 515
514 516 fullrow.each_line do |row|
515 517 ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
516 518 cells = []
517 519 row.split( /(\|)(?![^\[\|]*\]\])/ )[1..-2].each do |cell|
518 520 next if cell == '|'
519 521 ctyp = 'd'
520 522 ctyp = 'h' if cell =~ /^_/
521 523
522 524 catts = ''
523 525 catts, cell = pba( $1, 'td' ), $2 if cell =~ /^(_?#{S}#{A}#{C}\. ?)(.*)/
524 526
525 527 catts = shelve( catts ) if catts
526 528 cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>"
527 529 end
528 530 ratts = shelve( ratts ) if ratts
529 531 rows << "\t\t<tr#{ ratts }>\n#{ cells.join( "\n" ) }\n\t\t</tr>"
530 532 end
531 533 "\t<table#{ tatts }>\n#{ rows.join( "\n" ) }\n\t</table>\n\n"
532 534 end
533 535 end
534 536
535 537 LISTS_RE = /^([#*]+?#{C} .*?)$(?![^#*])/m
536 538 LISTS_CONTENT_RE = /^([#*]+)(#{A}#{C}) (.*)$/m
537 539
538 540 # Parses Textile lists and generates HTML
539 541 def block_textile_lists( text )
540 542 text.gsub!( LISTS_RE ) do |match|
541 543 lines = match.split( /\n/ )
542 544 last_line = -1
543 545 depth = []
544 546 lines.each_with_index do |line, line_id|
545 547 if line =~ LISTS_CONTENT_RE
546 548 tl,atts,content = $~[1..3]
547 549 if depth.last
548 550 if depth.last.length > tl.length
549 551 (depth.length - 1).downto(0) do |i|
550 552 break if depth[i].length == tl.length
551 553 lines[line_id - 1] << "</li>\n\t</#{ lT( depth[i] ) }l>\n\t"
552 554 depth.pop
553 555 end
554 556 end
555 557 if depth.last and depth.last.length == tl.length
556 558 lines[line_id - 1] << '</li>'
557 559 end
558 560 end
559 561 unless depth.last == tl
560 562 depth << tl
561 563 atts = pba( atts )
562 564 atts = shelve( atts ) if atts
563 565 lines[line_id] = "\t<#{ lT(tl) }l#{ atts }>\n\t<li>#{ content }"
564 566 else
565 567 lines[line_id] = "\t\t<li>#{ content }"
566 568 end
567 569 last_line = line_id
568 570
569 571 else
570 572 last_line = line_id
571 573 end
572 574 if line_id - last_line > 1 or line_id == lines.length - 1
573 575 depth.delete_if do |v|
574 576 lines[last_line] << "</li>\n\t</#{ lT( v ) }l>"
575 577 end
576 578 end
577 579 end
578 580 lines.join( "\n" )
579 581 end
580 582 end
581 583
582 584 QUOTES_RE = /(^>+([^\n]*?)(\n|$))+/m
583 585 QUOTES_CONTENT_RE = /^([> ]+)(.*)$/m
584 586
585 587 def block_textile_quotes( text )
586 588 text.gsub!( QUOTES_RE ) do |match|
587 589 lines = match.split( /\n/ )
588 590 quotes = ''
589 591 indent = 0
590 592 lines.each do |line|
591 593 line =~ QUOTES_CONTENT_RE
592 594 bq,content = $1, $2
593 595 l = bq.count('>')
594 596 if l != indent
595 597 quotes << ("\n\n" + (l>indent ? '<blockquote>' * (l-indent) : '</blockquote>' * (indent-l)) + "\n\n")
596 598 indent = l
597 599 end
598 600 quotes << (content + "\n")
599 601 end
600 602 quotes << ("\n" + '</blockquote>' * indent + "\n\n")
601 603 quotes
602 604 end
603 605 end
604 606
605 607 CODE_RE = /(\W)
606 608 @
607 609 (?:\|(\w+?)\|)?
608 610 (.+?)
609 611 @
610 612 (?=\W)/x
611 613
612 614 def inline_textile_code( text )
613 615 text.gsub!( CODE_RE ) do |m|
614 616 before,lang,code,after = $~[1..4]
615 617 lang = " lang=\"#{ lang }\"" if lang
616 618 rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }", false )
617 619 end
618 620 end
619 621
620 622 def lT( text )
621 623 text =~ /\#$/ ? 'o' : 'u'
622 624 end
623 625
624 626 def hard_break( text )
625 627 text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
626 628 end
627 629
628 630 BLOCKS_GROUP_RE = /\n{2,}(?! )/m
629 631
630 632 def blocks( text, deep_code = false )
631 633 text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk|
632 634 plain = blk !~ /\A[#*> ]/
633 635
634 636 # skip blocks that are complex HTML
635 637 if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1
636 638 blk
637 639 else
638 640 # search for indentation levels
639 641 blk.strip!
640 642 if blk.empty?
641 643 blk
642 644 else
643 645 code_blk = nil
644 646 blk.gsub!( /((?:\n(?:\n^ +[^\n]*)+)+)/m ) do |iblk|
645 647 flush_left iblk
646 648 blocks iblk, plain
647 649 iblk.gsub( /^(\S)/, "\t\\1" )
648 650 if plain
649 651 code_blk = iblk; ""
650 652 else
651 653 iblk
652 654 end
653 655 end
654 656
655 657 block_applied = 0
656 658 @rules.each do |rule_name|
657 659 block_applied += 1 if ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
658 660 end
659 661 if block_applied.zero?
660 662 if deep_code
661 663 blk = "\t<pre><code>#{ blk }</code></pre>"
662 664 else
663 665 blk = "\t<p>#{ blk }</p>"
664 666 end
665 667 end
666 668 # hard_break blk
667 669 blk + "\n#{ code_blk }"
668 670 end
669 671 end
670 672
671 673 end.join( "\n\n" ) )
672 674 end
673 675
674 676 def textile_bq( tag, atts, cite, content )
675 677 cite, cite_title = check_refs( cite )
676 678 cite = " cite=\"#{ cite }\"" if cite
677 679 atts = shelve( atts ) if atts
678 680 "\t<blockquote#{ cite }>\n\t\t<p#{ atts }>#{ content }</p>\n\t</blockquote>"
679 681 end
680 682
681 683 def textile_p( tag, atts, cite, content )
682 684 atts = shelve( atts ) if atts
683 685 "\t<#{ tag }#{ atts }>#{ content }</#{ tag }>"
684 686 end
685 687
686 688 alias textile_h1 textile_p
687 689 alias textile_h2 textile_p
688 690 alias textile_h3 textile_p
689 691 alias textile_h4 textile_p
690 692 alias textile_h5 textile_p
691 693 alias textile_h6 textile_p
692 694
693 695 def textile_fn_( tag, num, atts, cite, content )
694 696 atts << " id=\"fn#{ num }\" class=\"footnote\""
695 697 content = "<sup>#{ num }</sup> #{ content }"
696 698 atts = shelve( atts ) if atts
697 699 "\t<p#{ atts }>#{ content }</p>"
698 700 end
699 701
700 702 BLOCK_RE = /^(([a-z]+)(\d*))(#{A}#{C})\.(?::(\S+))? (.*)$/m
701 703
702 704 def block_textile_prefix( text )
703 705 if text =~ BLOCK_RE
704 706 tag,tagpre,num,atts,cite,content = $~[1..6]
705 707 atts = pba( atts )
706 708
707 709 # pass to prefix handler
708 710 if respond_to? "textile_#{ tag }", true
709 711 text.gsub!( $&, method( "textile_#{ tag }" ).call( tag, atts, cite, content ) )
710 712 elsif respond_to? "textile_#{ tagpre }_", true
711 713 text.gsub!( $&, method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content ) )
712 714 end
713 715 end
714 716 end
715 717
716 718 SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m
717 719 def block_markdown_setext( text )
718 720 if text =~ SETEXT_RE
719 721 tag = if $2 == "="; "h1"; else; "h2"; end
720 722 blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $'
721 723 blocks cont
722 724 text.replace( blk + cont )
723 725 end
724 726 end
725 727
726 728 ATX_RE = /\A(\#{1,6}) # $1 = string of #'s
727 729 [ ]*
728 730 (.+?) # $2 = Header text
729 731 [ ]*
730 732 \#* # optional closing #'s (not counted)
731 733 $/x
732 734 def block_markdown_atx( text )
733 735 if text =~ ATX_RE
734 736 tag = "h#{ $1.length }"
735 737 blk, cont = "<#{ tag }>#{ $2 }</#{ tag }>\n\n", $'
736 738 blocks cont
737 739 text.replace( blk + cont )
738 740 end
739 741 end
740 742
741 743 MARKDOWN_BQ_RE = /\A(^ *> ?.+$(.+\n)*\n*)+/m
742 744
743 745 def block_markdown_bq( text )
744 746 text.gsub!( MARKDOWN_BQ_RE ) do |blk|
745 747 blk.gsub!( /^ *> ?/, '' )
746 748 flush_left blk
747 749 blocks blk
748 750 blk.gsub!( /^(\S)/, "\t\\1" )
749 751 "<blockquote>\n#{ blk }\n</blockquote>\n\n"
750 752 end
751 753 end
752 754
753 755 MARKDOWN_RULE_RE = /^(#{
754 756 ['*', '-', '_'].collect { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
755 757 })$/
756 758
757 759 def block_markdown_rule( text )
758 760 text.gsub!( MARKDOWN_RULE_RE ) do |blk|
759 761 "<hr />"
760 762 end
761 763 end
762 764
763 765 # XXX TODO XXX
764 766 def block_markdown_lists( text )
765 767 end
766 768
767 769 def inline_textile_span( text )
768 770 QTAGS.each do |qtag_rc, ht, qtag_re, rtype|
769 771 text.gsub!( qtag_re ) do |m|
770 772
771 773 case rtype
772 774 when :limit
773 775 sta,oqs,qtag,content,oqa = $~[1..6]
774 776 atts = nil
775 777 if content =~ /^(#{C})(.+)$/
776 778 atts, content = $~[1..2]
777 779 end
778 780 else
779 781 qtag,atts,cite,content = $~[1..4]
780 782 sta = ''
781 783 end
782 784 atts = pba( atts )
783 785 atts = shelve( atts ) if atts
784 786
785 787 "#{ sta }#{ oqs }<#{ ht }#{ atts }>#{ content }</#{ ht }>#{ oqa }"
786 788
787 789 end
788 790 end
789 791 end
790 792
791 793 LINK_RE = /
792 794 (
793 795 ([\s\[{(]|[#{PUNCT}])? # $pre
794 796 " # start
795 797 (#{C}) # $atts
796 798 ([^"\n]+?) # $text
797 799 \s?
798 800 (?:\(([^)]+?)\)(?="))? # $title
799 801 ":
800 802 ( # $url
801 803 (\/|[a-zA-Z]+:\/\/|www\.|mailto:) # $proto
802 804 [\w\/]\S+?
803 805 )
804 806 (\/)? # $slash
805 807 ([^\w\=\/;\(\)]*?) # $post
806 808 )
807 809 (?=<|\s|$)
808 810 /x
809 811 #"
810 812 def inline_textile_link( text )
811 813 text.gsub!( LINK_RE ) do |m|
812 814 all,pre,atts,text,title,url,proto,slash,post = $~[1..9]
813 815 if text.include?('<br />')
814 816 all
815 817 else
816 818 url, url_title = check_refs( url )
817 819 title ||= url_title
818 820
819 821 # Idea below : an URL with unbalanced parethesis and
820 822 # ending by ')' is put into external parenthesis
821 823 if ( url[-1]==?) and ((url.count("(") - url.count(")")) < 0 ) )
822 824 url=url[0..-2] # discard closing parenth from url
823 825 post = ")"+post # add closing parenth to post
824 826 end
825 827 atts = pba( atts )
826 828 atts = " href=\"#{ url }#{ slash }\"#{ atts }"
827 829 atts << " title=\"#{ htmlesc title }\"" if title
828 830 atts = shelve( atts ) if atts
829 831
830 832 external = (url =~ /^https?:\/\//) ? ' class="external"' : ''
831 833
832 834 "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
833 835 end
834 836 end
835 837 end
836 838
837 839 MARKDOWN_REFLINK_RE = /
838 840 \[([^\[\]]+)\] # $text
839 841 [ ]? # opt. space
840 842 (?:\n[ ]*)? # one optional newline followed by spaces
841 843 \[(.*?)\] # $id
842 844 /x
843 845
844 846 def inline_markdown_reflink( text )
845 847 text.gsub!( MARKDOWN_REFLINK_RE ) do |m|
846 848 text, id = $~[1..2]
847 849
848 850 if id.empty?
849 851 url, title = check_refs( text )
850 852 else
851 853 url, title = check_refs( id )
852 854 end
853 855
854 856 atts = " href=\"#{ url }\""
855 857 atts << " title=\"#{ title }\"" if title
856 858 atts = shelve( atts )
857 859
858 860 "<a#{ atts }>#{ text }</a>"
859 861 end
860 862 end
861 863
862 864 MARKDOWN_LINK_RE = /
863 865 \[([^\[\]]+)\] # $text
864 866 \( # open paren
865 867 [ \t]* # opt space
866 868 <?(.+?)>? # $href
867 869 [ \t]* # opt space
868 870 (?: # whole title
869 871 (['"]) # $quote
870 872 (.*?) # $title
871 873 \3 # matching quote
872 874 )? # title is optional
873 875 \)
874 876 /x
875 877
876 878 def inline_markdown_link( text )
877 879 text.gsub!( MARKDOWN_LINK_RE ) do |m|
878 880 text, url, quote, title = $~[1..4]
879 881
880 882 atts = " href=\"#{ url }\""
881 883 atts << " title=\"#{ title }\"" if title
882 884 atts = shelve( atts )
883 885
884 886 "<a#{ atts }>#{ text }</a>"
885 887 end
886 888 end
887 889
888 890 TEXTILE_REFS_RE = /(^ *)\[([^\[\n]+?)\](#{HYPERLINK})(?=\s|$)/
889 891 MARKDOWN_REFS_RE = /(^ *)\[([^\n]+?)\]:\s+<?(#{HYPERLINK})>?(?:\s+"((?:[^"]|\\")+)")?(?=\s|$)/m
890 892
891 893 def refs( text )
892 894 @rules.each do |rule_name|
893 895 method( rule_name ).call( text ) if rule_name.to_s.match /^refs_/
894 896 end
895 897 end
896 898
897 899 def refs_textile( text )
898 900 text.gsub!( TEXTILE_REFS_RE ) do |m|
899 901 flag, url = $~[2..3]
900 902 @urlrefs[flag.downcase] = [url, nil]
901 903 nil
902 904 end
903 905 end
904 906
905 907 def refs_markdown( text )
906 908 text.gsub!( MARKDOWN_REFS_RE ) do |m|
907 909 flag, url = $~[2..3]
908 910 title = $~[6]
909 911 @urlrefs[flag.downcase] = [url, title]
910 912 nil
911 913 end
912 914 end
913 915
914 916 def check_refs( text )
915 917 ret = @urlrefs[text.downcase] if text
916 918 ret || [text, nil]
917 919 end
918 920
919 921 IMAGE_RE = /
920 922 (>|\s|^) # start of line?
921 923 \! # opening
922 924 (\<|\=|\>)? # optional alignment atts
923 925 (#{C}) # optional style,class atts
924 926 (?:\. )? # optional dot-space
925 927 ([^\s(!]+?) # presume this is the src
926 928 \s? # optional space
927 929 (?:\(((?:[^\(\)]|\([^\)]+\))+?)\))? # optional title
928 930 \! # closing
929 931 (?::#{ HYPERLINK })? # optional href
930 932 /x
931 933
932 934 def inline_textile_image( text )
933 935 text.gsub!( IMAGE_RE ) do |m|
934 936 stln,algn,atts,url,title,href,href_a1,href_a2 = $~[1..8]
935 937 htmlesc title
936 938 atts = pba( atts )
937 939 atts = " src=\"#{ url }\"#{ atts }"
938 940 atts << " title=\"#{ title }\"" if title
939 941 atts << " alt=\"#{ title }\""
940 942 # size = @getimagesize($url);
941 943 # if($size) $atts.= " $size[3]";
942 944
943 945 href, alt_title = check_refs( href ) if href
944 946 url, url_title = check_refs( url )
945 947
946 948 out = ''
947 949 out << "<a#{ shelve( " href=\"#{ href }\"" ) }>" if href
948 950 out << "<img#{ shelve( atts ) } />"
949 951 out << "</a>#{ href_a1 }#{ href_a2 }" if href
950 952
951 953 if algn
952 954 algn = h_align( algn )
953 955 if stln == "<p>"
954 956 out = "<p style=\"float:#{ algn }\">#{ out }"
955 957 else
956 958 out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>"
957 959 end
958 960 else
959 961 out = stln + out
960 962 end
961 963
962 964 out
963 965 end
964 966 end
965 967
966 968 def shelve( val )
967 969 @shelf << val
968 970 " :redsh##{ @shelf.length }:"
969 971 end
970 972
971 973 def retrieve( text )
972 974 @shelf.each_with_index do |r, i|
973 975 text.gsub!( " :redsh##{ i + 1 }:", r )
974 976 end
975 977 end
976 978
977 979 def incoming_entities( text )
978 980 ## turn any incoming ampersands into a dummy character for now.
979 981 ## This uses a negative lookahead for alphanumerics followed by a semicolon,
980 982 ## implying an incoming html entity, to be skipped
981 983
982 984 text.gsub!( /&(?![#a-z0-9]+;)/i, "x%x%" )
983 985 end
984 986
985 987 def no_textile( text )
986 988 text.gsub!( /(^|\s)==([^=]+.*?)==(\s|$)?/,
987 989 '\1<notextile>\2</notextile>\3' )
988 990 text.gsub!( /^ *==([^=]+.*?)==/m,
989 991 '\1<notextile>\2</notextile>\3' )
990 992 end
991 993
992 994 def clean_white_space( text )
993 995 # normalize line breaks
994 996 text.gsub!( /\r\n/, "\n" )
995 997 text.gsub!( /\r/, "\n" )
996 998 text.gsub!( /\t/, ' ' )
997 999 text.gsub!( /^ +$/, '' )
998 1000 text.gsub!( /\n{3,}/, "\n\n" )
999 1001 text.gsub!( /"$/, "\" " )
1000 1002
1001 1003 # if entire document is indented, flush
1002 1004 # to the left side
1003 1005 flush_left text
1004 1006 end
1005 1007
1006 1008 def flush_left( text )
1007 1009 indt = 0
1008 1010 if text =~ /^ /
1009 1011 while text !~ /^ {#{indt}}\S/
1010 1012 indt += 1
1011 1013 end unless text.empty?
1012 1014 if indt.nonzero?
1013 1015 text.gsub!( /^ {#{indt}}/, '' )
1014 1016 end
1015 1017 end
1016 1018 end
1017 1019
1018 1020 def footnote_ref( text )
1019 1021 text.gsub!( /\b\[([0-9]+?)\](\s)?/,
1020 1022 '<sup><a href="#fn\1">\1</a></sup>\2' )
1021 1023 end
1022 1024
1023 1025 OFFTAGS = /(code|pre|kbd|notextile)/
1024 1026 OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }\W|\Z)/mi
1025 1027 OFFTAG_OPEN = /<#{ OFFTAGS }/
1026 1028 OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
1027 1029 HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m
1028 1030 ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m
1029 1031
1030 1032 def glyphs_textile( text, level = 0 )
1031 1033 if text !~ HASTAG_MATCH
1032 1034 pgl text
1033 1035 footnote_ref text
1034 1036 else
1035 1037 codepre = 0
1036 1038 text.gsub!( ALLTAG_MATCH ) do |line|
1037 1039 ## matches are off if we're between <code>, <pre> etc.
1038 1040 if $1
1039 1041 if line =~ OFFTAG_OPEN
1040 1042 codepre += 1
1041 1043 elsif line =~ OFFTAG_CLOSE
1042 1044 codepre -= 1
1043 1045 codepre = 0 if codepre < 0
1044 1046 end
1045 1047 elsif codepre.zero?
1046 1048 glyphs_textile( line, level + 1 )
1047 1049 else
1048 1050 htmlesc( line, :NoQuotes )
1049 1051 end
1050 1052 # p [level, codepre, line]
1051 1053
1052 1054 line
1053 1055 end
1054 1056 end
1055 1057 end
1056 1058
1057 1059 def rip_offtags( text, escape_aftertag=true )
1058 1060 if text =~ /<.*>/
1059 1061 ## strip and encode <pre> content
1060 1062 codepre, used_offtags = 0, {}
1061 1063 text.gsub!( OFFTAG_MATCH ) do |line|
1062 1064 if $3
1063 1065 first, offtag, aftertag = $3, $4, $5
1064 1066 codepre += 1
1065 1067 used_offtags[offtag] = true
1066 1068 if codepre - used_offtags.length > 0
1067 1069 htmlesc( line, :NoQuotes )
1068 1070 @pre_list.last << line
1069 1071 line = ""
1070 1072 else
1071 1073 ### htmlesc is disabled between CODE tags which will be parsed with highlighter
1072 1074 ### Regexp in formatter.rb is : /<code\s+class="(\w+)">\s?(.+)/m
1073 1075 ### NB: some changes were made not to use $N variables, because we use "match"
1074 1076 ### and it breaks following lines
1075 1077 htmlesc( aftertag, :NoQuotes ) if aftertag && escape_aftertag && !first.match(/<code\s+class="(\w+)">/)
1076 1078 line = "<redpre##{ @pre_list.length }>"
1077 1079 first.match(/<#{ OFFTAGS }([^>]*)>/)
1078 1080 tag = $1
1079 1081 $2.to_s.match(/(class\=\S+)/i)
1080 1082 tag << " #{$1}" if $1
1081 1083 @pre_list << "<#{ tag }>#{ aftertag }"
1082 1084 end
1083 1085 elsif $1 and codepre > 0
1084 1086 if codepre - used_offtags.length > 0
1085 1087 htmlesc( line, :NoQuotes )
1086 1088 @pre_list.last << line
1087 1089 line = ""
1088 1090 end
1089 1091 codepre -= 1 unless codepre.zero?
1090 1092 used_offtags = {} if codepre.zero?
1091 1093 end
1092 1094 line
1093 1095 end
1094 1096 end
1095 1097 text
1096 1098 end
1097 1099
1098 1100 def smooth_offtags( text )
1099 1101 unless @pre_list.empty?
1100 1102 ## replace <pre> content
1101 1103 text.gsub!( /<redpre#(\d+)>/ ) { @pre_list[$1.to_i] }
1102 1104 end
1103 1105 end
1104 1106
1105 1107 def inline( text )
1106 1108 [/^inline_/, /^glyphs_/].each do |meth_re|
1107 1109 @rules.each do |rule_name|
1108 1110 method( rule_name ).call( text ) if rule_name.to_s.match( meth_re )
1109 1111 end
1110 1112 end
1111 1113 end
1112 1114
1113 1115 def h_align( text )
1114 1116 H_ALGN_VALS[text]
1115 1117 end
1116 1118
1117 1119 def v_align( text )
1118 1120 V_ALGN_VALS[text]
1119 1121 end
1120 1122
1121 1123 def textile_popup_help( name, windowW, windowH )
1122 1124 ' <a target="_blank" href="http://hobix.com/textile/#' + helpvar + '" onclick="window.open(this.href, \'popupwindow\', \'width=' + windowW + ',height=' + windowH + ',scrollbars,resizable\'); return false;">' + name + '</a><br />'
1123 1125 end
1124 1126
1125 1127 # HTML cleansing stuff
1126 1128 BASIC_TAGS = {
1127 1129 'a' => ['href', 'title'],
1128 1130 'img' => ['src', 'alt', 'title'],
1129 1131 'br' => [],
1130 1132 'i' => nil,
1131 1133 'u' => nil,
1132 1134 'b' => nil,
1133 1135 'pre' => nil,
1134 1136 'kbd' => nil,
1135 1137 'code' => ['lang'],
1136 1138 'cite' => nil,
1137 1139 'strong' => nil,
1138 1140 'em' => nil,
1139 1141 'ins' => nil,
1140 1142 'sup' => nil,
1141 1143 'sub' => nil,
1142 1144 'del' => nil,
1143 1145 'table' => nil,
1144 1146 'tr' => nil,
1145 1147 'td' => ['colspan', 'rowspan'],
1146 1148 'th' => nil,
1147 1149 'ol' => nil,
1148 1150 'ul' => nil,
1149 1151 'li' => nil,
1150 1152 'p' => nil,
1151 1153 'h1' => nil,
1152 1154 'h2' => nil,
1153 1155 'h3' => nil,
1154 1156 'h4' => nil,
1155 1157 'h5' => nil,
1156 1158 'h6' => nil,
1157 1159 'blockquote' => ['cite']
1158 1160 }
1159 1161
1160 1162 def clean_html( text, tags = BASIC_TAGS )
1161 1163 text.gsub!( /<!\[CDATA\[/, '' )
1162 1164 text.gsub!( /<(\/*)(\w+)([^>]*)>/ ) do
1163 1165 raw = $~
1164 1166 tag = raw[2].downcase
1165 1167 if tags.has_key? tag
1166 1168 pcs = [tag]
1167 1169 tags[tag].each do |prop|
1168 1170 ['"', "'", ''].each do |q|
1169 1171 q2 = ( q != '' ? q : '\s' )
1170 1172 if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
1171 1173 attrv = $1
1172 1174 next if prop == 'src' and attrv =~ %r{^(?!http)\w+:}
1173 1175 pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
1174 1176 break
1175 1177 end
1176 1178 end
1177 1179 end if tags[tag]
1178 1180 "<#{raw[1]}#{pcs.join " "}>"
1179 1181 else
1180 1182 " "
1181 1183 end
1182 1184 end
1183 1185 end
1184 1186
1185 1187 ALLOWED_TAGS = %w(redpre pre code notextile)
1186 1188
1187 1189 def escape_html_tags(text)
1188 1190 text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
1189 1191 end
1190 1192 end
1191 1193
@@ -1,81 +1,88
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2010 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.dirname(__FILE__) + '/../../../../test_helper'
19 19
20 20 class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
21 21
22 22 def setup
23 23 @formatter = Redmine::WikiFormatting::Textile::Formatter
24 24 end
25 25
26 26 MODIFIERS = {
27 27 "*" => 'strong', # bold
28 28 "_" => 'em', # italic
29 29 "+" => 'ins', # underline
30 30 "-" => 'del', # deleted
31 31 "^" => 'sup', # superscript
32 32 "~" => 'sub' # subscript
33 33 }
34 34
35 35 def test_modifiers
36 36 assert_html_output(
37 37 '*bold*' => '<strong>bold</strong>',
38 38 'before *bold*' => 'before <strong>bold</strong>',
39 39 '*bold* after' => '<strong>bold</strong> after',
40 40 '*two words*' => '<strong>two words</strong>',
41 41 '*two*words*' => '<strong>two*words</strong>',
42 42 '*two * words*' => '<strong>two * words</strong>',
43 43 '*two* *words*' => '<strong>two</strong> <strong>words</strong>',
44 44 '*(two)* *(words)*' => '<strong>(two)</strong> <strong>(words)</strong>',
45 45 # with class
46 46 '*(foo)two words*' => '<strong class="foo">two words</strong>'
47 47 )
48 48 end
49 49
50 50 def test_modifiers_combination
51 51 MODIFIERS.each do |m1, tag1|
52 52 MODIFIERS.each do |m2, tag2|
53 53 next if m1 == m2
54 54 text = "#{m2}#{m1}Phrase modifiers#{m1}#{m2}"
55 55 html = "<#{tag2}><#{tag1}>Phrase modifiers</#{tag1}></#{tag2}>"
56 56 assert_html_output text => html
57 57 end
58 58 end
59 59 end
60 60
61 61 def test_inline_code
62 62 assert_html_output(
63 63 'this is @some code@' => 'this is <code>some code</code>',
64 64 '@<Location /redmine>@' => '<code>&lt;Location /redmine&gt;</code>'
65 65 )
66 66 end
67 67
68 68 def test_escaping
69 69 assert_html_output(
70 70 'this is a <script>' => 'this is a &lt;script&gt;'
71 71 )
72 72 end
73 73
74 def test_double_dashes_should_not_strikethrough
75 assert_html_output(
76 'double -- dashes -- test' => 'double -- dashes -- test',
77 'double -- *dashes* -- test' => 'double -- <strong>dashes</strong> -- test'
78 )
79 end
80
74 81 private
75 82
76 83 def assert_html_output(to_test)
77 84 to_test.each do |text, expected|
78 85 assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html, "Formatting the following text failed:\n===\n#{text}\n===\n"
79 86 end
80 87 end
81 88 end
General Comments 0
You need to be logged in to leave comments. Login now