tesorotools-python 0.1.5__tar.gz → 0.1.6__tar.gz

{tesorotools_python-0.1.5 → tesorotools_python-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: tesorotools-python
-Version: 0.1.5
+Version: 0.1.6
 Requires-Python: >=3.13
 Requires-Dist: babel>=2.17
 Requires-Dist: matplotlib>=3.10

{tesorotools_python-0.1.5 → tesorotools_python-0.1.6}/src/tesorotools/artists/_common.py

@@ -24,6 +24,7 @@ overrides only need to update ``plots.yaml``.
 from __future__ import annotations
 
 import math
+import warnings
 from collections.abc import Sequence
 from pathlib import Path
 from typing import Any, Literal, Protocol, Self, cast, runtime_checkable
@@ -698,14 +699,21 @@ def date_span_ticks(
     lo: float = float(cast(Any, date2num(data_min)))
     hi: float = float(cast(Any, date2num(data_max)))
     locator = AutoDateLocator(minticks=2, maxticks=maxticks)
-    candidates: list[float] = cast(
-        "list[float]", locator.tick_values(data_min, data_max)
-    )
-    if not pin_start:
-        return [t for t in candidates if lo <= t <= hi] or [lo, hi]
-    chosen: Any = locator.get_locator(  # type: ignore[reportUnknownMemberType]
-        data_min, data_max
-    )
+    # With few ticks over a long span the locator finds no interval in its
+    # table, warns and falls back to a sensible default: the fallback is
+    # the wanted result, the warning only noise for whoever draws a chart.
+    with warnings.catch_warnings():
+        warnings.filterwarnings(
+            "ignore", "AutoDateLocator was unable", UserWarning
+        )
+        candidates: list[float] = cast(
+            "list[float]", locator.tick_values(data_min, data_max)
+        )
+        if not pin_start:
+            return [t for t in candidates if lo <= t <= hi] or [lo, hi]
+        chosen: Any = locator.get_locator(  # type: ignore[reportUnknownMemberType]
+            data_min, data_max
+        )
     if isinstance(chosen, YearLocator):
         step = int(cast(Any, chosen.base).step)
         if step > 1:

{tesorotools_python-0.1.5 → tesorotools_python-0.1.6}/src/tesorotools/note/builder.py

@@ -55,6 +55,7 @@ from docx.oxml import OxmlElement, parse_xml  # type: ignore[reportUnknownVariab
 from docx.oxml.ns import qn
 from docx.shared import Cm, Emu, Pt, Twips
 from docx.table import Table as DocxTable
+from docx.text.run import Run
 from docx.table import _Cell  # pyright: ignore[reportPrivateUsage]
 from docx.text.paragraph import Paragraph
 
@@ -99,6 +100,8 @@ _MIN_PAIR_SCALE = 0.9
 
 #: Space after a chart or table block: that of the ``Nota`` style.
 _BLOCK_AFTER = 160
+#: Left indent (twips) of the text of a list item («Bullet Nivel 1»).
+_ITEM_INDENT = 714
 
 _CHART = "Gráfico"
 _TABLE = "Tabla"
@@ -261,7 +264,26 @@ def format_number(
 
 
 #: Cells that do not make a numeric column textual.
-_PLACEHOLDERS = {"", "-", "\u2013", "\u2014", "..", "...", "n.d.", "nd", "s.d."}
+_PLACEHOLDERS = {
+    "",
+    "-",
+    "\u2013",
+    "\u2014",
+    "\u2212",
+    "\u2026",
+    "..",
+    "...",
+    "n.d.",
+    "n.d",
+    "nd",
+    "n/d",
+    "s.d.",
+    "s.d",
+    "sd",
+    "n.a.",
+    "n.a",
+    "na",
+}
 
 
 def _is_numeric(text: str) -> bool:
@@ -282,8 +304,13 @@ def _year_column(values: Sequence[object]) -> bool:
     )
 
 
+def _placeholder(cell: str) -> str:
+    """*cell* lowered and without spaces («n. d.» -> «n.d.»)."""
+    return "".join(cell.split()).lower()
+
+
 def _numeric_column(cells: Sequence[str]) -> bool:
-    values = [c for c in cells if c.strip().lower() not in _PLACEHOLDERS]
+    values = [c for c in cells if _placeholder(c) not in _PLACEHOLDERS]
     return bool(values) and all(_is_numeric(c) for c in values)
 
 
@@ -467,6 +494,18 @@ def _footnotes_root(document: Document) -> tuple[Any, Any]:
     return part, _parse(part.blob)
 
 
+def _es(value: float, spec: str = "g") -> str:
+    """*value* with a decimal comma, for the messages («7,2 cm»)."""
+    return format(value, spec).replace(".", ",")
+
+
+def _end_block(table: DocxTable) -> None:
+    """The last row of *table* does not keep with what follows it."""
+    for cell in table.rows[-1].cells:
+        for paragraph in cell.paragraphs:
+            paragraph.paragraph_format.keep_with_next = False
+
+
 def _cm(emu: float) -> float:
     return emu / 360000
 
@@ -644,8 +683,17 @@ class Note:
         self._block()
         if level == 1:
             self._appendix = is_appendix(text)
-            self._references = _REFERENCES.match(text.strip()) is not None
+            self._references = _REFERENCES.search(text) is not None
         paragraph = self._add(f"Heading{level}")
+        if self._appendix and level < 3:
+            # Annexes, references and bibliography are not numbered
+            # sections («3. Anexo I» reads as a section of the body): the
+            # numbering of the style is switched off (numId 0) and so is
+            # the hanging indent left for the number.
+            pPr = _xml(paragraph)._p.get_or_add_pPr()
+            pPr.get_or_add_numPr().get_or_add_numId().val = 0
+            paragraph.paragraph_format.left_indent = Twips(0)
+            paragraph.paragraph_format.first_line_indent = Twips(0)
         self._write(paragraph, spans)
         return paragraph
 
@@ -661,12 +709,20 @@ class Note:
         if self._references or long_link:
             paragraph.alignment = WD_ALIGN_PARAGRAPH.LEFT
 
-    def paragraph(self, text: str) -> Paragraph:
-        """Body paragraph; start it with its ``**lead sentence.**``."""
+    def paragraph(self, text: str, *, continuation: bool = False) -> Paragraph:
+        """Body paragraph; start it with its ``**lead sentence.**``.
+
+        ``continuation`` is a further paragraph of a list item: indented
+        like the item's text, and the list goes on after it (the next
+        item keeps its number).
+        """
         spans = parse_inline(text)
-        self._block()
+        if not continuation:
+            self._block()
         style = self._appendix_style() if self._appendix else "Normal"
         paragraph = self._add(style)
+        if continuation:
+            paragraph.paragraph_format.left_indent = Twips(_ITEM_INDENT)
         self._align(paragraph, spans)
         self._write(paragraph, spans)
         return paragraph
@@ -778,8 +834,9 @@ class Note:
     def _shrink(self, paragraph: Paragraph) -> None:
         """Annex bullets and numbered items: the annex font size."""
         if self._appendix:
-            for run in paragraph.runs:
-                run.font.size = Pt(_APPENDIX_PT)
+            # every run, also those inside hyperlinks (not in .runs)
+            for r in _xml(paragraph)._p.iter(qn("w:r")):
+                Run(r, paragraph).font.size = Pt(_APPENDIX_PT)
             paragraph.paragraph_format.space_after = Pt(2)
 
     # -- captions, sources and notes ---------------------------------------
@@ -846,13 +903,20 @@ class Note:
         The block ends with the spacing of the ``Nota`` style even when
         there is no note, so the next paragraph does not stick to it
         (*last* is ``None`` after a table, whose end already separates).
+        Its last paragraph does not keep with the next one: the ``Fuente``
+        style (and the image) keep with the next paragraph so that the
+        block holds together, and on the last paragraph that would chain
+        the block to the following chart or heading, which would then jump
+        to the next page together and leave half a page blank.
         """
         if source:
             last = self._attribution("Fuente", source)
         if note:
-            self._attribution("Nota", note)
+            last = self._attribution("Nota", note)
         elif last is not None:
             last.paragraph_format.space_after = Twips(_BLOCK_AFTER)
+        if last is not None:
+            last.paragraph_format.keep_with_next = False
 
     # -- charts -------------------------------------------------------------
 
@@ -875,8 +939,8 @@ class Note:
             width = float(Cm(chart.width_cm))
             if chart.width_cm > TEXT_WIDTH_CM:
                 self.warnings.append(
-                    f"«{chart.title}»: ancho de {chart.width_cm:g} cm, más que"
-                    f" el texto; se reduce a {TEXT_WIDTH_CM:g} cm"
+                    f"«{chart.title}»: ancho de {_es(chart.width_cm)} cm, más que"
+                    f" el texto; se reduce a {_es(TEXT_WIDTH_CM)} cm"
                 )
         width = min(width, float(Cm(TEXT_WIDTH_CM)))
         height = width * native_h / native_w
@@ -885,7 +949,7 @@ class Note:
             width, height = width * scale, height * scale
             self.warnings.append(
                 f"«{chart.title}»: la imagen no cabe en una página; se reduce"
-                f" a {_cm(width):.1f} x {_cm(height):.1f} cm"
+                f" a {_es(_cm(width), '.1f')} x {_es(_cm(height), '.1f')} cm"
             )
         return round(width), round(height)
 
@@ -904,8 +968,8 @@ class Note:
             and _cm(width) < _SMALL_CHART_CM
         ):
             self.warnings.append(
-                f"«{chart.title}» mide {_cm(width):.1f} cm de ancho en un texto"
-                f" de {TEXT_WIDTH_CM:g}: genéralo con chart_size() o ponlo en"
+                f"«{chart.title}» mide {_es(_cm(width), '.1f')} cm de ancho en un texto"
+                f" de {_es(TEXT_WIDTH_CM)}: genéralo con chart_size() o ponlo en"
                 " un bloque graficos con otro"
             )
         self._block()
@@ -949,7 +1013,7 @@ class Note:
                 if chart.width_cm > PAIR_WIDTH_CM:
                     self.warnings.append(
                         f"«{chart.title}»: en una pareja el ancho máximo es"
-                        f" {PAIR_WIDTH_CM:g} cm"
+                        f" {_es(PAIR_WIDTH_CM)} cm"
                     )
                 cap = min(cap, chart.width_cm)
             caps.append(cap)
@@ -960,7 +1024,7 @@ class Note:
             if scale < _MIN_PAIR_SCALE:
                 self.warnings.append(
                     f"«{chart.title}»: en la pareja se reduce al"
-                    f" {scale * 100:.0f} % de su tamaño (la letra queda por debajo"
+                    f" {_es(scale * 100, '.0f')} % de su tamaño (la letra queda por debajo"
                     " de 7 puntos); genera las imágenes con"
                     " chart_size(pair=True) y la misma proporción"
                 )
@@ -1006,6 +1070,7 @@ class Note:
             # image itself it would lift this chart above the other one
             if not (one_note and col) and (last is not image or rows == 2):
                 last.paragraph_format.space_after = Twips(_BLOCK_AFTER)
+        _end_block(table)
 
     def _separate_tables(self) -> None:
         """Keep a new table from merging with one that ends the body.
@@ -1152,6 +1217,8 @@ class Note:
                         _element("w:noWrap")
                     )
         self._fit_table(grid, table, rows, size or _TABLE_PT)
+        if not (table.source or table.note):
+            _end_block(grid)
         self._close(None, table.source, table.note)
 
     def _fit_table(
@@ -1166,8 +1233,8 @@ class Note:
             total = sum(table.widths)
             if total > TEXT_WIDTH_CM + 0.01:
                 self.warnings.append(
-                    f"la tabla «{table.title}» mide {total:g} cm de ancho;"
-                    f" el texto, {TEXT_WIDTH_CM:g} cm"
+                    f"la tabla «{table.title}» mide {_es(total)} cm de ancho;"
+                    f" el texto, {_es(TEXT_WIDTH_CM)} cm"
                 )
             props = _xml(grid)._tbl.tblPr
             props.find(qn("w:tblLook")).addprevious(
@@ -1185,7 +1252,7 @@ class Note:
         if needed > TEXT_WIDTH_CM:
             self.warnings.append(
                 f"la tabla «{table.title}» parece no caber en el ancho de la"
-                f" página (unos {needed:.0f} cm de {TEXT_WIDTH_CM:g}):"
+                f" página (unos {_es(needed, '.0f')} cm de {_es(TEXT_WIDTH_CM)}):"
                 " abrevia las cabeceras, quita columnas o fija «anchos»"
             )