- fix generated Texinfo markup for \deprecated

- add support for additional markup: \leq, \textbar, \textit
- add a comment about the non-support for the Euro character
(ported from release24-maint branch release 1.10.4.2)

diff --git a/Doc/tools/py2texi.el b/Doc/tools/py2texi.el
index 82dc5bb994c9c0173d4607c4d96f61ee942af893..c3d8df0cd898ba3e772e9447829e1941df153f8e 100644 (file)
--- a/Doc/tools/py2texi.el
+++ b/Doc/tools/py2texi.el
@@ -238,7 +238,7 @@ Both BEGIN and END are evaled.  Moreover, you can reference arguments through
     ("dataline" 1 (progn (setq findex t) "@item \\1\n@findex \\1\n"))
     ("date" 1 "\\1")
     ("declaremodule" 2 (progn (setq cindex t) "@label{\\2}@cindex{\\2}\ 1"))
-    ("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{}")
@@ -279,6 +279,7 @@ Both BEGIN and END are evaled.  Moreover, you can reference arguments through
     ("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")
@@ -380,7 +381,15 @@ Both BEGIN and END are evaled.  Moreover, you can reference arguments through
     ("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}")