man page fixes from Debian

git-svn-id: svn://tug.org/texlive/trunk@50583 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 115 insertions, 16 deletions

diff --git a/Build/source/texk/xdvik/ChangeLog b/Build/source/texk/xdvik/ChangeLog
index fd2ff8a13a6..3edc265a0ad 100644
--- a/Build/source/texk/xdvik/ChangeLog
+++ b/Build/source/texk/xdvik/ChangeLog
@@ -1,3 +1,8 @@
+2019-03-25  Karl Berry  <karl@freefriends.org>
+
+	* xdvi.1.in: omit unused second font letter for option names.
+	From Debian.
+
 2018-01-17  Karl Berry  <karl@freefriends.org>
 
 	* xdvi.1.in: remove trailing whitespace to placate Debian.
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 28a6f104597..a95f0246085 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -18964,9 +18964,103 @@ esac
 else
   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 fi
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PKG_CONFIG"; then
+  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+  ac_ct_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_PKG_CONFIG"; then
+  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_PKG_CONFIG" = x; then
+    PKG_CONFIG="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_ct_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
diff --git a/Build/source/texk/xdvik/xdvi.1.in b/Build/source/texk/xdvik/xdvi.1.in
index 88ba2f74fea..72228c0aab9 100644
--- a/Build/source/texk/xdvik/xdvi.1.in
+++ b/Build/source/texk/xdvik/xdvi.1.in
@@ -1,4 +1,4 @@
-.\" Copyright 1990-2018 Paul Vojta and others
+.\" Copyright 1990-2019 Paul Vojta and others
 .\"
 .\" This is Paul's license, included here only for reference, it does not apply
 .\" to all parts of the k version.
@@ -648,7 +648,7 @@ Same as
 .BR -fg .
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-fullscreen
+.B \-fullscreen
 When this option is used, xdvi will (try to) run in fullscreen mode, with
 no window decorations.
 This option is not guaranteed to work with all windowmanagers/desktops;
@@ -853,7 +853,7 @@ List the names of all fonts used.
 Prints licensing information.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-linkcolor
+.B \-linkcolor
 .RB ( .linkColor )
 Color used for unvisited hyperlinks (`Blue2' by default). Hyperlinks
 are unvisited before you click on them, or after the DVI file has been reloaded.
@@ -867,7 +867,7 @@ and
 .BR \-linkstyle .
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-linkstyle
+.B \-linkstyle
 .RB ( .LinkStyle )
 Determines the style in which hyperlinks are displayed. Possible
 values and their meanings are:
@@ -882,9 +882,9 @@ values and their meanings are:
 .sp 1n
 .fi
 The values for \fIlink color\fR are specified by the options/resources
-.BI \-linkcolor
+.B \-linkcolor
 and
-.BI \-visitedlinkcolor
+.B \-visitedlinkcolor
 (which see).
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
@@ -1165,7 +1165,7 @@ to
 #endif
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-noomega
+.B \-noomega
 .RB ( .omega )
 This will disable the use of Omega extensions when interpreting DVI files.
 By default, the additional opcodes
@@ -1249,7 +1249,7 @@ to
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 #ift1
 .TP
-.BI \-notype1fonts
+.B \-notype1fonts
 .RB ( .type1 )
 This will disable the use of the FreeType library to display PostScript<tm>
 Type 1 fonts.
@@ -1461,7 +1461,7 @@ Determines the color of the rules used for the magnifier
 (default: foreground color).
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-q
+.B \-q
 .RB ( .noInitFile )
 Ignore the
 .I $HOME/.xdvirc
@@ -1581,7 +1581,7 @@ extensions in both filenames.
 Otherwise, if one of the filenames does contain a path component (e.g.:
 .IR ./test.tex ,
 .IR ../test.tex ,
-.IR /my/homedir/tex/test.tex
+.I /my/homedir/tex/test.tex
 or any combination of these), both filenames are expanded to a full path,
 with any occurrences of
 .I ../
@@ -1674,7 +1674,7 @@ controlling a remote instance of xdvi like this; all other options are
 currently ignored.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-useTeXpages
+.B \-useTeXpages
 Use logical \*(Te\& pages (the values of the
 .I \ecount0
 register) instead of physical pages for the pagelist labels and
@@ -1686,12 +1686,12 @@ This option can be toggled via the
 keystroke.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-version
+.B \-version
 Print information on the version of
 .BR xdvi .
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-visitedlinkcolor
+.B \-visitedlinkcolor
 .RB ( .visitedLinkColor )
 Color used for visited hyperlinks (`Purple4' by default). Hyperlinks become
 visited once you click on them. As for
@@ -1966,7 +1966,7 @@ move forward
 history items.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BR ^
+.B ^
 .RB [ home() ]
 Move to the ``home'' position of the page.  This is normally the upper
 left-hand corner of the page, depending on the margins as described in the
@@ -3267,7 +3267,7 @@ These specify the time (in milliseconds) that the printing progress window will
 stay open after the
 .B dvips
 process has terminated. The value of
-.BR dvipsHangTime
+.B dvipsHangTime
 is used if the process terminates successfully;
 .B dvipsFailHangTime
 is used if it terminates with an error. The default values are 1.5 and 5 seconds, respectively.
@@ -4112,7 +4112,7 @@ string may contain the format string
 .IR %s ,
 which will be replaced by the file name.
 .TP
-.BI needsterminal
+.B needsterminal
 If this flag is used, the command will be executed in a new xterm
 window by prepending
 .RI `` "xterm -e "''