[Python-checkins] CVS: python/dist/src/Doc/lib libcurses.tex,1.31.2.1,1.31.2.2

Wed, 26 Dec 2001 14:03:16 -0800

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30779/lib

Modified Files:
      Tag: release21-maint
	libcurses.tex 
Log Message:
Fix wrongly-named formal parameters in three places: begin_y was used twice
instead of begin_y and begin_x for derwin(), subpad(), and subwin().
Reported for derwin() by Eric Huss.

Added class annotations for the window methods so they would be properly
described in the index.

Index: libcurses.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcurses.tex,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -C2 -d -r1.31.2.1 -r1.31.2.2
*** libcurses.tex	2001/04/21 05:56:39	1.31.2.1
--- libcurses.tex	2001/12/26 22:03:14	1.31.2.2
***************
*** 542,546 ****
  following methods:

! \begin{methoddesc}{addch}{\optional{y, x,} ch\optional{, attr}}
  \strong{Note:} A \emph{character} means a C character (i.e., an
  \ASCII{} code), rather then a Python character (a string of length 1).
--- 542,546 ----
  following methods:

! \begin{methoddesc}[window]{addch}{\optional{y, x,} ch\optional{, attr}}
  \strong{Note:} A \emph{character} means a C character (i.e., an
  \ASCII{} code), rather then a Python character (a string of length 1).
***************
*** 554,558 ****
  \end{methoddesc}

! \begin{methoddesc}{addnstr}{\optional{y, x,} str, n\optional{, attr}}
  Paint at most \var{n} characters of the 
  string \var{str} at \code{(\var{y}, \var{x})} with attributes
--- 554,558 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{addnstr}{\optional{y, x,} str, n\optional{, attr}}
  Paint at most \var{n} characters of the 
  string \var{str} at \code{(\var{y}, \var{x})} with attributes
***************
*** 560,584 ****
  \end{methoddesc}

! \begin{methoddesc}{addstr}{\optional{y, x,} str\optional{, attr}}
  Paint the string \var{str} at \code{(\var{y}, \var{x})} with attributes
  \var{attr}, overwriting anything previously on the display.
  \end{methoddesc}

! \begin{methoddesc}{attroff}{attr}
  Remove attribute \var{attr} from the ``background'' set applied to all
  writes to the current window.
  \end{methoddesc}

! \begin{methoddesc}{attron}{attr}
  Add attribute \var{attr} from the ``background'' set applied to all
  writes to the current window.
  \end{methoddesc}

! \begin{methoddesc}{attrset}{attr}
  Set the ``background'' set of attributes to \var{attr}.  This set is
  initially 0 (no attributes).
  \end{methoddesc}

! \begin{methoddesc}{bkgd}{ch\optional{, attr}}
  Sets the background property of the window to the character \var{ch},
  with attributes \var{attr}.  The change is then applied to every
--- 560,584 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{addstr}{\optional{y, x,} str\optional{, attr}}
  Paint the string \var{str} at \code{(\var{y}, \var{x})} with attributes
  \var{attr}, overwriting anything previously on the display.
  \end{methoddesc}

! \begin{methoddesc}[window]{attroff}{attr}
  Remove attribute \var{attr} from the ``background'' set applied to all
  writes to the current window.
  \end{methoddesc}

! \begin{methoddesc}[window]{attron}{attr}
  Add attribute \var{attr} from the ``background'' set applied to all
  writes to the current window.
  \end{methoddesc}

! \begin{methoddesc}[window]{attrset}{attr}
  Set the ``background'' set of attributes to \var{attr}.  This set is
  initially 0 (no attributes).
  \end{methoddesc}

! \begin{methoddesc}[window]{bkgd}{ch\optional{, attr}}
  Sets the background property of the window to the character \var{ch},
  with attributes \var{attr}.  The change is then applied to every
***************
*** 595,599 ****
  \end{methoddesc}

! \begin{methoddesc}{bkgdset}{ch\optional{, attr}}
  Sets the window's background.  A window's background consists of a
  character and any combination of attributes.  The attribute part of
--- 595,599 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{bkgdset}{ch\optional{, attr}}
  Sets the window's background.  A window's background consists of a
  character and any combination of attributes.  The attribute part of
***************
*** 606,612 ****
  \end{methoddesc}

! \begin{methoddesc}{border}{\optional{ls\optional{, rs\optional{, ts\optional{,
!                            bs\optional{, tl\optional{, tr\optional{,
!                            bl\optional{, br}}}}}}}}}
  Draw a border around the edges of the window. Each parameter specifies 
  the character to use for a specific part of the border; see the table
--- 606,612 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{border}{\optional{ls\optional{, rs\optional{,
!                                    ts\optional{, bs\optional{, tl\optional{,
!                                    tr\optional{, bl\optional{, br}}}}}}}}}
  Draw a border around the edges of the window. Each parameter specifies 
  the character to use for a specific part of the border; see the table
***************
*** 631,635 ****
  \end{methoddesc}

! \begin{methoddesc}{box}{\optional{vertch, horch}}
  Similar to \method{border()}, but both \var{ls} and \var{rs} are
  \var{vertch} and both \var{ts} and {bs} are \var{horch}.  The default
--- 631,635 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{box}{\optional{vertch, horch}}
  Similar to \method{border()}, but both \var{ls} and \var{rs} are
  \var{vertch} and both \var{ts} and {bs} are \var{horch}.  The default
***************
*** 637,674 ****
  \end{methoddesc}

! \begin{methoddesc}{clear}{}
  Like \method{erase()}, but also causes the whole window to be repainted
  upon next call to \method{refresh()}.
  \end{methoddesc}

! \begin{methoddesc}{clearok}{yes}
  If \var{yes} is 1, the next call to \method{refresh()}
  will clear the window completely.
  \end{methoddesc}

! \begin{methoddesc}{clrtobot}{}
  Erase from cursor to the end of the window: all lines below the cursor
  are deleted, and then the equivalent of \method{clrtoeol()} is performed.
  \end{methoddesc}

! \begin{methoddesc}{clrtoeol}{}
  Erase from cursor to the end of the line.
  \end{methoddesc}

! \begin{methoddesc}{cursyncup}{}
  Updates the current cursor position of all the ancestors of the window
  to reflect the current cursor position of the window.
  \end{methoddesc}

! \begin{methoddesc}{delch}{\optional{x, y}}
  Delete any character at \code{(\var{y}, \var{x})}.
  \end{methoddesc}

! \begin{methoddesc}{deleteln}{}
  Delete the line under the cursor. All following lines are moved up
  by 1 line.
  \end{methoddesc}

! \begin{methoddesc}{derwin}{\optional{nlines, ncols,} begin_y, begin_y}
  An abbreviation for ``derive window'', \method{derwin()} is the same
  as calling \method{subwin()}, except that \var{begin_y} and
--- 637,674 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{clear}{}
  Like \method{erase()}, but also causes the whole window to be repainted
  upon next call to \method{refresh()}.
  \end{methoddesc}

! \begin{methoddesc}[window]{clearok}{yes}
  If \var{yes} is 1, the next call to \method{refresh()}
  will clear the window completely.
  \end{methoddesc}

! \begin{methoddesc}[window]{clrtobot}{}
  Erase from cursor to the end of the window: all lines below the cursor
  are deleted, and then the equivalent of \method{clrtoeol()} is performed.
  \end{methoddesc}

! \begin{methoddesc}[window]{clrtoeol}{}
  Erase from cursor to the end of the line.
  \end{methoddesc}

! \begin{methoddesc}[window]{cursyncup}{}
  Updates the current cursor position of all the ancestors of the window
  to reflect the current cursor position of the window.
  \end{methoddesc}

! \begin{methoddesc}[window]{delch}{\optional{x, y}}
  Delete any character at \code{(\var{y}, \var{x})}.
  \end{methoddesc}

! \begin{methoddesc}[window]{deleteln}{}
  Delete the line under the cursor. All following lines are moved up
  by 1 line.
  \end{methoddesc}

! \begin{methoddesc}[window]{derwin}{\optional{nlines, ncols,} begin_y, begin_x}
  An abbreviation for ``derive window'', \method{derwin()} is the same
  as calling \method{subwin()}, except that \var{begin_y} and
***************
*** 678,687 ****
  \end{methoddesc}

! \begin{methoddesc}{echochar}{ch\optional{, attr}}
  Add character \var{ch} with attribute \var{attr}, and immediately 
  call \method{refresh()} on the window.
  \end{methoddesc}

! \begin{methoddesc}{enclose}{y, x}
  Tests whether the given pair of screen-relative character-cell
  coordinates are enclosed by the given window, returning true or
--- 678,687 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{echochar}{ch\optional{, attr}}
  Add character \var{ch} with attribute \var{attr}, and immediately 
  call \method{refresh()} on the window.
  \end{methoddesc}

! \begin{methoddesc}[window]{enclose}{y, x}
  Tests whether the given pair of screen-relative character-cell
  coordinates are enclosed by the given window, returning true or
***************
*** 690,703 ****
  \end{methoddesc}

! \begin{methoddesc}{erase}{}
  Clear the window.
  \end{methoddesc}

! \begin{methoddesc}{getbegyx}{}
  Return a tuple \code{(\var{y}, \var{x})} of co-ordinates of upper-left
  corner.
  \end{methoddesc}

! \begin{methoddesc}{getch}{\optional{x, y}}
  Get a character. Note that the integer returned does \emph{not} have to
  be in \ASCII{} range: function keys, keypad keys and so on return numbers
--- 690,703 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{erase}{}
  Clear the window.
  \end{methoddesc}

! \begin{methoddesc}[window]{getbegyx}{}
  Return a tuple \code{(\var{y}, \var{x})} of co-ordinates of upper-left
  corner.
  \end{methoddesc}

! \begin{methoddesc}[window]{getch}{\optional{x, y}}
  Get a character. Note that the integer returned does \emph{not} have to
  be in \ASCII{} range: function keys, keypad keys and so on return numbers
***************
*** 706,710 ****
  \end{methoddesc}

! \begin{methoddesc}{getkey}{\optional{x, y}}
  Get a character, returning a string instead of an integer, as
  \method{getch()} does. Function keys, keypad keys and so on return a
--- 706,710 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{getkey}{\optional{x, y}}
  Get a character, returning a string instead of an integer, as
  \method{getch()} does. Function keys, keypad keys and so on return a
***************
*** 713,722 ****
  \end{methoddesc}

! \begin{methoddesc}{getmaxyx}{}
  Return a tuple \code{(\var{y}, \var{x})} of the height and width of
  the window.
  \end{methoddesc}

! \begin{methoddesc}{getparyx}{}
  Returns the beginning coordinates of this window relative to its
  parent window into two integer variables y and x.  Returns
--- 713,722 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{getmaxyx}{}
  Return a tuple \code{(\var{y}, \var{x})} of the height and width of
  the window.
  \end{methoddesc}

! \begin{methoddesc}[window]{getparyx}{}
  Returns the beginning coordinates of this window relative to its
  parent window into two integer variables y and x.  Returns
***************
*** 724,742 ****
  \end{methoddesc}

! \begin{methoddesc}{getstr}{\optional{x, y}}
  Read a string from the user, with primitive line editing capacity.
  \end{methoddesc}

! \begin{methoddesc}{getyx}{}
  Return a tuple \code{(\var{y}, \var{x})} of current cursor position 
  relative to the window's upper-left corner.
  \end{methoddesc}

! \begin{methoddesc}{hline}{\optional{y, x,} ch, n}
  Display a horizontal line starting at \code{(\var{y}, \var{x})} with
  length \var{n} consisting of the character \var{ch}.
  \end{methoddesc}

! \begin{methoddesc}{idcok}{flag}
  If \var{flag} is false, curses no longer considers using the hardware
  insert/delete character feature of the terminal; if \var{flag} is
--- 724,742 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{getstr}{\optional{x, y}}
  Read a string from the user, with primitive line editing capacity.
  \end{methoddesc}

! \begin{methoddesc}[window]{getyx}{}
  Return a tuple \code{(\var{y}, \var{x})} of current cursor position 
  relative to the window's upper-left corner.
  \end{methoddesc}

! \begin{methoddesc}[window]{hline}{\optional{y, x,} ch, n}
  Display a horizontal line starting at \code{(\var{y}, \var{x})} with
  length \var{n} consisting of the character \var{ch}.
  \end{methoddesc}

! \begin{methoddesc}[window]{idcok}{flag}
  If \var{flag} is false, curses no longer considers using the hardware
  insert/delete character feature of the terminal; if \var{flag} is
***************
*** 746,750 ****
  \end{methoddesc}

! \begin{methoddesc}{idlok}{yes}
  If called with \var{yes} equal to 1, \module{curses} will try and use
  hardware line editing facilities. Otherwise, line insertion/deletion
--- 746,750 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{idlok}{yes}
  If called with \var{yes} equal to 1, \module{curses} will try and use
  hardware line editing facilities. Otherwise, line insertion/deletion
***************
*** 752,756 ****
  \end{methoddesc}

! \begin{methoddesc}{immedok}{flag}
  If \var{flag} is true, any change in the window image
  automatically causes the window to be refreshed; you no longer
--- 752,756 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{immedok}{flag}
  If \var{flag} is true, any change in the window image
  automatically causes the window to be refreshed; you no longer
***************
*** 760,769 ****
  \end{methoddesc}

! \begin{methoddesc}{inch}{\optional{x, y}}
  Return the character at the given position in the window. The bottom
  8 bits are the character proper, and upper bits are the attributes.
  \end{methoddesc}

! \begin{methoddesc}{insch}{\optional{y, x,} ch\optional{, attr}}
  Paint character \var{ch} at \code{(\var{y}, \var{x})} with attributes
  \var{attr}, moving the line from position \var{x} right by one
--- 760,769 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{inch}{\optional{x, y}}
  Return the character at the given position in the window. The bottom
  8 bits are the character proper, and upper bits are the attributes.
  \end{methoddesc}

! \begin{methoddesc}[window]{insch}{\optional{y, x,} ch\optional{, attr}}
  Paint character \var{ch} at \code{(\var{y}, \var{x})} with attributes
  \var{attr}, moving the line from position \var{x} right by one
***************
*** 771,775 ****
  \end{methoddesc}

! \begin{methoddesc}{insdelln}{nlines}
  Inserts \var{nlines} lines into the specified window above the current
  line.  The \var{nlines} bottom lines are lost.  For negative
--- 771,775 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{insdelln}{nlines}
  Inserts \var{nlines} lines into the specified window above the current
  line.  The \var{nlines} bottom lines are lost.  For negative
***************
*** 779,788 ****
  \end{methoddesc}

! \begin{methoddesc}{insertln}{}
  Insert a blank line under the cursor. All following lines are moved
  down by 1 line.
  \end{methoddesc}

! \begin{methoddesc}{insnstr}{\optional{y, x, } str, n \optional{, attr}}
  Insert a character string (as many characters as will fit on the line)
  before the character under the cursor, up to \var{n} characters.  
--- 779,788 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{insertln}{}
  Insert a blank line under the cursor. All following lines are moved
  down by 1 line.
  \end{methoddesc}

! \begin{methoddesc}[window]{insnstr}{\optional{y, x,} str, n \optional{, attr}}
  Insert a character string (as many characters as will fit on the line)
  before the character under the cursor, up to \var{n} characters.  
***************
*** 795,799 ****
  \end{methoddesc}

! \begin{methoddesc}{insstr}{\optional{y, x, } str \optional{, attr}}
  Insert a character string (as many characters as will fit on the line)
  before the character under the cursor.  All characters to the right of
--- 795,799 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{insstr}{\optional{y, x, } str \optional{, attr}}
  Insert a character string (as many characters as will fit on the line)
  before the character under the cursor.  All characters to the right of
***************
*** 803,807 ****
  \end{methoddesc}

! \begin{methoddesc}{instr}{\optional{y, x} \optional{, n}}
  Returns a string of characters, extracted from the window starting at
  the current cursor position, or at \var{y}, \var{x} if specified.
--- 803,807 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{instr}{\optional{y, x} \optional{, n}}
  Returns a string of characters, extracted from the window starting at
  the current cursor position, or at \var{y}, \var{x} if specified.
***************
*** 811,815 ****
  \end{methoddesc}

! \begin{methoddesc}{is_linetouched}{\var{line}}
  Returns true if the specified line was modified since the last call to
  \method{refresh()}; otherwise returns false.  Raises a
--- 811,815 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{is_linetouched}{\var{line}}
  Returns true if the specified line was modified since the last call to
  \method{refresh()}; otherwise returns false.  Raises a
***************
*** 818,827 ****
  \end{methoddesc}

! \begin{methoddesc}{is_wintouched}{}
  Returns true if the specified window was modified since the last call to
  \method{refresh()}; otherwise returns false.
  \end{methoddesc}

! \begin{methoddesc}{keypad}{yes}
  If \var{yes} is 1, escape sequences generated by some keys (keypad, 
  function keys) will be interpreted by \module{curses}.
--- 818,827 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{is_wintouched}{}
  Returns true if the specified window was modified since the last call to
  \method{refresh()}; otherwise returns false.
  \end{methoddesc}

! \begin{methoddesc}[window]{keypad}{yes}
  If \var{yes} is 1, escape sequences generated by some keys (keypad, 
  function keys) will be interpreted by \module{curses}.
***************
*** 830,834 ****
  \end{methoddesc}

! \begin{methoddesc}{leaveok}{yes}
  If \var{yes} is 1, cursor is left where it is on update, instead of
  being at ``cursor position.''  This reduces cursor movement where
--- 830,834 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{leaveok}{yes}
  If \var{yes} is 1, cursor is left where it is on update, instead of
  being at ``cursor position.''  This reduces cursor movement where
***************
*** 839,847 ****
  \end{methoddesc}

! \begin{methoddesc}{move}{new_y, new_x}
  Move cursor to \code{(\var{new_y}, \var{new_x})}.
  \end{methoddesc}

! \begin{methoddesc}{mvderwin}{y, x}
  Moves the window inside its parent window.  The screen-relative
  parameters of the window are not changed.  This routine is used to
--- 839,847 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{move}{new_y, new_x}
  Move cursor to \code{(\var{new_y}, \var{new_x})}.
  \end{methoddesc}

! \begin{methoddesc}[window]{mvderwin}{y, x}
  Moves the window inside its parent window.  The screen-relative
  parameters of the window are not changed.  This routine is used to
***************
*** 850,863 ****
  \end{methoddesc}

! \begin{methoddesc}{mvwin}{new_y, new_x}
  Move the window so its upper-left corner is at
  \code{(\var{new_y}, \var{new_x})}.
  \end{methoddesc}

! \begin{methoddesc}{nodelay}{yes}
  If \var{yes} is \code{1}, \method{getch()} will be non-blocking.
  \end{methoddesc}

! \begin{methoddesc}{notimeout}{yes}
  If \var{yes} is \code{1}, escape sequences will not be timed out.

--- 850,863 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{mvwin}{new_y, new_x}
  Move the window so its upper-left corner is at
  \code{(\var{new_y}, \var{new_x})}.
  \end{methoddesc}

! \begin{methoddesc}[window]{nodelay}{yes}
  If \var{yes} is \code{1}, \method{getch()} will be non-blocking.
  \end{methoddesc}

! \begin{methoddesc}[window]{notimeout}{yes}
  If \var{yes} is \code{1}, escape sequences will not be timed out.

***************
*** 866,870 ****
  \end{methoddesc}

! \begin{methoddesc}{noutrefresh}{}
  Mark for refresh but wait.  This function updates the data structure
  representing the desired state of the window, but does not force
--- 866,870 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{noutrefresh}{}
  Mark for refresh but wait.  This function updates the data structure
  representing the desired state of the window, but does not force
***************
*** 873,878 ****
  \end{methoddesc}

! \begin{methoddesc}{overlay}{destwin\optional{, sminrow, smincol,
!                             dminrow, dmincol, dmaxrow, dmaxcol}}
  Overlay the window on top of \var{destwin}. The windows need not be
  the same size, only the overlapping region is copied. This copy is
--- 873,878 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{overlay}{destwin\optional{, sminrow, smincol,
!                                     dminrow, dmincol, dmaxrow, dmaxcol}}
  Overlay the window on top of \var{destwin}. The windows need not be
  the same size, only the overlapping region is copied. This copy is
***************
*** 886,891 ****
  \end{methoddesc}

! \begin{methoddesc}{overwrite}{destwin\optional{, sminrow, smincol,
!                               dminrow, dmincol, dmaxrow, dmaxcol}}
  Overwrite the window on top of \var{destwin}. The windows need not be
  the same size, in which case only the overlapping region is
--- 886,891 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{overwrite}{destwin\optional{, sminrow, smincol,
!                                       dminrow, dmincol, dmaxrow, dmaxcol}}
  Overwrite the window on top of \var{destwin}. The windows need not be
  the same size, in which case only the overlapping region is
***************
*** 899,910 ****
  \end{methoddesc}

! \begin{methoddesc}{putwin}{file}
  Writes all data associated with the window into the provided file
  object.  This information can be later retrieved using the
  \function{getwin()} function.
- 
  \end{methoddesc}

! \begin{methoddesc}{redrawln}{beg, num}
  Indicates that the \var{num} screen lines, starting at line \var{beg},
  are corrupted and should be completely redrawn on the next
--- 899,909 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{putwin}{file}
  Writes all data associated with the window into the provided file
  object.  This information can be later retrieved using the
  \function{getwin()} function.
  \end{methoddesc}

! \begin{methoddesc}[window]{redrawln}{beg, num}
  Indicates that the \var{num} screen lines, starting at line \var{beg},
  are corrupted and should be completely redrawn on the next
***************
*** 912,922 ****
  \end{methoddesc}

! \begin{methoddesc}{redrawwin}{}
  Touches the entire window, causing it to be completely redrawn on the
  next \method{refresh()} call.
  \end{methoddesc}

! \begin{methoddesc}{refresh}{\optional{pminrow, pmincol, sminrow,
!                                       smincol, smaxrow, smaxcol}}
  Update the display immediately (sync actual screen with previous
  drawing/deleting methods).
--- 911,921 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{redrawwin}{}
  Touches the entire window, causing it to be completely redrawn on the
  next \method{refresh()} call.
  \end{methoddesc}

! \begin{methoddesc}[window]{refresh}{\optional{pminrow, pmincol, sminrow,
!                                     smincol, smaxrow, smaxcol}}
  Update the display immediately (sync actual screen with previous
  drawing/deleting methods).
***************
*** 936,944 ****
  \end{methoddesc}

! \begin{methoddesc}{scroll}{\optional{lines\code{ = 1}}}
  Scroll the screen or scrolling region upward by \var{lines} lines.
  \end{methoddesc}

! \begin{methoddesc}{scrollok}{flag}
  Controls what happens when the cursor of a window is moved off the
  edge of the window or scrolling region, either as a result of a
--- 935,943 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{scroll}{\optional{lines\code{ = 1}}}
  Scroll the screen or scrolling region upward by \var{lines} lines.
  \end{methoddesc}

! \begin{methoddesc}[window]{scrollok}{flag}
  Controls what happens when the cursor of a window is moved off the
  edge of the window or scrolling region, either as a result of a
***************
*** 951,969 ****
  \end{methoddesc}

! \begin{methoddesc}{setscrreg}{top, bottom}
  Set the scrolling region from line \var{top} to line \var{bottom}. All
  scrolling actions will take place in this region.
  \end{methoddesc}

! \begin{methoddesc}{standend}{}
  Turn off the standout attribute.  On some terminals this has the
  side effect of turning off all attributes.
  \end{methoddesc}

! \begin{methoddesc}{standout}{}
  Turn on attribute \var{A_STANDOUT}.
  \end{methoddesc}

! \begin{methoddesc}{subpad}{\optional{nlines, ncols,} begin_y, begin_y}
  Return a sub-window, whose upper-left corner is at
  \code{(\var{begin_y}, \var{begin_x})}, and whose width/height is
--- 950,968 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{setscrreg}{top, bottom}
  Set the scrolling region from line \var{top} to line \var{bottom}. All
  scrolling actions will take place in this region.
  \end{methoddesc}

! \begin{methoddesc}[window]{standend}{}
  Turn off the standout attribute.  On some terminals this has the
  side effect of turning off all attributes.
  \end{methoddesc}

! \begin{methoddesc}[window]{standout}{}
  Turn on attribute \var{A_STANDOUT}.
  \end{methoddesc}

! \begin{methoddesc}[window]{subpad}{\optional{nlines, ncols,} begin_y, begin_x}
  Return a sub-window, whose upper-left corner is at
  \code{(\var{begin_y}, \var{begin_x})}, and whose width/height is
***************
*** 971,975 ****
  \end{methoddesc}

! \begin{methoddesc}{subwin}{\optional{nlines, ncols,} begin_y, begin_y}
  Return a sub-window, whose upper-left corner is at
  \code{(\var{begin_y}, \var{begin_x})}, and whose width/height is
--- 970,974 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{subwin}{\optional{nlines, ncols,} begin_y, begin_x}
  Return a sub-window, whose upper-left corner is at
  \code{(\var{begin_y}, \var{begin_x})}, and whose width/height is
***************
*** 980,984 ****
  \end{methoddesc}

! \begin{methoddesc}{syncdown}{}
  Touches each location in the window that has been touched in any of
  its ancestor windows.  This routine is called by \method{refresh()},
--- 979,983 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{syncdown}{}
  Touches each location in the window that has been touched in any of
  its ancestor windows.  This routine is called by \method{refresh()},
***************
*** 986,1000 ****
  \end{methoddesc}

! \begin{methoddesc}{syncok}{flag}
  If called with \var{flag} set to true, then \method{syncup()} is
  called automatically whenever there is a change in the window.
  \end{methoddesc}

! \begin{methoddesc}{syncup}{}
  Touches all locations in ancestors of the window that have been changed in 
  the window.  
  \end{methoddesc}

! \begin{methoddesc}{timeout}{delay}
  Sets blocking or non-blocking read behavior for the window.  If
  \var{delay} is negative, blocking read is used, which will wait
--- 985,999 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{syncok}{flag}
  If called with \var{flag} set to true, then \method{syncup()} is
  called automatically whenever there is a change in the window.
  \end{methoddesc}

! \begin{methoddesc}[window]{syncup}{}
  Touches all locations in ancestors of the window that have been changed in 
  the window.  
  \end{methoddesc}

! \begin{methoddesc}[window]{timeout}{delay}
  Sets blocking or non-blocking read behavior for the window.  If
  \var{delay} is negative, blocking read is used, which will wait
***************
*** 1006,1025 ****
  \end{methoddesc}

! \begin{methoddesc}{touchline}{start, count}
  Pretend \var{count} lines have been changed, starting with line
  \var{start}.
  \end{methoddesc}

! \begin{methoddesc}{touchwin}{}
  Pretend the whole window has been changed, for purposes of drawing
  optimizations.
  \end{methoddesc}

! \begin{methoddesc}{untouchwin}{}
  Marks all lines in  the  window  as unchanged since the last call to
  \method{refresh()}. 
  \end{methoddesc}

! \begin{methoddesc}{vline}{\optional{y, x,} ch, n}
  Display a vertical line starting at \code{(\var{y}, \var{x})} with
  length \var{n} consisting of the character \var{ch}.
--- 1005,1024 ----
  \end{methoddesc}

! \begin{methoddesc}[window]{touchline}{start, count}
  Pretend \var{count} lines have been changed, starting with line
  \var{start}.
  \end{methoddesc}

! \begin{methoddesc}[window]{touchwin}{}
  Pretend the whole window has been changed, for purposes of drawing
  optimizations.
  \end{methoddesc}

! \begin{methoddesc}[window]{untouchwin}{}
  Marks all lines in  the  window  as unchanged since the last call to
  \method{refresh()}. 
  \end{methoddesc}

! \begin{methoddesc}[window]{vline}{\optional{y, x,} ch, n}
  Display a vertical line starting at \code{(\var{y}, \var{x})} with
  length \var{n} consisting of the character \var{ch}.