uEdition 2.0.0a1__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

uedition/__about__.py

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

uedition/cli/__init__.py

@@ -2,60 +2,17 @@
 #
 # SPDX-License-Identifier: MIT
 """uEdtion Command-line Tool."""
-import typer
-from rich import print as print_cli
+
+from rich import print as output
 
 from uedition.__about__ import __version__
-from uedition.cli import build as build_module
-from uedition.cli import create as create_module
-from uedition.cli import language as language_module
-from uedition.cli import serve as serve_module
-from uedition.cli import update as update_module
+from uedition.cli import build, init, language, migrate, serve, update  # noqa:F401
+from uedition.cli.base import app
 from uedition.settings import settings
 
-app = typer.Typer()
-language_app = typer.Typer()
-app.add_typer(language_app, name="language")
-
-
-@app.command()
-def create(path: str) -> None:
-    """Create a new μEdition."""
-    create_module.run(path)
-
-
-@app.command()
-def build() -> None:
-    """Build the μEdition."""
-    build_module.run()
-
-
-@app.command()
-def serve() -> None:
-    """Serve the μEdition for writing."""
-    serve_module.run()
-
-
-@app.command()
-def update() -> None:
-    """Update the μEdition."""
-    update_module.run()
-
 
 @app.command()
 def version() -> None:
     """Output the current μEdition version."""
-    print_cli(f"μEdition: {__version__}")
-    print_cli(f'Configuration: {settings["version"]}')
-
-
-@language_app.command("add")
-def language_add(path: str) -> None:
-    """Add a language to the μEdition."""
-    language_module.add(path)
-
-
-@language_app.command("update")
-def language_update(path: str) -> None:
-    """Update a language."""
-    language_module.update(path)
+    output(f"μEdition:      {__version__}")
+    output(f"Configuration: {settings['version']}")

uedition/cli/base.py

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2023-present Mark Hall <mark.hall@work.room3b.eu>
+#
+# SPDX-License-Identifier: MIT
+"""The μEdition CLI base."""
+
+import typer
+
+app = typer.Typer()

uedition/cli/build.py

@@ -10,6 +10,7 @@ from shutil import copytree, ignore_patterns, rmtree
 
 from yaml import safe_dump, safe_load
 
+from uedition.cli.base import app
 from uedition.settings import NoConfigError, reload_settings, settings
 
 LANDING_PAGE_TEMPLATE = """\
@@ -187,18 +188,19 @@ def full_build(lang: dict) -> None:
             check=False,
             shell=False,
         )
-    copytree(
-        path.join("_build", lang["path"], "html"),
-        path.join(settings["output"]["path"], lang["path"]),
-        dirs_exist_ok=True,
-    )
-    if settings["output"]["tei"]:
+    if path.isdir(path.join("_build", lang["path"], "html")):
         copytree(
-            path.join("_build", lang["path"], "tei"),
+            path.join("_build", lang["path"], "html"),
             path.join(settings["output"]["path"], lang["path"]),
-            ignore=ignore_patterns("_sphinx_design_static"),
             dirs_exist_ok=True,
         )
+        if settings["output"]["tei"] and path.isdir(path.join("_build", lang["path"], "tei")):
+            copytree(
+                path.join("_build", lang["path"], "tei"),
+                path.join(settings["output"]["path"], lang["path"]),
+                ignore=ignore_patterns("_sphinx_design_static"),
+                dirs_exist_ok=True,
+            )
 
 
 def partial_build(lang: dict) -> None:
@@ -227,22 +229,24 @@ def partial_build(lang: dict) -> None:
             check=False,
             shell=False,
         )
-    copytree(
-        path.join("_build", lang["path"], "html"),
-        path.join(settings["output"]["path"], lang["path"]),
-        dirs_exist_ok=True,
-    )
-    if settings["output"]["tei"]:
+    if path.isdir(path.join("_build", lang["path"], "html")):
         copytree(
-            path.join("_build", lang["path"], "tei"),
+            path.join("_build", lang["path"], "html"),
             path.join(settings["output"]["path"], lang["path"]),
-            ignore=ignore_patterns("_sphinx_design_static"),
             dirs_exist_ok=True,
         )
+        if settings["output"]["tei"] and path.isdir(path.join("_build", lang["path"], "tei")):
+            copytree(
+                path.join("_build", lang["path"], "tei"),
+                path.join(settings["output"]["path"], lang["path"]),
+                ignore=ignore_patterns("_sphinx_design_static"),
+                dirs_exist_ok=True,
+            )
 
 
-def run() -> None:
-    """Build the full uEdition."""
+@app.command()
+def build() -> None:
+    """Build the full μEdition."""
     if not path.exists("uEdition.yml") and not path.exists("uEdition.yaml"):
         raise NoConfigError()
     if path.exists(settings["output"]["path"]):

uedition/cli/init.py

@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: 2023-present Mark Hall <mark.hall@work.room3b.eu>
+#
+# SPDX-License-Identifier: MIT
+"""Local server that automatically rebuilds on changes."""
+
+from os import path
+
+from yaml import safe_dump
+
+from uedition.cli.base import app
+from uedition.settings import NoConfigError
+
+
+@app.command()
+def init(force: bool = False) -> None:  # noqa: ARG001 FBT001 FBT002
+    """Initialise a new μEdition."""
+    if path.exists("uEdition.yml") and path.exists("uEdition.yaml"):
+        raise NoConfigError()
+    with open("uEdition.yml", "w") as out_f:
+        safe_dump({"version": "2", "output": "site"}, out_f)
+    with open("toc.yml", "w") as out_f:
+        safe_dump({"format": "jb-book", "root": "index"}, out_f)

uedition/cli/language.py

@@ -1,58 +1,63 @@
 # SPDX-FileCopyrightText: 2023-present Mark Hall <mark.hall@work.room3b.eu>
 #
 # SPDX-License-Identifier: MIT
-"""The μEdition language functionality for managing languages used in the μEdition."""
+"""The μEdition language functionality."""
+
 import os
+from typing import Annotated
 
-from copier import run_copy, run_update
-from yaml import dump, safe_load
+from rich import print as output
+from typer import Option, Typer
+from yaml import safe_dump, safe_load
 
+from uedition.cli.base import app
 from uedition.settings import NoConfigError
 
-
-def add(path: str) -> None:
-    """Add a language to the μEdition using Copier."""
-    if not os.path.exists("uEdition.yml") and not os.path.exists("uEdition.yaml"):
-        raise NoConfigError()
-    run_copy("gh:uEdition/uEdition-language-template", path, data={"path": path})
-    with open(os.path.join(path, ".uEdition.answers")) as in_f:
-        answers = safe_load(in_f)
-    with open("uEdition.yml") as in_f:
-        config = safe_load(in_f)
-    found = False
-    if "languages" in config:
-        for lang in config["languages"]:
-            if lang["code"] == answers["code"]:
-                lang["label"] = answers["label"]
-                lang["path"] = path
-                found = True
-    else:
-        config["languages"] = []
-    if not found:
-        config["languages"].append({"code": answers["code"], "label": answers["label"], "path": path})
-    with open("uEdition.yml", "w") as out_f:
-        dump(config, out_f)
+lang_app = Typer(help="Language configuration functionality")
+app.add_typer(lang_app, name="language")
 
 
-def update(path: str) -> None:
-    """Update a language to the latest template."""
-    if not os.path.exists("uEdition.yml") and not os.path.exists("uEdition.yaml"):
-        raise NoConfigError()
-    run_update(path, answers_file=".uEdition.answers", overwrite=True, data={"path": path})
-    with open(os.path.join(path, ".uEdition.answers")) as in_f:
-        answers = safe_load(in_f)
-    with open("uEdition.yml") as in_f:
-        config = safe_load(in_f)
-    found = False
-    if "languages" in config:
-        for lang in config["languages"]:
-            if lang["code"] == answers["code"]:
-                lang["label"] = answers["label"]
-                lang["path"] = path
-                found = True
+@lang_app.command()
+def add(
+    code: Annotated[str, Option(prompt="Language code")],
+    label: Annotated[
+        str,
+        Option(prompt="Language name"),
+    ],
+    title: Annotated[str, Option(prompt="Title")],
+    path: str | None = None,
+) -> None:
+    """Add a language."""
+    if path is None:
+        path = code
+    if os.path.exists("uEdition.yml"):
+        with open("uEdition.yml") as in_f:
+            config = safe_load(in_f)
+    elif os.path.exists("uEdition.yaml"):
+        with open("uEdition.yaml") as in_f:
+            config = safe_load(in_f)
     else:
+        raise NoConfigError()
+    if "languages" not in config:
         config["languages"] = []
-    if not found:
-        config["languages"].append({"code": answers["code"], "label": answers["label"], "path": path})
+    for lang in config["languages"]:
+        if lang["code"] == code:
+            output(
+                "[red bold]The language code [/red bold]"
+                f"[cyan bold]{code}[/cyan bold]"
+                "[red bold] is already configured[/red bold]"
+            )
+            return
+    if os.path.exists(path):
+        output(
+            f"[red bold]The target path [/red bold][cyan bold]{code}[/cyan bold][red bold] already exists.[/red bold]"
+        )
+    os.mkdir(path)
+    config["languages"].append({"code": code, "label": label, "path": path})
+    if "title" not in config:
+        config["title"] = {}
+    config["title"][code] = title
     with open("uEdition.yml", "w") as out_f:
-        dump(config, out_f)
+        safe_dump(config, out_f)
+    with open(os.path.join(path, "index.md"), "w") as out_f:
+        out_f.write(f"# {title}\n")

uedition/cli/migrate.py

@@ -0,0 +1,137 @@
+# SPDX-FileCopyrightText: 2023-present Mark Hall <mark.hall@work.room3b.eu>
+#
+# SPDX-License-Identifier: MIT
+"""The μEdition migration functionality."""
+
+import os
+from os import path
+
+import tomlkit
+from rich import print as output
+
+from uedition.cli.base import app
+from uedition.settings import NoConfigError
+
+
+def cleanup_old_files() -> None:
+    """Cleanup any old files."""
+    # Scan for old files to remove
+    old_copier_files = []
+    old_config_files = []
+    for basepath, _, filenames in os.walk("."):
+        for filename in filenames:
+            if filename == ".uEdition.answers":
+                old_copier_files.append(path.join(basepath, filename))
+            elif filename in ("_config.yaml", "_config.yml"):
+                old_config_files.append(path.join(basepath, filename))
+    # Remove old copier files (v2.0.0)
+    if len(old_copier_files) > 0:
+        output(":broom: Removing old configuration answers")
+        for filename in old_copier_files:
+            os.unlink(filename)
+    # Remove old config files (v2.0.0)
+    if len(old_config_files) > 0:
+        output(":broom: Removing old configuration files")
+        for filename in old_config_files:
+            os.unlink(filename)
+
+
+def cleanup_gitignore() -> None:
+    """Cleanup the gitignore."""
+    # Update .gitignore (v2.0.0)
+    if path.isfile(".gitignore"):
+        with open(".gitignore") as in_f:
+            lines = in_f.readlines()
+        original_length = len(lines)
+        lines = [line for line in lines if line.strip() not in ("_config.yml", "_config.yaml")]
+        found = False
+        for line in lines:
+            if line.strip() == "conf.py":
+                found = True
+        if not found or len(lines) != original_length:
+            output(":broom: Updating the .gitignore")
+            if not found:
+                lines.append("conf.py\n")
+            with open(".gitignore", "w") as out_f:
+                for line in lines:
+                    out_f.write(line)
+
+
+def cleanup_pyproject() -> None:
+    """Cleanup the pyproject file."""
+    if not path.exists("pyproject.toml"):
+        raise NoConfigError()
+    with open("pyproject.toml") as in_f:
+        pyproject = tomlkit.parse(in_f.read())
+    updated = False
+    if "tool" not in pyproject:
+        pyproject["tool"] = tomlkit.table()
+    if "hatch" not in pyproject["tool"]:
+        pyproject["tool"]["hatch"] = tomlkit.table()
+    if "envs" not in pyproject["tool"]["hatch"]:
+        pyproject["tool"]["hatch"]["envs"] = tomlkit.table()
+    if "default" not in pyproject["tool"]["hatch"]["envs"]:
+        pyproject["tool"]["hatch"]["envs"]["default"] = tomlkit.table()
+    if "scripts" not in pyproject["tool"]["hatch"]["envs"]["default"]:
+        pyproject["tool"]["hatch"]["envs"]["default"]["scripts"] = tomlkit.table()
+        updated = True
+    if "add-language" in pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]:
+        del pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]["add-language"]
+        updated = True
+    if "update-language" in pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]:
+        del pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]["update-language"]
+        updated = True
+    if "migrate" not in pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]:
+        pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]["migrate"] = "uEdition migrate {args}"
+        updated = True
+    if "language" not in pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]:
+        pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]["language"] = "uEdition language {args}"
+        updated = True
+    if "init" not in pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]:
+        pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]["init"] = "uEdition init {args}"
+        updated = True
+    if "edit" not in pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]:
+        pyproject["tool"]["hatch"]["envs"]["default"]["scripts"]["edit"] = (
+            "uvicorn --port 8000 uedition_editor:app {args} {args}"
+        )
+        updated = True
+    if updated:
+        output(":broom: Updating the pyproject.toml")
+    with open("pyproject.toml", "w") as out_f:
+        tomlkit.dump(pyproject, out_f)
+
+
+def migrate_ueditor() -> None:
+    """Migrate the μEditor to the latest supported version."""
+    ueditor_version = "uedition_editor>=2.0.0b5,<2.1"
+    output(":hammer: Updating the μEditor")
+    with open("pyproject.toml") as in_f:
+        pyproject = tomlkit.parse(in_f.read())
+    found_ueditor = False
+    for idx, dep in enumerate(pyproject["tool"]["hatch"]["envs"]["default"]["dependencies"]):
+        dep = dep.lower()  # noqa:PLW2901
+        if (
+            dep == "uedition_editor"
+            or dep.startswith("uedition_editor=")
+            or dep.startswith("uedition_editor<")
+            or dep.startswith("uedition_editor>")
+        ):
+            pyproject["tool"]["hatch"]["envs"]["default"]["dependencies"][idx] = ueditor_version
+            found_ueditor = True
+    if not found_ueditor:
+        pyproject["tool"]["hatch"]["envs"]["default"]["dependencies"].append(ueditor_version)
+    with open("pyproject.toml", "w") as out_f:
+        tomlkit.dump(pyproject, out_f)
+
+
+@app.command()
+def migrate() -> None:
+    """Migrate the μEdition to the latest version."""
+    if not path.exists("uEdition.yml") and not path.exists("uEdition.yaml") and not path.exists("pyproject.toml"):
+        raise NoConfigError()
+    output(":hammer: Migrating the μEdition")
+    cleanup_old_files()
+    cleanup_gitignore()
+    cleanup_pyproject()
+    migrate_ueditor()
+    output(":checkered_flag: Migration complete")

uedition/cli/serve.py

@@ -2,11 +2,13 @@
 #
 # SPDX-License-Identifier: MIT
 """Local server that automatically rebuilds on changes."""
+
 from os import path
 from typing import Callable
 
 from livereload import Server
 
+from uedition.cli.base import app
 from uedition.cli.build import full_build, partial_build
 from uedition.settings import NoConfigError, settings
 
@@ -27,8 +29,9 @@ def build_cmd(lang: dict, full: bool = True) -> Callable[[], None]:  # noqa: FBT
         return cmd
 
 
-def run() -> None:
-    """Run the development server."""
+@app.command()
+def serve() -> None:
+    """Run the local μEdition writing server."""
     if not path.exists("uEdition.yml") and not path.exists("uEdition.yaml"):
         raise NoConfigError()
     full_rebuilds = [build_cmd(lang, full=True) for lang in settings["languages"]]

uedition/cli/update.py

@@ -1,16 +1,84 @@
 # SPDX-FileCopyrightText: 2023-present Mark Hall <mark.hall@work.room3b.eu>
 #
 # SPDX-License-Identifier: MIT
-"""The μEdition check functionality for validating a μEdition and its files."""
+"""The μEdition update functionality."""
+
+from enum import Enum
 from os import path
 
-from copier import run_update
+import httpx
+import tomlkit
+from packaging.specifiers import SpecifierSet
+from packaging.version import Version
+from rich import print as output
 
+from uedition.cli.base import app
 from uedition.settings import NoConfigError
 
 
-def run() -> None:
-    """Update the μEdition using Copier."""
-    if not path.exists("uEdition.yml") and not path.exists("uEdition.yaml"):
-        raise NoConfigError()
-    run_update(".", answers_file=".uEdition.answers", overwrite=True, skip_answered=True)
+class UpdateVersionOptions(Enum):
+    """Option settings for upgrade version selection."""
+
+    RELEASES = "releases"
+    PRE_RELEASES = "pre-releases"
+
+
+@app.command()
+def update(allow_versions: UpdateVersionOptions = UpdateVersionOptions.RELEASES.value) -> None:
+    """Update the μEdition to the latest version."""
+    try:
+        if not path.exists("uEdition.yml") and not path.exists("uEdition.yaml") and not path.exists("pyproject.toml"):
+            raise NoConfigError()
+        with open("pyproject.toml") as in_f:
+            pyproject = tomlkit.parse(in_f.read())
+        output(":hourglass_flowing_sand: Determining latest version")
+        response = httpx.get(
+            "https://pypi.org/simple/uedition/", headers={"Accept": "application/vnd.pypi.simple.v1+json"}
+        )
+        if response.status_code != 200:  # noqa: PLR2004
+            output(":cross_mark: Failed to determine the latest version")
+            raise Exception("PyPi access error")  # noqa: EM101
+        versions = response.json()["versions"]
+        versions.reverse()
+        target_version = None
+        for version in versions:
+            if Version(version).is_prerelease and allow_versions == UpdateVersionOptions.PRE_RELEASES:
+                target_version = Version(version)
+                break
+            elif not Version(version).is_prerelease:
+                target_version = Version(version)
+                break
+        if target_version is None:
+            raise Exception("No version found to upgrade to")  # noqa: EM101
+        target_specifier = SpecifierSet(f">={target_version},<{target_version.major}.{target_version.minor + 1}")
+        output(f":hammer: Upgrading to {target_version}")
+        if "tool" not in pyproject:
+            pyproject["tool"] = tomlkit.table()
+        if "hatch" not in pyproject["tool"]:
+            pyproject["tool"]["hatch"] = tomlkit.table()
+        if "envs" not in pyproject["tool"]["hatch"]:
+            pyproject["tool"]["hatch"]["envs"] = tomlkit.table()
+        if "default" not in pyproject["tool"]["hatch"]["envs"]:
+            pyproject["tool"]["hatch"]["envs"]["default"] = tomlkit.table()
+        if "dependencies" not in pyproject["tool"]["hatch"]["envs"]["default"]:
+            pyproject["tool"]["hatch"]["envs"]["default"]["dependencies"] = []
+        pyproject["tool"]["hatch"]["envs"]["default"]["skip-install"] = True
+        # Upgrade the uEdition version
+        found_uedition = False
+        for idx, dep in enumerate(pyproject["tool"]["hatch"]["envs"]["default"]["dependencies"]):
+            dep = dep.lower()  # noqa:PLW2901
+            if (
+                dep == "uedition"
+                or dep.startswith("uedition=")
+                or dep.startswith("uedition<")
+                or dep.startswith("uedition>")
+            ):
+                pyproject["tool"]["hatch"]["envs"]["default"]["dependencies"][idx] = f"uedition{target_specifier}"
+                found_uedition = True
+        if not found_uedition:
+            pyproject["tool"]["hatch"]["envs"]["default"]["dependencies"].append(f"uedition{target_specifier}")
+        with open("pyproject.toml", "w") as out_f:
+            tomlkit.dump(pyproject, out_f)
+        output(":checkered_flag: Upgrade complete")
+    except Exception as e:
+        output(f":cross_mark: Update failed: {e}")

uedition/ext/tei/builder.py

@@ -14,6 +14,8 @@ from sphinx.locale import __
 from sphinx.util.osutil import ensuredir, os_path
 from sphinx.writers.xml import XMLWriter
 
+from uedition.ext.tei.parser import TeiElement
+
 logger = logging.getLogger(__name__)
 
 MAPPINGS = [
@@ -37,6 +39,13 @@ MAPPINGS = [
     },
     {"cls": nodes.compound, "tagname": "div", "type": "block"},
     {"cls": nodes.admonition, "tagname": "div", "type": "block"},
+    {
+        "cls": nodes.definition_list,
+        "tagname": "list",
+        "type": "block",
+        "attrs": [{"target": "type", "value": "definition"}],
+    },
+    {"cls": nodes.definition_list_item, "tagname": "item", "type": "block"},
     {"cls": sphinx.addnodes.toctree},
     {
         "cls": nodes.footnote,
@@ -105,6 +114,16 @@ class TEITranslator(nodes.GenericNodeVisitor):
         for rule in MAPPINGS:
             if isinstance(node, rule["cls"]):
                 return rule
+        if isinstance(node, TeiElement):
+            tag = node.get("tei_tag")
+            tag = tag[tag.find("}") + 1 :]
+            attrs = []
+            for key, value in node.get("tei_attributes").items():
+                if key.startswith("data-tei-block-") or key.startswith("data-tei-mark-"):
+                    continue
+                elif key.startswith("data-tei-attribute-"):
+                    attrs.append({"target": key[19:], "value": value})
+            return {"tagname": tag, "type": "block", "attrs": attrs}
         self.warn(f"Unknown node {node.__class__.__module__}.{node.__class__.__qualname__} ({node.attlist()})")
         return {"tagname": "div", "type": "block"}
 

uedition/ext/tei/parser.py

@@ -104,10 +104,15 @@ class TEIParser(SphinxParser):
                         source.sort(key=self._sort_key(conf_section["sort"]))
                     doc_section.append(section)
                     for source in sources:
-                        tmp = nodes.section(ids=[source.attrib["id"]])
-                        for child in source:
-                            self._walk_tree(child, tmp)
-                        section.append(tmp)
+                        tmp = None
+                        if "id" in source.attrib:
+                            tmp = nodes.section(ids=[source.attrib["id"]])
+                        elif "{http://www.w3.org/XML/1998/namespace}id" in source.attrib:
+                            tmp = nodes.section(ids=[source.attrib["{http://www.w3.org/XML/1998/namespace}id"]])
+                        if tmp is not None and len(source) > 0:
+                            for child in source:
+                                self._walk_tree(child, tmp)
+                            section.append(tmp)
                     # self._wrap_sections(section, tmp)
             elif conf_section["type"] == "metadata":
                 # Process a field or metadata section
@@ -169,8 +174,12 @@ class TEIParser(SphinxParser):
                 element = TeiElement(
                     html_tag=conf["tag"] if conf["tag"] else "span", tei_tag=node.tag, tei_attributes=attrs
                 )
-                if len(node) == 0 and node.text:
-                    element.append(nodes.Text(node.text))
+                if len(node) == 0:
+                    if conf["text"]:
+                        for match in node.xpath(conf["text"], namespaces=namespaces):
+                            element.append(nodes.Text(match))
+                    elif node.text:
+                        element.append(nodes.Text(node.text))
                 else:
                     for child in node:
                         self._walk_tree(child, element)
@@ -179,7 +188,7 @@ class TEIParser(SphinxParser):
         if len(node) == 0:
             parent.append(nodes.Text(node.text))
         else:
-            logger.warning(f"No block or mark configured for {node.tag}")
+            logger.warning(f"No block or mark configured for {node.tag} ({node.attrib})")
 
     def _parse_attributes(self, node: etree.Element, attribute_configs: list) -> dict:
         attrs = {}
@@ -256,7 +265,7 @@ class TEIParser(SphinxParser):
 
     def _parse_list_field(self: "TEIParser", parent: etree.Element, field: dict, root: etree.Element) -> None:
         """Parse a list of metadata fields."""
-        content = root.xpath(field["content"], namespaces=namespaces)
+        content = root.xpath(field["selector"], namespaces=namespaces)
         if len(content) > 0:
             li = nodes.definition_list_item()
             dt = nodes.term()
@@ -274,7 +283,7 @@ class TEIParser(SphinxParser):
 
     def _parse_download_field(self: "TEIParser", parent: etree.Element, field: dict, root: etree.Element) -> None:
         """Parse a download metadata field."""
-        content = root.xpath(field["content"], namespaces=namespaces)
+        content = root.xpath(field["selector"], namespaces=namespaces)
         target = root.xpath(field["target"], namespaces=namespaces)
         if len(content) > 0 and len(target) > 0:
             if isinstance(content, list):

{uedition-2.0.0a1.dist-info → uedition-2.0.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uEdition
-Version: 2.0.0a1
+Version: 2.0.0b1
 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
@@ -16,16 +16,19 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
-Requires-Dist: copier<10.0.0,>=9.0.0
+Requires-Dist: httpx<0.29,>=0.28.1
 Requires-Dist: livereload
 Requires-Dist: lxml<6.0.0,>=4.9.2
 Requires-Dist: myst-parser<5,>=4.0.1
+Requires-Dist: packaging==24.2
 Requires-Dist: pydantic-settings<3.0.0,>=2.0.0
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: pyyaml<7.0.0,>=6.0.0
 Requires-Dist: sphinx-book-theme<2,>=1.1.4
 Requires-Dist: sphinx-external-toc<2,>=1.0.1
 Requires-Dist: sphinx<9,>=8.2.3
+Requires-Dist: strictyaml<2,>=1.7.3
+Requires-Dist: tomlkit<0.14,>=0.13.2
 Requires-Dist: typer<1.0.0
 Description-Content-Type: text/markdown
 

uedition-2.0.0b1.dist-info/RECORD

@@ -0,0 +1,27 @@
+uedition/__about__.py,sha256=igeteuzPnSden9GXP0P5R-IDvMoaA-z1geZwMH_24Mw,160
+uedition/__init__.py,sha256=xDDK2i5l1NLhxq6_LJH5g7UJDrFEjIJNmT2tcg7xNWI,301
+uedition/__main__.py,sha256=Pg_yGV-ndR2iiImDC3f017llSX6pSYMslIwZlw8vEpQ,189
+uedition/settings.py,sha256=G73r6muJmRzuENZ-2n51bBf88qS3tRv0kdxr2SRt1j4,5048
+uedition/cli/__init__.py,sha256=3UpRbkx28iIvg0A3yLL-hHQS_TBkRzf8eoHW6ICSR8k,562
+uedition/cli/base.py,sha256=wi8hQbNlC5u0xdagd4x9GEV8W8WhVbEk5WoC8cECniw,174
+uedition/cli/build.py,sha256=aVKFLsZ0XZ2cexx4Bc2z75b4vNn207d8_m5W3IsMUfU,8555
+uedition/cli/init.py,sha256=yD4l1ZhSlq_ftdrfv2wa0WPNwDnuP0lQ2WGR757jb7g,730
+uedition/cli/language.py,sha256=EgjphwNH_2all60Tnc2FFMR8ZRV_Ox_hiD_h2r18Sd0,1988
+uedition/cli/migrate.py,sha256=U4Whtat02Baa_fhlUaDcgBl6f8Jvp1GStyONxF5fXsI,5672
+uedition/cli/serve.py,sha256=640qCCalJBXcLtdgep6e0xITaF5oa3_hbUrh--6mMY0,1577
+uedition/cli/update.py,sha256=XRhv9Fdvcf_iKxZMW4Oz1_5h0OSbf32y18gKijFjOQk,3752
+uedition/ext/__init__.py,sha256=hAK3MB5il4tAkfWnZNVxIJhfJ5vN0Fdmmtz0ZAYsvo4,406
+uedition/ext/config.py,sha256=zu0XSH3Ca09n--umhUJ7k6611lVCecOTVZCWAFn4TRU,994
+uedition/ext/language_switcher.css,sha256=y4LzkCgCm6E_nHt15I4Ku5QzBNpjwda9bt9FsqD1ybM,132
+uedition/ext/language_switcher.js,sha256=HIgQiLg0WGS_G_VjpfEpTDLqb1HwHxcL3r6mdoSUix4,2697
+uedition/ext/language_switcher.py,sha256=tHpf4HsvMtatVn5dQ3EFlrk5urFaMzsZZY755cvgCu8,1425
+uedition/ext/settings.py,sha256=CCbvwlWjhikhoeRZ5E_SuA4zUIqDBMkRes_hjOUxjWk,3735
+uedition/ext/tei/__init__.py,sha256=8KgVi31bz8nI65m6u4EdT_f1qNCP45HrU0V7MSGlZxA,1074
+uedition/ext/tei/builder.py,sha256=XcMv_QTGM1zs86lbdQ2Maotl_7RPEvZ004XM9G7orBM,12539
+uedition/ext/tei/parser.py,sha256=b-1jYRd_9994BzVglY_zadFmQkTJHcE2qbp_wa2hnNA,13813
+uedition/ext/tei/tei_download.js,sha256=5_IPCuamZGPXWriPPPz5wA-zo0Y0Oy1858S6ltxSdQ8,2151
+uedition-2.0.0b1.dist-info/METADATA,sha256=PVpjm2v-vfhhy6OtLYd218p7lQXF8yIG8Kgkio7mdAM,2674
+uedition-2.0.0b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+uedition-2.0.0b1.dist-info/entry_points.txt,sha256=cDOOVBb1SZ072ZkY1hW4Y7I_WKKGCtCJtDY1XST1Hr4,96
+uedition-2.0.0b1.dist-info/licenses/LICENSE.txt,sha256=MhLJl8GE8mnuO5i_pvKaobpIGnhiAEdkY-a6LKiuwCE,1101
+uedition-2.0.0b1.dist-info/RECORD,,

uedition/cli/create.py

@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2023-present Mark Hall <mark.hall@work.room3b.eu>
-#
-# SPDX-License-Identifier: MIT
-"""The μEdition create functionality for creating a new μEdition from the project template."""
-from copier import run_copy
-
-
-def run(path: str) -> None:
-    """Create a new μEdition using Copier."""
-    run_copy("gh:uEdition/uEdition-project-template", path)

uedition-2.0.0a1.dist-info/RECORD

@@ -1,25 +0,0 @@
-uedition/__about__.py,sha256=kq7WGmRyG7G8lDeopl9H4oZ4X9xtex9Qs3BryTuumU0,160
-uedition/__init__.py,sha256=xDDK2i5l1NLhxq6_LJH5g7UJDrFEjIJNmT2tcg7xNWI,301
-uedition/__main__.py,sha256=Pg_yGV-ndR2iiImDC3f017llSX6pSYMslIwZlw8vEpQ,189
-uedition/settings.py,sha256=G73r6muJmRzuENZ-2n51bBf88qS3tRv0kdxr2SRt1j4,5048
-uedition/cli/__init__.py,sha256=gnpl_N8uaw-4uF5ByWV3jXveJBvjLb_uay5YkYCUQWw,1478
-uedition/cli/build.py,sha256=L_-OsIEFBXQh-aTHLwLhOXJzXqRH61X2SgVIPxmUgQ0,8169
-uedition/cli/create.py,sha256=Q-SvDq9VtmUP4DQhuuvt1eZ_72sX8_tcFOj2Bt_T6J8,371
-uedition/cli/language.py,sha256=JAyUwNa4gwqMvrJDPPKGkMLm5Cx9sHJkU5r6xTAMb7M,2214
-uedition/cli/serve.py,sha256=FcKp0IbjcyCgn1XjU8VdhI59pGRMNCSXa5jbAS23nxs,1513
-uedition/cli/update.py,sha256=SmAcczHxj3j3X0QYplvXPoIHS8XEfXYVqgXBney0v9c,550
-uedition/ext/__init__.py,sha256=hAK3MB5il4tAkfWnZNVxIJhfJ5vN0Fdmmtz0ZAYsvo4,406
-uedition/ext/config.py,sha256=zu0XSH3Ca09n--umhUJ7k6611lVCecOTVZCWAFn4TRU,994
-uedition/ext/language_switcher.css,sha256=y4LzkCgCm6E_nHt15I4Ku5QzBNpjwda9bt9FsqD1ybM,132
-uedition/ext/language_switcher.js,sha256=HIgQiLg0WGS_G_VjpfEpTDLqb1HwHxcL3r6mdoSUix4,2697
-uedition/ext/language_switcher.py,sha256=tHpf4HsvMtatVn5dQ3EFlrk5urFaMzsZZY755cvgCu8,1425
-uedition/ext/settings.py,sha256=CCbvwlWjhikhoeRZ5E_SuA4zUIqDBMkRes_hjOUxjWk,3735
-uedition/ext/tei/__init__.py,sha256=8KgVi31bz8nI65m6u4EdT_f1qNCP45HrU0V7MSGlZxA,1074
-uedition/ext/tei/builder.py,sha256=LkLR3cu1M6lHHdcjhH5esZ9Qn6eFBXCZWkxVxdXv69E,11719
-uedition/ext/tei/parser.py,sha256=ebeqEiji2RZ-Gfszf0Yaa-Lqww-EPqLmxXiMBq-gj90,13216
-uedition/ext/tei/tei_download.js,sha256=5_IPCuamZGPXWriPPPz5wA-zo0Y0Oy1858S6ltxSdQ8,2151
-uedition-2.0.0a1.dist-info/METADATA,sha256=YquOplbaOq4Z17fRpMEQMK2S1imGpd0HS3TWeCaWXEk,2572
-uedition-2.0.0a1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-uedition-2.0.0a1.dist-info/entry_points.txt,sha256=cDOOVBb1SZ072ZkY1hW4Y7I_WKKGCtCJtDY1XST1Hr4,96
-uedition-2.0.0a1.dist-info/licenses/LICENSE.txt,sha256=MhLJl8GE8mnuO5i_pvKaobpIGnhiAEdkY-a6LKiuwCE,1101
-uedition-2.0.0a1.dist-info/RECORD,,