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

weasyprint/__init__.py

@@ -15,7 +15,7 @@ import cssselect2
 import tinycss2
 import tinyhtml5
 
-VERSION = __version__ = '64.1'
+VERSION = __version__ = '65.1'
 
 #: Default values for command-line and Python API options. See
 #: :func:`__main__.main` to learn more about specific options for
@@ -306,6 +306,7 @@ class CSS:
         self.base_url = base_url
         self.matcher = matcher or cssselect2.Matcher()
         self.page_rules = [] if page_rules is None else page_rules
+        counter_style = {} if counter_style is None else counter_style
         preprocess_stylesheet(
             media_type, base_url, stylesheet, url_fetcher, self.matcher,
             self.page_rules, font_config, counter_style)

weasyprint/css/computed_values.py

@@ -337,7 +337,7 @@ def image_orientation(style, name, values):
     if values in ('none', 'from-image'):
         return values
     angle, flip = values
-    return (int(round(angle / pi * 2)) % 4 * 90, flip)
+    return (round(angle / pi * 2) % 4 * 90, flip)
 
 
 @register_computer('border-top-width')

weasyprint/css/html5_ph.css

@@ -12,181 +12,68 @@ a "i" flag when CSS Selectors Level 4 is supported.
 
 */
 
-pre[wrap] { white-space: pre-wrap; }
-
-br[clear=left] { clear: left; }
-br[clear=right] { clear: right; }
-br[clear=all], br[clear=both] { clear: both; }
-
-ol[type="1"], li[type="1"] { list-style-type: decimal; }
-ol[type=a], li[type=a] { list-style-type: lower-alpha; }
-ol[type=A], li[type=A] { list-style-type: upper-alpha; }
-ol[type=i], li[type=i] { list-style-type: lower-roman; }
-ol[type=I], li[type=I] { list-style-type: upper-roman; }
-ul[type=disc], li[type=disc] { list-style-type: disc; }
-ul[type=circle], li[type=circle] { list-style-type: circle; }
-ul[type=square], li[type=square] { list-style-type: square; }
-
-table[align=left] { float: left; }
-table[align=right] { float: right; }
-table[align=center] { margin-left: auto; margin-right: auto; }
-thead[align=absmiddle], tbody[align=absmiddle], tfoot[align=absmiddle],
-tr[align=absmiddle], td[align=absmiddle], th[align=absmiddle] {
-  text-align: center;
-}
-
-caption[align=bottom] { caption-side: bottom; }
-p[align=left], h1[align=left], h2[align=left], h3[align=left],
-h4[align=left], h5[align=left], h6[align=left] {
-  text-align: left;
-}
-p[align=right], h1[align=right], h2[align=right], h3[align=right],
-h4[align=right], h5[align=right], h6[align=right] {
-  text-align: right;
-}
-p[align=center], h1[align=center], h2[align=center], h3[align=center],
-h4[align=center], h5[align=center], h6[align=center] {
-  text-align: center;
-}
-p[align=justify], h1[align=justify], h2[align=justify], h3[align=justify],
-h4[align=justify], h5[align=justify], h6[align=justify] {
-  text-align: justify;
-}
-thead[valign=top], tbody[valign=top], tfoot[valign=top],
-tr[valign=top], td[valign=top], th[valign=top] {
-  vertical-align: top;
-}
-thead[valign=middle], tbody[valign=middle], tfoot[valign=middle],
-tr[valign=middle], td[valign=middle], th[valign=middle] {
-  vertical-align: middle;
-}
-thead[valign=bottom], tbody[valign=bottom], tfoot[valign=bottom],
-tr[valign=bottom], td[valign=bottom], th[valign=bottom] {
-  vertical-align: bottom;
-}
-thead[valign=baseline], tbody[valign=baseline], tfoot[valign=baseline],
-tr[valign=baseline], td[valign=baseline], th[valign=baseline] {
-  vertical-align: baseline;
-}
-
-td[nowrap], th[nowrap] { white-space: nowrap; }
-
-table[rules=none], table[rules=groups], table[rules=rows],
-table[rules=cols], table[rules=all] {
-  border-style: hidden;
-  border-collapse: collapse;
-}
-table[border]:not([border="0"]) { border-style: outset; }
-table[frame=void] { border-style: hidden; }
-table[frame=above] { border-style: outset hidden hidden hidden; }
-table[frame=below] { border-style: hidden hidden outset hidden; }
-table[frame=hsides] { border-style: outset hidden outset hidden; }
-table[frame=lhs] { border-style: hidden hidden hidden outset; }
-table[frame=rhs] { border-style: hidden outset hidden hidden; }
-table[frame=vsides] { border-style: hidden outset; }
-table[frame=box], table[frame=border] { border-style: outset; }
-
-table[border]:not([border="0"]) > tr > td, table[border]:not([border="0"]) > tr > th,
-table[border]:not([border="0"]) > thead > tr > td, table[border]:not([border="0"]) > thead > tr > th,
-table[border]:not([border="0"]) > tbody > tr > td, table[border]:not([border="0"]) > tbody > tr > th,
-table[border]:not([border="0"]) > tfoot > tr > td, table[border]:not([border="0"]) > tfoot > tr > th {
-  border-width: 1px;
-  border-style: inset;
-}
-table[rules=none] > tr > td, table[rules=none] > tr > th,
-table[rules=none] > thead > tr > td, table[rules=none] > thead > tr > th,
-table[rules=none] > tbody > tr > td, table[rules=none] > tbody > tr > th,
-table[rules=none] > tfoot > tr > td, table[rules=none] > tfoot > tr > th,
-table[rules=groups] > tr > td, table[rules=groups] > tr > th,
-table[rules=groups] > thead > tr > td, table[rules=groups] > thead > tr > th,
-table[rules=groups] > tbody > tr > td, table[rules=groups] > tbody > tr > th,
-table[rules=groups] > tfoot > tr > td, table[rules=groups] > tfoot > tr > th,
-table[rules=rows] > tr > td, table[rules=rows] > tr > th,
-table[rules=rows] > thead > tr > td, table[rules=rows] > thead > tr > th,
-table[rules=rows] > tbody > tr > td, table[rules=rows] > tbody > tr > th,
-table[rules=rows] > tfoot > tr > td, table[rules=rows] > tfoot > tr > th {
-  border-width: 1px;
-  border-style: none;
-}
-table[rules=cols] > tr > td, table[rules=cols] > tr > th,
-table[rules=cols] > thead > tr > td, table[rules=cols] > thead > tr > th,
-table[rules=cols] > tbody > tr > td, table[rules=cols] > tbody > tr > th,
-table[rules=cols] > tfoot > tr > td, table[rules=cols] > tfoot > tr > th {
-  border-width: 1px;
-  border-style: none solid;
-}
-table[rules=all] > tr > td, table[rules=all] > tr > th,
-table[rules=all] > thead > tr > td, table[rules=all] > thead > tr > th,
-table[rules=all] > tbody > tr > td, table[rules=all] > tbody > tr > th,
-table[rules=all] > tfoot > tr > td, table[rules=all] > tfoot > tr > th {
-  border-width: 1px;
-  border-style: solid;
-}
-
-table[rules=groups] > colgroup {
-  border-left-width: 1px;
-  border-left-style: solid;
-  border-right-width: 1px;
-  border-right-style: solid;
-}
-table[rules=groups] > thead,
-table[rules=groups] > tbody,
-table[rules=groups] > tfoot {
-  border-top-width: 1px;
-  border-top-style: solid;
-  border-bottom-width: 1px;
-  border-bottom-style: solid;
-}
-
-table[rules=rows] > tr, table[rules=rows] > thead > tr,
-table[rules=rows] > tbody > tr, table[rules=rows] > tfoot > tr {
-  border-top-width: 1px;
-  border-top-style: solid;
-  border-bottom-width: 1px;
-  border-bottom-style: solid;
-}
-
-hr[align=left] { margin-left: 0; margin-right: auto; }
-hr[align=right] { margin-left: auto; margin-right: 0; }
-hr[align=center] { margin-left: auto; margin-right: auto; }
-hr[color], hr[noshade] { border-style: solid; }
-
-iframe[frameborder="0"], iframe[frameborder=no] { border: none; }
-
-applet[align=left], embed[align=left], iframe[align=left],
-img[align=left], input[type=image][align=left], object[align=left] {
-  float: left;
-}
-
-applet[align=right], embed[align=right], iframe[align=right],
-img[align=right], input[type=image][align=right], object[align=right] {
-  float: right;
-}
-
-applet[align=top], embed[align=top], iframe[align=top],
-img[align=top], input[type=image][align=top], object[align=top] {
-  vertical-align: top;
-}
-
-applet[align=baseline], embed[align=baseline], iframe[align=baseline],
-img[align=baseline], input[type=image][align=baseline], object[align=baseline] {
-  vertical-align: baseline;
-}
-
-applet[align=texttop], embed[align=texttop], iframe[align=texttop],
-img[align=texttop], input[type=image][align=texttop], object[align=texttop] {
-  vertical-align: text-top;
-}
-
-applet[align=absmiddle], embed[align=absmiddle], iframe[align=absmiddle],
-img[align=absmiddle], input[type=image][align=absmiddle], object[align=absmiddle],
-applet[align=abscenter], embed[align=abscenter], iframe[align=abscenter],
-img[align=abscenter], input[type=image][align=abscenter], object[align=abscenter] {
-  vertical-align: middle;
-}
-
-applet[align=bottom], embed[align=bottom], iframe[align=bottom],
-img[align=bottom], input[type=image][align=bottom],
-object[align=bottom] {
-  vertical-align: bottom;
-}
+pre[wrap] { white-space: pre-wrap }
+
+br[clear=left i] { clear: left }
+br[clear=right i] { clear: right }
+br[clear=all i], br[clear=both i] { clear: both }
+
+:is(ol, li)[type="1"] { list-style-type: decimal }
+:is(ol, li)[type=a] { list-style-type: lower-alpha }
+:is(ol, li)[type=A] { list-style-type: upper-alpha }
+:is(ol, li)[type=i] { list-style-type: lower-roman }
+:is(ol, li)[type=I] { list-style-type: upper-roman }
+:is(ul, li)[type=disc i] { list-style-type: disc }
+:is(ul, li)[type=circle i] { list-style-type: circle }
+:is(ul, li)[type=square i] { list-style-type: square }
+
+table[align=left i] { float: left }
+table[align=right i] { float: right }
+table[align=center i] { margin-left: auto; margin-right: auto }
+:is(thead, tbody, tfoot, tr, td, th)[align=absmiddle i] { text-align: center }
+
+caption[align=bottom i] { caption-side: bottom }
+:is(p, h1, h2, h3, h4, h5, h6)[align=left i] { text-align: left }
+:is(p, h1, h2, h3, h4, h5, h6)[align=right i] { text-align: right }
+:is(p, h1, h2, h3, h4, h5, h6)[align=center i] { text-align: center }
+:is(p, h1, h2, h3, h4, h5, h6)[align=justify i] { text-align: justify }
+:is(thead, tbody, tfoot, tr, td, th)[valign=top i] { vertical-align: top }
+:is(thead, tbody, tfoot, tr, td, th)[valign=middle i] { vertical-align: middle }
+:is(thead, tbody, tfoot, tr, td, th)[valign=bottom i] { vertical-align: bottom }
+:is(thead, tbody, tfoot, tr, td, th)[valign=baseline i] { vertical-align: baseline }
+
+:is(td, th)[nowrap] { white-space: nowrap }
+
+table:is([rules=none i], [rules=groups i], [rules=rows i], [rules=cols i]) { border-style: hidden; border-collapse: collapse }
+table[border]:not([border="0 i"]) { border-style: outset }
+table[frame=void i] { border-style: hidden }
+table[frame=above i] { border-style: outset hidden hidden hidden }
+table[frame=below i] { border-style: hidden hidden outset hidden }
+table[frame=hsides i] { border-style: outset hidden outset hidden }
+table[frame=lhs i] { border-style: hidden hidden hidden outset }
+table[frame=rhs i] { border-style: hidden outset hidden hidden }
+table[frame=vsides i] { border-style: hidden outset }
+table[frame=box i], table[frame=border i] { border-style: outset }
+
+table[border]:not([border="0"]) > tr > :is(td, th), table[border]:not([border="0"]) > :is(thead, tbody, tfoot) > tr > :is(td, th) { border-width: 1px; border-style: inset }
+table:is([rules=none i], [rules=groups i], [rules=rows i]) > tr > :is(td, th), table:is([rules=none i], [rules=groups i], [rules=rows i]) > :is(thead, tbody, tfoot) > tr > :is(td, th) { border-width: 1px; border-style: none }
+table[rules=cols i] > tr > :is(td, th), table[rules=cols i] > :is(thead, tbody, tfoot) > tr > :is(td, th) { border-width: 1px; border-style: none solid }
+table[rules=all i] > tr > :is(td, th), table[rules=all i] > :is(thead, tbody, tfoot) > tr > :is(td, th) { border-width: 1px; border-style: solid }
+table[rules=groups i] > colgroup { border-left-width: 1px; border-left-style: solid; border-right-width: 1px; border-right-style: solid }
+table[rules=groups i] > :is(thead, tbody, tfoot) { border-top-width: 1px; border-top-style: solid; border-bottom-width: 1px; border-bottom-style: solid }
+table[rules=rows i] > tr, table[rules=rows i] > :is(thead, tbody, tfoot) > tr { border-top-width: 1px; border-top-style: solid; border-bottom-width: 1px; border-bottom-style: solid }
+
+hr[align=left i] { margin-left: 0; margin-right: auto }
+hr[align=right i] { margin-left: auto; margin-right: 0 }
+hr[align=center i] { margin-left: auto; margin-right: auto }
+hr[color], hr[noshade] { border-style: solid }
+
+iframe[frameborder="0"], iframe[frameborder=no i] { border: none }
+
+:is(applet, embed, iframe, img, input, object)[align=left i] { float: left }
+:is(applet, embed, iframe, img, input, object)[align=right i] { float: right }
+:is(applet, embed, iframe, img, input, object)[align=top i] { vertical-align: top }
+:is(applet, embed, iframe, img, input, object)[align=baseline i] { vertical-align: baseline }
+:is(applet, embed, iframe, img, input, object)[align=texttop i] { vertical-align: text-top }
+:is(applet, embed, iframe, img, input, object):is([align=middle i], [align=absmiddle i], [align=absmiddle i]) { vertical-align: middle }
+:is(applet, embed, iframe, img, input, object)[align=bottom i] { vertical-align: bottom }