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

More work on fast css transforms

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

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

@ -36,7 +36,7 @@ is_surrogate(char32_t ch) {
static inline bool
is_hex_digit(char32_t ch) {
return ('0' <= ch && ch <= '9') || ('a' <= ch && ch <= 'f') || ('A' <= ch || ch <= 'F');
return ('0' <= ch && ch <= '9') || ('a' <= ch && ch <= 'f') || ('A' <= ch && ch <= 'F');
}
static inline bool
@ -357,13 +357,15 @@ class Token {
}
bool text_as_ascii_lowercase(std::string &scratch) {
scratch.clear();
scratch.resize(text.size());
size_t i = 0;
for (auto ch : text) {
if (is_printable_ascii(ch)) {
if ('A' <= ch && ch <= 'Z') ch += 'a' - 'A';
scratch.push_back((char)ch);
scratch[i++] = (char)ch;
} else return false;
}
scratch.resize(i);
return true;
}
@ -417,9 +419,8 @@ class Token {
for (Py_ssize_t i = 0; i < PyUnicode_GET_LENGTH(src); i++) text[i] = PyUnicode_READ(kind, data, i);
}
void set_text(const char* src, size_t len=0) {
text.resize(len ? len : strlen(src));
for (size_t i = 0; i < text.size(); i++) text[i] = src[i];
void set_text(const char32_t *src) {
text = src;
}
void set_text(const frozen::string &src) {
@ -440,10 +441,11 @@ class Token {
double val = parse_css_number<std::string>(scratch, unit_at).as_double();
double new_val = convert_font_size(val, lit->second);
if (val == new_val) return false;
char buf[64];
int num = std::snprintf(buf, sizeof(buf), "%grem", new_val);
scratch.reserve(128); scratch.clear(); scratch.resize(128);
int num = std::snprintf(&scratch[0], scratch.capacity(), "%grem", new_val);
if (num <= 0) throw std::runtime_error("Failed to format font size");
set_text(buf, num);
scratch.resize(num);
set_text(scratch);
return true;
}
@ -608,7 +610,7 @@ class TokenQueue {
changed = true; keep_going = false;
break;
case PropertyType::non_standard_writing_mode:
it->set_text("writing-mode");
it->set_text(U"writing-mode");
changed = true; keep_going = false;
break;
}
@ -829,7 +831,7 @@ class Parser {
std::stack<BlockTypeFlags> block_types;
std::stack<ParseState> states;
char escape_buf[16];
size_t escape_buf_pos;
unsigned escape_buf_pos;
TokenQueue token_queue;
InputStream input;

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

@ -22,5 +22,8 @@ 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)
d(r'f\ont-s\69z\65 : 16\px', 'font-size: 1rem')
d('font-size: 16px', 'font-size: 1rem')
d('color: red', 'color: red')
d('fOnt-size :16px', 'fOnt-size :1rem')
d('font-size:2%', 'font-size:2%')
d('font-size: 72pt; color: red; font-size: 2in', 'font-size: 6rem; color: red; font-size: 12rem')