Show
Ignore:
Timestamp:
08/10/06 11:19:54 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/man/texinfo.tex

    r4098 r4140  
    44\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi 
    55% 
    6 \def\texinfoversion{2006-06-19.13} 
     6\def\texinfoversion{2006-07-17.16} 
    77% 
    88% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 
    …… 
    328328      \ifdim\ht\footlinebox > 0pt 
    329329        % Only leave this space if the footline is nonempty. 
    330         % (We lessened \vsize for it in \oddfootingxxx.) 
     330        % (We lessened \vsize for it in \oddfootingyyy.) 
    331331        % The \baselineskip=24pt in plain's \makefootline has no effect. 
    332         \vskip 2\baselineskip 
     332        \vskip 24pt 
    333333        \unvbox\footlinebox 
    334334      \fi 
    …… 
    20522052%  -- rms. 
    20532053{ 
    2054   \catcode`\-=\active 
    2055   \catcode`\_=\active 
     2054  \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active 
    20562055  % 
    20572056  \global\def\code{\begingroup 
    2058     \catcode`\-=\active  \catcode`\_=\active 
     2057    \catcode`\-=\active  \catcode`\_=\active \catcode`\'=\active 
     2058    \let'\singlequotechar 
    20592059    \ifallowcodebreaks 
    20602060     \let-\codedash 
    …… 
    24732473  % Leave some space for the footline.  Hopefully ok to assume 
    24742474  % @evenfooting will not be used by itself. 
    2475   \global\advance\pageheight by -\baselineskip 
    2476   \global\advance\vsize by -\baselineskip 
     2475  \global\advance\pageheight by -12pt 
     2476  \global\advance\vsize by -12pt 
    24772477} 
    24782478 
    …… 
    50435043\dimen2 = .55pt % Thickness of rules 
    50445044% The text. (`r' is open on the right, `e' somewhat less so on the left.) 
    5045 \setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt} 
     5045\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} 
    50465046% 
    50475047\setbox\errorbox=\hbox to \dimen0{\hfil 
    …… 
    52665266\maketwodispenvs {lisp}{example}{% 
    52675267  \nonfillstart 
    5268   \tt 
     5268  \tt\quoteexpand 
    52695269  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. 
    52705270  \gobble       % eat return 
    52715271} 
    5272  
    52735272% @display/@smalldisplay: same as @lisp except keep current font. 
    52745273% 
    …… 
    53985397% 
    53995398\def\starttabbox{\setbox0=\hbox\bgroup} 
     5399 
     5400% Allow an option to not replace quotes with a regular directed right 
     5401% quote/apostrophe (char 0x27), but instead use the undirected quote 
     5402% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it 
     5403% the default, but it works for pasting with more pdf viewers (at least 
     5404% evince), the lilypond developers report.  xpdf does work with the 
     5405% regular 0x27.   
     5406%  
     5407\def\singlequotechar{% 
     5408  \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax 
     5409    '% 
     5410  \else 
     5411    \char'15 
     5412  \fi 
     5413} 
     5414% 
    54005415\begingroup 
    54015416  \catcode`\^^I=\active 
    …… 
    54105425    }% 
    54115426  } 
     5427  \catcode`\'=\active 
     5428  \gdef\quoteexpand{% 
     5429    \catcode`\'=\active 
     5430    \def'{\singlequotechar} 
     5431  }% 
    54125432\endgroup 
     5433% 
    54135434\def\setupverbatim{% 
    54145435  \let\nonarrowing = t% 
    …… 
    54195440  \catcode`\`=\active 
    54205441  \tabexpand 
     5442  \quoteexpand 
    54215443  % Respect line breaks, 
    54225444  % print special symbols as themselves, and