[Python-checkins] r52974 - in python/branches/release25-maint: Doc/lib/libmsilib.tex Doc/tools/py2texi.el Misc/NEWS

Sat Dec 9 13:13:10 CET 2006

Author: matthias.klose
Date: Sat Dec 9 13:13:02 2006
New Revision: 52974
Modified:
 python/branches/release25-maint/Doc/lib/libmsilib.tex
 python/branches/release25-maint/Doc/tools/py2texi.el
 python/branches/release25-maint/Misc/NEWS
Log:
- Fix the build of the library reference in info format.
Modified: python/branches/release25-maint/Doc/lib/libmsilib.tex
==============================================================================

--- python/branches/release25-maint/Doc/lib/libmsilib.tex	(original)
+++ python/branches/release25-maint/Doc/lib/libmsilib.tex	Sat Dec 9 13:13:02 2006
@@ -344,8 +344,8 @@
 \subsection{Features\label{features}}
 
 \begin{classdesc}{Feature}{database, id, title, desc, display\optional{,
- level=1\optional{, parent\optional\{, directory\optional{, 
- attributes=0}}}}
+ level=1\optional{, parent\optional{, directory\optional{, 
+ attributes=0}}}}}
 
 Add a new record to the \code{Feature} table, using the values
 \var{id}, \var{parent.id}, \var{title}, \var{desc}, \var{display},
Modified: python/branches/release25-maint/Doc/tools/py2texi.el
==============================================================================
--- python/branches/release25-maint/Doc/tools/py2texi.el	(original)
+++ python/branches/release25-maint/Doc/tools/py2texi.el	Sat Dec 9 13:13:02 2006
@@ -1,5 +1,6 @@
 ;;; py2texi.el -- Conversion of Python LaTeX documentation to Texinfo
 
+;; Copyright (C) 2006 Jeroen Dekkers <jeroen at dekkers.cx>
 ;; Copyright (C) 1998, 1999, 2001, 2002 Milan Zamazal
 
 ;; Author: Milan Zamazal <pdm at zamazal.org>
@@ -168,6 +169,7 @@
 "@end table\n")
 ("productionlist" 0 "\n at table @code\n" "@end table\n")
 ("quotation" 0 "@quotation" "@end quotation")
+ ("quote" 0 "@quotation" "@end quotation")
 ("seealso" 0 "See also:\n at table @emph\n" "@end table\n")
 ("seealso*" 0 "@table @emph\n" "@end table\n")
 ("sloppypar" 0 "" "")
@@ -246,11 +248,12 @@
 ("env" 1 "@code{\1円}")
 ("EOF" 0 "@code{EOF}")
 ("email" 1 "@email{\1円}")
+ ("em" 1 "@emph{\1円}")
 ("emph" 1 "@emph{\1円}")
 ("envvar" 1 "@env{\1円}")
 ("exception" 1 "@code{\1円}")
 ("exindex" 1 (progn (setq obindex t) "@obindex{\1円}"))
- ("fi" 0 (concat "@end " last-if))
+ ("fi" 0 (if (equal last-if "ifx") "" (concat "@end " last-if)))
 ("file" 1 "@file{\1円}")
 ("filenq" 1 "@file{\1円}")
 ("filevar" 1 "@file{@var{\1円}}")
@@ -262,6 +265,7 @@
 ("grammartoken" 1 "@code{\1円}")
 ("guilabel" 1 "@strong{\1円}")
 ("hline" 0 "")
+ ("ifx" 0 (progn (setq last-if "ifx") ""))
 ("ifhtml" 0 (concat "@" (setq last-if "ifinfo")))
 ("iftexi" 0 (concat "@" (setq last-if "ifinfo")))
 ("index" 1 (progn (setq cindex t) "@cindex{\1円}"))
@@ -284,6 +288,7 @@
 ("lineiii" 3 "@item \1円 @tab \2円 @tab \3円")
 ("lineiv" 4 "@item \1円 @tab \2円 @tab \3円 @tab \4円")
 ("linev" 5 "@item \1円 @tab \2円 @tab \3円 @tab \4円 @tab \5円")
+ ("locallinewidth" 0 "")
 ("localmoduletable" 0 "")
 ("longprogramopt" 1 "@option{--\1円}")
 ("macro" 1 "@code{@backslash{}\1円}")
@@ -307,6 +312,7 @@
 ("moreargs" 0 "@dots{}")
 ("n" 0 "@backslash{}n")
 ("newcommand" 2 "")
+ ("newlength" 1 "")
 ("newsgroup" 1 "@samp{\1円}")
 ("nodename" 1
 (save-excursion
@@ -322,6 +328,7 @@
 ("opindex" 1 (progn (setq cindex t) "@cindex{\1円}"))
 ("option" 1 "@option{\1円}")
 ("optional" 1 "[\1円]")
+ ("paragraph" 1 "@subsubheading \1円")
 ("pep" 1 (progn (setq cindex t) "PEP@ \\1 at cindex PEP \1円\n"))
 ("pi" 0 "pi")
 ("platform" 1 "")
@@ -363,6 +370,7 @@
 ("seetitle" 1 "@cite{\1円}")
 ("seeurl" 2 "\n at table @url\n at item \1円\n\2円\n at end table\n")
 ("setindexsubitem" 1 (progn (setq cindex t) "@cindex \1円"))
+ ("setlength" 2 "")
 ("setreleaseinfo" 1 (progn (setq py2texi-releaseinfo "")))
 ("setshortversion" 1
 (progn (setq py2texi-python-short-version (match-string 1 string)) ""))
@@ -382,8 +390,8 @@
 ("textasciicircum" 0 "^")
 ("textbackslash" 0 "@backslash{}")
 ("textbar" 0 "|")
- ; Some common versions of Texinfo don't support @euro yet:
- ; ("texteuro" 0 "@euro{}")
+ ("textbf" 1 "@strong{\1円}")
+ ("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.
@@ -394,6 +402,7 @@
 ("textrm" 1 "\1円")
 ("texttt" 1 "@code{\1円}")
 ("textunderscore" 0 "_")
+ ("tilde" 0 "~")
 ("title" 1 (progn (setq title (match-string 1 string)) "@settitle \1円"))
 ("today" 0 "@today{}")
 ("token" 1 "@code{\1円}")
@@ -402,6 +411,7 @@
 ("u" 0 "@backslash{}u")
 ("ulink" 2 "\1円")
 ("UNIX" 0 "UNIX")
+ ("undefined" 0 "")
 ("unspecified" 0 "@dots{}")
 ("url" 1 "@url{\1円}")
 ("usepackage" 1 "")
@@ -534,15 +544,20 @@
 	beg
 	end)
 (py2texi-search-safe "\\\\begin{\\(verbatim\\|displaymath\\)}"
- (replace-match "@example")
- (setq beg (copy-marker (point) nil))
- (re-search-forward "\\\\end{\\(verbatim\\|displaymath\\)}")
- (setq end (copy-marker (match-beginning 0) nil))
- (replace-match "@end example")
- (py2texi-texinfo-escape beg end)
- (put-text-property (- beg (length "@example"))
-			 (+ end (length "@end example"))
-			 'py2texi-protected t))
+ (when (save-excursion
+	 ; Make sure we aren't looking at a commented out version
+	 ; of a verbatim environment
+	 (beginning-of-line)
+	 (not (looking-at "%")))
+	(replace-match "@example ")
+	(setq beg (copy-marker (point) nil))
+	(re-search-forward "\\\\end{\\(verbatim\\|displaymath\\)}")
+	(setq end (copy-marker (match-beginning 0) nil))
+	(replace-match "@end example")
+	(py2texi-texinfo-escape beg end)
+	(put-text-property (- beg (length "@example "))
+			 (+ end (length "@end example"))
+			 'py2texi-protected t)))
 (py2texi-search-safe "\\\\verb\\([^a-z]\\)"
 (setq delimiter (match-string 1))
 (replace-match "@code{")
@@ -883,6 +898,10 @@
 
 (defun py2texi-fix-braces ()
 "Escape braces for Texinfo."
+ (py2texi-search "{@{}"
+ (replace-match "@{"))
+ (py2texi-search "{@}}"
+ (replace-match "@}"))
 (let (string)
 (py2texi-search "{"
 (unless (or (py2texi-protected)
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sat Dec 9 13:13:02 2006
@@ -229,6 +229,8 @@
 
 - Fix build failure on kfreebsd and on the hurd.
 
+- Fix the build of the library reference in info format.
+
 
 Windows
 -------
