Kozea/WeasyPrint
1
1
Fork 0
mirror of https://github.com/Kozea/WeasyPrint.git synced 2024-10-05 00:21:15 +03:00
Code Issues Projects Releases Wiki Activity
1,160 Commits 8 Branches 108 Tags 39 MiB
9afa96e987
Commit Graph

191 Commits

Author SHA1 Message Date
Guillaume Ayoub
9afa96e987 Put floats in the next line when they don't fit on current line 2012-06-25 23:48:21 +02:00
Guillaume Ayoub
762a8db2be Don't detect collisions with 0-height boxes only for float boxes 2012-06-25 23:47:07 +02:00
Guillaume Ayoub
2f68f0f519 Again! 2012-06-25 21:37:15 +02:00
Guillaume Ayoub
b26d35cd96 Don't resolve percentages on tables 2012-06-25 21:35:45 +02:00
Guillaume Ayoub
4c824f7374 Don't create new lines for floats with height = 0 2012-06-25 21:10:00 +02:00
Guillaume Ayoub
6bccfe7514 Fix a lot of things about floats 2012-06-25 19:48:22 +02:00
Guillaume Ayoub
8c4cf4118d Remove print 2012-06-25 12:51:13 +02:00
Guillaume Ayoub
683afe9f3a Fix tests 2012-06-25 12:47:15 +02:00
Guillaume Ayoub
3b740f32a6 Fix stupid bug 2012-06-25 10:21:42 +02:00
Guillaume Ayoub
b61f57b97c Avoid collision of replaced blocks and tables with floats 2012-06-25 10:17:39 +02:00
Guillaume Ayoub
b67bebfb92 Fix the position of line children next to float boxes 2012-06-24 00:03:45 +02:00
Guillaume Ayoub
aee82fd576 Add a todo and fix a little thing about text align for floats in inline 2012-06-23 13:05:08 +02:00
Guillaume Ayoub
a3cc6c62a8 Merge branch 'master' into float 2012-06-23 11:51:05 +02:00
Guillaume Ayoub
6c4f05fb54 Remove useless import 2012-06-23 11:50:10 +02:00
Guillaume Ayoub
e696d2b196 Translate children moved by floats (but no available_width shrink yet) 2012-06-23 11:47:38 +02:00
Guillaume Ayoub
989ae739ef Merge branch 'master' into float 
Comment failing tests too :(

Conflicts:
	weasyprint/document.py
	weasyprint/draw.py
 2012-06-23 02:00:09 +02:00
Simon Sapin
4f801d61b4 Bug fix: list + tuple in find_earlier_break() 2012-06-22 14:34:36 +02:00
Guillaume Ayoub
cd1e5b3e05 Merge branch 'master' into float 
Conflicts:
	weasyprint/layout/preferred.py
	weasyprint/text.py
 2012-06-22 01:29:26 +02:00
Simon Sapin
9fde81d006 Fix a corner case in page-break-*: avoid 2012-06-21 19:05:54 +02:00
Guillaume Ayoub
a78c3d2749 Small fixes about floats 2012-06-21 18:12:17 +02:00
Simon Sapin
97f3eee889 Refactor text handling 
* Kill the TextFragment class. Use a set of functions instead.
* Pass around an `enable_hinting` boolean rather than a dummy surface
 2012-06-21 17:22:01 +02:00
Guillaume Ayoub
e12880b113 Handle float in inline as almost normal boxes 2012-06-21 16:03:29 +02:00
Guillaume Ayoub
c1e495bee1 Add a todo about float blocks and collapse margins 2012-06-20 14:13:25 +02:00
Guillaume Ayoub
7cc8be2f90 Merge branch 'master' into float 
Conflicts:
	weasyprint/layout/blocks.py
 2012-06-20 13:47:28 +02:00
Guillaume Ayoub
cb068ec111 Add skip to resume_at indexes in find_earlier_page_break 2012-06-20 13:39:44 +02:00
Simon Sapin
d4399ee269 Add support for page-break-{before,after}: avoid 2012-06-20 12:53:22 +02:00
Guillaume Ayoub
36a6b6b6f3 Pass the fixed_boxes argument instead of using current_page 
Cherry-picked from 043d71dc29

Conflicts:
	weasyprint/layout/absolute.py
	weasyprint/layout/blocks.py
	weasyprint/layout/float.py
	weasyprint/layout/inlines.py
 2012-06-19 18:00:50 +02:00
Guillaume Ayoub
f9e7c40ca2 Fix the drawing order of fixed boxes 
Cherry-picked from 568e0aeb70

Conflicts:
	weasyprint/layout/blocks.py
	weasyprint/layout/inlines.py
 2012-06-19 17:42:15 +02:00
Guillaume Ayoub
4fe56316f6 Finally fix margin collapsing for blocks with clearance 2012-06-19 14:52:30 +02:00
Guillaume Ayoub
f441f8c810 Increase position_y after clear blocks 2012-06-19 00:00:28 +02:00
Guillaume Ayoub
9cf9e53d0b Fix a little bug with clearance 2012-06-18 19:34:35 +02:00
Guillaume Ayoub
ef76204e99 Fix clearance and margin collapsing 2012-06-18 19:31:24 +02:00
Guillaume Ayoub
b3e3581f48 Remove useless import 2012-06-18 18:04:20 +02:00
Guillaume Ayoub
8a94ff2f9b Strip spaces at the beginning of text fragments to get real line widths 2012-06-18 10:44:54 +02:00
Guillaume Ayoub
d62ba4936a Don't collapse through boxes with clearance 2012-06-18 10:06:18 +02:00
Guillaume Ayoub
e4f9ff5331 Don't collapse through clear boxes 2012-06-15 18:49:40 +02:00
Simon Sapin
f7d765e0c1 Bug fixes and tests on floats… 2012-06-15 17:59:15 +02:00
Simon Sapin
937710bf9c Account for line height when avoiding collisions with floats. 2012-06-15 15:14:43 +02:00
Simon Sapin
2c0abe1483 Merge branch 'master' into float 2012-06-08 18:49:27 +02:00
Simon Sapin
26b4f57292 Implement vertical-align: top/bottom. 2012-06-08 18:49:10 +02:00
Simon Sapin
fd6c5451e0 Merge branch 'master' into float 2012-06-08 17:16:31 +02:00
Guillaume Ayoub
85df2ebe47 Fix the struts and heights of line/inline boxes. (For real this time. Maybe.) 2012-06-08 17:13:45 +02:00
Guillaume Ayoub
6cbdab0799 Fix various tests, remove monkeypatch validation 2012-06-06 12:52:02 +02:00
Simon Sapin
706113c24b Revert "Make the strut have an effect on line boxes" 
This reverts commit d88ecbb6ba.
 2012-06-06 12:05:59 +02:00
Guillaume Ayoub
043d71dc29 Pass the fixed_boxes argument instead of using current_page 2012-06-06 12:04:09 +02:00
Guillaume Ayoub
568e0aeb70 Fix the drawing order of fixed boxes 2012-06-06 09:49:56 +02:00
Guillaume Ayoub
d88ecbb6ba Make the strut have an effect on line boxes 2012-06-05 17:56:58 +02:00
Guillaume Ayoub
39e503858d Fix margin collapsing with clearance 2012-06-05 17:14:33 +02:00
Guillaume Ayoub
505ee8de26 Handle the mix/max-widths/heights for absolute and float 2012-06-04 19:22:18 +02:00
Guillaume Ayoub
3684c8ed0d Merge branch 'master' into float 2012-06-04 16:09:10 +02:00