diff --git a/CHANGELOG b/CHANGELOG index 8f5be5a2..44d91e34 100644 --- 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 index 96c513ee..7faa356c 100644 --- 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 index 2b9c9b91..3e2801eb 100644 --- a/spec/fixtures/basic.yml +++ b/spec/fixtures/basic.yml @@ -380,8 +380,8 @@ html:

Red here

--- 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:

Spacey blue

+in: p{color:blue;margin:30px;font-size:120%;font-family:'Comic Sans'}. Spacey blue +html:

Spacey blue

--- name: language designations desc: Language designations can be given between angel brackets.