Import Upstream version 5e3upstream/5e3

1 files changed, 57 insertions, 69 deletions

diff --git a/Xlibscm.texi b/Xlibscm.texi
index 356877c..a9d82fb 100644
--- a/Xlibscm.texi
+++ b/Xlibscm.texi
@@ -1,7 +1,7 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
-@setfilename Xlibscm.info
-@settitle Xlibscm
+@setfilename XlibScm.info
+@settitle XlibScm
 @include version.txi
 @setchapternewpage on
 @c Choices for setchapternewpage are {on,off,odd}.
@@ -10,28 +10,15 @@
 @syncodeindex ft cp
 @c %**end of header
 
-@dircategory The Algorithmic Language Scheme
-@direntry
-* Xlibscm: (Xlibscm).   SCM Language X Interface.
-@end direntry
-
-@iftex
-@finalout
-@c DL: lose the egregious vertical whitespace, esp. around examples
-@c but paras in @defun-like things don't have parindent
-@parskip 4pt plus 1pt
-@end iftex
-
-@titlepage
-@title Xlibscm
-@subtitle SCM Language X Interface
-@subtitle Version @value{SCMVERSION}
-@author by Aubrey Jaffer
+@copying
+@noindent
+This manual documents the X Interface for SCM Language (version
+@value{SCMVERSION}, @value{SCMDATE}).
 
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1990-1999 Free Software Foundation
+@noindent
+Copyright @copyright{} 1999 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
 are preserved on all copies.
@@ -45,44 +32,41 @@ Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the author.
-@end titlepage
-
-@node Top, Xlibscm, (dir), (dir)
-
-
-@ifinfo
-This manual documents the X - SCM Language X Interface.  The most recent
-information about SCM can be found on SCM's @dfn{WWW} home page:
-
-@center @url{http://swiss.csail.mit.edu/~jaffer/SCM}
+@end quotation
+@end copying
 
+@dircategory The Algorithmic Language Scheme
+@direntry
+* XlibScm: (XlibScm).   SCM Language X Interface.
+@end direntry
 
-Copyright (C) 1990-1999 Free Software Foundation
+@iftex
+@finalout
+@c DL: lose the egregious vertical whitespace, esp. around examples
+@c but paras in @defun-like things don't have parindent
+@parskip 4pt plus 1pt
+@end iftex
 
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
+@titlepage
+@title XlibScm
+@subtitle SCM Language X Interface
+@subtitle Version @value{SCMVERSION}
+@author Aubrey Jaffer
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
 
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
+@contents
 
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
+@ifnottex
+@node Top, XlibScm, (dir), (dir)
+@top XlibScm
 
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by the author.
-@end ifinfo
+@insertcopying
 
 @menu
-* Xlibscm::                     
+* XlibScm::                     
 * Display and Screens::         
 * Drawables::                   
 * Graphics Context::            
@@ -91,13 +75,14 @@ by the author.
 * Rendering::                   
 * Images::                      
 * Event::                       
-* Index::                       
+* Indexes::                     
 @end menu
+@end ifnottex
 
-@node Xlibscm, Display and Screens, Top, Top
-@chapter Xlibscm
+@node XlibScm, Display and Screens, Top, Top
+@chapter XlibScm
 
-@dfn{Xlibscm} is a SCM interface to @dfn{X}.
+@dfn{XlibScm} is a SCM interface to @dfn{X}.
 @cindex X
 The
 @ifset html
@@ -187,7 +172,7 @@ the suitability of this documentation for any purpose.  It is provided
 ``as is'' without express or implied warranty.
 
 
-@node Display and Screens, Drawables, Xlibscm, Top
+@node Display and Screens, Drawables, XlibScm, Top
 @chapter Display and Screens
 
 @defun x:open-display display-name
@@ -1857,7 +1842,7 @@ tile-stipple-x-origin, and tile-stipple-y-origin.
 
 @end defun
 
-@node Event, Index, Images, Top
+@node Event, Indexes, Images, Top
 @chapter Event
 
 @noindent
@@ -2091,25 +2076,28 @@ X-event:count represents the number of keycodes altered.
 @end multitable
 @end defun
 
-@node Index,  , Event, Top
-@c @node Procedure and Macro Index, Variable Index, The Implementation, Top
-@unnumbered Procedure and Macro Index
+@node Indexes,  , Event, Top
+@unnumbered Indexes
 
-This is an alphabetical list of all the procedures and macros in Xlibscm.
+@menu
+* Procedure and Macro Index::   
+* Variable Index::              
+* Concept Index::               
+@end menu
 
-@printindex fn
+@node Procedure and Macro Index, Variable Index, Indexes, Indexes
+@unnumberedsec Procedure and Macro Index
 
-@c @node Variable Index, Type Index, Procedure and Macro Index, Top
-@unnumbered Variable Index
+@printindex fn
 
-This is an alphabetical list of all the global variables in Xlibscm.
+@node Variable Index, Concept Index, Procedure and Macro Index, Indexes
+@unnumberedsec Variable Index
 
 @printindex vr
 
-This is an alphabetical list of concepts introduced in this manual.
+@node Concept Index,  , Variable Index, Indexes
+@unnumberedsec Concept Index
 
-@unnumbered Concept Index
 @printindex cp
 
-@contents
 @bye