Allow quotes in styles so you can do things like listing font-familie…

…s. [#166 state:resolved]
jgarber · Mar 1, 2010 · 31a35a0 · 31a35a0
1 parent 0a481fb
commit 31a35a0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 === Edge
 
+* Allow quotes in styles so you can do things like listing font-families. [Jason Garber]
 * Fix uninitialized constant Gem::Specification::PLATFORM_CROSS_TARGETS in Rails [Jason Garber]
 * Allow uppercase letters in ID attribute even though it's invalid [Jason Garber]
 * Fix compatibility with newer Echoe, by using full-name for Platform [Flameeyes]

diff --git a/ext/redcloth_scan/redcloth_common.rl b/ext/redcloth_scan/redcloth_common.rl
@@ -18,7 +18,7 @@
   # textile element attributes
   class = [a-z0-9\- _]+ ;
   id = [A-Za-z0-9\-_]+ ;
-  style_chars = [a-z0-9: ;\-_#&.%];
+  style_chars = [A-Za-z0-9: ;\-_#&.%'"];
   style_url = "url(" [a-z0-9'".\\/#?=+@_\-]+ ")";
   style = style_chars (style_chars+ | style_url)* ; # maybe put in uri when in url()
   language = [a-z\-_]+ ;

diff --git a/spec/fixtures/basic.yml b/spec/fixtures/basic.yml
@@ -380,8 +380,8 @@ html: <p class="example1" id="big-red2">Red here</p>
 --- 
 name: css style
 desc: Style settings can be provided directly by surrounding them in curly braces.
-in: p{color:blue;margin:30px;font-size:120%;}. Spacey blue
-html: <p style="color:blue;margin:30px;font-size:120%;">Spacey blue</p>
+in: p{color:blue;margin:30px;font-size:120%;font-family:'Comic Sans'}. Spacey blue
+html: <p style="color:blue;margin:30px;font-size:120%;font-family:&#39;Comic Sans&#39;;">Spacey blue</p>
 --- 
 name: language designations
 desc: Language designations can be given between angel brackets.