[Python-checkins] python/dist/src/Doc/tools getpagecounts, 1.8.2.1, 1.8.2.2 mkpkglist, 1.1.8.2, 1.1.8.3 py2texi.el, 1.2.2.2, 1.2.2.3

Sun Oct 16 07:24:31 CEST 2005

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27718/Doc/tools
Modified Files:
 Tag: ast-branch
	getpagecounts mkpkglist py2texi.el 
Log Message:
Merge head to branch (for the last time)
Index: getpagecounts
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/getpagecounts,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2

--- getpagecounts	7 Jan 2005 06:57:36 -0000	1.8.2.1
+++ getpagecounts	16 Oct 2005 05:23:58 -0000	1.8.2.2
@@ -65,7 +65,7 @@
 of it! To locate published copies of the larger manuals, or other
 Python reference material, consult the Python Bookstore at:
 
- http://www.python.org/cgi-bin/moinmoin/PythonBooks
+ http://wiki.python.org/moin/PythonBooks
 
 The following manuals are included in this package:
 """
Index: mkpkglist
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkpkglist,v
retrieving revision 1.1.8.2
retrieving revision 1.1.8.3
diff -u -d -r1.1.8.2 -r1.1.8.3
--- mkpkglist	7 Jan 2005 06:57:37 -0000	1.1.8.2
+++ mkpkglist	16 Oct 2005 05:23:58 -0000	1.1.8.3
@@ -67,14 +67,17 @@
 have_tgz = isfile(tgz_fn)
 have_bz2 = isfile(bz2_fn)
 
- if have_zip or have_tgz or have_bz2:
- print " <tr><td>%s</td>" % name
-
- print get_file_cell(prefix, ".zip", have_zip)
- print get_file_cell(prefix, ".tgz", have_tgz)
- print get_file_cell(prefix, ".tar.bz2", have_bz2)
+ have_some = have_zip or have_tgz or have_bz2
 
- print " </tr>"
+ if not have_some:
+ print " <!--"
+ print " <tr><td>%s</td>" % name
+ print get_file_cell(prefix, ".zip", have_zip)
+ print get_file_cell(prefix, ".tgz", have_tgz)
+ print get_file_cell(prefix, ".tar.bz2", have_bz2)
+ print " </tr>"
+ if not have_some:
+ print " -->"
 
 print '''\
 </tbody>
Index: py2texi.el
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/py2texi.el,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- py2texi.el	7 Jan 2005 06:57:37 -0000	1.2.2.2
+++ py2texi.el	16 Oct 2005 05:23:58 -0000	1.2.2.3
@@ -238,7 +238,7 @@
 ("dataline" 1 (progn (setq findex t) "@item \1円\n at findex \1円\n"))
 ("date" 1 "\1円")
 ("declaremodule" 2 (progn (setq cindex t) "@label{\2円}@cindex{\2円}"))
- ("deprecated" 2 "@emph{This is deprecated in Python \1円. \2円}")
+ ("deprecated" 2 "@emph{This is deprecated in Python \1円. \2円}\n\n")
 ("dfn" 1 "@dfn{\1円}")
 ("documentclass" 1 py2texi-magic)
 ("e" 0 "@backslash{}")
@@ -260,6 +260,7 @@
 ("funclineni" 2 "@item \1円 \2円")
 ("function" 1 "@code{\1円}")
 ("grammartoken" 1 "@code{\1円}")
+ ("guilabel" 1 "@strong{\1円}")
 ("hline" 0 "")
 ("ifhtml" 0 (concat "@" (setq last-if "ifinfo")))
 ("iftexi" 0 (concat "@" (setq last-if "ifinfo")))
@@ -278,6 +279,7 @@
 ("large" 0 "")
 ("ldots" 0 "@dots{}")
 ("leftline" 1 "\1円")
+ ("leq" 0 "<=")
 ("lineii" 2 "@item \1円 @tab \2円")
 ("lineiii" 3 "@item \1円 @tab \2円 @tab \3円")
 ("lineiv" 4 "@item \1円 @tab \2円 @tab \3円 @tab \4円")
@@ -353,6 +355,7 @@
 			 (py2texi-backslash-quote (match-string 2 str)))
 		 "@node \1円\n at section \1円\n"))))
 ("sectionauthor" 2 "")
+ ("seelink" 3 "\n at table @url\n at item @strong{\1円}\n(\2円)\n\3円\n at end table\n")
 ("seemodule" 2 "@ref{\1円} \2円")
 ("seepep" 3 "\n at table @strong\n at item PEP\1円 \2円\n\3円\n at end table\n")
 ("seerfc" 3 "\n at table @strong\n at item RFC\1円 \2円\n\3円\n at end table\n")
@@ -378,7 +381,15 @@
 ("textasciitilde" 0 "~")
 ("textasciicircum" 0 "^")
 ("textbackslash" 0 "@backslash{}")
+ ("textbar" 0 "|")
+ ; Some common versions of Texinfo don't support @euro yet:
+ ; ("texteuro" 0 "@euro{}")
+ ; Unfortunately, this alternate spelling doesn't actually apply to
+ ; the usage found in Python Tutorial, which actually requires a
+ ; Euro symbol to make sense, so this is commented out as well.
+ ; ("texteuro" 0 "Euro ")
 ("textgreater" 0 ">")
+ ("textit" 1 "@i{\1円}")
 ("textless" 0 "<")
 ("textrm" 1 "\1円")
 ("texttt" 1 "@code{\1円}")
