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 urls not being transformed if property is followed by '}'

Browse Source
This commit is contained in:
Kovid Goyal 2021-03-21 19:55:52 +05:30
parent d21ef82385
commit 9407f7b08f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -718,6 +718,7 @@ class TokenQueue {
if (process_urls(TokenType::string)) changed = true; if (process_urls(TokenType::string)) changed = true;
} }
} else { } else {
if (process_urls()) changed = true;
if (process_declaration()) changed = true; if (process_declaration()) changed = true;
} }
if (changed && queue.size()) { if (changed && queue.size()) {

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

@ -31,6 +31,7 @@ class TestTransform(SimpleTest):
def s(src, expected, url_callback=upper_case): def s(src, expected, url_callback=upper_case):
return d(src, expected, url_callback=url_callback, is_declaration=False) return d(src, expected, url_callback=url_callback, is_declaration=False)
s('.c{x:url(y)}', '.c{x:url("Y")}')
s('@im/* c */port "x.y";', '@import "X.Y";') s('@im/* c */port "x.y";', '@import "X.Y";')
s('@import url("narrow.css") supports(display: flex) handheld and (max-width: 400px);', 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);') '@import url("NARROW.CSS") supports(display: flex) handheld and (max-width: 400px);')
@ -57,3 +58,28 @@ class TestTransform(SimpleTest):
d('-epub-writing-mode: a; -web/* */kit-writing-mode: b; writing-mode: c', 'writing-mode: a; writing-mode: b; writing-mode: c') d('-epub-writing-mode: a; -web/* */kit-writing-mode: b; writing-mode: c', 'writing-mode: a; writing-mode: b; writing-mode: c')
d('xxx:yyy', 'xxx:yyy') d('xxx:yyy', 'xxx:yyy')
sheet = '''
@import "loc.test";
@media screen {
font: 16px calc(20vw - 30rem);
.cls {
color: red;
font-size: 16px;
background: url("loc.test")
}
#moo.cat {
x: url("loc.test")
}
@zoo {
not(.woo) and why {
font: 16px "something something" 16;
}
}
}
.why { font: 16px}
'''
s(sheet, sheet.replace('16px', '1rem').replace('loc.test', 'LOC.TEST'))