##// END OF EJS Templates
Fixed: text formatting breaks when using parenthesis inside bold tags (#1334)....
Jean-Philippe Lang -
r3449:24b4c5f48dc0
parent child
Show More
@@ -1,1186 +1,1187
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 /(^|[>\s\(])
384 (#{QTAGS_JOIN}|)
385 (#{rcq})
386 (#{C})
387 (?::(\S+?))?
388 (\w|[^\s].*?[^\s])
383 /(^|[>\s\(]) # sta
384 (#{QTAGS_JOIN}|) # oqs
385 (#{rcq}) # qtag
386 (\w|[^\s].*?[^\s]) # content
389 387 #{rcq}
390 (#{QTAGS_JOIN}|)
388 (#{QTAGS_JOIN}|) # oqa
391 389 (?=[[:punct:]]|\s|\)|$)/x
392 390 else
393 391 /(#{rcq})
394 392 (#{C})
395 393 (?::(\S+))?
396 394 (\w|[^\s\-].*?[^\s\-])
397 395 #{rcq}/xm
398 396 end
399 397 [rc, ht, re, rtype]
400 398 end
401 399
402 400 # Elements to handle
403 401 GLYPHS = [
404 402 # [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
405 403 # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
406 404 # [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
407 405 # [ /\'/, '&#8216;' ], # single opening
408 406 # [ /</, '&lt;' ], # less-than
409 407 # [ />/, '&gt;' ], # greater-than
410 408 # [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
411 409 # [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
412 410 # [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
413 411 # [ /"/, '&#8220;' ], # double opening
414 412 # [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
415 413 # [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
416 414 # [ /(^|[^"][>\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
417 415 # [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
418 416 # [ /\s->\s/, ' &rarr; ' ], # right arrow
419 417 # [ /\s-\s/, ' &#8211; ' ], # en dash
420 418 # [ /(\d+) ?x ?(\d+)/, '\1&#215;\2' ], # dimension sign
421 419 # [ /\b ?[(\[]TM[\])]/i, '&#8482;' ], # trademark
422 420 # [ /\b ?[(\[]R[\])]/i, '&#174;' ], # registered
423 421 # [ /\b ?[(\[]C[\])]/i, '&#169;' ] # copyright
424 422 ]
425 423
426 424 H_ALGN_VALS = {
427 425 '<' => 'left',
428 426 '=' => 'center',
429 427 '>' => 'right',
430 428 '<>' => 'justify'
431 429 }
432 430
433 431 V_ALGN_VALS = {
434 432 '^' => 'top',
435 433 '-' => 'middle',
436 434 '~' => 'bottom'
437 435 }
438 436
439 437 #
440 438 # Flexible HTML escaping
441 439 #
442 440 def htmlesc( str, mode=:Quotes )
443 441 if str
444 442 str.gsub!( '&', '&amp;' )
445 443 str.gsub!( '"', '&quot;' ) if mode != :NoQuotes
446 444 str.gsub!( "'", '&#039;' ) if mode == :Quotes
447 445 str.gsub!( '<', '&lt;')
448 446 str.gsub!( '>', '&gt;')
449 447 end
450 448 str
451 449 end
452 450
453 451 # Search and replace for Textile glyphs (quotes, dashes, other symbols)
454 452 def pgl( text )
455 453 #GLYPHS.each do |re, resub, tog|
456 454 # next if tog and method( tog ).call
457 455 # text.gsub! re, resub
458 456 #end
459 457 text.gsub!(/\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/) do |m|
460 458 "<acronym title=\"#{htmlesc $2}\">#{$1}</acronym>"
461 459 end
462 460 end
463 461
464 462 # Parses Textile attribute lists and builds an HTML attribute string
465 463 def pba( text_in, element = "" )
466 464
467 465 return '' unless text_in
468 466
469 467 style = []
470 468 text = text_in.dup
471 469 if element == 'td'
472 470 colspan = $1 if text =~ /\\(\d+)/
473 471 rowspan = $1 if text =~ /\/(\d+)/
474 472 style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
475 473 end
476 474
477 475 style << "#{ htmlesc $1 };" if text.sub!( /\{([^}]*)\}/, '' ) && !filter_styles
478 476
479 477 lang = $1 if
480 478 text.sub!( /\[([^)]+?)\]/, '' )
481 479
482 480 cls = $1 if
483 481 text.sub!( /\(([^()]+?)\)/, '' )
484 482
485 483 style << "padding-left:#{ $1.length }em;" if
486 484 text.sub!( /([(]+)/, '' )
487 485
488 486 style << "padding-right:#{ $1.length }em;" if text.sub!( /([)]+)/, '' )
489 487
490 488 style << "text-align:#{ h_align( $& ) };" if text =~ A_HLGN
491 489
492 490 cls, id = $1, $2 if cls =~ /^(.*?)#(.*)$/
493 491
494 492 atts = ''
495 493 atts << " style=\"#{ style.join }\"" unless style.empty?
496 494 atts << " class=\"#{ cls }\"" unless cls.to_s.empty?
497 495 atts << " lang=\"#{ lang }\"" if lang
498 496 atts << " id=\"#{ id }\"" if id
499 497 atts << " colspan=\"#{ colspan }\"" if colspan
500 498 atts << " rowspan=\"#{ rowspan }\"" if rowspan
501 499
502 500 atts
503 501 end
504 502
505 503 TABLE_RE = /^(?:table(_?#{S}#{A}#{C})\. ?\n)?^(#{A}#{C}\.? ?\|.*?\|)(\n\n|\Z)/m
506 504
507 505 # Parses a Textile table block, building HTML from the result.
508 506 def block_textile_table( text )
509 507 text.gsub!( TABLE_RE ) do |matches|
510 508
511 509 tatts, fullrow = $~[1..2]
512 510 tatts = pba( tatts, 'table' )
513 511 tatts = shelve( tatts ) if tatts
514 512 rows = []
515 513
516 514 fullrow.each_line do |row|
517 515 ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
518 516 cells = []
519 517 row.split( /(\|)(?![^\[\|]*\]\])/ )[1..-2].each do |cell|
520 518 next if cell == '|'
521 519 ctyp = 'd'
522 520 ctyp = 'h' if cell =~ /^_/
523 521
524 522 catts = ''
525 523 catts, cell = pba( $1, 'td' ), $2 if cell =~ /^(_?#{S}#{A}#{C}\. ?)(.*)/
526 524
527 525 catts = shelve( catts ) if catts
528 526 cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>"
529 527 end
530 528 ratts = shelve( ratts ) if ratts
531 529 rows << "\t\t<tr#{ ratts }>\n#{ cells.join( "\n" ) }\n\t\t</tr>"
532 530 end
533 531 "\t<table#{ tatts }>\n#{ rows.join( "\n" ) }\n\t</table>\n\n"
534 532 end
535 533 end
536 534
537 535 LISTS_RE = /^([#*]+?#{C} .*?)$(?![^#*])/m
538 536 LISTS_CONTENT_RE = /^([#*]+)(#{A}#{C}) (.*)$/m
539 537
540 538 # Parses Textile lists and generates HTML
541 539 def block_textile_lists( text )
542 540 text.gsub!( LISTS_RE ) do |match|
543 541 lines = match.split( /\n/ )
544 542 last_line = -1
545 543 depth = []
546 544 lines.each_with_index do |line, line_id|
547 545 if line =~ LISTS_CONTENT_RE
548 546 tl,atts,content = $~[1..3]
549 547 if depth.last
550 548 if depth.last.length > tl.length
551 549 (depth.length - 1).downto(0) do |i|
552 550 break if depth[i].length == tl.length
553 551 lines[line_id - 1] << "</li>\n\t</#{ lT( depth[i] ) }l>\n\t"
554 552 depth.pop
555 553 end
556 554 end
557 555 if depth.last and depth.last.length == tl.length
558 556 lines[line_id - 1] << '</li>'
559 557 end
560 558 end
561 559 unless depth.last == tl
562 560 depth << tl
563 561 atts = pba( atts )
564 562 atts = shelve( atts ) if atts
565 563 lines[line_id] = "\t<#{ lT(tl) }l#{ atts }>\n\t<li>#{ content }"
566 564 else
567 565 lines[line_id] = "\t\t<li>#{ content }"
568 566 end
569 567 last_line = line_id
570 568
571 569 else
572 570 last_line = line_id
573 571 end
574 572 if line_id - last_line > 1 or line_id == lines.length - 1
575 573 depth.delete_if do |v|
576 574 lines[last_line] << "</li>\n\t</#{ lT( v ) }l>"
577 575 end
578 576 end
579 577 end
580 578 lines.join( "\n" )
581 579 end
582 580 end
583 581
584 582 QUOTES_RE = /(^>+([^\n]*?)(\n|$))+/m
585 583 QUOTES_CONTENT_RE = /^([> ]+)(.*)$/m
586 584
587 585 def block_textile_quotes( text )
588 586 text.gsub!( QUOTES_RE ) do |match|
589 587 lines = match.split( /\n/ )
590 588 quotes = ''
591 589 indent = 0
592 590 lines.each do |line|
593 591 line =~ QUOTES_CONTENT_RE
594 592 bq,content = $1, $2
595 593 l = bq.count('>')
596 594 if l != indent
597 595 quotes << ("\n\n" + (l>indent ? '<blockquote>' * (l-indent) : '</blockquote>' * (indent-l)) + "\n\n")
598 596 indent = l
599 597 end
600 598 quotes << (content + "\n")
601 599 end
602 600 quotes << ("\n" + '</blockquote>' * indent + "\n\n")
603 601 quotes
604 602 end
605 603 end
606 604
607 605 CODE_RE = /(\W)
608 606 @
609 607 (?:\|(\w+?)\|)?
610 608 (.+?)
611 609 @
612 610 (?=\W)/x
613 611
614 612 def inline_textile_code( text )
615 613 text.gsub!( CODE_RE ) do |m|
616 614 before,lang,code,after = $~[1..4]
617 615 lang = " lang=\"#{ lang }\"" if lang
618 616 rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }" )
619 617 end
620 618 end
621 619
622 620 def lT( text )
623 621 text =~ /\#$/ ? 'o' : 'u'
624 622 end
625 623
626 624 def hard_break( text )
627 625 text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
628 626 end
629 627
630 628 BLOCKS_GROUP_RE = /\n{2,}(?! )/m
631 629
632 630 def blocks( text, deep_code = false )
633 631 text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk|
634 632 plain = blk !~ /\A[#*> ]/
635 633
636 634 # skip blocks that are complex HTML
637 635 if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1
638 636 blk
639 637 else
640 638 # search for indentation levels
641 639 blk.strip!
642 640 if blk.empty?
643 641 blk
644 642 else
645 643 code_blk = nil
646 644 blk.gsub!( /((?:\n(?:\n^ +[^\n]*)+)+)/m ) do |iblk|
647 645 flush_left iblk
648 646 blocks iblk, plain
649 647 iblk.gsub( /^(\S)/, "\t\\1" )
650 648 if plain
651 649 code_blk = iblk; ""
652 650 else
653 651 iblk
654 652 end
655 653 end
656 654
657 655 block_applied = 0
658 656 @rules.each do |rule_name|
659 657 block_applied += 1 if ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
660 658 end
661 659 if block_applied.zero?
662 660 if deep_code
663 661 blk = "\t<pre><code>#{ blk }</code></pre>"
664 662 else
665 663 blk = "\t<p>#{ blk }</p>"
666 664 end
667 665 end
668 666 # hard_break blk
669 667 blk + "\n#{ code_blk }"
670 668 end
671 669 end
672 670
673 671 end.join( "\n\n" ) )
674 672 end
675 673
676 674 def textile_bq( tag, atts, cite, content )
677 675 cite, cite_title = check_refs( cite )
678 676 cite = " cite=\"#{ cite }\"" if cite
679 677 atts = shelve( atts ) if atts
680 678 "\t<blockquote#{ cite }>\n\t\t<p#{ atts }>#{ content }</p>\n\t</blockquote>"
681 679 end
682 680
683 681 def textile_p( tag, atts, cite, content )
684 682 atts = shelve( atts ) if atts
685 683 "\t<#{ tag }#{ atts }>#{ content }</#{ tag }>"
686 684 end
687 685
688 686 alias textile_h1 textile_p
689 687 alias textile_h2 textile_p
690 688 alias textile_h3 textile_p
691 689 alias textile_h4 textile_p
692 690 alias textile_h5 textile_p
693 691 alias textile_h6 textile_p
694 692
695 693 def textile_fn_( tag, num, atts, cite, content )
696 694 atts << " id=\"fn#{ num }\" class=\"footnote\""
697 695 content = "<sup>#{ num }</sup> #{ content }"
698 696 atts = shelve( atts ) if atts
699 697 "\t<p#{ atts }>#{ content }</p>"
700 698 end
701 699
702 700 BLOCK_RE = /^(([a-z]+)(\d*))(#{A}#{C})\.(?::(\S+))? (.*)$/m
703 701
704 702 def block_textile_prefix( text )
705 703 if text =~ BLOCK_RE
706 704 tag,tagpre,num,atts,cite,content = $~[1..6]
707 705 atts = pba( atts )
708 706
709 707 # pass to prefix handler
710 708 if respond_to? "textile_#{ tag }", true
711 709 text.gsub!( $&, method( "textile_#{ tag }" ).call( tag, atts, cite, content ) )
712 710 elsif respond_to? "textile_#{ tagpre }_", true
713 711 text.gsub!( $&, method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content ) )
714 712 end
715 713 end
716 714 end
717 715
718 716 SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m
719 717 def block_markdown_setext( text )
720 718 if text =~ SETEXT_RE
721 719 tag = if $2 == "="; "h1"; else; "h2"; end
722 720 blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $'
723 721 blocks cont
724 722 text.replace( blk + cont )
725 723 end
726 724 end
727 725
728 726 ATX_RE = /\A(\#{1,6}) # $1 = string of #'s
729 727 [ ]*
730 728 (.+?) # $2 = Header text
731 729 [ ]*
732 730 \#* # optional closing #'s (not counted)
733 731 $/x
734 732 def block_markdown_atx( text )
735 733 if text =~ ATX_RE
736 734 tag = "h#{ $1.length }"
737 735 blk, cont = "<#{ tag }>#{ $2 }</#{ tag }>\n\n", $'
738 736 blocks cont
739 737 text.replace( blk + cont )
740 738 end
741 739 end
742 740
743 741 MARKDOWN_BQ_RE = /\A(^ *> ?.+$(.+\n)*\n*)+/m
744 742
745 743 def block_markdown_bq( text )
746 744 text.gsub!( MARKDOWN_BQ_RE ) do |blk|
747 745 blk.gsub!( /^ *> ?/, '' )
748 746 flush_left blk
749 747 blocks blk
750 748 blk.gsub!( /^(\S)/, "\t\\1" )
751 749 "<blockquote>\n#{ blk }\n</blockquote>\n\n"
752 750 end
753 751 end
754 752
755 753 MARKDOWN_RULE_RE = /^(#{
756 754 ['*', '-', '_'].collect { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
757 755 })$/
758 756
759 757 def block_markdown_rule( text )
760 758 text.gsub!( MARKDOWN_RULE_RE ) do |blk|
761 759 "<hr />"
762 760 end
763 761 end
764 762
765 763 # XXX TODO XXX
766 764 def block_markdown_lists( text )
767 765 end
768 766
769 767 def inline_textile_span( text )
770 768 QTAGS.each do |qtag_rc, ht, qtag_re, rtype|
771 769 text.gsub!( qtag_re ) do |m|
772 770
773 771 case rtype
774 772 when :limit
775 sta,oqs,qtag,atts,cite,content,oqa = $~[1..7]
773 sta,oqs,qtag,content,oqa = $~[1..6]
774 atts = nil
775 if content =~ /^(#{C})(.+)$/
776 atts, content = $~[1..2]
777 end
776 778 else
777 779 qtag,atts,cite,content = $~[1..4]
778 780 sta = ''
779 781 end
780 782 atts = pba( atts )
781 atts << " cite=\"#{ cite }\"" if cite
782 783 atts = shelve( atts ) if atts
783 784
784 785 "#{ sta }#{ oqs }<#{ ht }#{ atts }>#{ content }</#{ ht }>#{ oqa }"
785 786
786 787 end
787 788 end
788 789 end
789 790
790 791 LINK_RE = /
791 792 (
792 793 ([\s\[{(]|[#{PUNCT}])? # $pre
793 794 " # start
794 795 (#{C}) # $atts
795 796 ([^"\n]+?) # $text
796 797 \s?
797 798 (?:\(([^)]+?)\)(?="))? # $title
798 799 ":
799 800 ( # $url
800 801 (\/|[a-zA-Z]+:\/\/|www\.|mailto:) # $proto
801 802 [\w\/]\S+?
802 803 )
803 804 (\/)? # $slash
804 805 ([^\w\=\/;\(\)]*?) # $post
805 806 )
806 807 (?=<|\s|$)
807 808 /x
808 809 #"
809 810 def inline_textile_link( text )
810 811 text.gsub!( LINK_RE ) do |m|
811 812 all,pre,atts,text,title,url,proto,slash,post = $~[1..9]
812 813 if text.include?('<br />')
813 814 all
814 815 else
815 816 url, url_title = check_refs( url )
816 817 title ||= url_title
817 818
818 819 # Idea below : an URL with unbalanced parethesis and
819 820 # ending by ')' is put into external parenthesis
820 821 if ( url[-1]==?) and ((url.count("(") - url.count(")")) < 0 ) )
821 822 url=url[0..-2] # discard closing parenth from url
822 823 post = ")"+post # add closing parenth to post
823 824 end
824 825 atts = pba( atts )
825 826 atts = " href=\"#{ url }#{ slash }\"#{ atts }"
826 827 atts << " title=\"#{ htmlesc title }\"" if title
827 828 atts = shelve( atts ) if atts
828 829
829 830 external = (url =~ /^https?:\/\//) ? ' class="external"' : ''
830 831
831 832 "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
832 833 end
833 834 end
834 835 end
835 836
836 837 MARKDOWN_REFLINK_RE = /
837 838 \[([^\[\]]+)\] # $text
838 839 [ ]? # opt. space
839 840 (?:\n[ ]*)? # one optional newline followed by spaces
840 841 \[(.*?)\] # $id
841 842 /x
842 843
843 844 def inline_markdown_reflink( text )
844 845 text.gsub!( MARKDOWN_REFLINK_RE ) do |m|
845 846 text, id = $~[1..2]
846 847
847 848 if id.empty?
848 849 url, title = check_refs( text )
849 850 else
850 851 url, title = check_refs( id )
851 852 end
852 853
853 854 atts = " href=\"#{ url }\""
854 855 atts << " title=\"#{ title }\"" if title
855 856 atts = shelve( atts )
856 857
857 858 "<a#{ atts }>#{ text }</a>"
858 859 end
859 860 end
860 861
861 862 MARKDOWN_LINK_RE = /
862 863 \[([^\[\]]+)\] # $text
863 864 \( # open paren
864 865 [ \t]* # opt space
865 866 <?(.+?)>? # $href
866 867 [ \t]* # opt space
867 868 (?: # whole title
868 869 (['"]) # $quote
869 870 (.*?) # $title
870 871 \3 # matching quote
871 872 )? # title is optional
872 873 \)
873 874 /x
874 875
875 876 def inline_markdown_link( text )
876 877 text.gsub!( MARKDOWN_LINK_RE ) do |m|
877 878 text, url, quote, title = $~[1..4]
878 879
879 880 atts = " href=\"#{ url }\""
880 881 atts << " title=\"#{ title }\"" if title
881 882 atts = shelve( atts )
882 883
883 884 "<a#{ atts }>#{ text }</a>"
884 885 end
885 886 end
886 887
887 888 TEXTILE_REFS_RE = /(^ *)\[([^\[\n]+?)\](#{HYPERLINK})(?=\s|$)/
888 889 MARKDOWN_REFS_RE = /(^ *)\[([^\n]+?)\]:\s+<?(#{HYPERLINK})>?(?:\s+"((?:[^"]|\\")+)")?(?=\s|$)/m
889 890
890 891 def refs( text )
891 892 @rules.each do |rule_name|
892 893 method( rule_name ).call( text ) if rule_name.to_s.match /^refs_/
893 894 end
894 895 end
895 896
896 897 def refs_textile( text )
897 898 text.gsub!( TEXTILE_REFS_RE ) do |m|
898 899 flag, url = $~[2..3]
899 900 @urlrefs[flag.downcase] = [url, nil]
900 901 nil
901 902 end
902 903 end
903 904
904 905 def refs_markdown( text )
905 906 text.gsub!( MARKDOWN_REFS_RE ) do |m|
906 907 flag, url = $~[2..3]
907 908 title = $~[6]
908 909 @urlrefs[flag.downcase] = [url, title]
909 910 nil
910 911 end
911 912 end
912 913
913 914 def check_refs( text )
914 915 ret = @urlrefs[text.downcase] if text
915 916 ret || [text, nil]
916 917 end
917 918
918 919 IMAGE_RE = /
919 920 (>|\s|^) # start of line?
920 921 \! # opening
921 922 (\<|\=|\>)? # optional alignment atts
922 923 (#{C}) # optional style,class atts
923 924 (?:\. )? # optional dot-space
924 925 ([^\s(!]+?) # presume this is the src
925 926 \s? # optional space
926 927 (?:\(((?:[^\(\)]|\([^\)]+\))+?)\))? # optional title
927 928 \! # closing
928 929 (?::#{ HYPERLINK })? # optional href
929 930 /x
930 931
931 932 def inline_textile_image( text )
932 933 text.gsub!( IMAGE_RE ) do |m|
933 934 stln,algn,atts,url,title,href,href_a1,href_a2 = $~[1..8]
934 935 htmlesc title
935 936 atts = pba( atts )
936 937 atts = " src=\"#{ url }\"#{ atts }"
937 938 atts << " title=\"#{ title }\"" if title
938 939 atts << " alt=\"#{ title }\""
939 940 # size = @getimagesize($url);
940 941 # if($size) $atts.= " $size[3]";
941 942
942 943 href, alt_title = check_refs( href ) if href
943 944 url, url_title = check_refs( url )
944 945
945 946 out = ''
946 947 out << "<a#{ shelve( " href=\"#{ href }\"" ) }>" if href
947 948 out << "<img#{ shelve( atts ) } />"
948 949 out << "</a>#{ href_a1 }#{ href_a2 }" if href
949 950
950 951 if algn
951 952 algn = h_align( algn )
952 953 if stln == "<p>"
953 954 out = "<p style=\"float:#{ algn }\">#{ out }"
954 955 else
955 956 out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>"
956 957 end
957 958 else
958 959 out = stln + out
959 960 end
960 961
961 962 out
962 963 end
963 964 end
964 965
965 966 def shelve( val )
966 967 @shelf << val
967 968 " :redsh##{ @shelf.length }:"
968 969 end
969 970
970 971 def retrieve( text )
971 972 @shelf.each_with_index do |r, i|
972 973 text.gsub!( " :redsh##{ i + 1 }:", r )
973 974 end
974 975 end
975 976
976 977 def incoming_entities( text )
977 978 ## turn any incoming ampersands into a dummy character for now.
978 979 ## This uses a negative lookahead for alphanumerics followed by a semicolon,
979 980 ## implying an incoming html entity, to be skipped
980 981
981 982 text.gsub!( /&(?![#a-z0-9]+;)/i, "x%x%" )
982 983 end
983 984
984 985 def no_textile( text )
985 986 text.gsub!( /(^|\s)==([^=]+.*?)==(\s|$)?/,
986 987 '\1<notextile>\2</notextile>\3' )
987 988 text.gsub!( /^ *==([^=]+.*?)==/m,
988 989 '\1<notextile>\2</notextile>\3' )
989 990 end
990 991
991 992 def clean_white_space( text )
992 993 # normalize line breaks
993 994 text.gsub!( /\r\n/, "\n" )
994 995 text.gsub!( /\r/, "\n" )
995 996 text.gsub!( /\t/, ' ' )
996 997 text.gsub!( /^ +$/, '' )
997 998 text.gsub!( /\n{3,}/, "\n\n" )
998 999 text.gsub!( /"$/, "\" " )
999 1000
1000 1001 # if entire document is indented, flush
1001 1002 # to the left side
1002 1003 flush_left text
1003 1004 end
1004 1005
1005 1006 def flush_left( text )
1006 1007 indt = 0
1007 1008 if text =~ /^ /
1008 1009 while text !~ /^ {#{indt}}\S/
1009 1010 indt += 1
1010 1011 end unless text.empty?
1011 1012 if indt.nonzero?
1012 1013 text.gsub!( /^ {#{indt}}/, '' )
1013 1014 end
1014 1015 end
1015 1016 end
1016 1017
1017 1018 def footnote_ref( text )
1018 1019 text.gsub!( /\b\[([0-9]+?)\](\s)?/,
1019 1020 '<sup><a href="#fn\1">\1</a></sup>\2' )
1020 1021 end
1021 1022
1022 1023 OFFTAGS = /(code|pre|kbd|notextile)/
1023 1024 OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }\W|\Z)/mi
1024 1025 OFFTAG_OPEN = /<#{ OFFTAGS }/
1025 1026 OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
1026 1027 HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m
1027 1028 ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m
1028 1029
1029 1030 def glyphs_textile( text, level = 0 )
1030 1031 if text !~ HASTAG_MATCH
1031 1032 pgl text
1032 1033 footnote_ref text
1033 1034 else
1034 1035 codepre = 0
1035 1036 text.gsub!( ALLTAG_MATCH ) do |line|
1036 1037 ## matches are off if we're between <code>, <pre> etc.
1037 1038 if $1
1038 1039 if line =~ OFFTAG_OPEN
1039 1040 codepre += 1
1040 1041 elsif line =~ OFFTAG_CLOSE
1041 1042 codepre -= 1
1042 1043 codepre = 0 if codepre < 0
1043 1044 end
1044 1045 elsif codepre.zero?
1045 1046 glyphs_textile( line, level + 1 )
1046 1047 else
1047 1048 htmlesc( line, :NoQuotes )
1048 1049 end
1049 1050 # p [level, codepre, line]
1050 1051
1051 1052 line
1052 1053 end
1053 1054 end
1054 1055 end
1055 1056
1056 1057 def rip_offtags( text )
1057 1058 if text =~ /<.*>/
1058 1059 ## strip and encode <pre> content
1059 1060 codepre, used_offtags = 0, {}
1060 1061 text.gsub!( OFFTAG_MATCH ) do |line|
1061 1062 if $3
1062 1063 offtag, aftertag = $4, $5
1063 1064 codepre += 1
1064 1065 used_offtags[offtag] = true
1065 1066 if codepre - used_offtags.length > 0
1066 1067 htmlesc( line, :NoQuotes )
1067 1068 @pre_list.last << line
1068 1069 line = ""
1069 1070 else
1070 1071 htmlesc( aftertag, :NoQuotes ) if aftertag
1071 1072 line = "<redpre##{ @pre_list.length }>"
1072 1073 $3.match(/<#{ OFFTAGS }([^>]*)>/)
1073 1074 tag = $1
1074 1075 $2.to_s.match(/(class\=\S+)/i)
1075 1076 tag << " #{$1}" if $1
1076 1077 @pre_list << "<#{ tag }>#{ aftertag }"
1077 1078 end
1078 1079 elsif $1 and codepre > 0
1079 1080 if codepre - used_offtags.length > 0
1080 1081 htmlesc( line, :NoQuotes )
1081 1082 @pre_list.last << line
1082 1083 line = ""
1083 1084 end
1084 1085 codepre -= 1 unless codepre.zero?
1085 1086 used_offtags = {} if codepre.zero?
1086 1087 end
1087 1088 line
1088 1089 end
1089 1090 end
1090 1091 text
1091 1092 end
1092 1093
1093 1094 def smooth_offtags( text )
1094 1095 unless @pre_list.empty?
1095 1096 ## replace <pre> content
1096 1097 text.gsub!( /<redpre#(\d+)>/ ) { @pre_list[$1.to_i] }
1097 1098 end
1098 1099 end
1099 1100
1100 1101 def inline( text )
1101 1102 [/^inline_/, /^glyphs_/].each do |meth_re|
1102 1103 @rules.each do |rule_name|
1103 1104 method( rule_name ).call( text ) if rule_name.to_s.match( meth_re )
1104 1105 end
1105 1106 end
1106 1107 end
1107 1108
1108 1109 def h_align( text )
1109 1110 H_ALGN_VALS[text]
1110 1111 end
1111 1112
1112 1113 def v_align( text )
1113 1114 V_ALGN_VALS[text]
1114 1115 end
1115 1116
1116 1117 def textile_popup_help( name, windowW, windowH )
1117 1118 ' <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 />'
1118 1119 end
1119 1120
1120 1121 # HTML cleansing stuff
1121 1122 BASIC_TAGS = {
1122 1123 'a' => ['href', 'title'],
1123 1124 'img' => ['src', 'alt', 'title'],
1124 1125 'br' => [],
1125 1126 'i' => nil,
1126 1127 'u' => nil,
1127 1128 'b' => nil,
1128 1129 'pre' => nil,
1129 1130 'kbd' => nil,
1130 1131 'code' => ['lang'],
1131 1132 'cite' => nil,
1132 1133 'strong' => nil,
1133 1134 'em' => nil,
1134 1135 'ins' => nil,
1135 1136 'sup' => nil,
1136 1137 'sub' => nil,
1137 1138 'del' => nil,
1138 1139 'table' => nil,
1139 1140 'tr' => nil,
1140 1141 'td' => ['colspan', 'rowspan'],
1141 1142 'th' => nil,
1142 1143 'ol' => nil,
1143 1144 'ul' => nil,
1144 1145 'li' => nil,
1145 1146 'p' => nil,
1146 1147 'h1' => nil,
1147 1148 'h2' => nil,
1148 1149 'h3' => nil,
1149 1150 'h4' => nil,
1150 1151 'h5' => nil,
1151 1152 'h6' => nil,
1152 1153 'blockquote' => ['cite']
1153 1154 }
1154 1155
1155 1156 def clean_html( text, tags = BASIC_TAGS )
1156 1157 text.gsub!( /<!\[CDATA\[/, '' )
1157 1158 text.gsub!( /<(\/*)(\w+)([^>]*)>/ ) do
1158 1159 raw = $~
1159 1160 tag = raw[2].downcase
1160 1161 if tags.has_key? tag
1161 1162 pcs = [tag]
1162 1163 tags[tag].each do |prop|
1163 1164 ['"', "'", ''].each do |q|
1164 1165 q2 = ( q != '' ? q : '\s' )
1165 1166 if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
1166 1167 attrv = $1
1167 1168 next if prop == 'src' and attrv =~ %r{^(?!http)\w+:}
1168 1169 pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
1169 1170 break
1170 1171 end
1171 1172 end
1172 1173 end if tags[tag]
1173 1174 "<#{raw[1]}#{pcs.join " "}>"
1174 1175 else
1175 1176 " "
1176 1177 end
1177 1178 end
1178 1179 end
1179 1180
1180 1181 ALLOWED_TAGS = %w(redpre pre code notextile)
1181 1182
1182 1183 def escape_html_tags(text)
1183 1184 text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
1184 1185 end
1185 1186 end
1186 1187
@@ -1,45 +1,63
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 def test_modifiers
36 to_test = {
37 '*bold*' => '<strong>bold</strong>',
38 'before *bold*' => 'before <strong>bold</strong>',
39 '*bold* after' => '<strong>bold</strong> after',
40 '*two words*' => '<strong>two words</strong>',
41 '*two*words*' => '<strong>two*words</strong>',
42 '*two * words*' => '<strong>two * words</strong>',
43 '*two* *words*' => '<strong>two</strong> <strong>words</strong>',
44 '*(two)* *(words)*' => '<strong>(two)</strong> <strong>(words)</strong>',
45 # with class
46 '*(foo)two words*' => '<strong class="foo">two words</strong>',
47 }
48 to_test.each do |text, expected|
49 assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html
50 end
51 end
52
35 53 def test_modifiers_combination
36 54 MODIFIERS.each do |m1, tag1|
37 55 MODIFIERS.each do |m2, tag2|
38 56 next if m1 == m2
39 57 text = "#{m2}#{m1}Phrase modifiers#{m1}#{m2}"
40 58 html = "<p><#{tag2}><#{tag1}>Phrase modifiers</#{tag1}></#{tag2}></p>"
41 59 assert_equal html, @formatter.new(text).to_html
42 60 end
43 61 end
44 62 end
45 63 end
General Comments 0
You need to be logged in to leave comments. Login now