[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r8554: texinfo.tex etc
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r8554: texinfo.tex etc |
|
Date: |
Tue, 30 Aug 2022 22:01:31 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 8554
revision-id: carlhansen@gnu.org-20220831020125-g67gnir9d9ch2wzd
parent: carlhansen@gnu.org-20220831015936-fsjvd059fuqrskht
committer: Carl Hansen <carlhansen@gnu.org>
branch nick: trunk
timestamp: Tue 2022-08-30 19:01:25 -0700
message:
texinfo.tex etc
modified:
doc/texinfo.tex texinfo.tex-20210501180820-1twq5wdsrp9yr9h7-1
=== modified file 'doc/texinfo.tex'
--- a/doc/texinfo.tex 2022-08-20 15:04:11 +0000
+++ b/doc/texinfo.tex 2022-08-31 02:01:25 +0000
@@ -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{2022-08-20.13}
+\def\texinfoversion{2022-08-27.12}
%
% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
%
@@ -739,7 +739,8 @@
\vskip0pt plus -\dimen0
\vskip \dimen0
\penalty9999
- \vskip -\dimen0\relax
+ \vskip -\dimen0
+ \penalty0\relax % this hides the above glue from \safewhatsit and \dobreak
\fi
}
@@ -2802,14 +2803,23 @@
% @var unconditionally uses \sl. This gives consistency for
% parameter names whether they are in @def, @table @code or a
% regular paragraph.
+% To get ttsl font for @var when used in code context, @set txicodevaristt.
% The \null is to reset \spacefactor.
\def\aftersmartic{}
\def\var#1{%
\let\saveaftersmartic = \aftersmartic
\def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
- {\sl #1}\smartitaliccorrection
+ \ifusingtt{%
+ \ifflagclear{txicodevaristt}%
+ {{\sl #1}}%
+ {{\ttsl #1}}%
+ }{{\sl #1}}%
+ \smartitaliccorrection
}
+% To be removed after next release
+\def\SETtxicodevaristt{}% @set txicodevaristt
+
\let\i=\smartitalic
\let\slanted=\smartslanted
\let\dfn=\smartslanted
@@ -3447,10 +3457,16 @@
\ifx\textnominalsize\xwordpt
% for 10pt running text, lllsize (8pt) is too small for the A in LaTeX.
% Revert to plain's \scriptsize, which is 7pt.
- \count255=\the\fam $\fam\count255 \scriptstyle A$%
+ % \count255=\the\fam $\fam\count255 \scriptstyle A$%
+ \switchtolllsize A%
\else
- % For 11pt, we can use our lllsize.
- \switchtolllsize A%
+ \iffalse % x\curfontsize\smallword
+ % For footnotes and indices
+ \count255=\the\fam $\fam\count255 \scriptstyle A$%
+ \else
+ % For 11pt, we can use our lllsize.
+ \switchtolllsize A%
+ \fi
\fi
}%
\vss
@@ -3458,6 +3474,7 @@
\kern-.15em
\TeX
}
+\def\smallword{small}
% Some math mode symbols. Define \ensuremath to switch into math mode
% unless we are already there. Expansion tricks may not be needed here,
@@ -10333,103 +10350,101 @@
% least make most of the characters not bomb out.
%
\def\unicodechardefs{%
- % Disable ASCII definitions, as with the current implementation, this
- % makes all characters output literally with XeTeX, including @.
- % \DeclareUnicodeCharacter{0020}{ } % space
- % \DeclareUnicodeCharacter{0021}{\char"21 } % space to terminate number
- % \DeclareUnicodeCharacter{0022}{\char"22 }
- % \DeclareUnicodeCharacter{0023}{\char"23 }
- % \DeclareUnicodeCharacter{0024}{\char"24 }
- % \DeclareUnicodeCharacter{0025}{\char"25 }
- % \DeclareUnicodeCharacter{0026}{\char"26 }
- % \DeclareUnicodeCharacter{0027}{\char"27 }
- % \DeclareUnicodeCharacter{0028}{\char"28 }
- % \DeclareUnicodeCharacter{0029}{\char"29 }
- % \DeclareUnicodeCharacter{002A}{\char"2A }
- % \DeclareUnicodeCharacter{002B}{\char"2B }
- % \DeclareUnicodeCharacter{002C}{\char"2C }
- % \DeclareUnicodeCharacter{002D}{\char"2D }
- % \DeclareUnicodeCharacter{002E}{\char"2E }
- % \DeclareUnicodeCharacter{002F}{\char"2F }
- % \DeclareUnicodeCharacter{0030}{0}%
- % \DeclareUnicodeCharacter{0031}{1}%
- % \DeclareUnicodeCharacter{0032}{2}%
- % \DeclareUnicodeCharacter{0033}{3}%
- % \DeclareUnicodeCharacter{0034}{4}%
- % \DeclareUnicodeCharacter{0035}{5}%
- % \DeclareUnicodeCharacter{0036}{6}%
- % \DeclareUnicodeCharacter{0037}{7}%
- % \DeclareUnicodeCharacter{0038}{8}%
- % \DeclareUnicodeCharacter{0039}{9}%
- % \DeclareUnicodeCharacter{003A}{\char"3A }
- % \DeclareUnicodeCharacter{003B}{\char"3B }
- % \DeclareUnicodeCharacter{003C}{\char"3C }
- % \DeclareUnicodeCharacter{003D}{\char"3D }
- % \DeclareUnicodeCharacter{003E}{\char"3E }
- % \DeclareUnicodeCharacter{003F}{\char"3F }
- % \DeclareUnicodeCharacter{0040}{\char"40 }
- % \DeclareUnicodeCharacter{0041}{A}%
- % \DeclareUnicodeCharacter{0042}{B}%
- % \DeclareUnicodeCharacter{0043}{C}%
- % \DeclareUnicodeCharacter{0044}{D}%
- % \DeclareUnicodeCharacter{0045}{E}%
- % \DeclareUnicodeCharacter{0046}{F}%
- % \DeclareUnicodeCharacter{0047}{G}%
- % \DeclareUnicodeCharacter{0048}{H}%
- % \DeclareUnicodeCharacter{0049}{I}%
- % \DeclareUnicodeCharacter{004A}{J}%
- % \DeclareUnicodeCharacter{004B}{K}%
- % \DeclareUnicodeCharacter{004C}{L}%
- % \DeclareUnicodeCharacter{004D}{M}%
- % \DeclareUnicodeCharacter{004E}{N}%
- % \DeclareUnicodeCharacter{004F}{O}%
- % \DeclareUnicodeCharacter{0050}{P}%
- % \DeclareUnicodeCharacter{0051}{Q}%
- % \DeclareUnicodeCharacter{0052}{R}%
- % \DeclareUnicodeCharacter{0053}{S}%
- % \DeclareUnicodeCharacter{0054}{T}%
- % \DeclareUnicodeCharacter{0055}{U}%
- % \DeclareUnicodeCharacter{0056}{V}%
- % \DeclareUnicodeCharacter{0057}{W}%
- % \DeclareUnicodeCharacter{0058}{X}%
- % \DeclareUnicodeCharacter{0059}{Y}%
- % \DeclareUnicodeCharacter{005A}{Z}%
- % \DeclareUnicodeCharacter{005B}{\char"5B }
- % \DeclareUnicodeCharacter{005C}{\char"5C }
- % \DeclareUnicodeCharacter{005D}{\char"5D }
- % \DeclareUnicodeCharacter{005E}{\char"5E }
- % \DeclareUnicodeCharacter{005F}{\char"5F }
- % \DeclareUnicodeCharacter{0060}{\char"60 }
- % \DeclareUnicodeCharacter{0061}{a}%
- % \DeclareUnicodeCharacter{0062}{b}%
- % \DeclareUnicodeCharacter{0063}{c}%
- % \DeclareUnicodeCharacter{0064}{d}%
- % \DeclareUnicodeCharacter{0065}{e}%
- % \DeclareUnicodeCharacter{0066}{f}%
- % \DeclareUnicodeCharacter{0067}{g}%
- % \DeclareUnicodeCharacter{0068}{h}%
- % \DeclareUnicodeCharacter{0069}{i}%
- % \DeclareUnicodeCharacter{006A}{j}%
- % \DeclareUnicodeCharacter{006B}{k}%
- % \DeclareUnicodeCharacter{006C}{l}%
- % \DeclareUnicodeCharacter{006D}{m}%
- % \DeclareUnicodeCharacter{006E}{n}%
- % \DeclareUnicodeCharacter{006F}{o}%
- % \DeclareUnicodeCharacter{0070}{p}%
- % \DeclareUnicodeCharacter{0071}{q}%
- % \DeclareUnicodeCharacter{0072}{r}%
- % \DeclareUnicodeCharacter{0073}{s}%
- % \DeclareUnicodeCharacter{0074}{t}%
- % \DeclareUnicodeCharacter{0075}{u}%
- % \DeclareUnicodeCharacter{0076}{v}%
- % \DeclareUnicodeCharacter{0077}{w}%
- % \DeclareUnicodeCharacter{0078}{x}%
- % \DeclareUnicodeCharacter{0079}{y}%
- % \DeclareUnicodeCharacter{007A}{z}%
- % \DeclareUnicodeCharacter{007B}{\char"7B }
- % \DeclareUnicodeCharacter{007C}{\char"7C }
- % \DeclareUnicodeCharacter{007D}{\char"7D }
- % \DeclareUnicodeCharacter{007E}{\char"7E }
+ \DeclareUnicodeCharacter{0020}{ } % space
+ \DeclareUnicodeCharacter{0021}{\char"21 }% % space to terminate number
+ \DeclareUnicodeCharacter{0022}{\char"22 }%
+ \DeclareUnicodeCharacter{0023}{\char"23 }%
+ \DeclareUnicodeCharacter{0024}{\char"24 }%
+ \DeclareUnicodeCharacter{0025}{\char"25 }%
+ \DeclareUnicodeCharacter{0026}{\char"26 }%
+ \DeclareUnicodeCharacter{0027}{\char"27 }%
+ \DeclareUnicodeCharacter{0028}{\char"28 }%
+ \DeclareUnicodeCharacter{0029}{\char"29 }%
+ \DeclareUnicodeCharacter{002A}{\char"2A }%
+ \DeclareUnicodeCharacter{002B}{\char"2B }%
+ \DeclareUnicodeCharacter{002C}{\char"2C }%
+ \DeclareUnicodeCharacter{002D}{\char"2D }%
+ \DeclareUnicodeCharacter{002E}{\char"2E }%
+ \DeclareUnicodeCharacter{002F}{\char"2F }%
+ \DeclareUnicodeCharacter{0030}{0}%
+ \DeclareUnicodeCharacter{0031}{1}%
+ \DeclareUnicodeCharacter{0032}{2}%
+ \DeclareUnicodeCharacter{0033}{3}%
+ \DeclareUnicodeCharacter{0034}{4}%
+ \DeclareUnicodeCharacter{0035}{5}%
+ \DeclareUnicodeCharacter{0036}{6}%
+ \DeclareUnicodeCharacter{0037}{7}%
+ \DeclareUnicodeCharacter{0038}{8}%
+ \DeclareUnicodeCharacter{0039}{9}%
+ \DeclareUnicodeCharacter{003A}{\char"3A }%
+ \DeclareUnicodeCharacter{003B}{\char"3B }%
+ \DeclareUnicodeCharacter{003C}{\char"3C }%
+ \DeclareUnicodeCharacter{003D}{\char"3D }%
+ \DeclareUnicodeCharacter{003E}{\char"3E }%
+ \DeclareUnicodeCharacter{003F}{\char"3F }%
+ \DeclareUnicodeCharacter{0040}{\char"40 }%
+ \DeclareUnicodeCharacter{0041}{A}%
+ \DeclareUnicodeCharacter{0042}{B}%
+ \DeclareUnicodeCharacter{0043}{C}%
+ \DeclareUnicodeCharacter{0044}{D}%
+ \DeclareUnicodeCharacter{0045}{E}%
+ \DeclareUnicodeCharacter{0046}{F}%
+ \DeclareUnicodeCharacter{0047}{G}%
+ \DeclareUnicodeCharacter{0048}{H}%
+ \DeclareUnicodeCharacter{0049}{I}%
+ \DeclareUnicodeCharacter{004A}{J}%
+ \DeclareUnicodeCharacter{004B}{K}%
+ \DeclareUnicodeCharacter{004C}{L}%
+ \DeclareUnicodeCharacter{004D}{M}%
+ \DeclareUnicodeCharacter{004E}{N}%
+ \DeclareUnicodeCharacter{004F}{O}%
+ \DeclareUnicodeCharacter{0050}{P}%
+ \DeclareUnicodeCharacter{0051}{Q}%
+ \DeclareUnicodeCharacter{0052}{R}%
+ \DeclareUnicodeCharacter{0053}{S}%
+ \DeclareUnicodeCharacter{0054}{T}%
+ \DeclareUnicodeCharacter{0055}{U}%
+ \DeclareUnicodeCharacter{0056}{V}%
+ \DeclareUnicodeCharacter{0057}{W}%
+ \DeclareUnicodeCharacter{0058}{X}%
+ \DeclareUnicodeCharacter{0059}{Y}%
+ \DeclareUnicodeCharacter{005A}{Z}%
+ \DeclareUnicodeCharacter{005B}{\char"5B }%
+ \DeclareUnicodeCharacter{005C}{\char"5C }%
+ \DeclareUnicodeCharacter{005D}{\char"5D }%
+ \DeclareUnicodeCharacter{005E}{\char"5E }%
+ \DeclareUnicodeCharacter{005F}{\char"5F }%
+ \DeclareUnicodeCharacter{0060}{\char"60 }%
+ \DeclareUnicodeCharacter{0061}{a}%
+ \DeclareUnicodeCharacter{0062}{b}%
+ \DeclareUnicodeCharacter{0063}{c}%
+ \DeclareUnicodeCharacter{0064}{d}%
+ \DeclareUnicodeCharacter{0065}{e}%
+ \DeclareUnicodeCharacter{0066}{f}%
+ \DeclareUnicodeCharacter{0067}{g}%
+ \DeclareUnicodeCharacter{0068}{h}%
+ \DeclareUnicodeCharacter{0069}{i}%
+ \DeclareUnicodeCharacter{006A}{j}%
+ \DeclareUnicodeCharacter{006B}{k}%
+ \DeclareUnicodeCharacter{006C}{l}%
+ \DeclareUnicodeCharacter{006D}{m}%
+ \DeclareUnicodeCharacter{006E}{n}%
+ \DeclareUnicodeCharacter{006F}{o}%
+ \DeclareUnicodeCharacter{0070}{p}%
+ \DeclareUnicodeCharacter{0071}{q}%
+ \DeclareUnicodeCharacter{0072}{r}%
+ \DeclareUnicodeCharacter{0073}{s}%
+ \DeclareUnicodeCharacter{0074}{t}%
+ \DeclareUnicodeCharacter{0075}{u}%
+ \DeclareUnicodeCharacter{0076}{v}%
+ \DeclareUnicodeCharacter{0077}{w}%
+ \DeclareUnicodeCharacter{0078}{x}%
+ \DeclareUnicodeCharacter{0079}{y}%
+ \DeclareUnicodeCharacter{007A}{z}%
+ \DeclareUnicodeCharacter{007B}{\char"7B }%
+ \DeclareUnicodeCharacter{007C}{\char"7C }%
+ \DeclareUnicodeCharacter{007D}{\char"7D }%
+ \DeclareUnicodeCharacter{007E}{\char"7E }%
% \DeclareUnicodeCharacter{007F}{} % DEL
%
\DeclareUnicodeCharacter{00A0}{\tie}%
@@ -11116,24 +11131,26 @@
% provide a definition macro to replace/pass-through a Unicode character
%
\def\DeclareUnicodeCharacterNative#1#2{%
- \catcode"#1=\active
- \def\dodeclareunicodecharacternative##1##2##3{%
+ \ifnum"#1>"7F % only make non-ASCII chars active
+ \catcode"#1=\active
+ \def\dodeclareunicodecharacternative##1##2##3{%
+ \begingroup
+ \uccode`\~="##2\relax
+ \uppercase{\gdef~}{%
+ \ifpassthroughchars
+ ##1%
+ \else
+ ##3%
+ \fi
+ }
+ \endgroup
+ }
\begingroup
- \uccode`\~="##2\relax
- \uppercase{\gdef~}{%
- \ifpassthroughchars
- ##1%
- \else
- ##3%
- \fi
- }
+ \uccode`\.="#1\relax
+ \uppercase{\def\UTFNativeTmp{.}}%
+ \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
\endgroup
- }
- \begingroup
- \uccode`\.="#1\relax
- \uppercase{\def\UTFNativeTmp{.}}%
- \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
- \endgroup
+ \fi
}
% Native Unicode handling (XeTeX and LuaTeX) character replacing definition.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r8554: texinfo.tex etc,
Carl Hansen <=