uEdition 2.0.0__tar.gz → 2.0.0b2__tar.gz

{uedition-2.0.0 → uedition-2.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uEdition
-Version: 2.0.0
+Version: 2.0.0b2
 Project-URL: Documentation, https://github.com/uEdition/uEdition#readme
 Project-URL: Issues, https://github.com/uEdition/uEdition/issues
 Project-URL: Source, https://github.com/uEdition/uEdition

{uedition-2.0.0 → uedition-2.0.0b2}/docs/pyproject.toml

@@ -18,7 +18,7 @@ Issues = "https://github.com/uEdition/uEdition/-/issues"
 Source = "https://github.com/uEdition/uEdition/-"
 
 [tool.hatch.envs.default]
-dependencies = ["uedition<3,>=2.0.0", "uedition_editor>=2.0.0b5,<2.1"]
+dependencies = ["uedition<2.1,>=2.0.0b1", "uedition_editor>=2.0.0b5,<2.1"]
 skip-install = true
 
 [tool.hatch.envs.default.scripts]

{uedition-2.0.0 → uedition-2.0.0b2}/docs/static/pyproject.toml

@@ -18,7 +18,7 @@ Issues = "http://edition.com"
 Source = "http://edition.com"
 
 [tool.hatch.envs.default]
-dependencies = ["uEdition<3,>=2.0.0b5", "uEdition-Editor<3,>=2.0.0b6"]
+dependencies = ["uEdition<3,>=2.0.0b1", "uEdition-Editor<3,>=2.0.0b6"]
 skip-install = true
 
 [tool.hatch.envs.default.scripts]

{uedition-2.0.0 → uedition-2.0.0b2}/uedition/__about__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 """About this package."""
 
-__version__ = "2.0.0"
+__version__ = "2.0.0b2"

{uedition-2.0.0 → uedition-2.0.0b2}/uedition/ext/settings.py

@@ -49,8 +49,6 @@ class TEINode(BaseModel):
     """Where to get the text from."""
     content: str | None = None
     """Allowed child nodes. Only relevant for block nodes."""
-    weight: int | None = None
-    """Weight of the node to determine nesting. Only used for mark nodes."""
 
 
 class TEIMetadataSectionSingleFieldRule(BaseModel):
@@ -108,15 +106,6 @@ class TEITextSection(BaseModel):
     """The XPath selector to retrieve this section."""
 
 
-class TEITextListSectionSort(BaseModel):
-    """Configuration for sorting a multiple text section."""
-
-    selector: str
-    """The XPath selector for the element to use for sorting."""
-    order: Literal["alpha"] | Literal["numeric"] | Literal["page,line"] = "alpha"
-    """The sorting algorithm to use"""
-
-
 class TEITextListSection(BaseModel):
     """A section in the TEI document containing multiple texts."""
 
@@ -128,7 +117,7 @@ class TEITextListSection(BaseModel):
     """The type must be set to textlist."""
     selector: str
     """The XPath selector to retrieve the texts in this section."""
-    sort: TEITextListSectionSort | None = None
+    sort: str | None = None
 
 
 class TEISettings(BaseModel):

{uedition-2.0.0 → uedition-2.0.0b2}/uedition/ext/tei/parser.py

@@ -100,8 +100,8 @@ class TEIParser(SphinxParser):
                 # Process a text section
                 sources = root.xpath(conf_section["selector"], namespaces=namespaces)
                 if len(sources) > 0:
-                    if conf_section["sort"] is not None:
-                        sources.sort(key=self._sort_key(conf_section["sort"]))
+                    if conf_section["sort"]:
+                        source.sort(key=self._sort_key(conf_section["sort"]))
                     doc_section.append(section)
                     for source in sources:
                         tmp = None
@@ -130,40 +130,27 @@ class TEIParser(SphinxParser):
                             self._parse_download_field(fields, field, sources[0])
         document.append(doc_section)
 
-    def _sort_key(self: "TEIParser", sort: dict) -> Callable[[etree.Element], tuple]:
-        """Create a sortkey that understands about various sorting patterns."""
+    def _sort_key(self: "TEIParser", xpath: str) -> Callable[[etree.Element], tuple[tuple[int, ...], ...]]:
+        """Create a sortkey that understands about `page,line` patterns for sorting."""
 
-        def sorter(node: etree.Element) -> tuple:
-            value = node.xpath(sort["selector"], namespaces=namespaces)
+        def sorter(node: etree.Element) -> tuple[tuple[int, ...], ...]:
+            value = node.xpath(xpath, namespaces=namespaces)
             if value is not None and len(value) > 0:
                 if isinstance(value, list):
                     value = value[0]
                 else:
                     value = str(value)
-                if sort["order"] == "page,line":
-                    match = re.match("([0-9-,]+).*", value)
-                    if match is not None:
-                        order = []
-                        for value in match.group(1).split(","):
-                            for value2 in value.split("-"):
-                                order.append(int(value2))
-                        return tuple(order)
-                    else:
-                        return (0,)
-                elif sort["order"] == "numeric":
-                    match = re.match("([0-9]+).*", value)
-                    if match is not None:
-                        return (int(match.group(1)),)
-                    else:
-                        return (0,)
-                else:
-                    return (value, "")
-            if sort["order"] == "page,line":
-                return (0,)
-            elif sort["order"] == "numeric":
-                return (0,)
-            else:
-                return ("",)
+                match = re.match("[0-9-,]+", value)
+                if match is not None:
+                    order = []
+                    for part in value.split("-"):
+                        tpl = tuple([int(v) for v in part.split(",")])
+                        if len(order) > 0 and len(order[-1]) > len(tpl):
+                            order.append(tuple(list(order[-1][: -len(tpl)]) + list(tpl)))
+                        else:
+                            order.append(tpl)
+                    return tuple(order)
+            return ((0,),)
 
         return sorter