Merge branch 'main' into typst-template

Author: christopherkenny

.circleci/config.yml

@@ -1 +1 @@
-github: [jgm,tarleb]
+github: [jgm,tarleb,silby]

.github/FUNDING.yml

@@ -7,20 +7,29 @@ assignees: ''
 
 ---
 <!--
-Thank you for reporting an issue! Before you continue, please make sure that you have
+Thank you for reporting an issue!
+Before you continue, please make sure that you have
 
-- searched the [issue tracker](https://github.com/jgm/pandoc/issues) for similar issues (including closed issues).
-- searched the [discussion forum](https://github.com/jgm/pandoc/discussions) for
-  solutions.
-- reproduced your issue on the [latest release of pandoc](https://github.com/jgm/pandoc/releases), or online at [try pandoc](https://pandoc.org/try).
+- reproduced your issue with the latest release of pandoc
+  (https://github.com/jgm/pandoc/releases), or online (https://pandoc.org/try).
+- searched the issue tracker (https://github.com/jgm/pandoc/issues)
+  for similar issues (including closed issues).
+- searched the discussion forum
+  (https://github.com/jgm/pandoc/discussions) for solutions.
+
+If you are experiencing a regression (an unwanted change of
+behavior from an earlier version of pandoc), please indicate
+this and give relevant version numbers. Be sure to check the
+release notes (https://pandoc.org/releases) for relevant
+changes, as you might find a solution there.
 
 Note that this bug tracker is for reporting bugs, not asking
-questions.  For questions, use the [discussion
-forum](https://github.com/jgm/pandoc/discussions).
+questions. For questions, use the discussion forum:
+https://github.com/jgm/pandoc/discussions.
 -->
 
 **Explain the problem.**
 Include the **exact command line** you used and **all inputs necessary to reproduce the issue**.  Please create as minimal an example as possible, to help the maintainers isolate the problem.  Explain the output you received and how it differs from what you expected.
 
 **Pandoc version?**
-What version of pandoc are you using, on what OS? (If it's not the latest release, please try with the latest release before reporting the issue.)
+What version of pandoc are you using, on what OS? (If it's not the latest release, please try with the latest release before reporting the issue. Note that many linux distributions have old versions of pandoc in their repositories.)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,6 @@ blank_issues_enabled: false
 contact_links:
   - name: Ask a question
     url: https://github.com/jgm/pandoc/discussions
-    # https://groups.google.com/forum/#!forum/pandoc-discuss
     about: "Discussion forum for pandoc"
   - name: Contributing Guidelines
     url: https://pandoc.org/CONTRIBUTING.html

.github/ISSUE_TEMPLATE/config.yml

@@ -12,7 +12,7 @@ Thank you for suggesting a feature! Before you continue, please make sure that y
 
 - read the contributing guidelines: https://pandoc.org/CONTRIBUTING.html
 - searched the issue tracker for similar issues (including closed issues): https://github.com/jgm/pandoc/issues
-- searched the pandoc-discuss mailing list for relevant discussions: https://groups.google.com/forum/#!forum/pandoc-discuss
+- searched the discussion list for relevant discussions: https://github.com/jgm/pandoc/discussions
 -->
 
 **Describe your proposed improvement and the problem it solves.**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -51,18 +51,35 @@ jobs:
           - ghc: '8.10'
             cabal: 'latest'
             cabalopts: ''
+            ghcopts: '-Werror'
           - ghc: '9.0'
             cabal: 'latest'
             cabalopts: ''
+            ghcopts: '-Werror'
           - ghc: '9.2'
             cabal: 'latest'
             cabalopts: ''
+            ghcopts: '-Werror'
           - ghc: '9.4'
             cabal: 'latest'
             cabalopts: ''
+            ghcopts: '-Werror'
           - ghc: '9.6'
             cabal: 'latest'
             cabalopts: ''
+            ghcopts: '-Werror'
+          - ghc: '9.8'
+            cabal: 'latest'
+            cabalopts: ''
+            ghcopts: '-Werror'
+          - ghc: '9.10'
+            cabal: 'latest'
+            cabalopts: ''
+            ghcopts: ''
+          - ghc: '9.12'
+            cabal: 'latest'
+            cabalopts: '--allow-newer'
+            ghcopts: ''
     steps:
     - uses: actions/checkout@v4
 
@@ -103,7 +120,7 @@ jobs:
 
     - name: Build and test
       run: |
-          cabal test ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization --ghc-options=-Werror all
+          cabal test ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization --ghc-options="${{ matrix.verisons.ghcopts }}" all
 
   linux-stack:
 
@@ -138,32 +155,32 @@ jobs:
       run: |
           stack test --fast
 
-  linux-nix-cabal:
+# linux-nix-cabal:
 
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-    steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@V27
-      with:
-        nix_path: nixpkgs=channel:nixos-unstable
-    - name: Cache cabal global package db
-      id:   cabal-global
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.local/state/cabal
-        key: ${{ runner.os }}-nix-cabal-global-${{ secrets.CACHE_VERSION }}
-    - name: Cache cabal work
-      id:   cabal-local
-      uses: actions/cache@v4
-      with:
-        path: |
-          dist-newstyle
-        key: ${{ runner.os }}-nix-cabal-local-${{ secrets.CACHE_VERSION }}
-    - run: |
-        nix-shell --run "cabal update && cabal test --enable-tests --disable-optimization --ghc-options=-Werror all"
+#   runs-on: ubuntu-latest
+#   strategy:
+#     fail-fast: true
+#   steps:
+#   - uses: actions/checkout@v4
+#   - uses: cachix/install-nix-action@v30
+#     with:
+#       nix_path: nixpkgs=channel:nixos-24.05
+#   - name: Cache cabal global package db
+#     id:   cabal-global
+#     uses: actions/cache@v4
+#     with:
+#       path: |
+#         ~/.local/state/cabal
+#       key: ${{ runner.os }}-nix-cabal-global-${{ secrets.CACHE_VERSION }}
+#   - name: Cache cabal work
+#     id:   cabal-local
+#     uses: actions/cache@v4
+#     with:
+#       path: |
+#         dist-newstyle
+#       key: ${{ runner.os }}-nix-cabal-local-${{ secrets.CACHE_VERSION }}
+#   - run: |
+#       nix-shell --run "cabal update && cabal test --enable-tests --disable-optimization --ghc-options=-Werror all"
 
   windows:
 
@@ -175,6 +192,7 @@ jobs:
     - name: Install ghc
       run: |
         ghcup install ghc --set 9.4.4
+        ghcup install cabal --set 3.10
 
     # declare/restore cached things
 
@@ -194,7 +212,7 @@ jobs:
           dist-newstyle
         key: ${{ runner.os }}-stack-work-${{ hashFiles('cabal.project') }}-${{ secrets.CACHE_VERSION }}
 
-    - name: Install dependencies
+    - name: Build and test
       run: |
           cabal update
           cabal test ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization --ghc-options=-Werror all

.github/workflows/ci.yml

@@ -17,7 +17,8 @@ jobs:
 
     - name: Install ghc
       run: |
-        ghcup install ghc --set 9.4.4
+        ghcup install ghc --set 9.8
+        ghcup install cabal --set 3.14
 
     - name: Install dependencies
       run: |
@@ -46,7 +47,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install ghc
       run: |
-        ghcup install ghc --set 9.4.4
+        ghcup install ghc --set 9.8
+        ghcup install cabal --set 3.14
     - name: Install dependencies
       run: |
           cabal update
@@ -69,13 +71,18 @@ jobs:
 
   macos:
 
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
     - uses: actions/checkout@v4
+    - name: Install ghcup
+      run: |
+        brew install ghcup
     - name: Install ghc
       run: |
-        ghcup install ghc --set 9.4.4
+        ghcup install ghc --set 9.8
+        ghcup install cabal --set 3.14
+        echo "$HOME/.ghcup/bin" >> "${GITHUB_PATH}"
     - name: Install dependencies
       run: |
           cabal update

.github/workflows/nightly.yml

@@ -77,15 +77,20 @@ jobs:
 
   macos:
 
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
     - uses: actions/checkout@v4
 
+    - name: Install ghcup
+      run: |
+        brew install ghcup
+
     - name: Install ghc and cabal
       run: |
         ghcup install ghc --set 9.6
         ghcup install cabal --set 3.10
+        echo "$HOME/.ghcup/bin" >> "${GITHUB_PATH}"
 
     - name: Create release
       run: |