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

[Fred L. Drake]

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

Modified Files:
      Tag: release22-maint
	python.sty 
Log Message:
Revise the markup related to the grammar productions to increase the
level of predictability.  This is not really "good" markup, but is arguably
better than we had before.
This closes SF bug #523117.


Index: python.sty
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/texinputs/python.sty,v
retrieving revision 1.88
retrieving revision 1.88.4.1
diff -C2 -d -r1.88 -r1.88.4.1
*** python.sty	14 Dec 2001 22:50:06 -0000	1.88
--- python.sty	15 Mar 2002 23:18:05 -0000	1.88.4.1
***************
*** 54,61 ****
    % this style file.
    \newcommand{\py@linkToName}[2]{%
!     \pdfannotlink attr{/Border [0 0 0]} goto name{#1}%
        \py@LinkColor#2\py@NormalColor%
      \pdfendlink%
!   }    
    % Compute the padded page number separately since we end up with a pair of
    % \relax tokens; this gets the right string computed and works.
--- 54,61 ----
    % this style file.
    \newcommand{\py@linkToName}[2]{%
!     \pdfstartlink attr{/Border [0 0 0]} goto name{#1}%
        \py@LinkColor#2\py@NormalColor%
      \pdfendlink%
!   }
    % Compute the padded page number separately since we end up with a pair of
    % \relax tokens; this gets the right string computed and works.
***************
*** 789,793 ****
  \ifpdf
    \newcommand{\url}[1]{{%
!     \pdfannotlink attr{/Border [0 0 0]} user{/S /URI /URI (#1)}%
      \py@LinkColor%                              color of the link text
      \small\sf #1%
--- 789,793 ----
  \ifpdf
    \newcommand{\url}[1]{{%
!     \pdfstartlink attr{/Border [0 0 0]} user{/S /URI /URI (#1)}%
      \py@LinkColor%                              color of the link text
      \small\sf #1%
***************
*** 865,871 ****
  \ifpdf
    % The \noindent here is a hack -- we're forcing pdfTeX into
!   % horizontal mode since \pdfannotlink requires that.
    \newcommand{\ulink}[2]{\noindent{%
!     \pdfannotlink attr{/Border [0 0 0]} user{/S /URI /URI (#2)}%
      \py@LinkColor%                              color of the link text
      #1%
--- 865,871 ----
  \ifpdf
    % The \noindent here is a hack -- we're forcing pdfTeX into
!   % horizontal mode since \pdfstartlink requires that.
    \newcommand{\ulink}[2]{\noindent{%
!     \pdfstartlink attr{/Border [0 0 0]} user{/S /URI /URI (#2)}%
      \py@LinkColor%                              color of the link text
      #1%
***************
*** 900,914 ****
    \def\optional##1{{\Large[}##1{\Large]}}
    \def\production##1##2{\code{##1}&::=&\code{##2}\\}
!   \def\orgroup##1{{\def\oritem{\textbar\ }##1}}
!   \def\orgroup*##1{{
!       \def\oritem{\\ \textbar&}
!       % This uses math mode's ``negative thin space'' to avoid a weird
!       % indentation that I've not been able to figure out, but
!       % probably relates to nesting tabular environments.
!       $\!\!\!\!\!\!\!\!\!\!$%
!       \begin{tabular}[t]{ll}
!         \ & ##1
!       \end{tabular}
!     }}
    \def\token##1{##1}
    \let\grammartoken=\token
--- 900,904 ----
    \def\optional##1{{\Large[}##1{\Large]}}
    \def\production##1##2{\code{##1}&::=&\code{##2}\\}
!   \def\productioncont##1{& &\code{##1}\\}
    \def\token##1{##1}
    \let\grammartoken=\token