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

Get url transforms working

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

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

@ -84,7 +84,7 @@ class pyobject_raii {
public:
pyobject_raii() : handle(NULL) {}
pyobject_raii(PyObject* h) : handle(h) {}
pyobject_raii(PyObject* h, bool incref=false) : handle(h) { if (incref && handle) Py_INCREF(handle); }
~pyobject_raii() { Py_CLEAR(handle); }
@ -648,7 +648,7 @@ class TokenQueue {
public:
TokenQueue(const size_t src_sz, PyObject *url_callback=NULL) :
pool(), queue(), out(), scratch(), scratch2(), url_callback(url_callback) {
pool(), queue(), out(), scratch(), scratch2(), url_callback(url_callback, true) {
out.reserve(src_sz * 2); scratch.reserve(16); scratch2.reserve(16);
}
@ -1047,6 +1047,7 @@ class Parser {
if (starting_string()) { pop_state(); end_string_with = ch; states.push(ParseState::url_string); return; }
if (ch == ')') { pop_state(); return; }
pop_state(); states.push(ParseState::url);
token_queue.add_char(ch);
}
void handle_url_string() {
@ -1059,8 +1060,9 @@ class Parser {
}
void handle_url() {
if (has_valid_escape()) enter_escape_mode();
if (ch == '\\' && has_valid_escape()) enter_escape_mode();
else if (ch == ')') exit_url_mode(true);
else token_queue.add_char(ch);
}
void exit_url_mode(bool trim=false) {

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

@ -22,6 +22,18 @@ class TestTransform(SimpleTest):
def d(src, expected, is_declaration=True, url_callback=None):
self.ae(transform_properties(src, is_declaration=is_declaration, url_callback=url_callback), expected)
def upper_case(val):
return val.upper()
def u(src, expected, is_declaration=True, url_callback=upper_case):
return d(src, expected, url_callback=url_callback, is_declaration=is_declaration)
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")')
u('a:url( "( )" )', 'a:url("( )")')
u('a:url( "()" )', 'a:url( "()" )', url_callback=lambda x: x)
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')
@ -35,3 +47,4 @@ class TestTransform(SimpleTest):
d('font: sans-serif 16px/3', 'font: sans-serif 1rem/3')
d('-epub-writing-mode: a; -webkit-writing-mode: b; writing-mode: c', 'writing-mode: a; writing-mode: b; writing-mode: c')
d('xxx:yyy', 'xxx:yyy')