diff --git a/.github/workflows/deploy-stable.yml b/.github/workflows/deploy-stable.yml index 6eb5c5b0..e10c87f2 100644 --- a/.github/workflows/deploy-stable.yml +++ b/.github/workflows/deploy-stable.yml @@ -116,23 +116,20 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create Release - id: create_release - uses: actions/create-release@latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: "v${{ env.VERSION }}" - release_name: "v${{ env.VERSION }}" - body: | - See the [changelog](CHANGELOG.md) for details. - draft: false - prerelease: false + tag: ${{ env.VERSION }} + run: | + gh release create "v$tag" \ + --repo="$GITHUB_REPOSITORY" \ + --title="v$tag" \ + --notes="See the [changelog](CHANGELOG.md) for details." dispatch: needs: deploy strategy: matrix: - repo: ['oscarlevin/pretext-docker', 'pretextbook/html-static'] + repo: ['pretextbook/pretext-docker', 'pretextbook/html-static'] runs-on: ubuntu-latest steps: - name: Repository Dispatch diff --git a/CHANGELOG.md b/CHANGELOG.md index a01324f4..ee3085e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ Instructions: Add a subsection under `[Unreleased]` for additions, fixes, change ## [Unreleased] +### Added + +- Publisher controlled page breaks for PDF output + +### Changes + +- Simplified course template + ## [2.34.0] - 2026-01-02 Includes updates to core through commit: [a7a0894](https://github.com/PreTeXtBook/pretext/commit/a7a089448b50916f7d114d9459185b049f96ccc8) diff --git a/poetry.lock b/poetry.lock index 85b1f84b..0a7e0a1e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1969,15 +1969,15 @@ reference = "pypi-public" [[package]] name = "prefig" -version = "0.4.6" +version = "0.5.0" description = "An authoring system for mathematical diagrams" optional = true python-versions = ">=3.10,<4.0" groups = ["main"] markers = "extra == \"prefigure\" or extra == \"all\"" files = [ - {file = "prefig-0.4.6-py3-none-any.whl", hash = "sha256:c291ebacf146cc9bdd0afddc370d301da51191feb5c275e00774f8c65492b88b"}, - {file = "prefig-0.4.6.tar.gz", hash = "sha256:7d8543d5a543071c29ad214d8c9261d6689145ba793950c0e97b6ce21ee5ced4"}, + {file = "prefig-0.5.0-py3-none-any.whl", hash = "sha256:2c5126a0b81dd863451a4cfe20a19613bf9e590f4d2194c9ac2a8ec23ff95e15"}, + {file = "prefig-0.5.0.tar.gz", hash = "sha256:332b2c217058db7dd7540e55b3fd995ab64368d4627303144d7bf5c915b2a546"}, ] [package.dependencies] @@ -3471,4 +3471,4 @@ prefigure = ["prefig"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "03998de1f09921cebd9ca6ab44d0af9e75bfe78fbf360c4dc35dc1de3dc253e9" +content-hash = "a828809c4b3507c3d01f6d46bacdea29bd3169eb6f7dce9d5a15124663dd7630" diff --git a/pretext/__init__.py b/pretext/__init__.py index 9ff72b84..98a6a60f 100644 --- a/pretext/__init__.py +++ b/pretext/__init__.py @@ -19,7 +19,7 @@ VERSION = get_version("pretext", Path(__file__).parent.parent) -CORE_COMMIT = "a7a089448b50916f7d114d9459185b049f96ccc8" +CORE_COMMIT = "d95a31b8ed95f8152b8fe66ddf8754f62ad65e24" def activate() -> None: diff --git a/pyproject.toml b/pyproject.toml index 13d3f8d7..09f34a16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ plastex = "^3" jinja2 = "^3" coloraide = "^4" pelican = { extras = ["markdown"], version = "^4.10", optional = true } -prefig = { extras = ["text"], version = "^0.4.6", optional = true } +prefig = { extras = ["text"], version = "^0.5.0", optional = true } citeproc-py = "^0" diff --git a/templates/course/README.md b/templates/course/README.md index 7223f3d0..48a9daa1 100644 --- a/templates/course/README.md +++ b/templates/course/README.md @@ -9,13 +9,13 @@ The course template includes a single PreTeXt "book" that contains (as chapters) You can build the course using ```bash -pretext build web +pretext build course ``` and view it with ```bash -pretext view web +pretext view course ``` Also included is the start of a slide deck. This is a single file in the `source/slides` folder. You could use this for all the slides in a course (as a single slideshow), or create separate slideshows. In that case, you might want to build those separate ones with something like, @@ -24,6 +24,8 @@ Also included is the start of a slide deck. This is a single file in the `sourc pretext build slides -i source/slides/chapter2.ptx ``` +In either case, you will need to uncomment the "slide" targets inside `project.ptx`. + ### Creating a landing page for multiple targets Build the entire course with: @@ -32,7 +34,7 @@ Build the entire course with: pretext build --deploys ``` -This will build both the course "book" and the slide deck. You can create a landing page with links to each of these automatically with the command, +This will build the course "book" (and the slide deck if you uncomment that target in `project.ptx`). You can create a landing page with links to each of these automatically with the command, ```bash pretext deploy --stage-only diff --git a/templates/course/project.ptx b/templates/course/project.ptx index 1fdadb70..2558dc13 100644 --- a/templates/course/project.ptx +++ b/templates/course/project.ptx @@ -9,12 +9,16 @@ + + diff --git a/templates/course/source/slides/slides.ptx b/templates/course/source/slides/slides.ptx index f45de416..201a7dd8 100644 --- a/templates/course/source/slides/slides.ptx +++ b/templates/course/source/slides/slides.ptx @@ -1,4 +1,6 @@ + + diff --git a/templates/installPandoc.sh b/templates/installPandoc.sh index dd5c18ea..8f7c8797 100644 --- a/templates/installPandoc.sh +++ b/templates/installPandoc.sh @@ -3,7 +3,14 @@ # This file was automatically generated with PreTeXt {VERSION}. # If you modify this file, PreTeXt will no longer automatically update it. -wget https://github.com/jgm/pandoc/releases/download/3.8.3/pandoc-3.8.3-1-amd64.deb -O pandoc.deb +# Detect architecture and download appropriate Pandoc version +if uname -m | grep -q "aarch64\|arm64"; then + # ARM architecture + wget https://github.com/jgm/pandoc/releases/download/3.8.3/pandoc-3.8.3-1-arm64.deb -O pandoc.deb +else + # x86/amd64 architecture + wget https://github.com/jgm/pandoc/releases/download/3.8.3/pandoc-3.8.3-1-amd64.deb -O pandoc.deb +fi # wait for 60 second and then double check that no other script is using apt-get: sleep 60