weasyprint 64.1__py3-none-any.whl → 65.1__py3-none-any.whl

weasyprint/text/fonts.py

@@ -208,14 +208,23 @@ class FontConfiguration:
             match = SubElement(root, 'match', target='font')
             test = SubElement(match, 'test', name='file', compare='eq')
             SubElement(test, 'string').text = str(font_path)
-            edit = SubElement(match, 'edit', name='fontfeatures', mode=mode)
             descriptors = {
                 rules[0][0].replace('-', '_'): rules[0][1] for rules in
                 rule_descriptors.get('font_variant', [])}
             settings = rule_descriptors.get('font_feature_settings', 'normal')
             features = font_features(font_feature_settings=settings, **descriptors)
-            for key, value in features.items():
-                SubElement(edit, 'string').text = f'{key} {value}'
+            if features:
+                edit = SubElement(match, 'edit', name='fontfeatures', mode=mode)
+                for key, value in features.items():
+                    SubElement(edit, 'string').text = f'{key} {value}'
+            if unicode_ranges := rule_descriptors.get('unicode_range'):
+                edit = SubElement(match, 'edit', name='charset', mode=mode)
+                plus = SubElement(edit, 'plus')
+                for unicode_range in unicode_ranges:
+                    charset = SubElement(plus, 'charset')
+                    range_ = SubElement(charset, 'range')
+                    for value in (unicode_range.start, unicode_range.end):
+                        SubElement(range_, 'int').text = f'0x{value:x}'
             header = (
                 b'<?xml version="1.0"?>',
                 b'<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">')

weasyprint/text/line_break.py

@@ -5,7 +5,7 @@ from math import inf
 
 import pyphen
 
-from .constants import LST_TO_ISO, PANGO_WRAP_MODE
+from .constants import LST_TO_ISO, PANGO_DIRECTION, PANGO_WRAP_MODE
 from .ffi import FROM_UNITS, TO_UNITS, ffi, gobject, pango, pangoft2, unicode_to_char_p
 from .fonts import font_features, get_font_description
 
@@ -76,6 +76,8 @@ class Layout:
             pango.pango_font_map_create_context(font_map),
             gobject.g_object_unref)
         pango.pango_context_set_round_glyph_positions(pango_context, False)
+        pango.pango_context_set_base_dir(
+            pango_context, PANGO_DIRECTION[style['direction']])
 
         if style['font_language_override'] != 'normal':
             lang_p, lang = unicode_to_char_p(LST_TO_ISO.get(
@@ -96,6 +98,7 @@ class Layout:
         self.layout = ffi.gc(
             pango.pango_layout_new(pango_context),
             gobject.g_object_unref)
+        pango.pango_layout_set_auto_dir(self.layout, False)
         pango.pango_layout_set_font_description(self.layout, font_description)
 
         text_decoration = style['text_decoration_line']
@@ -187,13 +190,11 @@ class Layout:
                     pango.pango_layout_set_text(self.layout, text, -1)
 
                 space_spacing = int(word_spacing * TO_UNITS + letter_spacing)
-                position = bytestring.find(b' ')
                 # Pango gives only half of word-spacing on boundaries
                 boundary_positions = (0, len(bytestring) - 1)
-                while position != -1:
-                    factor = 1 + (position in boundary_positions)
-                    add_attr(position, position + 1, factor * space_spacing)
-                    position = bytestring.find(b' ', position + 1)
+                for match in re.finditer(' |\u00a0'.encode(), bytestring):
+                    factor = 1 + (match.start() in boundary_positions)
+                    add_attr(match.start(), match.end(), factor * space_spacing)
 
             if word_breaking:
                 attr = pango.pango_attr_insert_hyphens_new(False)
@@ -213,7 +214,7 @@ class Layout:
             layout.set_text(' ' * self.style['tab_size'])
             line, _ = layout.get_first_line()
             width, _ = line_size(line, self.style)
-            width = int(round(width))
+            width = round(width)
         else:
             width = int(self.style['tab_size'].value)
         # 0 is not handled correctly by Pango

{weasyprint-64.1.dist-info → weasyprint-65.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weasyprint
-Version: 64.1
+Version: 65.1
 Summary: The Awesome Document Factory
 Keywords: html,css,pdf,converter
 Author-email: Simon Sapin <simon.sapin@exyr.org>
@@ -30,7 +30,7 @@ Requires-Dist: pydyf >=0.11.0
 Requires-Dist: cffi >=0.6
 Requires-Dist: tinyhtml5 >=2.0.0b1
 Requires-Dist: tinycss2 >=1.4.0
-Requires-Dist: cssselect2 >=0.1
+Requires-Dist: cssselect2 >=0.8.0
 Requires-Dist: Pyphen >=0.9.1
 Requires-Dist: Pillow >=9.1.0
 Requires-Dist: fonttools[woff] >=4.0.0

{weasyprint-64.1.dist-info → weasyprint-65.1.dist-info}/RECORD

@@ -1,60 +1,60 @@
-weasyprint/__init__.py,sha256=elGPspiq8Urexan8_lM1IBSjRcptb6ILZhMxOnZYhic,17338
+weasyprint/__init__.py,sha256=MrV26630NkuBXozSOqGdsFZWOFI6arULa1nSj-7EYM8,17409
 weasyprint/__main__.py,sha256=WaRdNsuuTBCJlny8AgqF9I_0Mnx5GseQEFA5lXimErw,7114
 weasyprint/anchors.py,sha256=yXEZD0uFsCAdDjC07cHgWqRuGOSsOsmmmk4omZZecAo,6428
 weasyprint/document.py,sha256=pUwJKcUp3tmgxh155RsQpS3kVUMuXWZfXCOziqQwaNc,17131
 weasyprint/html.py,sha256=om7dvhx12ecunTaVclmWejkr5nPQF1BZmeH7jqQ_4GM,11590
-weasyprint/images.py,sha256=NupVZkwBFqZa_kp4UXgaFK-NZtX8SZyB81j1lQMp58g,35565
+weasyprint/images.py,sha256=PI6xXN8z7vB79wK4RB9x3bLDwpPw7dQHZlzV4mLzqjM,35555
 weasyprint/logger.py,sha256=z1q548fX5shfAyLoMLeM9ozWGKgoBTKQsdlTtfRE_9U,1824
 weasyprint/matrix.py,sha256=v1BPtyn_-S_4TrAUgzOOR-viUXgdqsABKRndCEprkPc,1909
-weasyprint/stacking.py,sha256=TN4Bg6pRIUFdT7B9FKwRwNPTM6Tqj0u-miuNamxpCI4,5601
+weasyprint/stacking.py,sha256=oFB1-UHHeY8jO9nnS-IU5KK55azQ7V5QjEHYWGSqGW0,5628
 weasyprint/urls.py,sha256=yf6pXTic73l_nZiYkX03bfgFl2HdQlH0rCs4bSY5tjQ,9960
 weasyprint/css/__init__.py,sha256=6w2UoHQSoZ76eCuferHS3R0M8nAzFgab1NwR1vpy9LA,51599
-weasyprint/css/computed_values.py,sha256=dMznkSRT1bczjGdCF0bqiUURI5KK5YadMYeftmdcFeo,27306
+weasyprint/css/computed_values.py,sha256=O3USpx2ZH7Ff_FN5oIjn40lNMHj3zdThR0r51HRniIQ,27301
 weasyprint/css/counters.py,sha256=DHSrGJr2ktpZLCc-JYIiE67ak0TORsKSBKkjju-qwdE,11373
-weasyprint/css/html5_ph.css,sha256=u2VD0dJ5nAL3ubnQVd7q9Ii649T8vDKQ539I8h1Fh5o,7407
-weasyprint/css/html5_ua.css,sha256=1QuLfrHzSjksbLYKwlOBXK2QqEB-eRNrKF6YXcbebqU,31358
-weasyprint/css/html5_ua_form.css,sha256=WvUjNE1JUmikG7cLs0UOAo3aNW89nan5oo_FRwTZ2z0,241
+weasyprint/css/html5_ph.css,sha256=l8t4ZN3KoevKx0UEfNw3_vgVjArcII6y5DZXZolWaw0,4629
+weasyprint/css/html5_ua.css,sha256=qGUxl1eIu3tQRVu2fVMnC_oo_CbMYoukAC8dSvH1ErM,19111
+weasyprint/css/html5_ua_form.css,sha256=0JLdrpmhokuy9IFhK2L1ZwbTa2G3ibXTXcGuCkAw80Y,288
 weasyprint/css/media_queries.py,sha256=wHPteZ9Gs2ttuA5kZpMDgRtFHnhYZVwrFXrhKgmR-4g,1072
 weasyprint/css/properties.py,sha256=5nywzyQjLOSKKGxsvJsVgoyQfMsLSQarMeso-WRgYlU,11593
 weasyprint/css/targets.py,sha256=5Ofw1RrmPsfQjDuZ1FCgktspGUai3wJmNa03MbT2sOI,8853
 weasyprint/css/utils.py,sha256=bRZYaMDRGtlHqyQouzZRAA-SfMep6_xGe-nnIbUUG_Y,25105
 weasyprint/css/validation/__init__.py,sha256=tuyJXGP6TbUdVi_KtxLj0nFa49vGF5KNZkXI8HxR_cw,8468
-weasyprint/css/validation/descriptors.py,sha256=3Eu8TgxNnH_OhE4ibQYgviecA9A1QimkSskXqyse410,10961
+weasyprint/css/validation/descriptors.py,sha256=VOLmaKZP76mTVwMCqMzVgfzP1JaI4zYWdEIFLNXCfYQ,11160
 weasyprint/css/validation/expanders.py,sha256=9SJiVhoK8HESwwmN2IqXj-bmaC9p4SSD15tqmfMITnE,39263
 weasyprint/css/validation/properties.py,sha256=1xoYf0rEs4dKZDeZT7Qh-Z3_GmrBJ1pQ8ZozEIJOgyE,66811
 weasyprint/draw/__init__.py,sha256=JGk_UCt045atrZPkLlUDNNlqeV7ngze487-v_wqwG0w,22914
-weasyprint/draw/border.py,sha256=e66tKNdvYH8g29n57hPKr59GXa3rH6Dzj1CEmlC1520,27930
+weasyprint/draw/border.py,sha256=MRG9E7Bi_QLGkSVEgEJ7D1QlFbs3atkATAAA2s9a6wY,27910
 weasyprint/draw/color.py,sha256=ZjqiMDSNIFOLsIz2qP30HrFMbVqeEmYAKxcU6tl4GBs,1449
 weasyprint/draw/stack.py,sha256=o9VB8GtAdLfbrzQpZ1SWiV_hneHAz64egURawBLYbMo,281
-weasyprint/draw/text.py,sha256=OBnOvC6NCHg-DZBYSA2OQ1vWwFrkWUzyoMfxd-RPmhA,11231
+weasyprint/draw/text.py,sha256=L_5VqeAzz2PpPCdBhl7Dfza08NteNU0SfbAwITEaroE,11419
 weasyprint/formatting_structure/boxes.py,sha256=U3HPSaM9mbzQSbZCo_ZQp8VAS48KVOsQaH0g08iBGpc,26279
-weasyprint/formatting_structure/build.py,sha256=JwDU1ndfeBfnrYcaydM0HiVVFXzfVt5gLf-1VOsABFo,56607
-weasyprint/layout/__init__.py,sha256=hRt1LlxYuCdRG8pOcQXkePI4iHtqkoQfSiFnhk9Fjzk,15761
-weasyprint/layout/absolute.py,sha256=f9d9AZ7kAqXnMHxfRHHwu_L2nhee3ZtiZZm00A7BXDI,13966
+weasyprint/formatting_structure/build.py,sha256=c86cB4K8JL2oVMogFOWQn4V_GIhN1yEQL0z_wMqgPjo,56697
+weasyprint/layout/__init__.py,sha256=TNzbltiiuLVLLOlFDTLbwVlOoS7OnOzNPmHtWeaLk3M,16292
+weasyprint/layout/absolute.py,sha256=Caek_aFJDz5NLYFxTfEYO1-l7ITUMcx6TNDjNpE15-Y,13981
 weasyprint/layout/background.py,sha256=0ZRFZGAJnvF9eULIMyt8oy6lDqE-hKSbcyomQPx8HsQ,10008
-weasyprint/layout/block.py,sha256=TCzvUUNNqit-QYBdPr1IrKWWWBRFl7NBGNNBotiq9dU,45237
-weasyprint/layout/column.py,sha256=Oi-GzsZMpWZnR1SDAIBsc1o6Jz67gUVdk0m_t3i8O8Y,17322
-weasyprint/layout/flex.py,sha256=vwyISpZvDu67yQakAaE03Kcwcgeuig5ZDpDu6oWCrg8,53771
-weasyprint/layout/float.py,sha256=_ObCohsvfRvp9P_t_4WIkqdwfMPdIbHWPIrlT7uNGeM,9146
+weasyprint/layout/block.py,sha256=jwQS2jGCoQ0hSvCsWRPFK7Y3wad-Ucgzv0fzf-4DKm0,45388
+weasyprint/layout/column.py,sha256=P_863u0_vFYzig9tfBUMI8ZCpXlbx9SLoYekbZ5vg5Y,17299
+weasyprint/layout/flex.py,sha256=uAm4DAOvomSg0aX1oEse8-vT3M_fVI-IGFO1yatBH6E,42630
+weasyprint/layout/float.py,sha256=xo9CuXfvrC5jE8rnCVT2ShNRAXl7vAISq41oqkvvbK8,9266
 weasyprint/layout/grid.py,sha256=hzmsWXWQYw5rdy2XA_O_4Hz7CWCVle0RnnWTkugPEvY,54729
-weasyprint/layout/inline.py,sha256=4OK3eoj_77ja7oBkgDh81t3JSCB-CETSwzCDA8ivEvc,48167
+weasyprint/layout/inline.py,sha256=aFxHM0b-fQCSIWyXgf3dLHM90sQq8AOcS1ELx7sDpbc,48217
 weasyprint/layout/leader.py,sha256=wklI0aLyTx0VJhqU7D_FxtJpfe7dXswcN-VApAusM-Q,2825
 weasyprint/layout/min_max.py,sha256=JdXJG9ISO_RsfeHua_-3g477a16I-NrnYuwH_tQwq4o,1527
-weasyprint/layout/page.py,sha256=W3TLuK1Haa35WbA-ljQxsH2xffPrVLfJcEla96P8ez8,39690
-weasyprint/layout/percent.py,sha256=_UdU9eMTvRTRZYRiqGvOXCtB9alxbCU0huf6HKPhabo,6173
-weasyprint/layout/preferred.py,sha256=LGXBVZG5eKLEU2TxbeVBtt1yvPUWs5CaKUKPmzKCFP8,31011
+weasyprint/layout/page.py,sha256=JLKoYzGmrULONv11KLLrQuRFaTRK7XJZocuUsB0EGKs,39908
+weasyprint/layout/percent.py,sha256=2XzT_Y-fu7OVt2Ut1f9T1Tt9S4ftRr4x7wL3agvEJus,5626
+weasyprint/layout/preferred.py,sha256=cSOraU8g7i_8dDUifJhvKk0gxHBdPXqGZjjIgs8LVIs,31040
 weasyprint/layout/replaced.py,sha256=ucAd6VMKIEryjnwK8ciKbUoE2yK29-ggdYlGW3KPDXk,11178
 weasyprint/layout/table.py,sha256=qomzhxW0m4WaZ4Vis4GW7bfNQ6JP7yRSt7aze-dNcbU,47431
 weasyprint/pdf/__init__.py,sha256=pEehJ-JDH0ZepUFtj3Fz75BvVGBf7psduIbnph08PRo,12022
 weasyprint/pdf/anchors.py,sha256=Slgq3_IBiIBg3J7zzHMajISBb7ph2AVezIs-lW_tB9I,17386
 weasyprint/pdf/debug.py,sha256=reLw6U6hK94FOVNYW8psdt_SFN11iIe1rhYkr6sURF4,1407
-weasyprint/pdf/fonts.py,sha256=gheeTH3tTj5Vu77VQMtQ6px9E6iNu9vxQzcD1BstePE,24692
+weasyprint/pdf/fonts.py,sha256=D_T0JWFnofSDqdU29noTg8IbyenN9SlaULxSTPlg1JQ,24777
 weasyprint/pdf/metadata.py,sha256=r5ATj8Lv_6Ib-RbA2zgazyo6yJwF-LoqoNAWUchV4qE,4168
 weasyprint/pdf/pdfa.py,sha256=97J7nlKHmP5vdSBz0X0cDnGnqAPZ5qqoQ7ArZsdWRT8,3626
 weasyprint/pdf/pdfua.py,sha256=mCgXdr1RUe6hffg6Jsu4LzmDtBNyJTtj32wTouBeJy4,5236
 weasyprint/pdf/sRGB2014.icc,sha256=OEuDLeNBIGZ0O1KnXukGtvufuNngnpNvwsQyI4Fcbgo,3024
 weasyprint/pdf/stream.py,sha256=-s_ZT2xDsKzhjj9cgMnf4OkvVp88EnKBwzAvxKwOwWs,11301
-weasyprint/svg/__init__.py,sha256=0ADPt-G4mWMKcLY58xj3qMN0220g-YqvSEr3YLdJYmY,29802
+weasyprint/svg/__init__.py,sha256=smY5L9f68vf3BTZL1KTB0fz5JcwFM0kxFgywgRAOxdE,30012
 weasyprint/svg/bounding_box.py,sha256=ti9BZ8Pxr4K_RZr41vrcDeBu1Mz9CReh8ECbUzzh_0s,12999
 weasyprint/svg/css.py,sha256=AUsIim2rOmRGLgFuiWm4EzXwnrRlThczfM17Uq2MRUg,3832
 weasyprint/svg/defs.py,sha256=u_VQ-b6045qCBuLNEe9lwJWHcOsYYO4wBwsSWiXEZm0,20978
@@ -63,12 +63,12 @@ weasyprint/svg/path.py,sha256=Z-T6kbUU3pyHhzVV0JSBgO--XaCGXLsH-cS9iAsITMM,10064
 weasyprint/svg/shapes.py,sha256=NDo0KMnwrm0hj3BOmfrKjRZo4iJF9o-MeUhZ5avANco,3845
 weasyprint/svg/text.py,sha256=JVrLSpDtU3P9IgkG50g_lQVi0L5uNbXoEDh6tk3o2z4,6404
 weasyprint/svg/utils.py,sha256=RkmPhTAqBfn85YACP3u9m4Rs8hyqZyQLBLME1q8psyw,6969
-weasyprint/text/constants.py,sha256=5C1LzxrP2kVe4TsrjrpW_MQxSyEV_ONXjPCB3FJgC-M,14092
-weasyprint/text/ffi.py,sha256=3_t4Esj16_LiMoHwHyXNMG0fHVvleCy2MbQHAs87cxw,17852
-weasyprint/text/fonts.py,sha256=chphT780TvE3JuZcWhZRsMsgUbfS708tdFyH5K8OLUA,16911
-weasyprint/text/line_break.py,sha256=g_8cSpkZjO5mADU0jvApcn-EFcT96RCI1G2tiJtuy88,24627
-weasyprint-64.1.dist-info/entry_points.txt,sha256=wgDp3XXzFywdYgI5vUWMp1zAwx1sZXXH0FTUQbFOq6A,55
-weasyprint-64.1.dist-info/licenses/LICENSE,sha256=v9FOzPphAFdUYOaFVWsYM5nUvTNZBOPJUhsBFtIcVNo,1534
-weasyprint-64.1.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-weasyprint-64.1.dist-info/METADATA,sha256=zhSoS-a58cPe3oAmdYnQ3822Q_SC_dVd1W8-RqGYWt8,3705
-weasyprint-64.1.dist-info/RECORD,,
+weasyprint/text/constants.py,sha256=ifPeTG_us_sSgWuM-WTQgDrrAgwwnohYR63HhS_1dIM,14191
+weasyprint/text/ffi.py,sha256=0FWxNeYn0Nub-fKHWElFcQc9GmlgiLAKvS82hpDxsAs,18282
+weasyprint/text/fonts.py,sha256=Qa7HxrQeJN84XXBKgJitcRdVMRA9vz1QY8Kl3StRCE4,17460
+weasyprint/text/line_break.py,sha256=FXlHDk8A4lBB-i3wqgl7RO66P3TPpFzkkFbmu-FHGKg,24735
+weasyprint-65.1.dist-info/entry_points.txt,sha256=wgDp3XXzFywdYgI5vUWMp1zAwx1sZXXH0FTUQbFOq6A,55
+weasyprint-65.1.dist-info/licenses/LICENSE,sha256=v9FOzPphAFdUYOaFVWsYM5nUvTNZBOPJUhsBFtIcVNo,1534
+weasyprint-65.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+weasyprint-65.1.dist-info/METADATA,sha256=v9-RDucK9Kk_K1t1UO7i1KRMr7GRF-bbdCdt9XGn-qg,3707
+weasyprint-65.1.dist-info/RECORD,,

{weasyprint-64.1.dist-info → weasyprint-65.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.11.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any