use assembled source for the source_element() method, to work with versions (#959)

* use assembled source for the source_element() method, to work with versions

* update changelog

* fix tests

Author: oscarlevin

CHANGELOG.md

@@ -9,6 +9,14 @@ Instructions: Add a subsection under `[Unreleased]` for additions, fixes, change
 
 ## [Unreleased]
 
+### Changed
+
+- The CLI now uses your assembled source in case you use "versions" for checking for some source errors and deciding whether assets must be regenerated.  For example, if you change an asset in a component that is not part of a version, it will not trigger rebuilding all assets.
+
+### Fixed
+
+- Fixed a bug with the denver theme that displayed some tasks with their headings not inline.
+
 ## [2.16.1] - 2025-04-08
 
 Includes updates to core through commit: [7017d8f](https://github.com/PreTeXtBook/pretext/commit/7017d8fcc7005984ffc7fad81d0a37062a529a9d)

pretext/project/__init__.py

@@ -346,12 +346,16 @@ def post_validate(self) -> None:
                     raise ValueError(
                         "Only one <document-id> is allowed in a PreTeXt document."
                     )
-                d = d_list[0]
-                assert isinstance(d, str)
-                # Use the correct number of `../` to undo the project's `output-dir`, so the output from the build is located in the correct directory of `published/document-id`.
-                self.output_dir = Path(
-                    f"{'../'*len(self._project.output_dir.parents)}published/{d}"
-                )
+                # NB as of 2025-04-08, we are no longer setting the output directory automatically for
+                # Runestone targets.  This must be managed by the project.ptx file or by a client script.
+                # The commented code below is how we used to do this.
+
+                # d = d_list[0]
+                # assert isinstance(d, str)
+                # # Use the correct number of `../` to undo the project's `output-dir`, so the output from the build is located in the correct directory of `published/document-id`.
+                # self.output_dir = Path(
+                #    f"{'../'*len(self._project.output_dir.parents)}published/{d}"
+                # )
             else:
                 raise ValueError(
                     "The <document-id> must be defined for the Runestone format."
@@ -360,12 +364,28 @@ def post_validate(self) -> None:
     def source_abspath(self) -> Path:
         return self._project.source_abspath() / self.source
 
-    def source_element(self) -> ET._Element:
+    def original_source_element(self) -> ET._Element:
+        """
+        Returns the root element of the original source document without running through pretext assembly.
+        """
         source_doc = ET.parse(self.source_abspath())
         for _ in range(25):
             source_doc.xinclude()
+        print("Type of source_doc: ", type(source_doc))
         return source_doc.getroot()
 
+    def source_element(self) -> ET._Element:
+        """
+        Returns the root element for the assembled source, after processing with the "version-only" assembly.
+        """
+        assembled = core.assembly_internal(
+            xml=self.source_abspath(),
+            pub_file=self.publication_abspath().as_posix(),
+            stringparams=self.stringparams.copy(),
+            method="version",
+        )
+        return assembled.getroot()
+
     def publication_abspath(self) -> Path:
         return self._project.publication_abspath() / self.publication
 
@@ -446,7 +466,7 @@ def load_asset_table(self) -> pt.AssetTable:
 
     def generate_asset_table(self) -> pt.AssetTable:
         """
-        Returns a hash table (dictionary) with keys the asset types present in the current target's source, each with value a hash of all the assets of that type.
+        Returns a hash table (dictionary) with keys the asset types present in the current target's *assembled* source, each with value a hash of all the assets of that type.
         ex: {latex-image: <hash>, asymptote: <hash>}.
 
         NOTE: This is a change in behavior starting in 2.13; previously the keys were dictionaries mapping xml:id's to hashes of individual assets.
@@ -455,7 +475,7 @@ def generate_asset_table(self) -> pt.AssetTable:
         ns = {"pf": "https://prefigure.org"}
         for asset in constants.ASSET_TO_XPATH.keys():
             # everything else can be updated individually.
-            # get all the nodes for the asset attribute
+            # get all the nodes for the asset attribute (using assembled source)
             source_assets = self.source_element().xpath(
                 constants.ASSET_TO_XPATH[asset], namespaces=ns
             )

pretext/resources/resource_hash_table.json

@@ -116,5 +116,17 @@
     "installPandoc.sh": "0dfd2cf2455efeff82293ba2b3724bc94e20620ed9f87c4cd3ee967d0dedd076",
     "installLatex.sh": "89fc36da1ac5bf3c79e70990d760f288b94afb71dac03f0651424efbf55663aa",
     "installSage.sh": "7f2b791271aaf21a0b6c742e9758d4f131b59216c261902fe43c8461143cb407"
+  },
+  "2.16.2": {
+    "project.ptx": "72285565f5bcd94eedb2b91f88cea37e7af21604bcb5eb9e99c286fe1291ebb3",
+    "codechat_config.yaml": "2fb7c39582a71b878d6d5105b5ac5dae51d5c4f4ee3354f50ba0a9dfe80ce70c",
+    ".gitignore": "c9dd727d2357c9c7d8022a688ae71f17d17aa2d70bccf978cb366b49b43feda2",
+    "devcontainer.json": "ae45a61196b3121a5644ddf4dec62843a9178185e6f9cd8ed4d6e0bcaa6f24b9",
+    "pretext-cli.yml": "b9bb9deb5e64ed8fa2fe472688029ae4f77731cf6a006a5c58c80c55bdb85131",
+    "pretext-deploy.yml": "dbf18a18cf30b9301fff84890ad99334ba08f6ab0cdfa88b5d0cb233fc378c60",
+    "installPretext.sh": "0bab8bf900bd81c83039656740082742afea4c99f577324d5498ae7e8644073d",
+    "installPandoc.sh": "b36cfab7b0a9c0536777aea982e466186184d0f317867f598e06709bf4332b75",
+    "installLatex.sh": "1fa5ba1cbf5d7f0d5dc71e988558281fc16e4a131b09ae9fe917b5c692e08a47",
+    "installSage.sh": "797938aeab7a1f2e109e40a3f116f0c66fe96e49af59968833ede70a786130ff"
   }
 }

templates/.gitignore

@@ -1,4 +1,4 @@
-# This file was automatically generated with PreTeXt 2.16.1.
+# This file was automatically generated with PreTeXt 2.16.2.
 # If you modify this file, PreTeXt will no longer automatically update it.
 #
 # Boilerplate list of files in a PreTeXt project for git to ignore

templates/codechat_config.yaml

@@ -1,4 +1,4 @@
-# This file was automatically generated with PreTeXt 2.16.1.
+# This file was automatically generated with PreTeXt 2.16.2.
 # If you modify this file, PreTeXt will no longer automatically update it.
 #
 #############################################################

templates/devcontainer.json

@@ -1,4 +1,4 @@
-// This file was automatically generated with PreTeXt 2.16.1.
+// This file was automatically generated with PreTeXt 2.16.2.
 // If you modify this file, PreTeXt will no longer automatically update it.
 //
 //////////////////////////////////////////////////////////////

templates/installLatex.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-# This file was automatically generated with PreTeXt 2.16.1.
+# This file was automatically generated with PreTeXt 2.16.2.
 # If you modify this file, PreTeXt will no longer automatically update it.
 
 # We use TinyTeX (https://yihui.org/tinytex/)
 wget -qO- "https://yihui.org/tinytex/install-bin-unix.sh" | sh
 
-tlmgr install adjustbox amscdx bold-extra braket bussproofs cancel carlisle cases chessfss circuitikz colortbl enumitem extpfeil fontawesome5 fontaxes gensymb imakeidx kastrup lambda-lists listings listingsutf8 marvosym mathalpha mathtools menukeys mhchem microtype musicography newpx newtx nicematrix pdfcol pdfpages pdflscape pgfplots phaistos physics polyglossia pstricks realscripts relsize siunitx skak skaknew smartdiagram snapshot stmaryrd tcolorbox tikzfill titlesec txfonts ulem upquote was xfrac xltxtra xpatch xstring 
+tlmgr install adjustbox amscdx bold-extra braket bussproofs cancel carlisle cases chessfss circuitikz colortbl enumitem extpfeil fontawesome5 fontaxes gensymb imakeidx jknapltx kastrup lambda-lists listings listingsutf8 marvosym mathalpha mathtools menukeys mhchem microtype musicography newpx newtx nicematrix pdfcol pdfpages pdflscape pgfplots phaistos physics polyglossia pstricks realscripts relsize siunitx skak skaknew smartdiagram snapshot stmaryrd tcolorbox tikzfill titlesec txfonts ulem upquote was xfrac xltxtra xpatch xstring 
 
 tlmgr path add
 

templates/installPandoc.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This file was automatically generated with PreTeXt 2.16.1.
+# This file was automatically generated with PreTeXt 2.16.2.
 # If you modify this file, PreTeXt will no longer automatically update it.
 
 wget https://github.com/jgm/pandoc/releases/download/3.6.4/pandoc-3.6.4-1-amd64.deb -O pandoc.deb

templates/installPretext.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This file was automatically generated with PreTeXt 2.16.1.
+# This file was automatically generated with PreTeXt 2.16.2.
 # If you modify this file, PreTeXt will no longer automatically update it.
 
 sudo apt-get update 

templates/installSage.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This file was automatically generated with PreTeXt 2.16.1.
+# This file was automatically generated with PreTeXt 2.16.2.
 # If you modify this file, PreTeXt will no longer automatically update it.
 
 # Conda should already be installed in the codespace.  We need to add the conda-forge channel