tableio 0.3__tar.gz → 0.4__tar.gz

{tableio-0.3/tableio.egg-info → tableio-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tableio
-Version: 0.3
+Version: 0.4
 Summary: Uniform way to write table data to and read from different file formats
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -17,8 +17,8 @@ Requires-Dist: build>=1.4.2
 Requires-Dist: wheel>=0.46.3
 Requires-Dist: mformat-ext>=0.6
 Requires-Dist: openpyxl>=3.1.5
-Requires-Dist: types-openpyxl>=3.1.5.20260322
-Requires-Dist: odfdo>=3.22.3
+Requires-Dist: types-openpyxl>=3.1.5.20260402
+Requires-Dist: odfdo>=3.22.4
 Requires-Dist: xlsxwriter>=3.2.9
 Requires-Dist: pylightxl>=1.61
 Dynamic: author
@@ -138,14 +138,15 @@ a better start by reading the examples.
 
 | Version | Date        | Python version | Comment                     |
 |---------|-------------|----------------|-----------------------------|
-| 0.3     | 2023 Apr 01 | 3.12 or newer  | Improved API, more backends |
+| 0.4     | 2026 Apr 06 | 3.12 or newer  | Fix .xlsx and .ods syntax   |
+| 0.3     | 2026 Apr 01 | 3.12 or newer  | Improved API, more backends |
 | 0.2     | 2026 Mar 28 | 3.12 or newer  | More features, API changes  |
 | 0.1     | 2026 Mar 23 | 3.12 or newer  | First released version      |
 
 ## Test summary
 
-- Test result: 1010 passed in 14s
+- Test result: 1126 passed in 17s
 - No flake8 warnings.
 - No mypy errors found.
-- Built version(s): 0.3
+- Built version(s): 0.4
 - Build and test using Python 3.14.3

{tableio-0.3 → tableio-0.4}/README.md

@@ -93,8 +93,8 @@ information about the build system. This README can also be viewed at
 
 ## Test summary
 
-- Test result: 1010 passed in 14s
+- Test result: 1126 passed in 17s
 - No flake8 warnings.
 - No mypy errors found.
-- Built version(s): 0.3
+- Built version(s): 0.4
 - Build and test using Python 3.14.3

{tableio-0.3 → tableio-0.4}/README_pypi.md

@@ -110,14 +110,15 @@ a better start by reading the examples.
 
 | Version | Date        | Python version | Comment                     |
 |---------|-------------|----------------|-----------------------------|
-| 0.3     | 2023 Apr 01 | 3.12 or newer  | Improved API, more backends |
+| 0.4     | 2026 Apr 06 | 3.12 or newer  | Fix .xlsx and .ods syntax   |
+| 0.3     | 2026 Apr 01 | 3.12 or newer  | Improved API, more backends |
 | 0.2     | 2026 Mar 28 | 3.12 or newer  | More features, API changes  |
 | 0.1     | 2026 Mar 23 | 3.12 or newer  | First released version      |
 
 ## Test summary
 
-- Test result: 1010 passed in 14s
+- Test result: 1126 passed in 17s
 - No flake8 warnings.
 - No mypy errors found.
-- Built version(s): 0.3
+- Built version(s): 0.4
 - Build and test using Python 3.14.3

{tableio-0.3 → tableio-0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tableio"
-version = "0.3"
+version = "0.4"
 authors = [
   { name="Tom Björkholm", email="klausuler_linnet0q@icloud.com" },
 ]

{tableio-0.3 → tableio-0.4}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
   name='tableio',
-  version='0.3',
+  version='0.4',
   description='Uniform way to write table data to and read from different ' \
     'file formats',
   author='Tom Björkholm',
@@ -21,8 +21,8 @@ setup(
     'wheel >= 0.46.3',
     'mformat-ext >= 0.6',
     'openpyxl >= 3.1.5',
-    'types-openpyxl >= 3.1.5.20260322',
-    'odfdo >= 3.22.3',
+    'types-openpyxl >= 3.1.5.20260402',
+    'odfdo >= 3.22.4',
     'xlsxwriter >= 3.2.9',
     'pylightxl >= 1.61'
   ]

tableio-0.4/src/tableio/_archive_rewrite.py

@@ -0,0 +1,80 @@
+#! /usr/bin/env python3
+"""Helpers for rewriting spreadsheet ZIP archives safely.
+
+Spreadsheet writers first save library output to a temporary archive.
+These helpers then build a rewritten copy in a second temporary archive
+and replace the first archive only after both ZIP files are closed.
+"""
+
+# Copyright (c) 2026 Tom Björkholm
+# MIT License
+
+from pathlib import Path
+from tempfile import NamedTemporaryFile
+from typing import Callable, Optional
+from zipfile import ZIP_DEFLATED, ZipFile, ZipInfo
+
+
+def temporary_output_path(source_path: Path, suffix: str) -> Path:
+    """Return one missing temporary path next to ``source_path``.
+
+    The temporary file is created in the same directory as
+    ``source_path`` so a later ``Path.replace()`` stays on the same
+    filesystem. The file name uses ``suffix`` and the returned path does
+    not exist when this function returns.
+    """
+    with NamedTemporaryFile(delete=False, dir=source_path.parent,
+                            suffix=suffix) as temp_file:
+        temp_path = Path(temp_file.name)
+    temp_path.unlink()
+    return temp_path
+
+
+def rewrite_zip_archive(
+        archive_path: Path,
+        rewrite_entry: Callable[[ZipInfo, bytes], Optional[bytes]],
+        extra_entries: Optional[dict[str, bytes]] = None) -> None:
+    """Rewrite one ZIP archive by copying it into a new archive.
+
+    The original archive at ``archive_path`` is read entry by entry and
+    a rewritten archive is written to a sibling temporary file. The
+    callback receives each original ``ZipInfo`` together with its bytes.
+    Returning ``None`` drops the entry. Any mapping passed in
+    ``extra_entries`` is appended after copied entries, except for names
+    that were already written.
+
+    The original archive is replaced only after both ZIP files have been
+    closed. This avoids replacing an archive while it is still open,
+    which is a safer pattern on Windows as well as on Unix-like systems.
+
+    Args:
+        archive_path: Path to the archive to rewrite in place.
+        rewrite_entry: Callback invoked once for each original ZIP entry.
+            The callback receives the original ``ZipInfo`` together with
+            the entry bytes. It returns replacement bytes for the output
+            archive, or ``None`` to drop the entry completely.
+        extra_entries: Optional mapping of extra archive members to add
+            after copying rewritten entries. Names that were already
+            written are left unchanged.
+    """
+    temp_path = temporary_output_path(archive_path, archive_path.suffix)
+    try:
+        with ZipFile(archive_path, 'r') as source_zip, \
+                ZipFile(temp_path, 'w',
+                        compression=ZIP_DEFLATED) as target_zip:
+            written_names: set[str] = set()
+            for item in source_zip.infolist():
+                data = rewrite_entry(item, source_zip.read(item.filename))
+                if data is None:
+                    continue
+                target_zip.writestr(item, data)
+                written_names.add(item.filename)
+            if extra_entries is not None:
+                for entry_name, entry_data in extra_entries.items():
+                    if entry_name in written_names:
+                        continue
+                    target_zip.writestr(entry_name, entry_data)
+        temp_path.replace(archive_path)
+    finally:
+        if temp_path.exists():
+            temp_path.unlink()

{tableio-0.3 → tableio-0.4}/src/tableio/factory.py

@@ -274,6 +274,17 @@ class FactoryFormatInfo:
             raise TableIOFactoryNoCapabilityMatch(msg)
         return ret
 
+    def correct_implementation_name(self, implementation_name: str) -> str:
+        """Correct the implementation name to the correct case."""
+        if implementation_name in self._registry:
+            return implementation_name
+        if implementation_name.lower() in self._lower2correct:
+            return self._lower2correct[implementation_name.lower()]
+        raise TableIOFactoryNoSuchError(
+            f'Implementation "{implementation_name}" is not registered. ' +
+            'Available implementations: ' +
+            f'{", ".join(list(self._registry.keys()))}')
+
 
 class TableIOFactory:
     """Factory class for creating instances of TableIO subclasses.
@@ -416,21 +427,16 @@ class TableIOFactory:
         best_matches = format_info.best_match_names(
             capabilities=capabilities, empty_is_ok=False)
         if implementation is not None:
-            fikeys = list(format_info._registry.keys())  # pylint: disable=protected-access # noqa: E501
-            if implementation not in fikeys:
-                raise TableIOFactoryNoSuchError(
-                    f'Implementation "{implementation}" is not registered. ' +
-                    'Available implementations: ' +
-                    f'{", ".join(list(fikeys))}'
-                )
+            corrected_implementation = \
+                format_info.correct_implementation_name(implementation)
             bmatches_impls = [impl.implementation
                               for impl in best_matches.combined()]
-            if implementation not in bmatches_impls:
+            if corrected_implementation not in bmatches_impls:
                 msg3 = f'Implementation "{implementation}" '
                 msg3 += 'does not match the capabilities. Available matches: '
                 msg3 += f'{", ".join(bmatches_impls)}'
                 raise TableIOFactoryNoCapabilityMatch(msg3)
-            chosen_impl = implementation
+            chosen_impl = corrected_implementation
         else:
             chosen_impl = best_matches.combined()[0].implementation
         format_class = format_info._registry[chosen_impl]  # pylint: disable=protected-access # noqa: E501

{tableio-0.3 → tableio-0.4}/src/tableio/tableio.py

@@ -85,6 +85,8 @@ class TableIO:
         """Return the file name with the extension."""
         if not extension.startswith('.'):
             extension = f'.{extension}'
+        if str(file_name).lower().endswith(extension.lower()):
+            return str(file_name)
         return f'{str(file_name)}{extension}'
 
     @classmethod

{tableio-0.3 → tableio-0.4}/src/tableio/tableio_excel_openpyxl.py

@@ -4,13 +4,17 @@
 # Copyright (c) 2026 Tom Björkholm
 # MIT License
 
+from pathlib import Path
 from typing import Callable, Optional
+from xml.etree import ElementTree as ET
 from openpyxl import Workbook, load_workbook
 from openpyxl.styles import Font, PatternFill
 from openpyxl.utils.cell import get_column_letter, range_boundaries
 from openpyxl.worksheet.table import Table
 from openpyxl.worksheet.worksheet import Worksheet
 from mformat.mformat import PathLike
+from tableio._archive_rewrite import rewrite_zip_archive, \
+    temporary_output_path
 from tableio.color import Color
 from tableio.tableio import Descriptor, FileAccess
 from tableio.tableio_excelbased import TableIOExcelBased
@@ -22,6 +26,50 @@ _HIGHLIGHT_RGB: dict[Color, str] = {
     Color.GREEN: 'FFC6EFCE',
     Color.YELLOW: 'FFFFFF00'
 }
+_XML_NS = {'main': 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'}
+_FONT_CHILD_ORDER = [
+    'b',
+    'i',
+    'u',
+    'strike',
+    'outline',
+    'shadow',
+    'condense',
+    'extend',
+    'sz',
+    'color',
+    'name',
+    'family',
+    'charset',
+    'scheme'
+]
+
+
+def _font_child_sort_key(element: ET.Element) -> int:
+    """Return the schema-order key for one Excel font child element."""
+    tag_name = element.tag.split('}', 1)[-1]
+    if tag_name in _FONT_CHILD_ORDER:
+        return _FONT_CHILD_ORDER.index(tag_name)
+    return len(_FONT_CHILD_ORDER)
+
+
+def _styles_xml_with_sorted_fonts(data: bytes) -> bytes:
+    """Return styles XML with font child elements in schema order."""
+    root = ET.fromstring(data)
+    for font in root.findall('main:fonts/main:font', _XML_NS):
+        font[:] = sorted(list(font), key=_font_child_sort_key)
+    return bytes(ET.tostring(root, encoding='utf-8',
+                             xml_declaration=True))
+
+
+def _rewrite_saved_workbook(file_name: Path) -> None:
+    """Rewrite the saved workbook so styles XML follows validator order."""
+    def rewrite_entry(item: object, data: bytes) -> bytes:
+        """Rewrite one workbook archive entry when needed."""
+        if getattr(item, 'filename') == 'xl/styles.xml':
+            return _styles_xml_with_sorted_fonts(data)
+        return data
+    rewrite_zip_archive(file_name, rewrite_entry)
 
 
 class TableIOExcelOpenPyXL(TableIOExcelBased):
@@ -91,7 +139,15 @@ class TableIOExcelOpenPyXL(TableIOExcelBased):
         if self.file_access == FileAccess.READ:
             return
         assert self.workbook is not None
-        self.workbook.save(self.file_name)
+        file_path = Path(self.file_name)
+        temp_path = temporary_output_path(file_path, '.xlsx')
+        try:
+            self.workbook.save(temp_path)
+            _rewrite_saved_workbook(temp_path)
+            temp_path.replace(file_path)
+        finally:
+            if temp_path.exists():
+                temp_path.unlink()
 
     def _close(self) -> None:
         """Close any open workbook handles."""

{tableio-0.3 → tableio-0.4}/src/tableio/tableio_excel_pylightxl.py

@@ -6,15 +6,15 @@
 
 from datetime import datetime, timedelta
 from pathlib import Path
-from tempfile import NamedTemporaryFile
 from typing import Callable, Optional, Protocol, cast
 from xml.etree import ElementTree as ET
-from zipfile import ZIP_DEFLATED, ZipFile
-
+from zipfile import ZipFile
 from mformat.mformat import PathLike
+from openpyxl.writer.theme import theme_xml
 from pylightxl import Database, writexl  # type: ignore[import-untyped]
 from pylightxl import pylightxl as pylightxl_impl
-
+from tableio._archive_rewrite import rewrite_zip_archive, \
+    temporary_output_path
 from tableio.capability import CAP_IMPLEMENTED, CAP_IGNORED, Capabilities
 from tableio.tableio import Descriptor, FileAccess
 from tableio.tableio_excelbased import TableIOExcelBased
@@ -292,6 +292,11 @@ def _styles_xml() -> bytes:
     return text.encode('utf-8')
 
 
+def _theme_xml() -> bytes:
+    """Return the standard Excel theme XML."""
+    return theme_xml.encode('utf-8')
+
+
 class TableIOExcelPylightxl(TableIOExcelBased):
     """TableIO reader/writer class for Excel files using pylightxl.
 
@@ -399,11 +404,7 @@ class TableIOExcelPylightxl(TableIOExcelBased):
     @staticmethod
     def _temporary_workbook_path(source_path: Path) -> Path:
         """Return a temporary workbook path that does not yet exist."""
-        with NamedTemporaryFile(delete=False, dir=source_path.parent,
-                                suffix='.xlsx') as temp_file:
-            temp_path = Path(temp_file.name)
-        temp_path.unlink()
-        return temp_path
+        return temporary_output_path(source_path, '.xlsx')
 
     @staticmethod
     def _invalid_placeholder_cell(cell: ET.Element) -> bool:
@@ -431,70 +432,91 @@ class TableIOExcelPylightxl(TableIOExcelBased):
         return True
 
     def _rewrite_workbook_xml(self, file_name: Path) -> None:
-        """Clean written worksheet XML and add style metadata when needed."""
-        style_metadata = any(self._sheet_style_codes.values())
+        """Clean written worksheet XML and add required workbook metadata."""
         sheet_targets = _sheet_xml_targets(str(file_name))
-        temp_path = self._temporary_workbook_path(file_name)
-        with ZipFile(file_name, 'r') as source_zip, \
-                ZipFile(temp_path, 'w',
-                        compression=ZIP_DEFLATED) as target_zip:
-            written_names: set[str] = set()
-            for item in source_zip.infolist():
-                if style_metadata and item.filename == 'xl/styles.xml':
-                    continue
-                data = source_zip.read(item.filename)
-                if style_metadata and item.filename == '[Content_Types].xml':
-                    data = self._content_types_with_styles(data)
-                elif style_metadata and \
-                        item.filename == 'xl/_rels/workbook.xml.rels':
-                    data = self._workbook_rels_with_styles(data)
-                elif item.filename.startswith('xl/worksheets/'):
-                    data = self._worksheet_xml_for_output(item.filename,
-                                                          data,
-                                                          sheet_targets)
-                target_zip.writestr(item, data)
-                written_names.add(item.filename)
-            if style_metadata and 'xl/styles.xml' not in written_names:
-                target_zip.writestr('xl/styles.xml', _styles_xml())
-        temp_path.replace(file_name)
-
-    def _content_types_with_styles(self, data: bytes) -> bytes:
-        """Return content types XML updated with the styles part."""
+
+        def rewrite_entry(item: object, data: bytes) -> Optional[bytes]:
+            """Rewrite or drop one workbook archive entry when needed."""
+            file_name_text = getattr(item, 'filename')
+            if file_name_text in ['xl/styles.xml', 'xl/theme/theme1.xml']:
+                return None
+            if file_name_text == '[Content_Types].xml':
+                return self._content_types_with_required_parts(data)
+            if file_name_text == 'xl/_rels/workbook.xml.rels':
+                return self._workbook_rels_with_required_parts(data)
+            if file_name_text.startswith('xl/worksheets/'):
+                return self._worksheet_xml_for_output(file_name_text,
+                                                      data,
+                                                      sheet_targets)
+            return data
+        rewrite_zip_archive(
+            file_name,
+            rewrite_entry,
+            {'xl/styles.xml': _styles_xml(),
+             'xl/theme/theme1.xml': _theme_xml()}
+        )
+
+    def _content_types_with_required_parts(self, data: bytes) -> bytes:
+        """Return content types XML updated with styles and theme parts."""
         root = ET.fromstring(data)
-        part_name = '/xl/styles.xml'
-        content_type = ('application/vnd.openxmlformats-officedocument.'
-                        'spreadsheetml.styles+xml')
-        for override in root.findall('content:Override', _XML_NS):
-            if override.get('PartName') == part_name:
+        required_parts = {
+            '/xl/styles.xml': (
+                'application/vnd.openxmlformats-officedocument.'
+                'spreadsheetml.styles+xml'
+            ),
+            '/xl/theme/theme1.xml': (
+                'application/vnd.openxmlformats-officedocument.theme+xml'
+            )
+        }
+        existing_parts = {
+            override.get('PartName'): override
+            for override in root.findall('content:Override', _XML_NS)
+            if override.get('PartName') is not None
+        }
+        for part_name, content_type in required_parts.items():
+            override = existing_parts.get(part_name)
+            if override is not None:
                 override.set('ContentType', content_type)
-                return _xml_bytes(root)
-        ET.SubElement(root, '{%s}Override' % _XML_NS['content'],
-                      {'PartName': part_name, 'ContentType': content_type})
+                continue
+            ET.SubElement(root, '{%s}Override' % _XML_NS['content'],
+                          {'PartName': part_name,
+                           'ContentType': content_type})
         return _xml_bytes(root)
 
-    def _workbook_rels_with_styles(self, data: bytes) -> bytes:
-        """Return workbook relations XML updated with the styles relation."""
+    def _workbook_rels_with_required_parts(self, data: bytes) -> bytes:
+        """Return workbook relations XML updated with styles and theme."""
         root = ET.fromstring(data)
-        style_type = ('http://schemas.openxmlformats.org/officeDocument/2006/'
-                      'relationships/styles')
-        for relationship in root.findall('rels:Relationship', _XML_NS):
-            if relationship.get('Type') == style_type:
-                relationship.set('Target', 'styles.xml')
-                return _xml_bytes(root)
+        required_relationships = {
+            ('http://schemas.openxmlformats.org/officeDocument/2006/'
+             'relationships/styles'): 'styles.xml',
+            ('http://schemas.openxmlformats.org/officeDocument/2006/'
+             'relationships/theme'): 'theme/theme1.xml'
+        }
+        existing_relationships = {
+            relationship.get('Type'): relationship
+            for relationship in root.findall('rels:Relationship', _XML_NS)
+            if relationship.get('Type') is not None
+        }
         used_ids = {
             relationship.get('Id')
             for relationship in root.findall('rels:Relationship', _XML_NS)
             if relationship.get('Id') is not None
         }
         next_index = 1
-        next_id = f'rId{next_index}'
-        while next_id in used_ids:
-            next_index += 1
+        for relationship_type, target in required_relationships.items():
+            relationship = existing_relationships.get(relationship_type)
+            if relationship is not None:
+                relationship.set('Target', target)
+                continue
             next_id = f'rId{next_index}'
-        ET.SubElement(root, '{%s}Relationship' % _XML_NS['rels'],
-                      {'Id': next_id,
-                       'Type': style_type,
-                       'Target': 'styles.xml'})
+            while next_id in used_ids:
+                next_index += 1
+                next_id = f'rId{next_index}'
+            ET.SubElement(root, '{%s}Relationship' % _XML_NS['rels'],
+                          {'Id': next_id,
+                           'Type': relationship_type,
+                           'Target': target})
+            used_ids.add(next_id)
         return _xml_bytes(root)
 
     def _entry_style_codes(

{tableio-0.3 → tableio-0.4}/src/tableio/tableio_ods_odfdo.py

@@ -4,11 +4,15 @@
 # Copyright (c) 2026 Tom Björkholm
 # MIT License
 
+from pathlib import Path
 from typing import Any, Callable, Optional
+from xml.etree import ElementTree as ET
 from odfdo import Cell, Document, Element, Style, Table
 from odfdo.body import Spreadsheet
 from odfdo.utils import is_RFC3066
 from mformat.mformat import PathLike
+from tableio._archive_rewrite import rewrite_zip_archive, \
+    temporary_output_path
 from tableio.color import Color
 from tableio.tableio import Descriptor, FileAccess
 from tableio.tableio_spreadsheetbased import TableIOSpreadsheetBased, \
@@ -23,8 +27,96 @@ _HIGHLIGHT_RGB: dict[Color, str] = {
     Color.GREEN: '#c6efce',
     Color.YELLOW: '#ffff00'
 }
-
 _COLUMN_WIDTH_CM_PER_UNIT = 0.25
+_XML_NS = {
+    'manifest': 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0',
+    'office': 'urn:oasis:names:tc:opendocument:xmlns:office:1.0',
+    'style': 'urn:oasis:names:tc:opendocument:xmlns:style:1.0',
+    'table': 'urn:oasis:names:tc:opendocument:xmlns:table:1.0',
+    'text': 'urn:oasis:names:tc:opendocument:xmlns:text:1.0',
+    'calcext': 'urn:org:documentfoundation:names:experimental:calc:'
+    'xmlns:calcext:1.0',
+    'svg': 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'
+}
+
+for _prefix, _namespace in _XML_NS.items():
+    ET.register_namespace(_prefix, _namespace)
+
+
+def _manifest_xml_without_configuration_entries(data: bytes) -> bytes:
+    """Return manifest XML without unused Configurations2 file entries."""
+    root = ET.fromstring(data)
+    for entry in list(root.findall('manifest:file-entry', _XML_NS)):
+        full_path = entry.get('{%s}full-path' % _XML_NS['manifest'])
+        if full_path is None or not full_path.startswith('Configurations2/'):
+            continue
+        root.remove(entry)
+    return bytes(ET.tostring(root, encoding='utf-8',
+                             xml_declaration=True))
+
+
+def _referenced_style_names(root: ET.Element) -> set[str]:
+    """Return the set of style names referenced from one XML tree."""
+    referenced: set[str] = set()
+    for element in root.iter():
+        for attr_name, attr_value in element.attrib.items():
+            if attr_name.endswith('}style-name') and attr_value:
+                referenced.add(attr_value)
+    return referenced
+
+
+def _content_xml_without_unused_styles(data: bytes) -> bytes:
+    """Return content XML with unused automatic styles removed."""
+    root = ET.fromstring(data)
+    automatic_styles = root.find('office:automatic-styles', _XML_NS)
+    if automatic_styles is None:
+        return bytes(ET.tostring(root, encoding='utf-8',
+                                 xml_declaration=True))
+    referenced_names = _referenced_style_names(root)
+    for style in list(automatic_styles.findall('style:style', _XML_NS)):
+        style_name = style.get('{%s}name' % _XML_NS['style'])
+        if style_name is None or style_name in referenced_names:
+            continue
+        automatic_styles.remove(style)
+    return bytes(ET.tostring(root, encoding='utf-8',
+                             xml_declaration=True))
+
+
+def _styles_xml_with_required_defaults(data: bytes) -> bytes:
+    """Return styles XML with default table and table-row styles added."""
+    root = ET.fromstring(data)
+    office_styles = root.find('office:styles', _XML_NS)
+    if office_styles is None:
+        return bytes(ET.tostring(root, encoding='utf-8',
+                                 xml_declaration=True))
+    existing_families = {
+        style.get('{%s}family' % _XML_NS['style'])
+        for style in office_styles.findall('style:default-style', _XML_NS)
+    }
+    for family in ['table', 'table-row']:
+        if family in existing_families:
+            continue
+        ET.SubElement(office_styles, '{%s}default-style' % _XML_NS['style'],
+                      {'{%s}family' % _XML_NS['style']: family})
+    return bytes(ET.tostring(root, encoding='utf-8',
+                             xml_declaration=True))
+
+
+def _rewrite_saved_document(file_name: Path) -> None:
+    """Rewrite one saved ODS archive to remove validator complaints."""
+    def rewrite_entry(item: object, data: bytes) -> Optional[bytes]:
+        """Rewrite or drop one ODS archive entry when needed."""
+        file_name_text = getattr(item, 'filename')
+        if file_name_text.startswith('Configurations2/'):
+            return None
+        if file_name_text == 'META-INF/manifest.xml':
+            return _manifest_xml_without_configuration_entries(data)
+        if file_name_text == 'content.xml':
+            return _content_xml_without_unused_styles(data)
+        if file_name_text == 'styles.xml':
+            return _styles_xml_with_required_defaults(data)
+        return data
+    rewrite_zip_archive(file_name, rewrite_entry)
 
 
 class TableIOOdsOdfdo(TableIOSpreadsheetBased):
@@ -138,7 +230,15 @@ class TableIOOdsOdfdo(TableIOSpreadsheetBased):
         if self.file_access == FileAccess.READ:
             return
         assert self.document is not None
-        self.document.save(self.file_name)
+        file_path = Path(self.file_name)
+        temp_path = temporary_output_path(file_path, '.ods')
+        try:
+            self.document.save(temp_path)
+            _rewrite_saved_document(temp_path)
+            temp_path.replace(file_path)
+        finally:
+            if temp_path.exists():
+                temp_path.unlink()
 
     def _close(self) -> None:
         """Release document references."""

{tableio-0.3 → tableio-0.4/tableio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tableio
-Version: 0.3
+Version: 0.4
 Summary: Uniform way to write table data to and read from different file formats
 Author: Tom Björkholm
 Author-email: Tom Björkholm <klausuler_linnet0q@icloud.com>
@@ -17,8 +17,8 @@ Requires-Dist: build>=1.4.2
 Requires-Dist: wheel>=0.46.3
 Requires-Dist: mformat-ext>=0.6
 Requires-Dist: openpyxl>=3.1.5
-Requires-Dist: types-openpyxl>=3.1.5.20260322
-Requires-Dist: odfdo>=3.22.3
+Requires-Dist: types-openpyxl>=3.1.5.20260402
+Requires-Dist: odfdo>=3.22.4
 Requires-Dist: xlsxwriter>=3.2.9
 Requires-Dist: pylightxl>=1.61
 Dynamic: author
@@ -138,14 +138,15 @@ a better start by reading the examples.
 
 | Version | Date        | Python version | Comment                     |
 |---------|-------------|----------------|-----------------------------|
-| 0.3     | 2023 Apr 01 | 3.12 or newer  | Improved API, more backends |
+| 0.4     | 2026 Apr 06 | 3.12 or newer  | Fix .xlsx and .ods syntax   |
+| 0.3     | 2026 Apr 01 | 3.12 or newer  | Improved API, more backends |
 | 0.2     | 2026 Mar 28 | 3.12 or newer  | More features, API changes  |
 | 0.1     | 2026 Mar 23 | 3.12 or newer  | First released version      |
 
 ## Test summary
 
-- Test result: 1010 passed in 14s
+- Test result: 1126 passed in 17s
 - No flake8 warnings.
 - No mypy errors found.
-- Built version(s): 0.3
+- Built version(s): 0.4
 - Build and test using Python 3.14.3

{tableio-0.3 → tableio-0.4}/tableio.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README_pypi.md
 pyproject.toml
 setup.py
 src/tableio/__init__.py
+src/tableio/_archive_rewrite.py
 src/tableio/capability.py
 src/tableio/color.py
 src/tableio/factory.py

{tableio-0.3 → tableio-0.4}/tableio.egg-info/requires.txt

@@ -4,7 +4,7 @@ build>=1.4.2
 wheel>=0.46.3
 mformat-ext>=0.6
 openpyxl>=3.1.5
-types-openpyxl>=3.1.5.20260322
-odfdo>=3.22.3
+types-openpyxl>=3.1.5.20260402
+odfdo>=3.22.4
 xlsxwriter>=3.2.9
 pylightxl>=1.61