lib/libpaper: New convention

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

45 files changed, 857 insertions, 853 deletions

diff --git a/Build/source/libs/libpaper/ChangeLog b/Build/source/libs/libpaper/ChangeLog
index 36f9a26dc20..b7ffdc6843e 100644
--- a/Build/source/libs/libpaper/ChangeLog
+++ b/Build/source/libs/libpaper/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-18  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Makefile.am, configure.ac: New convention.
+
 2015-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/libs/libpaper/Makefile.am b/Build/source/libs/libpaper/Makefile.am
index 8da34ce4a0f..993ad77a587 100644
--- a/Build/source/libs/libpaper/Makefile.am
+++ b/Build/source/libs/libpaper/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = $(LIBPAPER_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(LIBPAPER_TREE)-PATCHES
+EXTRA_DIST += libpaper-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/libs/libpaper/Makefile.in b/Build/source/libs/libpaper/Makefile.in
index 38f27820265..90f96fcd1db 100644
--- a/Build/source/libs/libpaper/Makefile.in
+++ b/Build/source/libs/libpaper/Makefile.in
@@ -402,7 +402,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing \
 	$(top_srcdir)/../../build-aux/test-driver \
-	$(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in \
+	$(top_srcdir)/libpaper-src/man/paperconf.1.in \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -544,7 +544,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(LIBPAPER_TREE) $(LIBPAPER_TREE)-PATCHES
+EXTRA_DIST = $(LIBPAPER_TREE) libpaper-PATCHES
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
@@ -626,7 +626,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-paperconf.1: $(top_builddir)/config.status $(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in
+paperconf.1: $(top_builddir)/config.status $(top_srcdir)/libpaper-src/man/paperconf.1.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-noinstLIBRARIES:
diff --git a/Build/source/libs/libpaper/configure b/Build/source/libs/libpaper/configure
index 5aa76fbc69e..eb931ca5ee3 100755
--- a/Build/source/libs/libpaper/configure
+++ b/Build/source/libs/libpaper/configure
@@ -585,7 +585,7 @@ PACKAGE_STRING='libpaper (TeX Live) 1.1.24+nmu2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="libpaper-1.1.24+nmu2/lib/paper.h"
+ac_unique_file="libpaper-src/lib/paper.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -5234,10 +5234,10 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-LIBPAPER_TREE=libpaper-1.1.24+nmu2
+LIBPAPER_TREE=libpaper-src
 
 
-ac_config_files="$ac_config_files Makefile include/Makefile paperconf.1:libpaper-1.1.24+nmu2/man/paperconf.1.in"
+ac_config_files="$ac_config_files Makefile include/Makefile paperconf.1:libpaper-src/man/paperconf.1.in"
 
 
 cat >confcache <<\_ACEOF
@@ -5981,7 +5981,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "paperconf.1") CONFIG_FILES="$CONFIG_FILES paperconf.1:libpaper-1.1.24+nmu2/man/paperconf.1.in" ;;
+    "paperconf.1") CONFIG_FILES="$CONFIG_FILES paperconf.1:libpaper-src/man/paperconf.1.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/libs/libpaper/configure.ac b/Build/source/libs/libpaper/configure.ac
index b36ff819a46..fc711c6b741 100644
--- a/Build/source/libs/libpaper/configure.ac
+++ b/Build/source/libs/libpaper/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_include([version.ac])[] dnl define libpaper_version
 AC_INIT([libpaper (TeX Live)], libpaper_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([libpaper-]libpaper_version[/lib/paper.h])
+AC_CONFIG_SRCDIR([libpaper-src/lib/paper.h])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIRS([../../m4])
 
@@ -39,10 +39,10 @@ AC_SUBST([PAPERSIZEVAR], [PAPERSIZE])
 AC_DEFINE_UNQUOTED([PAPERSIZEVAR], ["$PAPERSIZEVAR"],
                    [Environment variable that overrides the default paper size])
 
-AC_SUBST([LIBPAPER_TREE], [libpaper-]libpaper_version)
+AC_SUBST([LIBPAPER_TREE], [libpaper-src])
 
 AC_CONFIG_FILES([Makefile 
                 include/Makefile
-                paperconf.1:libpaper-]libpaper_version[/man/paperconf.1.in])
+                paperconf.1:libpaper-src/man/paperconf.1.in])
 
 AC_OUTPUT
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog b/Build/source/libs/libpaper/libpaper-PATCHES/ChangeLog
index 88935dabef6..88935dabef6 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog
+++ b/Build/source/libs/libpaper/libpaper-PATCHES/ChangeLog
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes b/Build/source/libs/libpaper/libpaper-PATCHES/TL-Changes
index 779b6d4ff35..779b6d4ff35 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes
+++ b/Build/source/libs/libpaper/libpaper-PATCHES/TL-Changes
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS b/Build/source/libs/libpaper/libpaper-PATCHES/patch-01-JIS
index ce2016ad995..ce2016ad995 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS
+++ b/Build/source/libs/libpaper/libpaper-PATCHES/patch-01-JIS
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL b/Build/source/libs/libpaper/libpaper-PATCHES/patch-02-TL
index 601ccb9d252..601ccb9d252 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL
+++ b/Build/source/libs/libpaper/libpaper-PATCHES/patch-02-TL
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt b/Build/source/libs/libpaper/libpaper-PATCHES/patch-03-getopt
index cec650d1108..cec650d1108 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt
+++ b/Build/source/libs/libpaper/libpaper-PATCHES/patch-03-getopt
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-04-unsigned b/Build/source/libs/libpaper/libpaper-PATCHES/patch-04-unsigned
index 13c798bc1e5..13c798bc1e5 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-04-unsigned
+++ b/Build/source/libs/libpaper/libpaper-PATCHES/patch-04-unsigned
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/ChangeLog b/Build/source/libs/libpaper/libpaper-src/ChangeLog
index 1eadcbd9f1b..1eadcbd9f1b 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/ChangeLog
+++ b/Build/source/libs/libpaper/libpaper-src/ChangeLog
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/Makefile.am b/Build/source/libs/libpaper/libpaper-src/Makefile.am
index e646ec42084..b0a136b95c8 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/Makefile.am
+++ b/Build/source/libs/libpaper/libpaper-src/Makefile.am
@@ -1,3 +1,3 @@
-
-SUBDIRS = lib src man
-
+

+SUBDIRS = lib src man

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/README b/Build/source/libs/libpaper/libpaper-src/README
index 2b451f7a552..7c4fb128610 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/README
+++ b/Build/source/libs/libpaper/libpaper-src/README
@@ -1,39 +1,39 @@
-The paper library and accompanying files are intended to provide a simple
-way for applications to take actions based on a system- or user-specified
-paper size.
-
-This release is quite minimal, its purpose being to provide really basic
-functions (obtaining the system paper name and getting the height and
-width of a given kond of paper) that applications can immediately
-integrate.
-A more complete library, using a capabilities file for papers (giving,
-in addition to the size, informations like paper weigth, color, etc)
-will be released later.
-
-See the sources for paperconf(1) in src/paper.c for how to use the library.
-
-Adding new paper sizes
-======================
-
-If a paper format is missing, one need to add it to lib/paperspecs.  The
-format of this file is one paper format per line, with the name of the
-format, the width and height of the format separated with space.  You
-may add an option measurement unit among in, ft, pt, m, dm, cm, mm or you
-may leave the default unit of "point".  By defaults the width and height
-are specified in the "point" unit, which is 1/72 inch (2.54 cm).  This
-is the A4 entry:
-
-  a4 210 297 mm
-
-that was previously written as
-
-  a4 595 842
-
-The sizes here are 595 points / 72 points pr inch * 2.54 cm per
-inch = 20.99 cm and 842/72*2.54 = 29.70 cm.  The A4 format
-is 210x297 mm so this is a good approximation.  (Source:
-<URL:http://en.wikipedia.org/wiki/A4_paper_size>)
-
-Copyright (C) Yves Arrouye <yves@debian.org>, 1996
-              Adrian Bunk  <bunk@fs.tum.de> , 2000
-
+The paper library and accompanying files are intended to provide a simple

+way for applications to take actions based on a system- or user-specified

+paper size.

+

+This release is quite minimal, its purpose being to provide really basic

+functions (obtaining the system paper name and getting the height and

+width of a given kond of paper) that applications can immediately

+integrate.

+A more complete library, using a capabilities file for papers (giving,

+in addition to the size, informations like paper weigth, color, etc)

+will be released later.

+

+See the sources for paperconf(1) in src/paper.c for how to use the library.

+

+Adding new paper sizes

+======================

+

+If a paper format is missing, one need to add it to lib/paperspecs.  The

+format of this file is one paper format per line, with the name of the

+format, the width and height of the format separated with space.  You

+may add an option measurement unit among in, ft, pt, m, dm, cm, mm or you

+may leave the default unit of "point".  By defaults the width and height

+are specified in the "point" unit, which is 1/72 inch (2.54 cm).  This

+is the A4 entry:

+

+  a4 210 297 mm

+

+that was previously written as

+

+  a4 595 842

+

+The sizes here are 595 points / 72 points pr inch * 2.54 cm per

+inch = 20.99 cm and 842/72*2.54 = 29.70 cm.  The A4 format

+is 210x297 mm so this is a good approximation.  (Source:

+<URL:http://en.wikipedia.org/wiki/A4_paper_size>)

+

+Copyright (C) Yves Arrouye <yves@debian.org>, 1996

+              Adrian Bunk  <bunk@fs.tum.de> , 2000

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/config.h.in b/Build/source/libs/libpaper/libpaper-src/config.h.in
index eb99fd55840..66e89084033 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/config.h.in
+++ b/Build/source/libs/libpaper/libpaper-src/config.h.in
@@ -1,73 +1,73 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Default configuration file location */
-#undef PAPERCONF
-
-/* Environment variable that overrides the default configuration file location
-   */
-#undef PAPERCONFVAR
-
-/* Default paper size */
-#undef PAPERSIZE
-
-/* Environment variable that overrides the defaultpaper size */
-#undef PAPERSIZEVAR
-
-/* Default directory for run-parts */
-#undef RUNPARTSDIR
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* config.h.in.  Generated from configure.ac by autoheader.  */

+

+/* Define to 1 if you have the <dlfcn.h> header file. */

+#undef HAVE_DLFCN_H

+

+/* Define to 1 if you have the <inttypes.h> header file. */

+#undef HAVE_INTTYPES_H

+

+/* Define to 1 if you have the <memory.h> header file. */

+#undef HAVE_MEMORY_H

+

+/* Define to 1 if you have the <stdint.h> header file. */

+#undef HAVE_STDINT_H

+

+/* Define to 1 if you have the <stdlib.h> header file. */

+#undef HAVE_STDLIB_H

+

+/* Define to 1 if you have the <strings.h> header file. */

+#undef HAVE_STRINGS_H

+

+/* Define to 1 if you have the <string.h> header file. */

+#undef HAVE_STRING_H

+

+/* Define to 1 if you have the <sys/stat.h> header file. */

+#undef HAVE_SYS_STAT_H

+

+/* Define to 1 if you have the <sys/types.h> header file. */

+#undef HAVE_SYS_TYPES_H

+

+/* Define to 1 if you have the <unistd.h> header file. */

+#undef HAVE_UNISTD_H

+

+/* Define to the address where bug reports for this package should be sent. */

+#undef PACKAGE_BUGREPORT

+

+/* Define to the full name of this package. */

+#undef PACKAGE_NAME

+

+/* Define to the full name and version of this package. */

+#undef PACKAGE_STRING

+

+/* Define to the one symbol short name of this package. */

+#undef PACKAGE_TARNAME

+

+/* Define to the version of this package. */

+#undef PACKAGE_VERSION

+

+/* Default configuration file location */

+#undef PAPERCONF

+

+/* Environment variable that overrides the default configuration file location

+   */

+#undef PAPERCONFVAR

+

+/* Default paper size */

+#undef PAPERSIZE

+

+/* Environment variable that overrides the defaultpaper size */

+#undef PAPERSIZEVAR

+

+/* Default directory for run-parts */

+#undef RUNPARTSDIR

+

+/* Define to 1 if you have the ANSI C header files. */

+#undef STDC_HEADERS

+

+/* Enable GNU extensions on systems that have them.  */

+#ifndef _GNU_SOURCE

+# undef _GNU_SOURCE

+#endif

+

+/* Define to empty if `const' does not conform to ANSI C. */

+#undef const

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/configure.ac b/Build/source/libs/libpaper/libpaper-src/configure.ac
index 4b6ef5714ad..cc5bacc7101 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/configure.ac
+++ b/Build/source/libs/libpaper/libpaper-src/configure.ac
@@ -1,66 +1,66 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([libpaper], [1.1.9])
-AC_CONFIG_SRCDIR([configure.ac])
-AM_INIT_AUTOMAKE([no-define])
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-dnl Check for standard build environment
-dnl ====================================
-AC_PROG_CC
-AC_GNU_SOURCE
-AC_PROG_INSTALL
-AM_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-
-dnl Complier features
-dnl =================
-AC_C_CONST
-
-dnl set up some substitutions
-dnl =========================
-PAPERCONF="${sysconfdir}/papersize"
-AC_SUBST(PAPERCONF)
-AH_TEMPLATE(PAPERCONF, [Default configuration file location])
-AC_DEFINE_UNQUOTED(PAPERCONF, "$PAPERCONF")
-
-PAPERCONFVAR=PAPERCONF
-AC_SUBST(PAPERCONFVAR)
-AH_TEMPLATE(PAPERCONFVAR, [Environment variable that overrides the default configuration file location])
-AC_DEFINE_UNQUOTED(PAPERCONFVAR, "$PAPERCONFVAR")
-
-PAPERSIZE=letter
-AC_SUBST(PAPERSIZE)
-AH_TEMPLATE(PAPERSIZE, [Default paper size])
-AC_DEFINE_UNQUOTED(PAPERSIZE, "$PAPERSIZE")
-
-RUNPARTSDIR="${sysconfdir}/libpaper.d"
-AC_SUBST(RUNPARTSDIR)
-AH_TEMPLATE(RUNPARTSDIR, [Default directory for run-parts])
-AC_DEFINE_UNQUOTED(RUNPARTSDIR, "$RUNPARTSDIR")
-
-RUNPARTSDIRVAR=PAPERDIR
-AC_SUBST(RUNPARTSDIRVAR)
-AH_TEMPLATE(RUNPARTSDIRVAR, [Environment variable that overrides the default directory for run-parts])
-AC_DEFINE_UNQUOTED(RUNPARTSDIRVAR, "$RUNPARTSDIRVAR")
-
-PAPERSIZEVAR=PAPERSIZE
-AC_SUBST(PAPERSIZEVAR)
-AH_TEMPLATE(PAPERSIZEVAR, [Environment variable that overrides the default paper size])
-AC_DEFINE_UNQUOTED(PAPERSIZEVAR, "$PAPERSIZEVAR")
-
-dnl Create files
-dnl ============
-AC_OUTPUT([
-	Makefile
-	lib/Makefile
-	src/Makefile
-	src/paperconfig
-	man/Makefile
-	man/paperconf.1
-	man/paperconfig.8
-	man/papersize.5
-	man/systempapername.3
-])
-
+dnl Process this file with autoconf to produce a configure script.

+

+AC_INIT([libpaper], [1.1.9])

+AC_CONFIG_SRCDIR([configure.ac])

+AM_INIT_AUTOMAKE([no-define])

+AM_CONFIG_HEADER(config.h)

+AM_MAINTAINER_MODE

+

+dnl Check for standard build environment

+dnl ====================================

+AC_PROG_CC

+AC_GNU_SOURCE

+AC_PROG_INSTALL

+AM_PROG_LIBTOOL

+AC_PROG_MAKE_SET

+

+dnl Complier features

+dnl =================

+AC_C_CONST

+

+dnl set up some substitutions

+dnl =========================

+PAPERCONF="${sysconfdir}/papersize"

+AC_SUBST(PAPERCONF)

+AH_TEMPLATE(PAPERCONF, [Default configuration file location])

+AC_DEFINE_UNQUOTED(PAPERCONF, "$PAPERCONF")

+

+PAPERCONFVAR=PAPERCONF

+AC_SUBST(PAPERCONFVAR)

+AH_TEMPLATE(PAPERCONFVAR, [Environment variable that overrides the default configuration file location])

+AC_DEFINE_UNQUOTED(PAPERCONFVAR, "$PAPERCONFVAR")

+

+PAPERSIZE=letter

+AC_SUBST(PAPERSIZE)

+AH_TEMPLATE(PAPERSIZE, [Default paper size])

+AC_DEFINE_UNQUOTED(PAPERSIZE, "$PAPERSIZE")

+

+RUNPARTSDIR="${sysconfdir}/libpaper.d"

+AC_SUBST(RUNPARTSDIR)

+AH_TEMPLATE(RUNPARTSDIR, [Default directory for run-parts])

+AC_DEFINE_UNQUOTED(RUNPARTSDIR, "$RUNPARTSDIR")

+

+RUNPARTSDIRVAR=PAPERDIR

+AC_SUBST(RUNPARTSDIRVAR)

+AH_TEMPLATE(RUNPARTSDIRVAR, [Environment variable that overrides the default directory for run-parts])

+AC_DEFINE_UNQUOTED(RUNPARTSDIRVAR, "$RUNPARTSDIRVAR")

+

+PAPERSIZEVAR=PAPERSIZE

+AC_SUBST(PAPERSIZEVAR)

+AH_TEMPLATE(PAPERSIZEVAR, [Environment variable that overrides the default paper size])

+AC_DEFINE_UNQUOTED(PAPERSIZEVAR, "$PAPERSIZEVAR")

+

+dnl Create files

+dnl ============

+AC_OUTPUT([

+	Makefile

+	lib/Makefile

+	src/Makefile

+	src/paperconfig

+	man/Makefile

+	man/paperconf.1

+	man/paperconfig.8

+	man/papersize.5

+	man/systempapername.3

+])

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/Makefile.am b/Build/source/libs/libpaper/libpaper-src/lib/Makefile.am
index 3375cc05d38..028abaa59a2 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/Makefile.am
+++ b/Build/source/libs/libpaper/libpaper-src/lib/Makefile.am
@@ -1,21 +1,21 @@
-
-lib_LTLIBRARIES = libpaper.la
-libpaper_la_SOURCES = dimen.c paper.c dimen.h paperspecs.h
-libpaper_la_LDFLAGS = -version-info 2:2:1
-libpaper_la_CPPFLAGS = -D_REENTRANT
-
-BUILT_SOURCES = paperspecs.h
-
-include_HEADERS = paper.h
-
-EXTRA_DIST = paperspecs
-
-paperspecs.h: paperspecs Makefile
-	echo '    /* This file has been automaticaly generated.' >$@
-	echo '       Edit paperspecs to make changes to the papers specifications. */' >>$@
-	echo >>$@
-	env LANG=C LC_ALL=C awk '{ factor = 1.0; \
-	       if ($$4 == "mm") factor = 72.0 / 25.4; \
-	       if ($$4 == "in") factor = 72.0; \
-	       printf("    { \"%s\", %5f, %5f },\n", \
-		      $$1, $$2 * factor, $$3 * factor); }' < $< >> $@
+

+lib_LTLIBRARIES = libpaper.la

+libpaper_la_SOURCES = dimen.c paper.c dimen.h paperspecs.h

+libpaper_la_LDFLAGS = -version-info 2:2:1

+libpaper_la_CPPFLAGS = -D_REENTRANT

+

+BUILT_SOURCES = paperspecs.h

+

+include_HEADERS = paper.h

+

+EXTRA_DIST = paperspecs

+

+paperspecs.h: paperspecs Makefile

+	echo '    /* This file has been automaticaly generated.' >$@

+	echo '       Edit paperspecs to make changes to the papers specifications. */' >>$@

+	echo >>$@

+	env LANG=C LC_ALL=C awk '{ factor = 1.0; \

+	       if ($$4 == "mm") factor = 72.0 / 25.4; \

+	       if ($$4 == "in") factor = 72.0; \

+	       printf("    { \"%s\", %5f, %5f },\n", \

+		      $$1, $$2 * factor, $$3 * factor); }' < $< >> $@

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.c b/Build/source/libs/libpaper/libpaper-src/lib/dimen.c
index 702d7937668..702d7937668 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.c
+++ b/Build/source/libs/libpaper/libpaper-src/lib/dimen.c
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.h b/Build/source/libs/libpaper/libpaper-src/lib/dimen.h
index d574ac3202d..d574ac3202d 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.h
+++ b/Build/source/libs/libpaper/libpaper-src/lib/dimen.h
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.c b/Build/source/libs/libpaper/libpaper-src/lib/paper.c
index 512dff88452..512dff88452 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.c
+++ b/Build/source/libs/libpaper/libpaper-src/lib/paper.c
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.h b/Build/source/libs/libpaper/libpaper-src/lib/paper.h
index 993f7463c8c..993f7463c8c 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.h
+++ b/Build/source/libs/libpaper/libpaper-src/lib/paper.h
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs
index 6be0a46dc3a..6be0a46dc3a 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs
+++ b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs.h b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs.h
index a94ec36dafb..a94ec36dafb 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs.h
+++ b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs.h
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/Makefile.am b/Build/source/libs/libpaper/libpaper-src/man/Makefile.am
index f9d579a645c..6a86233affd 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/Makefile.am
+++ b/Build/source/libs/libpaper/libpaper-src/man/Makefile.am
@@ -1,25 +1,25 @@
-man_MANS = \
-	paperconf.1 \
-	defaultpapername.3 \
-	defaultpapersizefile.3 \
-	paperdone.3 \
-	paperfirst.3 \
-	paperinfo.3 \
-	paperinit.3 \
-	paperlast.3 \
-	papernext.3 \
-	paperprev.3 \
-	paperpsheight.3 \
-	paperpsname.3 \
-	paperpswidth.3 \
-	paperwithsize.3 \
-	systempapername.3 \
-	systempapersizefile.3 \
-	papersize.5 \
-	paperconfig.8
-
-EXTRA_DIST = \
-	paperconf.1.in \
-	systempapername.3.in \
-	papersize.5.in \
-	paperconfig.8.in
+man_MANS = \

+	paperconf.1 \

+	defaultpapername.3 \

+	defaultpapersizefile.3 \

+	paperdone.3 \

+	paperfirst.3 \

+	paperinfo.3 \

+	paperinit.3 \

+	paperlast.3 \

+	papernext.3 \

+	paperprev.3 \

+	paperpsheight.3 \

+	paperpsname.3 \

+	paperpswidth.3 \

+	paperwithsize.3 \

+	systempapername.3 \

+	systempapersizefile.3 \

+	papersize.5 \

+	paperconfig.8

+

+EXTRA_DIST = \

+	paperconf.1.in \

+	systempapername.3.in \

+	papersize.5.in \

+	paperconfig.8.in

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapername.3 b/Build/source/libs/libpaper/libpaper-src/man/defaultpapername.3
index 882f4bbf27e..32199b5702f 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapername.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/defaultpapername.3
@@ -1,2 +1,2 @@
-.so man3/systempapername.3
-
+.so man3/systempapername.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3 b/Build/source/libs/libpaper/libpaper-src/man/defaultpapersizefile.3
index 390a56bdfeb..b3c0e4823cf 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/defaultpapersizefile.3
@@ -1,2 +1,2 @@
-.so man3/systempapersizefile.3
-
+.so man3/systempapersizefile.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconf.1.in b/Build/source/libs/libpaper/libpaper-src/man/paperconf.1.in
index 53cecd83bdd..243881cbc57 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconf.1.in
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperconf.1.in
@@ -1,76 +1,76 @@
-.TH PAPERCONF 1 "25 October 2013"
-.SH NAME
-.B paperconf
-\- print paper configuration information
-.SH SYNOPSIS
-\fBpaperconf\fR
-[\fB\-z\fR]
-[\fB\-n\fR|\fB\-N\fR]
-[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR]
-[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR]
-[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR]
-.SH DESCRIPTION
-.B paperconf
-prints information about a given paper.
-The information that can be obtained is the name of the paper, its
-size and its width or height.
-When called without arguments,
-.B paperconf
-prints the name of the system- or user-specified paper, obtained by
-looking in order at the
-.B @PAPERSIZEVAR@
-environment variable
-or by using
-.B a4
-as a fall-back value.
-By default, width and height of the paper are printed in PostScript points.
-.SH OPTIONS
-.TP
-.BI \-p " paper"
-Specify the name of the
-.I paper
-about which information is asked.
-.TP
-.B \-d
-Use the default builtin paper name.
-.TP
-.B \-a
-Consider all known paper names.
-.TP
-.B \-z
-If the paper name is unknown, print it but issue a message on the
-standard error and exit with a non-zero code.
-.TP
-.B \-n
-Print the name of the paper.
-.TP
-.B \-N
-Print the name of the paper with the first letter capitalized.
-.TP
-.B \-s
-Print the size (width followed by height) of the paper.
-.TP
-.B \-w
-Print the width of the paper.
-.TP
-.B \-h
-Print the height of the paper.
-.TP
-.B \-c
-Use centimetres as unit for paper size.
-.TP
-.B \-m
-Use millimetres as unit for paper size.
-.TP
-.B \-i
-Use inches as unit for paper size.
-
-.SH ENVIRONMENT
-.TP 20            
-.B @PAPERSIZEVAR@
-Paper size to use.
-.SH AUTHOR
-Yves Arrouye <arrouye@debian.org>
-
-Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
-
+.TH PAPERCONF 1 "25 October 2013"

+.SH NAME

+.B paperconf

+\- print paper configuration information

+.SH SYNOPSIS

+\fBpaperconf\fR

+[\fB\-z\fR]

+[\fB\-n\fR|\fB\-N\fR]

+[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR]

+[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR]

+[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR]

+.SH DESCRIPTION

+.B paperconf

+prints information about a given paper.

+The information that can be obtained is the name of the paper, its

+size and its width or height.

+When called without arguments,

+.B paperconf

+prints the name of the system- or user-specified paper, obtained by

+looking in order at the

+.B @PAPERSIZEVAR@

+environment variable

+or by using

+.B a4

+as a fall-back value.

+By default, width and height of the paper are printed in PostScript points.

+.SH OPTIONS

+.TP

+.BI \-p " paper"

+Specify the name of the

+.I paper

+about which information is asked.

+.TP

+.B \-d

+Use the default builtin paper name.

+.TP

+.B \-a

+Consider all known paper names.

+.TP

+.B \-z

+If the paper name is unknown, print it but issue a message on the

+standard error and exit with a non-zero code.

+.TP

+.B \-n

+Print the name of the paper.

+.TP

+.B \-N

+Print the name of the paper with the first letter capitalized.

+.TP

+.B \-s

+Print the size (width followed by height) of the paper.

+.TP

+.B \-w

+Print the width of the paper.

+.TP

+.B \-h

+Print the height of the paper.

+.TP

+.B \-c

+Use centimetres as unit for paper size.

+.TP

+.B \-m

+Use millimetres as unit for paper size.

+.TP

+.B \-i

+Use inches as unit for paper size.

+

+.SH ENVIRONMENT

+.TP 20            

+.B @PAPERSIZEVAR@

+Paper size to use.

+.SH AUTHOR

+Yves Arrouye <arrouye@debian.org>

+

+Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconfig.8.in b/Build/source/libs/libpaper/libpaper-src/man/paperconfig.8.in
index 1c7ce4d9159..c462441f202 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconfig.8.in
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperconfig.8.in
@@ -1,73 +1,73 @@
-.\" paperconfig.8, Copyright (C) 1996, Yves Arrouye <arrouye@debian.org>
-.TH PAPERCONFIG 8 "5 January 2005" "Debian/Linux" "Linux Administrator's Manual"
-.SH NAME
-.B paperconfig
-\- configure the system default paper size
-.SH SYNOPSIS
-.B paperconfig
-[
-.BR \-v\fP, \fB\-\-version
-]
-[
-.BR \-h\fP, \fB\-\-help
-]
-[
-.BI "\-p\fP, \fB\-\-paper" " papername"
-|
-.B \-\-force
-]
-.SH DESCRIPTION
-.B paperconfig
-sets the system (or default) paper to be used by tools using the
-.B papersize
-file.
-It can either ask interactively for the paper to use or be called
-non-interactively by scripts.
-.PP
-When the paper size has been changed,
-.B paperconfig
-notifies other packages of the change by running the scripts in the
-.I @RUNPARTSDIR@
-directory.
-.SH OPTIONS
-.TP
-.BR \-v\fP, \fB\-\-version
-Print the version of
-.B paperconfig
-and exit.
-.TP
-.BR \-h\fP, \fB\-\-help
-Print help about usage and exit.
-.TP
-.BI "\-p\fP, \fB\-\-paper" " papername"
-Use
-.I papername
-if possible. If
-.I papername
-is not a valid paper, print an error message and exit.
-.TP
-.B \-\-force
-Force interactive selection of the system paper even if the actual paper
-is a valid one.
-.SH ENVIRONMENT
-.B PAPERCONF
-Full path to a file containing the paper size to use; this file will
-be rewritten with the system paper size.
-.SH FILES
-.TP 20
-.B @PAPERCONF@
-Contains the name of the system-wide default paper size to be used
-if the
-.B @PAPERSIZEVAR@
-variable is not set.
-.TP 20
-.B @RUNPARTSDIR@
-Directory of scripts to run after the paper size has been changed.
-This package puts no scripts here, but other packages may.
-.SH AUTHOR
-Yves Arrouye <arrouye@debian.org>
-.SH SEE ALSO
-.BR paperconf (1)
-.br
-.BR papersize (5)
-
+.\" paperconfig.8, Copyright (C) 1996, Yves Arrouye <arrouye@debian.org>

+.TH PAPERCONFIG 8 "5 January 2005" "Debian/Linux" "Linux Administrator's Manual"

+.SH NAME

+.B paperconfig

+\- configure the system default paper size

+.SH SYNOPSIS

+.B paperconfig

+[

+.BR \-v\fP, \fB\-\-version

+]

+[

+.BR \-h\fP, \fB\-\-help

+]

+[

+.BI "\-p\fP, \fB\-\-paper" " papername"

+|

+.B \-\-force

+]

+.SH DESCRIPTION

+.B paperconfig

+sets the system (or default) paper to be used by tools using the

+.B papersize

+file.

+It can either ask interactively for the paper to use or be called

+non-interactively by scripts.

+.PP

+When the paper size has been changed,

+.B paperconfig

+notifies other packages of the change by running the scripts in the

+.I @RUNPARTSDIR@

+directory.

+.SH OPTIONS

+.TP

+.BR \-v\fP, \fB\-\-version

+Print the version of

+.B paperconfig

+and exit.

+.TP

+.BR \-h\fP, \fB\-\-help

+Print help about usage and exit.

+.TP

+.BI "\-p\fP, \fB\-\-paper" " papername"

+Use

+.I papername

+if possible. If

+.I papername

+is not a valid paper, print an error message and exit.

+.TP

+.B \-\-force

+Force interactive selection of the system paper even if the actual paper

+is a valid one.

+.SH ENVIRONMENT

+.B PAPERCONF

+Full path to a file containing the paper size to use; this file will

+be rewritten with the system paper size.

+.SH FILES

+.TP 20

+.B @PAPERCONF@

+Contains the name of the system-wide default paper size to be used

+if the

+.B @PAPERSIZEVAR@

+variable is not set.

+.TP 20

+.B @RUNPARTSDIR@

+Directory of scripts to run after the paper size has been changed.

+This package puts no scripts here, but other packages may.

+.SH AUTHOR

+Yves Arrouye <arrouye@debian.org>

+.SH SEE ALSO

+.BR paperconf (1)

+.br

+.BR papersize (5)

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperdone.3 b/Build/source/libs/libpaper/libpaper-src/man/paperdone.3
index d1098b8c116..0ac16967590 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperdone.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperdone.3
@@ -1,2 +1,2 @@
-.so man3/paperinit.3
-
+.so man3/paperinit.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperfirst.3 b/Build/source/libs/libpaper/libpaper-src/man/paperfirst.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperfirst.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperfirst.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinfo.3 b/Build/source/libs/libpaper/libpaper-src/man/paperinfo.3
index 68f5bf75f98..3b59bc9579f 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinfo.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperinfo.3
@@ -1,65 +1,65 @@
-.TH PAPERINFO 3 "24 September 1996"
-.SH NAME
-paperinfo, paperwithsize, paperfirst, paperlast, papernext, paperprev
-\- return informations about a paper
-.SH SYNOPSYS
-.nf
-.B #include <paper.h>
-.sp
-.B "const struct paper* paperinfo(const char* papername)"
-.B "const struct paper* paperwithsize(double psw, double psh)"
-.sp
-.B "char*  papername(const struct paper*)"
-.B "double paperpswidth(const struct paper*)"
-.B "double paperpsheigth(const struct paper*)"
-.sp
-.B "const struct paper* paperfirst(void)"
-.B "const struct paper* papernext(const struct paper* pinfo)"
-.B "const struct paper* paperprev(const struct paper* pinfo)"
-.B "const struct paper* paperlast(void)"
-.fi
-.SH DESCRIPTION
-.B paperinfo()
-returns a pointer to a
-.B struct paper
-containing informations about the paper with name
-.B papername
-.
-.B paperwithsize()
-looks for a paper whose width and height is
-.B psw
-and
-.B psh
-in PostScript points, and return a pointer to a
-.B struct paper
-corresponding to the paper found.
-.PP
-.B papername()
-returns the name of a paper described by an opaque struct paper object
-.
-.B paperpswidth()
-returns the width, in PostScript points, of a paper described by an
-opaque struct paper object
-.
-.B paperpsheight()
-returns the height, in PostScript points, of a paper described by an
-opaque struct paper object
-.
-.PP
-.B paperfirst()
-and
-.B paperlast()
-return the first and last entries for papers.
-Iteration from one entry to the next or the previous one can be done
-with
-.B papernext()
-and
-.B paperprev()
-respectively.
-.SH SEE ALSO
-.BR paperinit (3),
-.BR paperdone (3)
-.BR defaultpapername (3)
-.br
-.BR papersize (5)
-
+.TH PAPERINFO 3 "24 September 1996"

+.SH NAME

+paperinfo, paperwithsize, paperfirst, paperlast, papernext, paperprev

+\- return informations about a paper

+.SH SYNOPSYS

+.nf

+.B #include <paper.h>

+.sp

+.B "const struct paper* paperinfo(const char* papername)"

+.B "const struct paper* paperwithsize(double psw, double psh)"

+.sp

+.B "char*  papername(const struct paper*)"

+.B "double paperpswidth(const struct paper*)"

+.B "double paperpsheigth(const struct paper*)"

+.sp

+.B "const struct paper* paperfirst(void)"

+.B "const struct paper* papernext(const struct paper* pinfo)"

+.B "const struct paper* paperprev(const struct paper* pinfo)"

+.B "const struct paper* paperlast(void)"

+.fi

+.SH DESCRIPTION

+.B paperinfo()

+returns a pointer to a

+.B struct paper

+containing informations about the paper with name

+.B papername

+.

+.B paperwithsize()

+looks for a paper whose width and height is

+.B psw

+and

+.B psh

+in PostScript points, and return a pointer to a

+.B struct paper

+corresponding to the paper found.

+.PP

+.B papername()

+returns the name of a paper described by an opaque struct paper object

+.

+.B paperpswidth()

+returns the width, in PostScript points, of a paper described by an

+opaque struct paper object

+.

+.B paperpsheight()

+returns the height, in PostScript points, of a paper described by an

+opaque struct paper object

+.

+.PP

+.B paperfirst()

+and

+.B paperlast()

+return the first and last entries for papers.

+Iteration from one entry to the next or the previous one can be done

+with

+.B papernext()

+and

+.B paperprev()

+respectively.

+.SH SEE ALSO

+.BR paperinit (3),

+.BR paperdone (3)

+.BR defaultpapername (3)

+.br

+.BR papersize (5)

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinit.3 b/Build/source/libs/libpaper/libpaper-src/man/paperinit.3
index e1f71dfdf99..fd69167ea16 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinit.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperinit.3
@@ -1,27 +1,27 @@
-.TH PAPERINIT 3 "24 September 1996"
-.SH NAME
-paperinit, paperdone \- begin and end using the paper library
-.SH SYNOPSYS
-.nf
-.B #include <paper.h>
-.sp
-.B "void paperinit(void)"
-.B "void paperdone(void)"
-.fi
-.SH DESCRIPTION
-.B paperinit()
-initializes the paper library, allocating any resources that are
-necessary for its use.
-This function must be called before any other function of the paper
-library is used.
-.PP
-.B paperdone()
-frees any resources that were allocated for the paper library.
-No function of the library should be called after a call to this
-function.
-.SH SEE ALSO
-.BR defaultpapername (3),
-.BR paperinfo (3)
-.br
-.BR papersize (5)
-
+.TH PAPERINIT 3 "24 September 1996"

+.SH NAME

+paperinit, paperdone \- begin and end using the paper library

+.SH SYNOPSYS

+.nf

+.B #include <paper.h>

+.sp

+.B "void paperinit(void)"

+.B "void paperdone(void)"

+.fi

+.SH DESCRIPTION

+.B paperinit()

+initializes the paper library, allocating any resources that are

+necessary for its use.

+This function must be called before any other function of the paper

+library is used.

+.PP

+.B paperdone()

+frees any resources that were allocated for the paper library.

+No function of the library should be called after a call to this

+function.

+.SH SEE ALSO

+.BR defaultpapername (3),

+.BR paperinfo (3)

+.br

+.BR papersize (5)

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperlast.3 b/Build/source/libs/libpaper/libpaper-src/man/paperlast.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperlast.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperlast.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papernext.3 b/Build/source/libs/libpaper/libpaper-src/man/papernext.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papernext.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/papernext.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperprev.3 b/Build/source/libs/libpaper/libpaper-src/man/paperprev.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperprev.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperprev.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsheight.3 b/Build/source/libs/libpaper/libpaper-src/man/paperpsheight.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsheight.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperpsheight.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsname.3 b/Build/source/libs/libpaper/libpaper-src/man/paperpsname.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsname.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperpsname.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpswidth.3 b/Build/source/libs/libpaper/libpaper-src/man/paperpswidth.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpswidth.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperpswidth.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papersize.5.in b/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in
index f0f71934890..d553909ad71 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papersize.5.in
+++ b/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in
@@ -1,63 +1,63 @@
-.TH PAPERSIZE 5
-.SH NAME
-.B papersize
-\- specify preferred paper size
-.SH SYNOPSYS
-.B @PAPERCONF@
-.SH DESCRIPTION
-The
-.B papersize
-file is used to specify the preferred paper size to use by available
-commands and programs generating documents.
-.PP
-The format of this file is extremely simple: whitespace and anything
-starting with `#' is ignored, and the name of the paper is the first
-string found; the case in the name of the paper does not import (see
-.B CAVEATS
-section however).
-.SH "PAPER NAMES"
-The following names are commonly understood by programs:
-.B a3\fP,\fB a4\fP,\fB a5\fP,
-.B b5\fP,\fB letter\fP,\fB legal\fP,\fB executive\fP,\fB note\fP
-and
-.BR 11x17 .
-.PP
-Additional paper names that one may encounter are:
-.B a0\fP,\fB a1\fP,\fB a2\fP,\fB a6\fP,\fB a7\fP,\fB a8\fP,\fB a9\fP,\fB a10\fP,
-.B b0\fP,\fB b1\fP,\fB b2\fP,\fB b3\fP,\fB b4\fP,\fB tabloid\fP,
-.B statement\fP,\fB note\fP,
-.B halfletter\fP,\fB halfexecutive\fP,\fB folio\fP,\fB quarto\fP,\fB ledger\fP,
-.B archA\fP,\fB archB\fP,\fB archC\fP,\fB archD\fP,\fB archE\fP,\fB flsa\fP,
-.B flse\fP,\fB csheet\fP,\fB dsheet\fP,\fB esheet\fP
-and       
-.BR 10x14 .
-.PP
-The value of the
-.B papersize
-file can be overrideen by
-looking in order at the
-.B @PAPERSIZEVAR@
-environment variable, then at the contents of the file specified by the
-.B @PAPERCONFVAR@
-environment variable.  If the
-.B papersize
-file does not exist, programs using the paper library default to using
-.B letter
-as a fall-back value
-.SH CAVEATS
-This manual page documents the format of the
-.B papersize
-file that is read by the
-.B libpaper
-library.
-Some programs that read this file do not yet use the library and may have
-trouble ignoring whitespace and comments in the file; they may also
-require that the paper names use a specific capitalization.
-.SH DOCUMENTATION
-Yves Arrouye <arrouye@debian.org>
-.SH SEE ALSO
-.BR paperconf (1)
-.br
-.BR paperconfig (8)
-
-
+.TH PAPERSIZE 5

+.SH NAME

+.B papersize

+\- specify preferred paper size

+.SH SYNOPSYS

+.B @PAPERCONF@

+.SH DESCRIPTION

+The

+.B papersize

+file is used to specify the preferred paper size to use by available

+commands and programs generating documents.

+.PP

+The format of this file is extremely simple: whitespace and anything

+starting with `#' is ignored, and the name of the paper is the first

+string found; the case in the name of the paper does not import (see

+.B CAVEATS

+section however).

+.SH "PAPER NAMES"

+The following names are commonly understood by programs:

+.B a3\fP,\fB a4\fP,\fB a5\fP,

+.B b5\fP,\fB letter\fP,\fB legal\fP,\fB executive\fP,\fB note\fP

+and

+.BR 11x17 .

+.PP

+Additional paper names that one may encounter are:

+.B a0\fP,\fB a1\fP,\fB a2\fP,\fB a6\fP,\fB a7\fP,\fB a8\fP,\fB a9\fP,\fB a10\fP,

+.B b0\fP,\fB b1\fP,\fB b2\fP,\fB b3\fP,\fB b4\fP,\fB tabloid\fP,

+.B statement\fP,\fB note\fP,

+.B halfletter\fP,\fB halfexecutive\fP,\fB folio\fP,\fB quarto\fP,\fB ledger\fP,

+.B archA\fP,\fB archB\fP,\fB archC\fP,\fB archD\fP,\fB archE\fP,\fB flsa\fP,

+.B flse\fP,\fB csheet\fP,\fB dsheet\fP,\fB esheet\fP

+and       

+.BR 10x14 .

+.PP

+The value of the

+.B papersize

+file can be overrideen by

+looking in order at the

+.B @PAPERSIZEVAR@

+environment variable, then at the contents of the file specified by the

+.B @PAPERCONFVAR@

+environment variable.  If the

+.B papersize

+file does not exist, programs using the paper library default to using

+.B letter

+as a fall-back value

+.SH CAVEATS

+This manual page documents the format of the

+.B papersize

+file that is read by the

+.B libpaper

+library.

+Some programs that read this file do not yet use the library and may have

+trouble ignoring whitespace and comments in the file; they may also

+require that the paper names use a specific capitalization.

+.SH DOCUMENTATION

+Yves Arrouye <arrouye@debian.org>

+.SH SEE ALSO

+.BR paperconf (1)

+.br

+.BR paperconfig (8)

+

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperwithsize.3 b/Build/source/libs/libpaper/libpaper-src/man/paperwithsize.3
index 0ba4c23059d..932aa20a755 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperwithsize.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/paperwithsize.3
@@ -1,2 +1,2 @@
-.so man3/paperinfo.3
-
+.so man3/paperinfo.3

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapername.3.in b/Build/source/libs/libpaper/libpaper-src/man/systempapername.3.in
index 033e0309756..f77d96e7991 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapername.3.in
+++ b/Build/source/libs/libpaper/libpaper-src/man/systempapername.3.in
@@ -1,53 +1,53 @@
-.TH SYSTEMPAPERNAME 3 "17 September 2001"
-.SH NAME
-systempapername, defaultpapername, systempapersizefile,
-defaultpapersizefile \- return names for managing system paper
-information
-.SH SYNOPSYS
-.nf
-.B #include <paper.h>
-.sp
-.B "const char* systempapername(void)"
-.B "const char* defaultpapername(void)"
-.sp
-.B "const char* systempapersizefile(void)"
-.B "const char* defaultpapersizefile(void)"
-.fi
-.SH DESCRIPTION
-.B systempapername()
-returns the name of the default paper to be used by a program.
-This name is obtained by looking in that order at the
-.B @PAPERCONFVAR@
-environment variable, at the contents of the file returned by
-.B systempapersizefile()
-or by using 
-.B defaultpapername()
-as a last chance.
-.PP
-.B defaultpapername()
-returns the name of the default paper to use if it is impossible to get
-its name from the environment.
-.PP
-.B systempapersizefile()
-returns the path of the papersize file to use.
-This path is obtained by looking at the
-.B @PAPERCONFVAR@
-environment variable or by calling
-.BR defaultpapersizefile() .
-.PP
-.B defaultpapersizefile
-returns the path of the default papersize file.
-.SH ENVIRONMENT
-.TP 20            
-.B @PAPERSIZEVAR@
-Paper size to use regardless of what the papersize file contains.
-.TP 20
-.B @PAPERCONFVAR@
-Full path to a file containing the paper size to use.
-.SH FILES         
-.TP 20
-.B @PAPERCONF@
-Contains the name of the system-wide default paper size to be used.
-.SH SEE ALSO
-.BR papersize (5)
-
+.TH SYSTEMPAPERNAME 3 "17 September 2001"

+.SH NAME

+systempapername, defaultpapername, systempapersizefile,

+defaultpapersizefile \- return names for managing system paper

+information

+.SH SYNOPSYS

+.nf

+.B #include <paper.h>

+.sp

+.B "const char* systempapername(void)"

+.B "const char* defaultpapername(void)"

+.sp

+.B "const char* systempapersizefile(void)"

+.B "const char* defaultpapersizefile(void)"

+.fi

+.SH DESCRIPTION

+.B systempapername()

+returns the name of the default paper to be used by a program.

+This name is obtained by looking in that order at the

+.B @PAPERCONFVAR@

+environment variable, at the contents of the file returned by

+.B systempapersizefile()

+or by using 

+.B defaultpapername()

+as a last chance.

+.PP

+.B defaultpapername()

+returns the name of the default paper to use if it is impossible to get

+its name from the environment.

+.PP

+.B systempapersizefile()

+returns the path of the papersize file to use.

+This path is obtained by looking at the

+.B @PAPERCONFVAR@

+environment variable or by calling

+.BR defaultpapersizefile() .

+.PP

+.B defaultpapersizefile

+returns the path of the default papersize file.

+.SH ENVIRONMENT

+.TP 20            

+.B @PAPERSIZEVAR@

+Paper size to use regardless of what the papersize file contains.

+.TP 20

+.B @PAPERCONFVAR@

+Full path to a file containing the paper size to use.

+.SH FILES         

+.TP 20

+.B @PAPERCONF@

+Contains the name of the system-wide default paper size to be used.

+.SH SEE ALSO

+.BR papersize (5)

+

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapersizefile.3 b/Build/source/libs/libpaper/libpaper-src/man/systempapersizefile.3
index 42182084272..c7f4c7f9b21 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapersizefile.3
+++ b/Build/source/libs/libpaper/libpaper-src/man/systempapersizefile.3
@@ -1 +1 @@
-.so man3/systempapername.3
+.so man3/systempapername.3

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/Makefile.am b/Build/source/libs/libpaper/libpaper-src/src/Makefile.am
index 5d7bc85170e..9e608539781 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/Makefile.am
+++ b/Build/source/libs/libpaper/libpaper-src/src/Makefile.am
@@ -1,8 +1,8 @@
-
-bin_PROGRAMS	= paperconf
-paperconf_LDADD		= ../lib/libpaper.la
-paperconf_CPPFLAGS	= -I$(top_srcdir)/lib
-
-sbin_SCRIPTS	= paperconfig
-
-EXTRA_DIST	= paperconfig.in
+

+bin_PROGRAMS	= paperconf

+paperconf_LDADD		= ../lib/libpaper.la

+paperconf_CPPFLAGS	= -I$(top_srcdir)/lib

+

+sbin_SCRIPTS	= paperconfig

+

+EXTRA_DIST	= paperconfig.in

diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconf.c b/Build/source/libs/libpaper/libpaper-src/src/paperconf.c
index bbd43802512..bbd43802512 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconf.c
+++ b/Build/source/libs/libpaper/libpaper-src/src/paperconf.c
diff --git a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconfig.in b/Build/source/libs/libpaper/libpaper-src/src/paperconfig.in
index 9548b4aa2f9..cd04efaa9aa 100644
--- a/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconfig.in
+++ b/Build/source/libs/libpaper/libpaper-src/src/paperconfig.in
@@ -1,227 +1,227 @@
-#! /bin/sh
-
-# paperconfig: configuration of system paper name
-#
-# Copyright (C) 1996, Yves Arrouye <arrouye@debian.org>
-#               2001, Adrian Bunk  <bunk@fs.tum.de>
-
-usage() {
-    if [ "$1" = -h ]
-    then
-	exec 1>&2
-	echo -n U
-    else
-	echo -n u
-    fi
-
-    echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ -p, --paper name | --force ]"
-
-    if [ "$1" = -h ]
-    then
-	cat <<EOF
-
-Options: -v, --verbose          print version information and exit
-         -h, --help             print this help and exit
-	 -p, --paper name	specify the paper to use
-         --force                force paper configuration
-EOF
-	exit 0
-    else
-	exit 1
-    fi
-}
-
-# "|| true" added below, to assure that the script does not fail even if
-# called with bash -e. (MP 22/08/98)
-
-unset @PAPERSIZEVAR@ || true 
-: ${@PAPERCONFVAR@:=@PAPERCONF@}
-export @PAPERCONFVAR@
-
-unset @RUNPARTSDIRVAR@ || true 
-: ${@RUNPARTSDIRVAR@:=@RUNPARTSDIR@}
-export @RUNPARTSDIRVAR@
-
-force=0
-
-if [ "$#" -eq 0 ]
-  then
-    usage
-fi
-
-while [ $# -ne 0 ]
-do
-    case "$1" in
-	-v|--version)
-	    echo "`basename $0` version 1.0" \
-		"by Yves Arrouye <arrouye@debian.org>"
-	    exit 0
-	    ;;
-	-h|--help)
-	    usage -h
-	    ;;
-	-p|--paper)
-	    test $# -gt 1 || usage
-	    paper="$2"
-	    shift
-	    ;;
-	--force)
-	    force=1
-	    ;;
-	*)
-	    usage
-	    ;;
-    esac
-    shift
-done
-
-invalidpaper() {
-    ! paperconf "$1" 2>/dev/null 1>&2
-}
-
-format() {
-    _maxwidth=$1; shift
-    _start="$1"; shift
-
-    _cline=
-
-    for w
-    do
-	if [ `echo "$_start$_cline$w " | wc -c` -ge 0$_maxwidth ]
-	then
-	    echo "$_cline"
-	    _cline=
-	    _start=
-	fi
-	_cline="$_cline$w "
-    done
-
-    if [ -n "$_cline" ]
-    then
-	echo "$_cline"
-    fi
-
-    unset _maxwidth _cline _start
-}
-
-# "chmod 644" added below, to assure that the conf file is created
-# with the right access permissions (MP 13/05/2000)
-
-setpaper() {
-    paperright=`paperconf "$1" 2>/dev/null`
-
-    ok=0
-
-    if 2>/dev/null echo "$paperright" >${@PAPERCONFVAR@}.new
-    then
-        if 2>/dev/null mv -f ${@PAPERCONFVAR@}.new $@PAPERCONFVAR@
-	then
-	    if 2>/dev/null chmod 644 $@PAPERCONFVAR@
-	    then
-		ok=1
-            fi
-        fi
-    fi
-
-    if [ $ok -eq 0 ]
-    then
-        echo `basename $0`: cannot create $@PAPERCONFVAR@
-        exit 2
-    else
-	#
-	# Added code for calling back applications when
-	# papersize changes. See bug #345466
-	# eppesuig@debian.org, 2006-01-05
-	if [ -d ${@RUNPARTSDIRVAR@} ]
-	then
-	    run-parts ${@RUNPARTSDIRVAR@}
-	fi
-    fi
-}
-
-if [ ! -z "$paper" ]
-then
-    if invalidpaper $paper
-    then
-	>&2 echo `basename $0`: \"$paper\" is not a known paper name
-	exit 3
-    fi
-    setpaper "$paper"
-    exit 0
-fi
-
-knownpapers="`paperconf -a`"
-
-prompt=
-width=72
-
-# "|| true" added below, to assure that the script does not fail even if 
-# called with bash -e. (MP 22/08/98)
-
-paper=`paperconf 2>/dev/null || true`
-dftpaper=`paperconf -d`
-
-if [ $force -eq 1 ] || [ ! -e $@PAPERCONFVAR@ ] || invalidpaper $paper
-then
-    papers="`format $width \"\" $knownpapers`"
-    echo
-
-    if [ -x /usr/bin/pager ]
-    then
-	: ${PAGER:=/usr/bin/pager}
-    fi
-    if [ -x /bin/more ]
-    then
-	: ${PAGER:=/bin/more}
-    fi
-    : ${PAGER:=cat}
-
-    LESS="-X -E $LESS"
-    export LESS
-
-    (
-	cat <<EOF
-The default (also known as system) paper can be chosen from many known
-papers that are currently recognized by programs using the libpaper
-library (with libpaper, paper names are case insensitive; if you use
-programs that use the system paper size but do not rely on the libpaper
-library, this may not be true and some of the papers listed below may
-not be known by these programs):
-
-EOF
-	echo "$papers" | sed 's/^/    /'
-	echo
-    ) | ${PAGER}
-
-    : ${paper:=$dftpaper}
-
-    echo -n "Default paper name? [$paper] "
-    read ans
-    : ${ans:=$paper}
-    paper=$ans
-fi
-
-while invalidpaper "$paper"
-do
-    if [ -z "$paper" ]
-    then
-	echo "Please choose a paper from the available papers list."
-    else
-	echo "Unknow paper \"$paper\"," \
-	    "please choose one from the available papers list."
-    fi
-
-    paper=$dftpaper
-
-    echo -n "Default paper name? [$paper] "
-    read ans
-    paper=$ans
-done
-
-if [ "`paperconf 2>/dev/null`" != "$paper" ] || grep -q "[# 	]" $@PAPERCONFVAR@
-then
-    setpaper "$paper"
-fi
-
-exit 0
-
+#! /bin/sh

+

+# paperconfig: configuration of system paper name

+#

+# Copyright (C) 1996, Yves Arrouye <arrouye@debian.org>

+#               2001, Adrian Bunk  <bunk@fs.tum.de>

+

+usage() {

+    if [ "$1" = -h ]

+    then

+	exec 1>&2

+	echo -n U

+    else

+	echo -n u

+    fi

+

+    echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ -p, --paper name | --force ]"

+

+    if [ "$1" = -h ]

+    then

+	cat <<EOF

+

+Options: -v, --verbose          print version information and exit

+         -h, --help             print this help and exit

+	 -p, --paper name	specify the paper to use

+         --force                force paper configuration

+EOF

+	exit 0

+    else

+	exit 1

+    fi

+}

+

+# "|| true" added below, to assure that the script does not fail even if

+# called with bash -e. (MP 22/08/98)

+

+unset @PAPERSIZEVAR@ || true 

+: ${@PAPERCONFVAR@:=@PAPERCONF@}

+export @PAPERCONFVAR@

+

+unset @RUNPARTSDIRVAR@ || true 

+: ${@RUNPARTSDIRVAR@:=@RUNPARTSDIR@}

+export @RUNPARTSDIRVAR@

+

+force=0

+

+if [ "$#" -eq 0 ]

+  then

+    usage

+fi

+

+while [ $# -ne 0 ]

+do

+    case "$1" in

+	-v|--version)

+	    echo "`basename $0` version 1.0" \

+		"by Yves Arrouye <arrouye@debian.org>"

+	    exit 0

+	    ;;

+	-h|--help)

+	    usage -h

+	    ;;

+	-p|--paper)

+	    test $# -gt 1 || usage

+	    paper="$2"

+	    shift

+	    ;;

+	--force)

+	    force=1

+	    ;;

+	*)

+	    usage

+	    ;;

+    esac

+    shift

+done

+

+invalidpaper() {

+    ! paperconf "$1" 2>/dev/null 1>&2

+}

+

+format() {

+    _maxwidth=$1; shift

+    _start="$1"; shift

+

+    _cline=

+

+    for w

+    do

+	if [ `echo "$_start$_cline$w " | wc -c` -ge 0$_maxwidth ]

+	then

+	    echo "$_cline"

+	    _cline=

+	    _start=

+	fi

+	_cline="$_cline$w "

+    done

+

+    if [ -n "$_cline" ]

+    then

+	echo "$_cline"

+    fi

+

+    unset _maxwidth _cline _start

+}

+

+# "chmod 644" added below, to assure that the conf file is created

+# with the right access permissions (MP 13/05/2000)

+

+setpaper() {

+    paperright=`paperconf "$1" 2>/dev/null`

+

+    ok=0

+

+    if 2>/dev/null echo "$paperright" >${@PAPERCONFVAR@}.new

+    then

+        if 2>/dev/null mv -f ${@PAPERCONFVAR@}.new $@PAPERCONFVAR@

+	then

+	    if 2>/dev/null chmod 644 $@PAPERCONFVAR@

+	    then

+		ok=1

+            fi

+        fi

+    fi

+

+    if [ $ok -eq 0 ]

+    then

+        echo `basename $0`: cannot create $@PAPERCONFVAR@

+        exit 2

+    else

+	#

+	# Added code for calling back applications when

+	# papersize changes. See bug #345466

+	# eppesuig@debian.org, 2006-01-05

+	if [ -d ${@RUNPARTSDIRVAR@} ]

+	then

+	    run-parts ${@RUNPARTSDIRVAR@}

+	fi

+    fi

+}

+

+if [ ! -z "$paper" ]

+then

+    if invalidpaper $paper

+    then

+	>&2 echo `basename $0`: \"$paper\" is not a known paper name

+	exit 3

+    fi

+    setpaper "$paper"

+    exit 0

+fi

+

+knownpapers="`paperconf -a`"

+

+prompt=

+width=72

+

+# "|| true" added below, to assure that the script does not fail even if 

+# called with bash -e. (MP 22/08/98)

+

+paper=`paperconf 2>/dev/null || true`

+dftpaper=`paperconf -d`

+

+if [ $force -eq 1 ] || [ ! -e $@PAPERCONFVAR@ ] || invalidpaper $paper

+then

+    papers="`format $width \"\" $knownpapers`"

+    echo

+

+    if [ -x /usr/bin/pager ]

+    then

+	: ${PAGER:=/usr/bin/pager}

+    fi

+    if [ -x /bin/more ]

+    then

+	: ${PAGER:=/bin/more}

+    fi

+    : ${PAGER:=cat}

+

+    LESS="-X -E $LESS"

+    export LESS

+

+    (

+	cat <<EOF

+The default (also known as system) paper can be chosen from many known

+papers that are currently recognized by programs using the libpaper

+library (with libpaper, paper names are case insensitive; if you use

+programs that use the system paper size but do not rely on the libpaper

+library, this may not be true and some of the papers listed below may

+not be known by these programs):

+

+EOF

+	echo "$papers" | sed 's/^/    /'

+	echo

+    ) | ${PAGER}

+

+    : ${paper:=$dftpaper}

+

+    echo -n "Default paper name? [$paper] "

+    read ans

+    : ${ans:=$paper}

+    paper=$ans

+fi

+

+while invalidpaper "$paper"

+do

+    if [ -z "$paper" ]

+    then

+	echo "Please choose a paper from the available papers list."

+    else

+	echo "Unknow paper \"$paper\"," \

+	    "please choose one from the available papers list."

+    fi

+

+    paper=$dftpaper

+

+    echo -n "Default paper name? [$paper] "

+    read ans

+    paper=$ans

+done

+

+if [ "`paperconf 2>/dev/null`" != "$paper" ] || grep -q "[# 	]" $@PAPERCONFVAR@

+then

+    setpaper "$paper"

+fi

+

+exit 0

+