Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of idents

Browse Source
This commit is contained in:
Kovid Goyal 2021-03-21 12:26:56 +05:30
parent 31c7698acb
commit 29e2561d61
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/srv/fast_css_transform.cpp
View File

@ -1025,15 +1025,11 @@ class Parser {
void handle_ident() {
if (is_name(ch)) { token_queue.add_char(ch); return; }
if (has_valid_escape()) { enter_escape_mode(); return; }
if (ch == '(') {
if (token_queue.current_token_text_equals_case_insensitive("url")) {
enter_url_start_mode();
}
else token_queue.make_function_start();
return;
}
reconsume();
pop_state();
if (ch == '(') {
if (token_queue.current_token_text_equals_case_insensitive("url")) enter_url_start_mode();
else token_queue.make_function_start();
} else reconsume();
} // }}}
// url {{{

10
src/calibre/srv/tests/fast_css_transform.py
View File

@ -28,6 +28,14 @@ class TestTransform(SimpleTest):
def u(src, expected, is_declaration=True, url_callback=upper_case):
return d(src, expected, url_callback=url_callback, is_declaration=is_declaration)
def s(src, expected, url_callback=upper_case):
return d(src, expected, url_callback=url_callback, is_declaration=False)
s('@import url("narrow.css") supports(display: flex) handheld and (max-width: 400px);',
'@import url("NARROW.CSS") supports(display: flex) handheld and (max-width: 400px);')
s('@import "x.y";', '@import "X.Y";')
s('@import url( x.y);', '@import url("X.Y");')
u('background: url( te st.gif ); src: url(x)', 'background: url("TE ST.GIF"); src: url("X")')
u('background: url(test.gif); xxx: url()', 'background: url("TEST.GIF"); xxx: url()')
u(r'background: url(t\)est.gif)', 'background: url("T)EST.GIF")')
@ -36,7 +44,7 @@ class TestTransform(SimpleTest):
d(r'f\ont-s\69z\65 : 16\px', 'font-size: 1rem')
d('font -size: 16px', 'font -size: 16px')
d('font-size: 16px', 'font-size: 1rem')
d('font-size: 16px !important', 'font-size: 1rem !important')
d('fOnt-size :16px', 'fOnt-size :1rem')
d('font-size:2%', 'font-size:2%')
d('font-size: 72pt; margin: 20px; font-size: 2in', 'font-size: 6rem; margin: 20px; font-size: 12rem')