diff options
-rwxr-xr-x | Build/source/build-aux/ar-lib | 21 | ||||
-rwxr-xr-x | Build/source/build-aux/compile | 29 | ||||
-rwxr-xr-x | Build/source/utils/m-tx/mtx-src/compile | 29 | ||||
-rw-r--r-- | Master/doc.html | 3 | ||||
-rw-r--r-- | Master/tlpkg/installer/ctan-mirrors.pl | 2 |
5 files changed, 60 insertions, 24 deletions
diff --git a/Build/source/build-aux/ar-lib b/Build/source/build-aux/ar-lib index 7d62dea9980..d0a7b5c8a54 100755 --- a/Build/source/build-aux/ar-lib +++ b/Build/source/build-aux/ar-lib @@ -2,7 +2,7 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-02-03.05; # UTC # Copyright (C) 2010-2025 Free Software Foundation, Inc. # Written by Peter Rosin <peda@lysator.liu.se>. @@ -51,9 +51,20 @@ func_file_conv () # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -65,8 +76,8 @@ func_file_conv () mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin | msys) - file=`cygpath -m "$file" || echo "$file"` + cygwin) + file=`cygpath -w "$file" || echo "$file"` ;; wine) file=`winepath -w "$file" || echo "$file"` diff --git a/Build/source/build-aux/compile b/Build/source/build-aux/compile index 14aec562188..c404e89e478 100755 --- a/Build/source/build-aux/compile +++ b/Build/source/build-aux/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2024-12-03.03; # UTC +scriptversion=2025-02-03.05; # UTC # Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. @@ -37,11 +37,11 @@ IFS=" "" $nl" file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ func_file_conv () # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ func_file_conv () fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` diff --git a/Build/source/utils/m-tx/mtx-src/compile b/Build/source/utils/m-tx/mtx-src/compile index 14aec562188..c404e89e478 100755 --- a/Build/source/utils/m-tx/mtx-src/compile +++ b/Build/source/utils/m-tx/mtx-src/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2024-12-03.03; # UTC +scriptversion=2025-02-03.05; # UTC # Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. @@ -37,11 +37,11 @@ IFS=" "" $nl" file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ func_file_conv () # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ func_file_conv () fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` diff --git a/Master/doc.html b/Master/doc.html index 38def514d38..097b805c50f 100644 --- a/Master/doc.html +++ b/Master/doc.html @@ -10585,6 +10585,7 @@ Fonts for typesetting in Church Slavonic language. <li id="fontscale"><b><a href="texmf-dist/doc/latex/fontscale/">fontscale</a></b><small> (<a href="https://ctan.org/pkg/fontscale">CTAN</a>): A flexible interface for setting font sizes. +<a href="texmf-dist/doc/latex/fontscale/fontscale-code.pdf">fontscale-code.pdf</a> <a href="texmf-dist/doc/latex/fontscale/fontscale.pdf">fontscale.pdf</a> </small></li> @@ -30710,5 +30711,5 @@ Standard conforming typesetting of Japanese, for XeLaTeX. <p><a href="#letter-1">1</a> - <a href="#letter-2">2</a> - <a href="#letter-A">A</a> - <a href="#letter-B">B</a> - <a href="#letter-C">C</a> - <a href="#letter-D">D</a> - <a href="#letter-E">E</a> - <a href="#letter-F">F</a> - <a href="#letter-G">G</a> - <a href="#letter-H">H</a> - <a href="#letter-I">I</a> - <a href="#letter-J">J</a> - <a href="#letter-K">K</a> - <a href="#letter-L">L</a> - <a href="#letter-M">M</a> - <a href="#letter-N">N</a> - <a href="#letter-O">O</a> - <a href="#letter-P">P</a> - <a href="#letter-Q">Q</a> - <a href="#letter-R">R</a> - <a href="#letter-S">S</a> - <a href="#letter-T">T</a> - <a href="#letter-U">U</a> - <a href="#letter-V">V</a> - <a href="#letter-W">W</a> - <a href="#letter-X">X</a> - <a href="#letter-Y">Y</a> - <a href="#letter-Z">Z</a></p> <hr> -<small>Generated Sun Feb 2 16:18:13 CET 2025 by tl-update-docindex.</small> +<small>Generated Wed Feb 5 01:40:17 CET 2025 by tl-update-docindex.</small> </body></html> diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl index 2c8bcfe3031..174e60e86ad 100644 --- a/Master/tlpkg/installer/ctan-mirrors.pl +++ b/Master/tlpkg/installer/ctan-mirrors.pl @@ -144,7 +144,6 @@ $mirrors = { 'Poland' => { 'https://ctan.gust.org.pl/tex-archive/' => 1, 'https://polish-mirror.evolution-host.com/ctan/' => 1, - 'https://sunsite.icm.edu.pl/pub/CTAN/' => 1, }, 'Portugal' => { 'https://ftp.eq.uc.pt/software/TeX/' => 1, @@ -193,7 +192,6 @@ $mirrors = { 'https://linux-mirror.xicalcoatl.mx/ctan/' => 1, }, 'USA' => { - 'https://ctan.math.illinois.edu/' => 1, 'https://ctan.math.utah.edu/ctan/tex-archive/' => 1, 'https://ctan.math.washington.edu/tex-archive/' => 1, 'https://ctan.mirrors.hoobly.com/' => 1, |