lino 25.1.6__py3-none-any.whl → 25.2.0__py3-none-any.whl

lino/utils/soup.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2016-2024 Rumma & Ko Ltd
+# Copyright 2016-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 # See https://dev.lino-framework.org/dev/bleach.html
@@ -8,7 +8,7 @@ import re
 from bs4 import BeautifulSoup, NavigableString, Comment, Doctype
 from bs4.element import Tag
 import logging; logger = logging.getLogger(__file__)
-from lino.api import dd
+# from lino.api import dd
 
 
 PARAGRAPH_TAGS = {
@@ -29,7 +29,6 @@ PARAGRAPH_TAGS = {
 
 WHITESPACE_TAGS = PARAGRAPH_TAGS | {
     "[document]",
-    "span",
     "ul",
     "html",
     "head",
@@ -37,6 +36,8 @@ WHITESPACE_TAGS = PARAGRAPH_TAGS | {
     "base",
 }
 
+SHORT_PREVIEW_IMAGE_HEIGHT = "8em"
+REMOVED_IMAGE_PLACEHOLDER = "⌧"
 
 class Style:
     # TODO: Extend rstgen.sphinxconf.sigal_image.Format to incoroporate this.
@@ -67,65 +68,139 @@ class Style:
         #     return
         if "width" in self._map:
             del self["width"]
-        self["height"] = dd.plugins.memo.short_preview_image_height
+        self["height"] = SHORT_PREVIEW_IMAGE_HEIGHT
 
     def as_string(self):
         return ";".join(["{}:{}".format(*kv) for kv in self._map.items()])
 
 
+# def truncate_soup(soup, max_length=None):
+#     elems = []
+#     found_image = False
+#     remaining = max_length or settings.SITE.plugins.memo.short_preview_length
+#     stop = False
+#     for ch in soup:
+#         if ch.name == "img":
+#             if found_image:
+#                 continue
+#             style = Style(ch.get("style", None))
+#             if not "float" in style:
+#                 style["float"] = "right"
+#             style.adjust_size()
+#             if style.is_dirty:
+#                 ch["style"] = style.as_string()
+#             found_image = True
+#             elems.append(ch)
+#             continue
+#
+#         if ch.string is not None:
+#             strlen = len(ch.string)
+#             if strlen > remaining:
+#                 stop = True
+#                 end_text = ch.string[:remaining] + "..."
+#                 ch.string.replace_with(end_text)
+#             elems.append(ch)
+#             remaining -= strlen
+#     if isinstance(ch, Tag):
+#         for c in ch.children:
+#             if c.name in PARAGRAPH_TAGS:
+#                 c.unwrap()
+#
+#         if stop:
+
+
 class TextCollector:
     def __init__(self, max_length=None):
         self.text = ""
-        self.sep = ""  # becomes "\n\n" after a PARAGRAPH_TAGS
+        self.sep = ""  # becomes " " after WHITESPACE_TAGS
         self.remaining = max_length or settings.SITE.plugins.memo.short_preview_length
-        self.image = None
+        self.found_image = False
 
     def add_chunk(self, ch):
-        # print("20230712 add_chunk", ch.name, ch)
-
+        # print(f"20250207 add_chunk {ch.__class__} {ch.name} {ch}")
+        # if isinstance(ch, Tag):
         if ch.name in WHITESPACE_TAGS:
+            # for c in ch.contents:
+            # for c in ch:
             for c in ch.children:
                 if not self.add_chunk(c):
                     return False
-            if ch.name in PARAGRAPH_TAGS:
-                self.sep = "\n\n"
-            else:
-                self.sep = " "
+            # if ch.name in PARAGRAPH_TAGS:
+            #     # self.sep = "\n\n"
+            #     self.sep = "<br/>"
+            # else:
+            #     self.sep = " "
+            self.sep = " "
             return True
 
-        assert ch.name != "IMG"
+        # assert ch.name != "IMG"
+        we_want_more = True
 
+        # Ignore all images except the first one. And for the first one we
+        # enforce our style.
         if ch.name == "img":
-            if self.image is not None:
-                # Ignore all images except the first one.
-                self.text += self.sep
+            if self.found_image:
+                # self.text += self.sep
+                self.text += REMOVED_IMAGE_PLACEHOLDER
                 return True
+            self.found_image = True
             style = Style(ch.get("style", None))
             if not "float" in style:
                 style["float"] = "right"
             style.adjust_size()
             if style.is_dirty:
                 ch["style"] = style.as_string()
-            self.image = ch
             # print("20231023 a", ch)
 
-        we_want_more = True
-        if ch.string is not None:
-            if len(ch.string) > self.remaining:
-                # print("20231023", len(ch.string), '>', self.remaining)
-                ch.string = ch.string[: self.remaining] + "..."
+        elif ch.string is not None:
+            text = ch.string
+            strlen = len(text)
+            # print(f"20250208b add_chunk {repr(ch)} len={strlen} remaining={self.remaining}")
+            # chop = self.remaining
+            if strlen > self.remaining:
                 we_want_more = False
+                # ch.string = ch.string[: self.remaining] + "..."
+                end_text = text[:self.remaining] + "..."
+                # raise Exception(f"20250208 {strlen} > {self.remaining} {end_text}")
+                if isinstance(ch, NavigableString):
+                    # ch = NavigableString(end_text)
+                    ch = end_text
+                else:
+                    ch.string.replace_with(end_text)
+                #     # ch = NavigableString(ch.string[:chop] + "...")
+                #     # self.text += self.sep + ch.string
+                #     self.text += self.sep + end_text
+                #     return False
+                # p = ch.string.parent
+                # previous_sibling = ch.previous_sibling
+                # ch = NavigableString(end_text)
+                # ch = previous_sibling.next_sibling
+                # raise Exception(f"20250208 Old {p} and new parent {ch.parent}")
+                # if isinstance(ch, NavigableString):
+                #     ch.replace_with(end_text)
+                # else:
+                #     ch.string.replace_with(end_text)
+                # self.text += self.sep + str(ch)
+                # for c in ch.children:
+                #     self.add_chunk(c)
+                # return False
+                # raise Exception(f"20250208 {end_text} -- {ch}")
+                # print(f"20250208c {repr(end_text)} in {ch}")
                 # print("20230927", ch.string, ch)
                 # self.text += str(ch.string) + "..."
-                # return False
-            self.remaining -= len(ch.string)
-
-        if isinstance(ch, NavigableString):
-            self.text += self.sep + ch.string
-        else:
-            self.text += self.sep + str(ch)
-
+                # self.remaining = 0
+                # return True
+                # return we_want_more
+            self.remaining -= strlen
+            # print(f"20250207c add_chunk {ch.__class__} {ch}")
+
+        # if isinstance(ch, NavigableString):
+        #     self.text += self.sep + ch.string
+        # else:
+        #     self.text += self.sep + str(ch)
+        self.text += self.sep + str(ch)
         self.remaining -= len(self.sep)
+        # self.remaining -= 1  # any separator counts as 1 char
         self.sep = ""
         return we_want_more
 
@@ -135,7 +210,8 @@ def truncate_comment(html_str, max_length=300):
     # new implementation since 20230713
     html_str = html_str.strip()  # remove leading or trailing newlines
 
-    if not html_str.startswith("<"):
+    if False:  # no longer need to test for specil case
+      if not html_str.startswith("<"):
         # print("20231023 c", html_str)
         if len(html_str) > max_length:
             return html_str[:max_length] + "..."
@@ -145,62 +221,17 @@ def truncate_comment(html_str, max_length=300):
     #     print(html_str)
     #     raise Exception("20230928 {} {}".format(len(html_str), max_length))
 
-    soup = BeautifulSoup(html_str, features="html.parser")
+    # soup = BeautifulSoup(html_str, features="html.parser")
+    soup = BeautifulSoup(html_str, features="lxml")
+    # soup = sanitized_soup(html_str)
+    # truncate_soup(soup, max_length)
+    # return str(soup)
+    # return "".join([str(s) for s in walk(soup, max_length)])
     tc = TextCollector(max_length)
     tc.add_chunk(soup)
     return tc.text
 
 
-
-def old_truncate_comment(html_str, max_p_len=None):
-    # returns a single paragraph with a maximum number of visible chars.
-    # No longer used. Replaced by new truncate_comment() below
-    if max_p_len is None:
-        max_p_len = settings.SITE.plugins.memo.short_preview_length
-    html_str = html_str.strip()  # remove leading or trailing newlines
-
-    if not html_str.startswith("<"):
-        if len(html_str) > max_p_len:
-            txt = html_str[:max_p_len] + "..."
-        else:
-            txt = html_str
-        return txt
-    soup = BeautifulSoup(html_str, "html.parser")
-    ps = soup.find_all(
-        ["p", "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "h9", "pre"]
-    )
-    if len(ps) > 0:
-        anchor_end = "</a>"
-        txt = ""
-        for p in ps:
-            text = ""
-            for c in p.contents:
-                if isinstance(c, Tag):
-                    if c.name == "a":
-                        text += str(c)
-                        max_p_len = max_p_len + len(text) - len(c.text)
-                    else:
-                        # text += str(c)
-                        text += c.text
-                else:
-                    text += str(c)
-
-            if len(txt) + len(text) > max_p_len:
-                txt += text
-                if anchor_end in txt:
-                    ae_index = txt.index(anchor_end) + len(anchor_end)
-                    if ae_index >= max_p_len:
-                        txt = txt[:ae_index]
-                        txt += "..."
-                        break
-                txt = txt[:max_p_len]
-                txt += "..."
-                break
-            else:
-                txt += text + "\n\n"
-        return txt
-    return html_str
-
 # remove these tags including their content.
 blacklist = frozenset(["script", "style", "head"])
 
@@ -234,16 +265,15 @@ ALLOWED_TAGS = frozenset([
     "tbody",
 ])
 
+GENERALLY_ALLOWED_ATTRS = {"title", "style", "class"}
 
-# Map of allowed attributes by tag. Copied from bleach.sanitizer:
+# Map of allowed attributes by tag. Originally copied from bleach.sanitizer.
 ALLOWED_ATTRIBUTES = {
-    "a": {"href", "title"},
-    "abbr": {"title"},
-    "acronym": {"title"},
+    "a": {"href"} | GENERALLY_ALLOWED_ATTRS,
+    "img": {"src", "alt"} | GENERALLY_ALLOWED_ATTRS,
 }
 
-ALLOWED_ATTRIBUTES["span"] = {
-    "class",
+ALLOWED_ATTRIBUTES["span"] = GENERALLY_ALLOWED_ATTRS | {
     "data-index",
     "data-denotation-char",
     "data-link",
@@ -251,28 +281,25 @@ ALLOWED_ATTRIBUTES["span"] = {
     "data-value",
     "contenteditable",
 }
-ALLOWED_ATTRIBUTES["p"] = {"align", "style"}
+
+ALLOWED_ATTRIBUTES["p"] = GENERALLY_ALLOWED_ATTRS | {"align"}
 
 # def safe_css(attr, css):
 #     if attr == "style":
 #         return re.sub("(width|height):[^;]+;", "", css)
 #     return css
 
-def sanitize(old):
+def sanitized_soup(old):
 
     # Inspired by https://chase-seibert.github.io/blog/2011/01/28/sanitize-html-with-beautiful-soup.html
 
-    old = old.strip()
-    if not old:
-        return old
-
     try:
         soup = BeautifulSoup(old, features="lxml")
     except HTMLParseError as e:
-        logger.info("Could not sanitize %r : %s", old, e)
+        logger.warning("Could not sanitize %r : %s", old, e)
         return f"Could not sanitize content ({e})"
 
-    for tag in soup.findAll():
+    for tag in soup.find_all():
         # print(tag)
         tag_name = tag.name.lower()
         if tag_name in blacklist:
@@ -282,11 +309,8 @@ def sanitize(old):
             tag.unwrap()
         elif tag_name in ALLOWED_TAGS:
             # tag is allowed. Make sure all the attributes are allowed.
-            allowed = ALLOWED_ATTRIBUTES.get(tag_name, None)
-            if allowed is None:
-                tag.attrs = dict()
-            else:
-                tag.attrs = {k: v for k, v in tag.attrs.items() if k in allowed}
+            allowed = ALLOWED_ATTRIBUTES.get(tag_name, GENERALLY_ALLOWED_ATTRS)
+            tag.attrs = {k: v for k, v in tag.attrs.items() if k in allowed}
         else:
             # print(tag.name)
             # tag.decompose()
@@ -298,7 +322,7 @@ def sanitize(old):
             tag.attrs = dict()
 
     # remove all comments because they might contain scripts
-    comments = soup.findAll(text=lambda text:isinstance(text, (Comment, Doctype)))
+    comments = soup.find_all(text=lambda text:isinstance(text, (Comment, Doctype)))
     for comment in comments:
         comment.extract()
 
@@ -308,4 +332,13 @@ def sanitize(old):
         if main_tag.name in useless_main_tags and not main_tag.attrs:
             main_tag.unwrap()
 
-    return str(soup).strip()
+    return soup
+
+def sanitize(s):
+    s = s.strip()
+    if not s:
+        return s
+    # do we want to remove whitespace between tags?
+    # s = re.sub(">\s+<", "><", s)
+    # return sanitized_soup(s).decode(formatter="html").strip()
+    return str(sanitized_soup(s)).strip()

{lino-25.1.6.dist-info → lino-25.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.1.6
+Version: 25.2.0
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino

{lino-25.1.6.dist-info → lino-25.2.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 lino/.cvsignore,sha256=1vrrWoP-WD8hPfCszHHIiJEi8KUMRCt5WvoKB9TSB1k,28
 lino/SciTEDirectory.properties,sha256=rCYi_e-6h8Yx5DwXhAa6MBPlVINcl6Vv9BQDYZV2_go,28
-lino/__init__.py,sha256=0yrHbVQ2XWyabku43gsxie9HdEs3B8JvaUfMah_yJXM,5584
+lino/__init__.py,sha256=L5fEz8yXvX5li-Ml36neDQc_SmeIeUm_wFYZp0vr_l4,5584
 lino/ad.py,sha256=AQ-vJ4scac1mx3xegXezxnxyOQpV-a0q3VFMJSDbj2s,142
 lino/apps.py,sha256=ECq-dPARDkuhngwNrcipse3b4Irj70HxJs44uWEZFc4,27
 lino/hello.py,sha256=7-PJg7PnEiznyETqGjOwXcKh8rda0qLetpbS2gvRYy0,532
-lino/help_texts.py,sha256=xLCUrDYM6fiYJSevxi6iq8xAO7XyKikm29HEJMv8HLo,90895
+lino/help_texts.py,sha256=WgZHe3ntyEtZ0LiKSIMMEH6OYHq4bFDKj-noKw7LYVQ,91195
 lino/api/__init__.py,sha256=WmzHU-rHdZ68se_nI0SmepQTGE8-cd9tPpovHRH9aag,512
 lino/api/ad.py,sha256=F6SrcKPRRalHKOZ7QLwsRWGq9hhykQIeo0b85cEk9NQ,314
 lino/api/dd.py,sha256=-mjuoflZilnFM97we-N1H_sEf1TQiNs62JwZ5m4XV1s,7813
@@ -28,10 +28,10 @@ lino/config/unused/403.html,sha256=ePwDIUXhz1iD8xXWWyt5xEvpcGIHU4LMnXma8x0ik1c,2
 lino/config/unused/404.html,sha256=GOJrAyF6NcM69ETdSHgjff_-lvYs_-bOYhyZBem7x3I,220
 lino/config/unused/500.html,sha256=aWmP37uPoMS-PJgPuBloxdx0nEreU7AvkXxsex3yVYs,544
 lino/core/__init__.py,sha256=T7106QxQpa3jXAouGTIer6AXEwpkJ0NAQ9B7Q3-K6qE,686
-lino/core/actions.py,sha256=B8jCkE__GNIL820LCc10yOzJ7inCUyxn9u1KupS9y84,46398
-lino/core/actors.py,sha256=lsp-w2kC_t_-iqeHtIYIkIPoS_jbHgZ3MZlGJWH2dyc,73663
+lino/core/actions.py,sha256=2QGQYpjQ_Fyvb3wb4TBGj8GO4f857aQ3YX3Uz6u15dw,46622
+lino/core/actors.py,sha256=0MhLLWf3uXzO5nEV5D8Bc12dedlgLCWVBo4WcJyLQCc,73865
 lino/core/boundaction.py,sha256=tb0C4WwbJpAP3yKbR6OaibzcAkwVs3nfeuD0RjXTjIg,6665
-lino/core/callbacks.py,sha256=xkosb1l48o6WeSdj82k5udK9OmjI7-p6x4AJFjXiOf8,7518
+lino/core/callbacks.py,sha256=uu1-znzxVDD-JETUebw-hYsNg_9ExQb1vfwbc7Psjro,7549
 lino/core/choicelists.py,sha256=8FpmfEREj0jITkx3qihjPfg8pPMBHWXprNfuje4b7N4,36525
 lino/core/classproperty.py,sha256=_E95WPAs7BWbAuFpPvoYM2ZwW_mbq3rvF7o43WsMq_8,4316
 lino/core/constants.py,sha256=chvG1TrwD2gVMmL4nTOZtO8NcffcclcUv3zBE8mMoiQ,4503
@@ -42,25 +42,25 @@ lino/core/ddh.py,sha256=dYScxWKTOCDEgow7wJNJe812ESasmmITPK2ovraBQno,3172
 lino/core/diff.py,sha256=XQ-oQQDS_v3kXd4eRP9Hwr5UCgp-TPZIPVav9ZblUno,5882
 lino/core/elems.py,sha256=wgRDDDHlEjN1el37Mgt8yvsLlLNgunr4_vSA4iFLsUM,108454
 lino/core/exceptions.py,sha256=QDxDo5cllSyXQ8VWet9hGXzNadxCOmwMVrFXc6V-vpE,665
-lino/core/fields.py,sha256=0vK0F4LCqwwjLXA3sA7qG4jR9OvQF9EgIDVcsac9Qh0,57335
+lino/core/fields.py,sha256=C14cCHHJclk0z6NlJFRPyXPJaVS1DhngQLTE6gPR0BE,57407
 lino/core/frames.py,sha256=ISxgq9zyZfqW3tDZMWdKi9Ij455lT_81qBH0xex0bfE,1161
 lino/core/gfks.py,sha256=6VXn2FSIXOrwVq0stfbPevT37EWg1tg4Fn-HMNVnbmk,1970
 lino/core/help.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/core/inject.py,sha256=o9pHxWBuo15vpGN5pwCsWVNk2awrMuBigOHiua78v4I,13413
 lino/core/kernel.py,sha256=gqx1dqVpahdxNPejLcVm9c7JX3qlajosEJ-yEQTgHCU,48275
-lino/core/keyboard.py,sha256=imdO-J5npZijtddhM2C7CLo2K6Hp30egsXgOOa4-AqQ,1137
+lino/core/keyboard.py,sha256=W3jA6qtB5HMppoNnd_6PgIM7ZlyHilJEhBvdeZTY7Xk,1283
 lino/core/layouts.py,sha256=Wojx5UUyhy7PsZE8FWmiXcmZDj4wz2y_1_wlz1G560Q,28663
 lino/core/menus.py,sha256=BoPtcqtTB1-ADp3ffnzEXyIx8lQ4HLaZWxo0eQrj-T4,10850
 lino/core/merge.py,sha256=sKtTeZtHdoDKerdHj4NXuXXNzpKDsfdPaiq-CY0NqQc,9094
-lino/core/model.py,sha256=MNTlg53WbKXPIne5wOHtO5V3nLdxoYTBMosz9JdFQJU,36386
+lino/core/model.py,sha256=wKxb0bWi_5FgcZn8Pz-bjDGo-5Y1cwOVTZPrJbv5ljQ,36408
 lino/core/permissions.py,sha256=Fnemz3NwWz21X0YATI9Q7ba2FcAdg-EMLHjIcbt_AVU,6840
 lino/core/plugin.py,sha256=oVvTsGoBBYmjvRgtyiFPIiHZQErH0ZlNjiUFtOk2dOM,6834
 lino/core/renderer.py,sha256=jIXxNSpljZhb9tBMhUfDNbZD3XmxYzaS6SlipHx29L4,47291
-lino/core/requests.py,sha256=DAen9Jys3RfDMRQNbQFAo_h7iUipe7khhXTVT4RvcNY,92822
+lino/core/requests.py,sha256=23pQckFF-R9IBfN7KVItlCodiKeGdmDH-UPOyR0N69M,92887
 lino/core/roles.py,sha256=PXwk436xUupxdbJcygRSYFu7ixfKjAJPQRUQ8sy0lB0,4425
 lino/core/signals.py,sha256=0JT89mkjSbRm57QZcSI9DoThoKUGkyi-egNhuLUKEds,948
-lino/core/site.py,sha256=lEPAEF4OyBsF8NLy3y9O0GOcC5C1REc9ug9mIZR-mIs,83150
-lino/core/store.py,sha256=6B_sYwkIKuIRsibx8iRrICyqJggqHh7pMC5K3-e7k7I,51372
+lino/core/site.py,sha256=s_kisoL35ZcbFbF18eyvARu7OcNA_61GPE3-_6rNJIc,83136
+lino/core/store.py,sha256=eQyahBvsMvX2K_lJvJGSATLV0SGOOCfqpf0JDJprNNw,51351
 lino/core/tables.py,sha256=VXfUDENJ-Zl6M3tRvEdLr1LGjmJcAmwXUWSG4EWLFDE,24413
 lino/core/urls.py,sha256=06QlmN1vpxjmb5snO3SPpP6lX1pMdE60bTiBiC77_vQ,2677
 lino/core/user_types.py,sha256=0iSYmzr2M9v2Mn2y6hzAZeqareUT-gD7l3MfIPyG9ZI,867
@@ -76,28 +76,28 @@ lino/core/auth/middleware.py,sha256=1c_z4lP_Rhbw7pdCapprGkjIXX40OJgIlFyQew4O-Nc,
 lino/core/auth/utils.py,sha256=Nv7QbINYi64hGZZxV-Ix1iwhrb_KOfUfhJXAzoKy2ng,4130
 lino/core/management/__init__.py,sha256=fp1cONBXgq1IftPk5c4b63gRlYOWpT5VzCIKrx0aGlE,61
 lino/fake_migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lino/locale/django.pot,sha256=d0LUP8ZhnGMBdClIcDMAeSO2RapiJJLXVH9nBTxVnyc,151864
+lino/locale/django.pot,sha256=dHb03JkAaWWR22EfURJE5JBiFUbcyJ6jwwZ5ASh-Dps,152924
 lino/locale/bn/LC_MESSAGES/django.mo,sha256=ygs6NvTycQXv5Dwl8bpyy13u-uMIcNK2-xpJM3zSy3Y,14893
-lino/locale/bn/LC_MESSAGES/django.po,sha256=k9JbY2wzq65ngU3IW9LdQNFvlLyv4QWs-4lLZ9NZNfU,191106
-lino/locale/de/LC_MESSAGES/django.mo,sha256=uPHl6I7G3nZ1AtEJAw6t8JneOzaDpsr1q13IDUxCvUc,27199
-lino/locale/de/LC_MESSAGES/django.po,sha256=lnz8LmtWfdxPdMZKVaR5HzL02bktibrUbJ3CEl66qDI,166337
+lino/locale/bn/LC_MESSAGES/django.po,sha256=DCTpcQcLOTC4DpA4NRvYoLVv5_Yvpp804BnjQgX6roM,192740
+lino/locale/de/LC_MESSAGES/django.mo,sha256=iLKQzGYhaGPt9rUvOmbv-oJQA99SHZgdvtECCjEqS7o,27552
+lino/locale/de/LC_MESSAGES/django.po,sha256=OWtq6Xr7u1me7oqkuetAUr7vjqpU-iIZWFqKxp29KUk,167411
 lino/locale/es/LC_MESSAGES/django.mo,sha256=r2zi4aulC-1zX1XcoGddo0mpdOpuuOpUxpWxGoYh8qc,2357
-lino/locale/es/LC_MESSAGES/django.po,sha256=JKSABlHW8LZFD6oK9Oh-gw9hwCAlfZjDg1Nl2nZUkTE,153744
+lino/locale/es/LC_MESSAGES/django.po,sha256=0ZILbxeYQJ8nru55rqWK6-3Oty2WvIbzZovvKWV8gqw,155257
 lino/locale/et/LC_MESSAGES/django.mo,sha256=1RH5dX6YOBgk2tX_xpkriBRDh6qkxJDPrWysVeio_eM,5519
-lino/locale/et/LC_MESSAGES/django.po,sha256=0jGqXMllcz_7-T2S-lSeR-BeTMfI4_Rgz1h5Jy_D1xE,217301
+lino/locale/et/LC_MESSAGES/django.po,sha256=1g1z5CWOZTWxKqJax7vaa4x5a8ndY5vuyPuZwysn5kc,218934
 lino/locale/fr/LC_MESSAGES/django.mo,sha256=N7TxEPKmUBjDLu-EabjGUm1VB-CqKjZH1AzRRJ2M5OM,18078
-lino/locale/fr/LC_MESSAGES/django.po,sha256=xRP1JGSmqAk3IuCohb6qCtUsokA90oaEj701WX-qhJ4,162550
+lino/locale/fr/LC_MESSAGES/django.po,sha256=hzwUrF6zQc6Uvr7b_3ygpOh-M7ogsjhXnkfB9e858VQ,164385
 lino/locale/nl/LC_MESSAGES/django.mo,sha256=cQ3DTQqc4dbwrAdm5d95Kf4pDoYqKdMdElAaRerC0XA,8115
-lino/locale/nl/LC_MESSAGES/django.po,sha256=u_oZzTdxdEdyMKAJfNVI3Vm1D-uKPCKYDPSXa1vn_qc,339218
+lino/locale/nl/LC_MESSAGES/django.po,sha256=1fmmyBEEPuLpsLQMRbBEHotcf7lDWvkksKU11ZgQNkk,340860
 lino/locale/pt/LC_MESSAGES/django.mo,sha256=OCKgnomRXLl_QsikdFsqUwKXkVexvLvSWf5kizPJrRE,42461
 lino/locale/pt/LC_MESSAGES/django.po,sha256=pMhpgCeuj2O7G37gDSr-8jdAKs1P3hEy-K2Lg-GbCIU,80311
 lino/locale/pt_BR/LC_MESSAGES/django.mo,sha256=OCKgnomRXLl_QsikdFsqUwKXkVexvLvSWf5kizPJrRE,42461
-lino/locale/pt_BR/LC_MESSAGES/django.po,sha256=UnAroqpeLJFO6ESmktwxfV_9-pD2E7TA_XiuPSxzcqg,152771
-lino/locale/zh_Hant/LC_MESSAGES/django.po,sha256=KWejkd_imTiK-SX6BG_bfEGtGIWEQ-bxGqOXLEXAHF0,152693
+lino/locale/pt_BR/LC_MESSAGES/django.po,sha256=61QR27iyU4ZXcErTj5DZj7GlyL-Fpwmn3E-tbXq1hyI,154284
+lino/locale/zh_Hant/LC_MESSAGES/django.po,sha256=JeP8cSTQ5bjX12Nr3EcCVhIaR-1pBYls5qSYv8iFRDs,154206
 lino/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/management/commands/__init__.py,sha256=raVDRiXns3SegyXEhaLZMcxfEDs7ggy2nFUN5D0f5F0,47
 lino/management/commands/buildcache.py,sha256=QjhvKKdp1mX6rl8Y5rcS6kUK2LVOBVAd6wrUKLYSGF8,448
-lino/management/commands/demotest.py,sha256=zb9gSrgqOH2S-OJSKUNezprUEbJLBQf8tVGSVdSENik,5017
+lino/management/commands/demotest.py,sha256=yvxpl1G0Clt-iu7lY0DK9HVhaWyl_tQhYx0YUpddTWM,5041
 lino/management/commands/diag.py,sha256=vt-NlZUx5gf7T4EpbM-gle3tAwMuwfPQY8lUgxjFaUw,478
 lino/management/commands/dump2py.py,sha256=DyvhXYPJY7-Tt_xyw4_U5WjVeobcOU5AhWRZB6l4esI,20329
 lino/management/commands/dump_settings.py,sha256=tGOR4h_ueVe2DOk84ILFvzvndt0doshvaxRkybB-rnY,2009
@@ -116,7 +116,7 @@ lino/management/commands/run.py,sha256=MiK53KIACYKDTKF6knJGwU-uzEApGnDxByi-3_nrT
 lino/management/commands/show.py,sha256=dS_TotAEeH8zo_wufQgca6q0Yj9qeWsJUOUcss6YD7E,1439
 lino/management/commands/syncscreenshots.py,sha256=XYZhqfm5_RwJzVFNGhHJKucl4j6T6mYo2GsDaUzvjAs,1561
 lino/management/commands/update_conf.py,sha256=saAaQdPhn3mNOoHcBxOFSf_vBEgM-aopTHq1sJN20Bo,1026
-lino/mixins/__init__.py,sha256=cSFXzy8i0Akp9PmUSJz8E5t3twO3Z2lyCTyTCEqAQSU,8931
+lino/mixins/__init__.py,sha256=ADIq0rPGlAY4ifSaMvqahXvCMnbFzq2qAWcyyUkx4Ds,8930
 lino/mixins/dupable.py,sha256=ofyYrcT9WiYdVTkzgXyXaBu1kS-y197YnFTnZNALUHo,10233
 lino/mixins/duplicable.py,sha256=lQ5SEQmxPcOU9vETocgQI41uzgvunvXIy7HAnPeKDUI,4224
 lino/mixins/human.py,sha256=YDIfIHHAaVmzd3uGsJp_vDvkaBWOp09I7i4AGNy9YsQ,13255
@@ -164,8 +164,8 @@ lino/modlib/changes/__init__.py,sha256=3-CO7xI-U-rKDu_-WJg7N4FaIgqmFcj81uzyQlNYr
 lino/modlib/changes/models.py,sha256=kx3BGV82VWu1rA9N393zjPpPvy-k55NbOvV7KI1gfYc,9340
 lino/modlib/changes/utils.py,sha256=4jz8QXgaBxfmCBUvDeZeh7lkdwfTq7OBXBiFhMmANqA,2550
 lino/modlib/checkdata/__init__.py,sha256=raUCoYi4WZLKVLG3GqH0ml1eH_YJXqY-EgXsKUe6iRY,2829
-lino/modlib/checkdata/choicelists.py,sha256=kJBzlojZ05ZqahlopolRwsuNH5M99A7euRgE9K_h2ak,5135
-lino/modlib/checkdata/models.py,sha256=Z4hJ9Q7ox2ovLDHlX1MGwi-WfRkB4JQpMl6usPGMidg,11547
+lino/modlib/checkdata/choicelists.py,sha256=OGv3mmr5DPPahoBliAOFIx_H6ysuW3ZpcrI4fIq1SB0,5244
+lino/modlib/checkdata/models.py,sha256=3xXd1opiOjIlWtSQd1jg1XoLU8ZbGrkjbw0vDD7J2SE,11639
 lino/modlib/checkdata/roles.py,sha256=xjQ882-BxYUoHbv2pzebs7MWl6snA2fKivFDTRzW7sQ,295
 lino/modlib/checkdata/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/checkdata/fixtures/checkdata.py,sha256=TY9yIBwB5nEw0e6RTXqRwYdiCaLkkYTwWmFGcVBw2ow,332
@@ -3496,7 +3496,7 @@ lino/modlib/gfks/fields.py,sha256=43yIsudT07bXuKD1Gsqvn15_F3UaeZQqZzuzK9dDdLc,32
 lino/modlib/gfks/mixins.py,sha256=BcITVETBR7zVj684diZGCii3rzm7lgrgzr2euy-D-iw,2626
 lino/modlib/gfks/models.py,sha256=bDbuvtpSW-wxNWLC3pKWsDQPyN4g6MFMTS-66aQ2DX8,6723
 lino/modlib/help/__init__.py,sha256=PlThatoYB6lThNahWkVL2ZatimW0d_9LAPTZIE7hiuE,4434
-lino/modlib/help/models.py,sha256=8CPqo3h5Nf4OHcJDG_OnF_4qeAOCKzPzz1q0enqd9J0,3283
+lino/modlib/help/models.py,sha256=Ik-fkUH8KHiPajar-SYCbuaQGfIbbgfI6-9rMkr1Np8,3497
 lino/modlib/help/utils.py,sha256=dWmz0huCw7N4ENIsCUoGiXyn3AbkE96jVR4YwyzPjjo,3944
 lino/modlib/help/config/makehelp/actor.tpl.rst,sha256=Yl-ZAWvI93cVFLd7GG-qpn_vkGFvKe3iR0eWBJpHgMc,346
 lino/modlib/help/config/makehelp/actors.tpl.rst,sha256=wXMKYQnlhLi432QggVgRUWGuHRDiSX9NyXSdnSar7Io,249
@@ -3516,7 +3516,7 @@ lino/modlib/importfilters/__init__.py,sha256=i_eUIwJSRHlSFJueqxBkApcIWOdW-bb1xwp
 lino/modlib/importfilters/models.py,sha256=iESoL9hwcYG1TzfCbBCqhJS2tzFw5M3gVNgrCULkSWM,3227
 lino/modlib/ipdict/__init__.py,sha256=n2fkShCZ-KIztazI_JQztJBBgg3c2GeIIh-5Q6ukZmA,1169
 lino/modlib/ipdict/models.py,sha256=9-pjj_xXdndhQaQI8sgXcmODxurST_aFcShGwomiYKk,1774
-lino/modlib/jinja/__init__.py,sha256=myTllY0VudAdqduK-xIMcbs08DwRbDSCkrAxZVmVdxA,3570
+lino/modlib/jinja/__init__.py,sha256=XSa-e1qZGabl8EmRDKPRtmzgBRole5ZbxAUBR_m-ds0,3418
 lino/modlib/jinja/choicelists.py,sha256=QHjWQWLnJCKSGnLIKeGqnCw41JYvcbTkCeXjBpWh23w,1466
 lino/modlib/jinja/loader.py,sha256=MX027X_UuQPqq0wOUr06QnOkdTzGpksNv0Om1CGp61I,1765
 lino/modlib/jinja/renderer.py,sha256=yywxocrNYSPvUcMjuYw9guiPoq50lfaIKkJOP_PHg5o,6142
@@ -3541,7 +3541,7 @@ lino/modlib/linod/utils.py,sha256=dE973Xib6Be1DvNsZ0M5wzY_jpkk35R21WKs-jQPorM,33
 lino/modlib/linod/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/linod/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/linod/management/commands/linod.py,sha256=9-zRm-Xgp3uWj6AlDZpjtzo_TqSPyxIkKIrI_jshxVI,3457
-lino/modlib/memo/__init__.py,sha256=JEfB1Zb31d32gjfx7AQRBYwb4Z6YARc3hyRkYcRPaEk,5245
+lino/modlib/memo/__init__.py,sha256=Kghjmlz0y1km6SFq5m9nbDqD3CKfSplj57rso3IevLk,5247
 lino/modlib/memo/mixins.py,sha256=Wv844JL6WyvYI56QqcCdiHq8nocs8xcIM_eNzaWu3So,10919
 lino/modlib/memo/models.py,sha256=2UbKaixPWCnP1ZkoJx_DDTtltpfYVbU3uJ1hmsZDU8A,3146
 lino/modlib/memo/parser.py,sha256=lOSoXY5nj_CaM3jdd2e2s7-MbXCGRQu3SxQ3d1CMkEE,12994
@@ -3574,8 +3574,8 @@ lino/modlib/office/__init__.py,sha256=rOKD9zKt-VBvFFqoHBioNp299Igb1Sk2n466iCt6AS
 lino/modlib/office/roles.py,sha256=oQWTZ-_9_vssc9QW5A0YspMjG_V5gCiHSU0eE0AIH30,356
 lino/modlib/periods/__init__.py,sha256=MFTI4YTYw3zTxYVlD568rBxn02e_J9Yn10uZ6U5W-uQ,1069
 lino/modlib/periods/choicelists.py,sha256=_t_l40FlXYAyRnlOZzh4DR5wMCM1nIWiIfS7QKbXkmw,1304
-lino/modlib/periods/mixins.py,sha256=2iHH3EMsGhhh35CvEdh_QjlUDrM-V9VuZJq8lkt5bM4,5009
-lino/modlib/periods/models.py,sha256=UGaK6qbmkEuXmp8n8SIuwCxfswLXRNLuR-SqOfASTn4,7336
+lino/modlib/periods/mixins.py,sha256=QQXtu1Z6HjqDlL_xMM98FR7PQGKhYgjslhusOiWwPDA,4271
+lino/modlib/periods/models.py,sha256=hu1myxDqrBMIiORNYWBpAIDz-WjDe3LmF2JhrvG6DeI,8444
 lino/modlib/periods/fixtures/std.py,sha256=iV6a2DNAhfYvO1VspGkcncEmygHK94zWdDZlHUY8JSw,881
 lino/modlib/printing/__init__.py,sha256=u1fq44d073-IDH_t8hWs1sQdlAHdsCP85sfEOMSW5L4,689
 lino/modlib/printing/actions.py,sha256=CME19ZC6lYWO5qGoVX1b8P4q_wHSwvV19ELKEquMLJs,11704
@@ -3634,7 +3634,7 @@ lino/modlib/summaries/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 lino/modlib/summaries/management/commands/checksummaries.py,sha256=hNEGFcZmbGFpL_H6aKAkdhL_Gw_mE8l-C2NYHvH4Bvo,839
 lino/modlib/system/__init__.py,sha256=cXb8cPBr3t18mXtiY_ScqscdUgd6MvSrsHebfqY-SHk,1407
 lino/modlib/system/actions.py,sha256=jmSYPQDvIQxDth8MaJ9GpkmSCufLGWjmAjKdHAIWE48,1126
-lino/modlib/system/choicelists.py,sha256=JRv_NQ6xHMFFNBkoGgu53CBLmAI3bBShzEc0JmGo61U,9534
+lino/modlib/system/choicelists.py,sha256=u9Y2e_lZxFS_SMe-MDeOCNOfHc1PtQ6OjdPG9WwpaGk,9512
 lino/modlib/system/mixins.py,sha256=fpj0O1218KgwGhRr8IHYRBXsNt5uXN87qVrx7dxvjys,19031
 lino/modlib/system/models.py,sha256=30HT4M6o_jyYgZ5hLSRf6Inc0nuhxAsHQvLfPtvkFhM,10837
 lino/modlib/system/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -4600,7 +4600,7 @@ lino/utils/addressable.py,sha256=o7bmLbyvrmOoAT478s7XqjWKvnZ7zSXj4k7Xf0ccqf8,221
 lino/utils/ajax.py,sha256=npCS0WumhTQlBzXxQPKnp2sYCRcPsYcbFqzE2ykVc4Q,3254
 lino/utils/choosers.py,sha256=9jjeLz-QcWVBfR8_GdY4PNYoqIYM63OI3OvOL2l1ZaU,17604
 lino/utils/code.py,sha256=-2vc8npHQ5jsrRqzxmjRZZ8FWY7QJ7-sRg7-ZhOsUEU,7053
-lino/utils/config.py,sha256=wkegrAmExYSNOGa8MIIg_fhjtQhzTnsHGom0a0HOf_Y,8456
+lino/utils/config.py,sha256=gtaJURPOwHyV_AW7i7_vin3KTj3UwZa4iviDbldwXGE,8568
 lino/utils/cycler.py,sha256=2LGMhMJX5At5ln4yZvmNleWROs-CA_YE_UCzxzvxK4U,1548
 lino/utils/daemoncommand.py,sha256=NjGShiz09fddIV0WU0jK2nzO_CwPj1MfdmgwAOYZi4M,11525
 lino/utils/dataserializer.py,sha256=-_xHXaGwDSO6-sYEHEa2BtEmKS8bW6gsYx4dV-GbvDs,3779
@@ -4609,7 +4609,7 @@ lino/utils/dbfreader.py,sha256=4sXOGBKX6DFQCEPkCMfnJAVneHMyDzJQB5tsYAq90vQ,12205
 lino/utils/dblogger.py,sha256=kr0YxQY6veymvNg5A4tsvkqW8haRWdwqL0C-_9_QTg0,721
 lino/utils/diag.py,sha256=evkU818hZSGpWdL0Du11QakT5_frvc5z4C93IEBlECg,18307
 lino/utils/djangotest.py,sha256=Phz1qNp0wDonZRja5dxbCk0Xl3a73gZNiKK8v9tAgZg,8334
-lino/utils/dpy.py,sha256=4bNIxc05bpJHa4--fo540yg7sUZ7x5QriSPzW2KwFWk,20190
+lino/utils/dpy.py,sha256=Hw4ofFnhRPAE2PsPf9r5RpzcfVLQdIjtOe-XtMMLtuE,20661
 lino/utils/format_date.py,sha256=HZ3wbN-1OjhawYG8-w2_TwgT33yYDuUvU877j-3QX7Q,2888
 lino/utils/html.py,sha256=pcE0UQmdQGxxmb-p0mBb47zNbRMXLP9cxxrXTLs4gbY,3143
 lino/utils/html2odf.py,sha256=Hxw4HiIHY1ZCjb4_JLykVHbr6yAMhhHrnrCnLNDYKAs,4826
@@ -4636,7 +4636,7 @@ lino/utils/restify.py,sha256=QMVQXrmjDl6PPC7HJJGeDm125pcvrZKvcMpiscaPrsw,14066
 lino/utils/screenshots.py,sha256=T-szKC3EJfo4JcLio8Jj0xqaoSuJcZG6Jf9EF_B8WDQ,2040
 lino/utils/sendchanges.py,sha256=fcSqRyI3l8sEf9_LSqIyWGML6CORoYkjcFp2bs-YNlY,7097
 lino/utils/socks.py,sha256=0d67FDbrJ7PXl4AYzNNZgwCzV-fzIAAtWGxMEB7dw78,538
-lino/utils/soup.py,sha256=zxNF7a4EoSEqkcP9jHu9tpQABd8zseemgOTNTNN3wzQ,8814
+lino/utils/soup.py,sha256=__Bt9WDoayUGPi98EzBrD3dlbVp_NNrD9_irB7yUugc,10753
 lino/utils/sql.py,sha256=kwCgv5E3n7uLjpXOEiaF2W2p8LeGXcP39xgtnqvzTP8,6795
 lino/utils/sqllog.py,sha256=kUCnBfFjExhItJ1w76WT9VWPaWWq8NQM-kSIMIIZnRU,3282
 lino/utils/ssin.py,sha256=Wo-9M0pG0uEYEGvmz8N--iRIqJe3ETtgLOXoung7qlE,4232
@@ -4649,8 +4649,8 @@ lino/utils/xml.py,sha256=4Z44W1e5HvTVrU8erkohgnwqY-5Cr2NHywaAJ5OgRvw,989
 lino/utils/mldbc/__init__.py,sha256=QqWRlzeXaOmFfbCk-vTY3SZMn1-FCf67XnpZdd_Nim0,1134
 lino/utils/mldbc/fields.py,sha256=tAX8G5UKigr9c6g0F3ARIjZZtg406mdaZ--PWSbiH9E,2873
 lino/utils/mldbc/mixins.py,sha256=CkYe5jDa7xp9fJq_V8zcZf8ocxgIjUgHc9KZccvA_Yw,1945
-lino-25.1.6.dist-info/METADATA,sha256=WqVqvSO_n0TLfSy-ydW7pz01iQW5IDz8nz90x5fge4I,42534
-lino-25.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lino-25.1.6.dist-info/licenses/AUTHORS.rst,sha256=8VEm_G4HOmYEa4oi1nVoKKsdo4JanekEJCefWd2E8vk,981
-lino-25.1.6.dist-info/licenses/COPYING,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-lino-25.1.6.dist-info/RECORD,,
+lino-25.2.0.dist-info/METADATA,sha256=2neMBuGZIjjgExyCMaMWrx3LMHo9UAVl_urM7nCHE70,42534
+lino-25.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lino-25.2.0.dist-info/licenses/AUTHORS.rst,sha256=8VEm_G4HOmYEa4oi1nVoKKsdo4JanekEJCefWd2E8vk,981
+lino-25.2.0.dist-info/licenses/COPYING,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+lino-25.2.0.dist-info/RECORD,,