From: kaoru <kaoru>
Date: Sat, 30 Dec 2000 03:08:18 +0000 (+0000)
Subject: Update to version 2000-12-11.07.
X-Git-Tag: wl-2_4_1pre~23
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd03b9f171ee9add2b87ee3db368014b68b62168;p=elisp%2Fwanderlust.git

Update to version 2000-12-11.07.
---

diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 4d67e38..1889b4c 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2000-11-10.15}
+\def\texinfoversion{2000-12-11.07}
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
 % Free Software Foundation, Inc.
@@ -704,20 +704,35 @@ where each line of input produces a line of output.}
     % if you have multiple lines of stuff to put here, you'll need to
     % make the vbox yourself of the appropriate size.
     \ifx#1l%
-      \llap{#2\hskip\inmarginspacing}%
+      \llap{\ignorespaces #2\hskip\inmarginspacing}%
     \else
-      \rlap{\hskip\hsize\hskip\inmarginspacing#2}%
+      \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
     \fi
     \null
   }%
 }}
 \def\inleftmargin{\doinmargin l}
 \def\inrightmargin{\doinmargin r}
-\def\inmargin{% not perfect, but better than nothing.
+%
+% @inmargin{TEXT [, RIGHT-TEXT]}
+% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
+% else use TEXT for both).
+% 
+\def\inmargin#1{\parseinmargin #1,,\finish}
+\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
+  \setbox0 = \hbox{\ignorespaces #2}% 
+  \ifdim\wd0 > 0pt
+    \def\lefttext{#1}%  have both texts
+    \def\righttext{#2}%
+  \else
+    \def\lefttext{#1}%  have only one text
+    \def\righttext{#1}%
+  \fi
+  %
   \ifodd\pageno
-    \let\temp=\inleftmargin
+    \def\temp{\inleftmargin\lefttext}%
   \else
-    \let\temp=\inrightmargin
+    \def\temp{\inrightmargin\righttext}%
   \fi
   \temp
 }