[Python-checkins] CVS: python/dist/src/Doc/lib libre.tex,1.60.2.2,1.60.2.3
Fred L. Drake
fdrake@users.sourceforge.net
Thu, 14 Feb 2002 07:26:17 -0800
Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv18828/lib
Modified Files:
Tag: release21-maint
libre.tex
Log Message:
Consistently use \textasciicircum to produce a ^ character.
LaTeX really falls flat on this one!
Index: libre.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libre.tex,v
retrieving revision 1.60.2.2
retrieving revision 1.60.2.3
diff -C2 -d -r1.60.2.2 -r1.60.2.3
*** libre.tex 12 Jul 2001 14:15:03 -0000 1.60.2.2
--- libre.tex 14 Feb 2002 15:26:15 -0000 1.60.2.3
***************
*** 94,99 ****
specified, this matches any character including a newline.
! \item[\character{\^}] (Caret.) Matches the start of the string, and in
! \constant{MULTILINE} mode also matches immediately after each newline.
\item[\character{\$}] Matches the end of the string, and in
--- 94,100 ----
specified, this matches any character including a newline.
! \item[\character{\textasciicircum}] (Caret.) Matches the start of the
! string, and in \constant{MULTILINE} mode also matches immediately
! after each newline.
\item[\character{\$}] Matches the end of the string, and in
***************
*** 169,175 ****
You can match the characters not within a range by \dfn{complementing}
the set. This is indicated by including a
! \character{\^} as the first character of the set; \character{\^} elsewhere will
! simply match the \character{\^} character. For example, \regexp{[{\^}5]}
! will match any character except \character{5}.
\item[\character{|}]\code{A|B}, where A and B can be arbitrary REs,
--- 170,179 ----
You can match the characters not within a range by \dfn{complementing}
the set. This is indicated by including a
! \character{\textasciicircum} as the first character of the set;
! \character{\textasciicircum} elsewhere will simply match the
! \character{\textasciicircum} character. For example,
! \regexp{[{\textasciicircum}5]} will match any character except
! \character{5}, and \regexp{[\textasciicircum\code{\textasciicircum}]}
! will match any character except \character{\textasciicircum}.
\item[\character{|}]\code{A|B}, where A and B can be arbitrary REs,
***************
*** 301,305 ****
\item[\code{\e D}]Matches any non-digit character; this is
! equivalent to the set \regexp{[{\^}0-9]}.
\item[\code{\e s}]Matches any whitespace character; this is
--- 305,309 ----
\item[\code{\e D}]Matches any non-digit character; this is
! equivalent to the set \regexp{[{\textasciicircum}0-9]}.
\item[\code{\e s}]Matches any whitespace character; this is
***************
*** 307,311 ****
\item[\code{\e S}]Matches any non-whitespace character; this is
! equivalent to the set \regexp{[\^\ \e t\e n\e r\e f\e v]}.
\item[\code{\e w}]When the \constant{LOCALE} and \constant{UNICODE}
--- 311,315 ----
\item[\code{\e S}]Matches any non-whitespace character; this is
! equivalent to the set \regexp{[\textasciicircum\ \e t\e n\e r\e f\e v]}.
\item[\code{\e w}]When the \constant{LOCALE} and \constant{UNICODE}
***************
*** 320,324 ****
\item[\code{\e W}]When the \constant{LOCALE} and \constant{UNICODE}
flags are not specified, matches any non-alphanumeric character; this
! is equivalent to the set \regexp{[{\^}a-zA-Z0-9_]}. With
\constant{LOCALE}, it will match any character not in the set
\regexp{[0-9_]}, and not defined as a letter for the current locale.
--- 324,328 ----
\item[\code{\e W}]When the \constant{LOCALE} and \constant{UNICODE}
flags are not specified, matches any non-alphanumeric character; this
! is equivalent to the set \regexp{[{\textasciicircum}a-zA-Z0-9_]}. With
\constant{LOCALE}, it will match any character not in the set
\regexp{[0-9_]}, and not defined as a letter for the current locale.
***************
*** 344,348 ****
Note that match may differ from search using a regular expression
! beginning with \character{\^}: \character{\^} matches only at the
start of the string, or in \constant{MULTILINE} mode also immediately
following a newline. The ``match'' operation succeeds only if the
--- 348,353 ----
Note that match may differ from search using a regular expression
! beginning with \character{\textasciicircum}:
! \character{\textasciicircum} matches only at the
start of the string, or in \constant{MULTILINE} mode also immediately
following a newline. The ``match'' operation succeeds only if the
***************
*** 411,422 ****
\begin{datadesc}{M}
\dataline{MULTILINE}
! When specified, the pattern character \character{\^} matches at the
! beginning of the string and at the beginning of each line
! (immediately following each newline); and the pattern character
\character{\$} matches at the end of the string and at the end of each line
! (immediately preceding each newline).
! By default, \character{\^} matches only at the beginning of the string, and
! \character{\$} only at the end of the string and immediately before the
! newline (if any) at the end of the string.
\end{datadesc}
--- 416,427 ----
\begin{datadesc}{M}
\dataline{MULTILINE}
! When specified, the pattern character \character{\textasciicircum}
! matches at the beginning of the string and at the beginning of each
! line (immediately following each newline); and the pattern character
\character{\$} matches at the end of the string and at the end of each line
! (immediately preceding each newline). By default,
! \character{\textasciicircum} matches only at the beginning of the
! string, and \character{\$} only at the end of the string and
! immediately before the newline (if any) at the end of the string.
\end{datadesc}
***************
*** 592,596 ****
The optional second parameter \var{pos} gives an index in the string
where the search is to start; it defaults to \code{0}. This is not
! completely equivalent to slicing the string; the \code{'\^'} pattern
character matches at the real beginning of the string and at positions
just after a newline, but not necessarily at the index where the search
--- 597,602 ----
The optional second parameter \var{pos} gives an index in the string
where the search is to start; it defaults to \code{0}. This is not
! completely equivalent to slicing the string; the
! \code{'\textasciicircum'} pattern
character matches at the real beginning of the string and at positions
just after a newline, but not necessarily at the index where the search