From b3472831ddfd1931359464019cc964efeac20d94 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 9 Apr 2022 03:00:48 +0000 Subject: CTAN sync 202204090300 --- macros/texinfo/latest/texi2dvi | 51 +++++------------------------------------- 1 file changed, 6 insertions(+), 45 deletions(-) (limited to 'macros/texinfo') diff --git a/macros/texinfo/latest/texi2dvi b/macros/texinfo/latest/texi2dvi index 241ad6817a..84ddde517c 100644 --- a/macros/texinfo/latest/texi2dvi +++ b/macros/texinfo/latest/texi2dvi @@ -1,7 +1,7 @@ #! /bin/sh # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources. # -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -74,18 +74,15 @@ newline=' ' IFS="$space$tab$newline" -: ${EGREP=egrep} +: ${EGREP=grep -E} # Systems which define $COMSPEC or $ComSpec use semicolons to separate # directories in TEXINPUTS -- except for Cygwin and Msys, where COMSPEC # might be inherited, but : is used. -# In the case of Msys, uname returns a value derived from MSYSTEM, as -# MSYSTEM is user configurable, it is not so safe to use it to detect -# Msys. It is safer to use OSTYPE, this is why we set MSYSTEM to -# $OSTYPE before calling uname if test -n "$COMSPEC$ComSpec" \ - && MSYSTEM=$OSTYPE uname | $EGREP -iv 'cygwin|msys' >/dev/null; then + && uname | $EGREP -iv 'cygwin|msys' >/dev/null \ + && test "$OSTYPE" != msys ; then path_sep=";" else path_sep=":" @@ -198,9 +195,9 @@ EOF version () { cat < This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -449,24 +446,6 @@ list_infix () IFS=$save_IFS } -# list_dir_to_abs LIST-NAME - Convert list to using only absolute dir names. -# Currently unused, but should replace absolute_filenames some day. -list_dir_to_abs () -{ - ldta_list="$1" - eval set X \$$ldta_list - shift - ldta_result='' - for dir - do - dir=`absolute "$dir"` - test -d "$dir" || continue - ldta_result="$ldata_result \"$dir\"" - done - set X $ldta_result; shift - eval $ldta_list=\"$@\" -} - # Language auxiliary functions. # @@ -674,24 +653,6 @@ index_file_p () return 0 } -########### not used currently -# xref_file_p FILE - Return success if FILE is an xref file (indexes, -# tables and lists). -xref_file_p () -{ - test -f "$1" || return 1 - # If the file is not suitable to be an index or xref file, don't - # process it. It's suitable if the first character is a - # backslash or right quote or at, as long as the first line isn't - # \input texinfo. - case `$SED '1q' "$1"` in - "\\input texinfo"*) return 1;; - [\\''@]*) return 0;; - *) return 1;; - esac -} - - # Used in generated_files_get generated_files_get_from_log () { -- cgit v1.2.3