Import changes from XORG-6.8.2CYGWIN-6_8_2-MERGECYGWIN

3 files changed, 25 insertions, 22 deletions

diff --git a/print.c b/print.c
index f068afe..54f5a29 100644
--- a/print.c
+++ b/print.c
@@ -305,6 +305,10 @@ void DoPrintTextSource(const char *programname,
     apd->jobtitle = jobtitle;
 
     n = 0;
+    /* Override any geometry resource settings as XawPrintShell adjusts it's size
+     * to the current page siue when |XawPrintLAYOUTMODE_DRAWABLEAREA| or
+     * |XawPrintLAYOUTMODE_PAGESIZE| are used. */
+    XtSetArg(args[n], XtNgeometry,    "+0+0");                          n++;
     XtSetArg(args[n], XawNlayoutMode, XawPrintLAYOUTMODE_DRAWABLEAREA); n++;
     apd->printshell = CreatePrintShell(toplevel, apd->pscreen, "printshell", args, n);
 
diff --git a/xmore.man b/xmore.man
index 33cf2d2..2936397 100644
--- a/xmore.man
+++ b/xmore.man
@@ -1,25 +1,23 @@
-.\" This manpage has been automatically generated by docbook2man 
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-.\" Please send any bug reports, improvements, comments, patches, 
-.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "XMORE" "__mansuffix__" "24 May 2004" "" ""
+.\" -*- coding: us-ascii -*-
+.TH xmore __appmansuffix__ "1 February 2005"  
 .SH NAME
 xmore \- plain text display program for the X Window System
 .SH SYNOPSIS
-
-\fBxmore\fR [ \fB\fIfilename\fB\fR] 
-
-.SH "DESCRIPTION"
-.PP
-\fBxmore\fR is a plain text browser.
-.SH "ENVIRONMENT"
-.TP
-\fBXPSERVERLIST \fR
+.ad l
+\fBxmore\fR \kx
+.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
+'in \n(.iu+\nxu
+[\fB\fBfilename\fR\fR]
+'in \n(.iu-\nxu
+.ad b
+.SH DESCRIPTION
+xmore is a plain text browser.
+.SH ENVIRONMENT
+.TP 
+\fBXPSERVERLIST\fR 
 \fB${XPSERVERLIST}\fR must be set,
 identifying the available Xprint servers.
 See \fBXprint\fR(__miscmansuffix__)
 for more details.
 .SH "SEE ALSO"
-.PP
-\fBX11\fR(__miscmansuffix__), \fBxman\fR(__mansuffix__)
+\fBX11\fR(__miscmansuffix__), \fBxman\fR(__appmansuffix__)
diff --git a/xmore.sgml b/xmore.sgml
index 66b0914..ec766c0 100644
--- a/xmore.sgml
+++ b/xmore.sgml
@@ -1,13 +1,14 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.2//EN" '/usr/share/sgml/docbook_4.2/docbook.dtd'>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.2//EN" 'http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd'>
 
 <!-- Process this file with DocBook tools to generate the output format
 (such as manual pages or HTML documents).
 
-Note that strings like __mansuffix__, __filemansuffix__, __libmansuffix__,
+Note that strings like __appmansuffix__, __filemansuffix__, __libmansuffix__,
 __miscmansuffix__ etc. have to be replaced first (in theory that's the
 job of ENTITIES but some XML tools are highly allergic to such stuff... ;-().
 A quick way to do that is to filter this document via
-/usr/bin/sed "s/__mansuffix__/${MANSUFFIX}/g;s/__filemansuffix__/${FILEMANSUFFIX}/g;s/__libmansuffix__/${LIBMANSUFFIX}/g;s/__miscmansuffix__/${MISCMANSUFFIX}/g"
+/usr/bin/sed "s/__appmansuffix__/${MANSUFFIX}/g;s/__filemansuffix__/${FILEMANSUFFIX}/g;s/__libmansuffix__/${LIBMANSUFFIX}/g;s/__misc
+mansuffix__/${MISCMANSUFFIX}/g"
 assuming that env vars like MANSUFFIX etc. have been set to the matching
 manual volume numbers.
   -->
@@ -15,7 +16,7 @@ manual volume numbers.
 <refentry>
   <refmeta>
     <refentrytitle>xmore</refentrytitle>
-    <manvolnum>__mansuffix__</manvolnum>
+    <manvolnum>__appmansuffix__</manvolnum>
   </refmeta>
   <refnamediv>
     <refname>xmore</refname>
@@ -72,7 +73,7 @@ manual volume numbers.
         
         <!-- Xprint general references -->
         <member><citerefentry><refentrytitle>X11</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>xman</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>xman</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
       </simplelist>
     </para>
   </refsect1>