[Python-checkins] CVS: python/dist/src/Doc/texinputs python.sty,1.88.4.2,1.88.4.3

[Fred L. Drake]

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

Modified Files:
      Tag: release22-maint
	python.sty 
Log Message:
Update from trunk:
  - make \url force horizontal mode (so it works at the start of a line)
  - make \verbatiminput produce results that look like a verbatim
    environment


Index: python.sty
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/texinputs/python.sty,v
retrieving revision 1.88.4.2
retrieving revision 1.88.4.3
diff -C2 -d -r1.88.4.2 -r1.88.4.3
*** python.sty	16 Mar 2002 04:52:55 -0000	1.88.4.2
--- python.sty	1 Apr 2002 18:59:24 -0000	1.88.4.3
***************
*** 176,179 ****
--- 176,180 ----
  \let\py@OldEndVerbatim=\endverbatim
  \RequirePackage{verbatim}
+ \let\py@OldVerbatimInput=\verbatiminput
  
  % Variable used by begin code command
***************
*** 181,197 ****
  
  \renewcommand{\verbatim}{%
!   \setlength{\parindent}{1cm}%
!   % Calculate the text width for the minipage:
!   \setlength{\py@codewidth}{\linewidth}%
!   \addtolength{\py@codewidth}{-\parindent}%
!   %
!   \par\indent%
!   \begin{minipage}[t]{\py@codewidth}%
!     \small%
      \py@OldVerbatim%
  }
  \renewcommand{\endverbatim}{%
      \py@OldEndVerbatim%
!   \end{minipage}%
  }
  
--- 182,203 ----
  
  \renewcommand{\verbatim}{%
!   \begingroup%
!   \small%
!   \begin{list}{}{\setlength{\leftmargin}{1cm}}
!     \item%
      \py@OldVerbatim%
  }
  \renewcommand{\endverbatim}{%
      \py@OldEndVerbatim%
!   \end{list}%
!   \endgroup
! }
! \renewcommand{\verbatiminput}[1]{%
!   {\small%
!    \begin{list}{}{\setlength{\leftmargin}{1cm}}
!      \item%
!      \py@OldVerbatimInput{#1}%
!    \end{list}
!   }%
  }
  
***************
*** 797,800 ****
--- 803,807 ----
  \ifpdf
    \newcommand{\url}[1]{{%
+     \noindent%
      \pdfstartlink attr{/Border [0 0 0]} user{/S /URI /URI (#1)}%
      \py@LinkColor%                              color of the link text