sagemath · vbraun · Dec 26, 2023 · Dec 11, 2023 · Dec 11, 2023 · Dec 12, 2023
diff --git a/.github/workflows/doc-build-pdf.yml b/.github/workflows/doc-build-pdf.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="build/bin:$PATH"
           eval $(sage-print-system-package-command auto update)
           eval $(sage-print-system-package-command auto --yes --no-install-recommends install zip)
-          eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive)
+          eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive texlive_luatex free_fonts xindy)
 
       - name: Add prebuilt tree as a worktree
         id: worktree

diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
@@ -161,7 +161,7 @@ jobs:
           export PATH="build/bin:$PATH"
           eval $(sage-print-system-package-command auto update)
           eval $(sage-print-system-package-command auto --yes --no-install-recommends install zip)
-          eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive)
+          eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive texlive_luatex free_fonts xindy)
           export SAGE_USE_CDNS=yes
           export SAGE_LIVE_DOC=yes
           export SAGE_JUPYTER_SERVER=binder:sagemath/sage-binder-env/dev

diff --git a/build/pkgs/_recommended/dependencies b/build/pkgs/_recommended/dependencies
@@ -1 +1 @@
-pandoc ffmpeg imagemagick texlive git libjpeg
+pandoc ffmpeg imagemagick git libjpeg texlive texlive_luatex free_fonts xindy
diff --git a/build/pkgs/free_fonts/SPKG.rst b/build/pkgs/free_fonts/SPKG.rst
@@ -0,0 +1,23 @@
+free_fonts: a free family of scalable outline fonts
+===================================================
+
+Description
+-----------
+
+This dummy package represents the GNU free fonts: a free family of scalable
+outline fonts, suitable for general use on computers and for desktop
+publishing. It is Unicode-encoded for compatibility with all modern operating
+systems.
+
+We do not have an SPKG for it. The purpose of this dummy package is to
+associate system package lists with it.
+
+License
+-------
+
+GNU General Public License GPLv3+
+
+Upstream Contact
+----------------
+
+https://www.gnu.org/software/freefont/
diff --git a/build/pkgs/free_fonts/distros/alpine.txt b/build/pkgs/free_fonts/distros/alpine.txt
@@ -0,0 +1 @@
+ttf-freefont
diff --git a/build/pkgs/free_fonts/distros/arch.txt b/build/pkgs/free_fonts/distros/arch.txt
@@ -0,0 +1 @@
+gnu-free-fonts
diff --git a/build/pkgs/free_fonts/distros/conda.txt b/build/pkgs/free_fonts/distros/conda.txt
@@ -0,0 +1 @@
+open-fonts
diff --git a/build/pkgs/free_fonts/distros/debian.txt b/build/pkgs/free_fonts/distros/debian.txt
@@ -0,0 +1 @@
+fonts-freefont-otf
diff --git a/build/pkgs/free_fonts/distros/fedora.txt b/build/pkgs/free_fonts/distros/fedora.txt
@@ -0,0 +1 @@
+gnu-free-fonts
diff --git a/build/pkgs/free_fonts/distros/freebsd.txt b/build/pkgs/free_fonts/distros/freebsd.txt
@@ -0,0 +1 @@
+x11-fonts/freefont-ttf
diff --git a/build/pkgs/free_fonts/distros/gentoo.txt b/build/pkgs/free_fonts/distros/gentoo.txt
@@ -0,0 +1 @@
+media-fonts/freefont
diff --git a/build/pkgs/free_fonts/distros/macports.txt b/build/pkgs/free_fonts/distros/macports.txt
@@ -0,0 +1 @@
+freefont-ttf
diff --git a/build/pkgs/free_fonts/distros/opensuse.txt b/build/pkgs/free_fonts/distros/opensuse.txt
@@ -0,0 +1 @@
+gnu-free-fonts
diff --git a/build/pkgs/free_fonts/distros/repology.txt b/build/pkgs/free_fonts/distros/repology.txt
@@ -0,0 +1 @@
+gnu-freefont
diff --git a/build/pkgs/free_fonts/distros/void.txt b/build/pkgs/free_fonts/distros/void.txt
@@ -0,0 +1 @@
+freefont-ttf
diff --git a/build/pkgs/free_fonts/spkg-configure.m4 b/build/pkgs/free_fonts/spkg-configure.m4
@@ -0,0 +1,16 @@
+SAGE_SPKG_CONFIGURE([free_fonts], [
+    sage_spkg_install_free_fonts=yes
+    m4_foreach([font],
+               [FreeSerif.ttf,FreeSerif.otf],
+        [
+        AC_MSG_CHECKING([for ]font)
+        AS_IF([kpsewhich ]font[ >& AS_MESSAGE_LOG_FD 2>&1], [
+            AC_MSG_RESULT([yes])
+            sage_spkg_install_free_fonts=no
+            break
+        ], [
+            AC_MSG_RESULT([no])
+        ])
+    ])
+])
+
diff --git a/build/pkgs/free_fonts/type b/build/pkgs/free_fonts/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/sagemath_doc_pdf/dependencies b/build/pkgs/sagemath_doc_pdf/dependencies
@@ -1 +1 @@
-sagemath_doc_html texlive
+sagemath_doc_html texlive texlive_luatex free_fonts xindy
diff --git a/build/pkgs/texlive_luatex/SPKG.rst b/build/pkgs/texlive_luatex/SPKG.rst
@@ -0,0 +1,21 @@
+texlive_luatex: LuaTeX packages
+===============================
+
+Description
+-----------
+
+Packages for LuaTeX, a TeX engine using Lua as an embedded scripting and
+extension language, with native support for Unicode, OpenType/TrueType fonts,
+and both PDF and DVI output.
+
+The purpose of this dummy package is to associate system package lists with it.
+
+License
+-------
+
+GNU General Public License version 2.0 (GPLv2)
+
+Upstream Contact
+----------------
+
+https://www.luatex.org/
diff --git a/build/pkgs/texlive_luatex/dependencies b/build/pkgs/texlive_luatex/dependencies
@@ -0,0 +1 @@
+texlive
diff --git a/build/pkgs/texlive_luatex/distros/alpine.txt b/build/pkgs/texlive_luatex/distros/alpine.txt
@@ -0,0 +1 @@
+texlive-luatex
diff --git a/build/pkgs/texlive_luatex/distros/arch.txt b/build/pkgs/texlive_luatex/distros/arch.txt
@@ -0,0 +1 @@
+texlive-collection-luatex
diff --git a/build/pkgs/texlive_luatex/distros/cygwin.txt b/build/pkgs/texlive_luatex/distros/cygwin.txt
@@ -0,0 +1 @@
+texlive
diff --git a/build/pkgs/texlive_luatex/distros/debian.txt b/build/pkgs/texlive_luatex/distros/debian.txt
@@ -0,0 +1 @@
+texlive-luatex
diff --git a/build/pkgs/texlive_luatex/distros/fedora.txt b/build/pkgs/texlive_luatex/distros/fedora.txt
@@ -0,0 +1 @@
+texlive-luatex
diff --git a/build/pkgs/texlive_luatex/distros/gentoo.txt b/build/pkgs/texlive_luatex/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-texlive/texlive-luatex
diff --git a/build/pkgs/texlive_luatex/distros/macports.txt b/build/pkgs/texlive_luatex/distros/macports.txt
@@ -0,0 +1 @@
+texlive-luatex
diff --git a/build/pkgs/texlive_luatex/distros/opensuse.txt b/build/pkgs/texlive_luatex/distros/opensuse.txt
@@ -0,0 +1 @@
+texlive-luatex
diff --git a/build/pkgs/texlive_luatex/distros/repology.txt b/build/pkgs/texlive_luatex/distros/repology.txt
@@ -0,0 +1 @@
+texlive-luatex
diff --git a/build/pkgs/texlive_luatex/spkg-configure.m4 b/build/pkgs/texlive_luatex/spkg-configure.m4
@@ -0,0 +1,10 @@
+SAGE_SPKG_CONFIGURE([texlive_luatex], [
+    sage_spkg_install_texlive_luatex=no
+    AC_MSG_CHECKING([for luaotfload-main.lua])
+    AS_IF([kpsewhich luaotfload-main.lua >& AS_MESSAGE_LOG_FD 2>&1], [
+        AC_MSG_RESULT([yes])
+    ], [
+        AC_MSG_RESULT([no])
+        sage_spkg_install_texlive_luatex=yes
+    ])
+])
diff --git a/build/pkgs/texlive_luatex/type b/build/pkgs/texlive_luatex/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/xindy/SPKG.rst b/build/pkgs/xindy/SPKG.rst
@@ -0,0 +1,20 @@
+xindy: a general-purpose index processor
+========================================
+
+Description
+-----------
+
+This dummy package represents xindy: xindy was developed after an impasse had been encountered in the attempt to complete internationalisation of makeindex. Xindy can be used to process indexes for documents marked up using (LA)TEX, Nroff family and SGML-based languages. Xindy is highly configurable, both in markup terms and in terms of the collating order of the text being processed.
+
+We do not have an SPKG for it. The purpose of this dummy package is to
+associate system package lists with it.
+
+License
+-------
+
+GNU General Public License version 2.0 (GPLv2)
+
+Upstream Contact
+----------------
+
+http://www.xindy.org/
diff --git a/build/pkgs/xindy/distros/debian.txt b/build/pkgs/xindy/distros/debian.txt
@@ -0,0 +1 @@
+xindy
diff --git a/build/pkgs/xindy/distros/macports.txt b/build/pkgs/xindy/distros/macports.txt
@@ -0,0 +1 @@
+xindy
diff --git a/build/pkgs/xindy/distros/opensuse.txt b/build/pkgs/xindy/distros/opensuse.txt
@@ -0,0 +1 @@
+xindy
diff --git a/build/pkgs/xindy/distros/repology.txt b/build/pkgs/xindy/distros/repology.txt
@@ -0,0 +1 @@
+xindy
diff --git a/build/pkgs/xindy/spkg-configure.m4 b/build/pkgs/xindy/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([xindy], [
+    sage_spkg_install_xindy=no
+    AC_PATH_PROG([XINDY], [xindy])
+    AS_IF([test -z "$XINDY"], [sage_spkg_install_xindy=yes])
+])
diff --git a/build/pkgs/xindy/type b/build/pkgs/xindy/type
@@ -0,0 +1 @@
+optional
diff --git a/src/doc/fr/tutorial/conf.py b/src/doc/fr/tutorial/conf.py
@@ -39,9 +39,6 @@
    'The Sage Group', 'manual'),
 ]
 
-# Additional LaTeX stuff for the French version
-#latex_elements['preamble'] += '\\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n'
-
 # the definition of \\at in the standard preamble of the sphinx doc
 # conflicts with that in babel/french[b]
 latex_elements['preamble'] += '\\let\\at\\undefined'
diff --git a/src/doc/ja/a_tour_of_sage/conf.py b/src/doc/ja/a_tour_of_sage/conf.py
@@ -25,6 +25,10 @@
 name = 'a_tour_of_sage'
 language = "ja"
 
+# The LaTeX engine to build the docs in Japanese.
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-latex_engine
+latex_engine = 'uplatex'
+
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 html_title = project + " v" + release

diff --git a/src/doc/ja/tutorial/conf.py b/src/doc/ja/tutorial/conf.py
@@ -25,6 +25,10 @@
 name = 'tutorial-jp'
 language = "ja"
 
+# The LaTeX engine to build the docs in Japanese.
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-latex_engine
+latex_engine = 'uplatex'
+
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 html_title = project + " v" + release

diff --git a/src/doc/ru/tutorial/conf.py b/src/doc/ru/tutorial/conf.py
@@ -38,6 +38,3 @@
   ('index', 'SageTutorial_ru.tex', 'Sage Tutorial in Russian',
    'The Sage Development Team', 'manual'),
 ]
-
-# Additional LaTeX stuff if necessary:
-#latex_elements['preamble'] += '\\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pandoc ffmpeg imagemagick texlive git libjpeg
		pandoc ffmpeg imagemagick git libjpeg texlive texlive_luatex free_fonts xindy
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		sagemath_doc_html texlive
		sagemath_doc_html texlive texlive_luatex free_fonts xindy