aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorPaul Eggert2016-09-15 11:50:23 -0700
committerPaul Eggert2016-09-15 15:55:30 -0700
commit8f4b6a20bfec96086845b2f7161e121b1e41b4ad (patch)
treee8c4a85626437b0f77ed0a7b575e7627d45dce9e /doc/misc
parent3c586e182c0694896dda670f5fc663b46c9bac63 (diff)
downloademacs-8f4b6a20bfec96086845b2f7161e121b1e41b4ad.tar.gz
emacs-8f4b6a20bfec96086845b2f7161e121b1e41b4ad.zip
Update from gnulib
This incorporates: 2016-09-15 stdint: support new _WIDTH macros 2016-09-15 limits-h: new module 2016-09-15 sys_types: avoid glibc 2.25 warnings about major() 2016-09-15 extensions: port to more ISO C TSes 2016-09-13 intprops: new macro TYPE_WIDTH 2016-09-13 extensions: port to recent ISO C TRs * .gitignore: Add lib/limits.h. * doc/misc/texinfo.tex, lib/ftoastr.h, lib/intprops.h: * lib/stdint.in.h, m4/extensions.m4, m4/stdint.m4, m4/stdio_h.m4: * m4/sys_types_h.m4: Copy from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/limits.in.h, m4/limits-h.m4: New files, copie from gnulib. * nt/gnulib.mk: Merge changes from lib/gnulib.mk.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/texinfo.tex203
1 files changed, 87 insertions, 116 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 5e260ed8f9c..a7469b22f30 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
3% Load plain if necessary, i.e., if running under initex. 3% Load plain if necessary, i.e., if running under initex.
4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi 4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
5% 5%
6\def\texinfoversion{2016-08-16.20} 6\def\texinfoversion{2016-09-12.20}
7% 7%
8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -862,36 +862,6 @@ where each line of input produces a line of output.}
862 \temp 862 \temp
863} 863}
864 864
865% @| inserts a changebar to the left of the current line. It should
866% surround any changed text. This approach does *not* work if the
867% change spans more than two lines of output. To handle that, we would
868% have adopt a much more difficult approach (putting marks into the main
869% vertical list for the beginning and end of each change). This command
870% is not documented, not supported, and doesn't work.
871%
872\def\|{%
873 % \vadjust can only be used in horizontal mode.
874 \leavevmode
875 %
876 % Append this vertical mode material after the current line in the output.
877 \vadjust{%
878 % We want to insert a rule with the height and depth of the current
879 % leading; that is exactly what \strutbox is supposed to record.
880 \vskip-\baselineskip
881 %
882 % \vadjust-items are inserted at the left edge of the type. So
883 % the \llap here moves out into the left-hand margin.
884 \llap{%
885 %
886 % For a thicker or thinner bar, change the `1pt'.
887 \vrule height\baselineskip width1pt
888 %
889 % This is the space between the bar and the text.
890 \hskip 12pt
891 }%
892 }%
893}
894
895% @include FILE -- \input text of FILE. 865% @include FILE -- \input text of FILE.
896% 866%
897\def\include{\parseargusing\filenamecatcodes\includezzz} 867\def\include{\parseargusing\filenamecatcodes\includezzz}
@@ -1885,40 +1855,9 @@ output) for that.)}
1885 } 1855 }
1886\fi 1856\fi
1887 1857
1888\message{fonts,}
1889 1858
1890% Change the current font style to #1, remembering it in \curfontstyle.
1891% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
1892% italics, not bold italics.
1893%
1894\def\setfontstyle#1{%
1895 \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
1896 \csname ten#1\endcsname % change the current font
1897}
1898
1899% Select #1 fonts with the current style.
1900% 1859%
1901\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} 1860\message{fonts,}
1902
1903\def\rm{\fam=0 \setfontstyle{rm}}
1904\def\it{\fam=\itfam \setfontstyle{it}}
1905\def\sl{\fam=\slfam \setfontstyle{sl}}
1906\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
1907\def\tt{\fam=\ttfam \setfontstyle{tt}}
1908
1909% Unfortunately, we have to override this for titles and the like, since
1910% in those cases "rm" is bold. Sigh.
1911\def\rmisbold{\rm\def\curfontstyle{bf}}
1912
1913% Texinfo sort of supports the sans serif font style, which plain TeX does not.
1914% So we set up a \sf.
1915\newfam\sffam
1916\def\sf{\fam=\sffam \setfontstyle{sf}}
1917\let\li = \sf % Sometimes we call it \li, not \sf.
1918
1919% We don't need math for this font style.
1920\def\ttsl{\setfontstyle{ttsl}}
1921
1922 1861
1923% Set the baselineskip to #1, and the lineskip and strut size 1862% Set the baselineskip to #1, and the lineskip and strut size
1924% correspondingly. There is no deep meaning behind these magic numbers 1863% correspondingly. There is no deep meaning behind these magic numbers
@@ -2269,8 +2208,8 @@ end
2269\setfont\deftt\ttshape{10}{\magstep1}{OT1TT} 2208\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
2270\setfont\defsl\slshape{10}{\magstep1}{OT1TT} 2209\setfont\defsl\slshape{10}{\magstep1}{OT1TT}
2271\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} 2210\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
2272\def\df{\let\tentt=\deftt \let\tenbf = \defbf 2211\def\df{\let\ttfont=\deftt \let\bffont = \defbf
2273\let\tenttsl=\defttsl \let\tensl=\defsl \bf} 2212\let\ttfontsl=\defttsl \let\slfont=\defsl \bf}
2274 2213
2275% Fonts for indices, footnotes, small examples (9pt). 2214% Fonts for indices, footnotes, small examples (9pt).
2276\def\smallnominalsize{9pt} 2215\def\smallnominalsize{9pt}
@@ -2403,8 +2342,8 @@ end
2403\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} 2342\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
2404\setfont\defsl\slshape{10}{\magstephalf}{OT1TT} 2343\setfont\defsl\slshape{10}{\magstephalf}{OT1TT}
2405\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} 2344\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
2406\def\df{\let\tentt=\deftt \let\tenbf = \defbf 2345\def\df{\let\ttfont=\deftt \let\bffont = \defbf
2407\let\tensl=\defsl \let\tenttsl=\defttsl \bf} 2346\let\slfont=\defsl \let\ttfontsl=\defttsl \bf}
2408 2347
2409% Fonts for indices, footnotes, small examples (9pt). 2348% Fonts for indices, footnotes, small examples (9pt).
2410\def\smallnominalsize{9pt} 2349\def\smallnominalsize{9pt}
@@ -2510,6 +2449,12 @@ end
2510\rm 2449\rm
2511} % end of 10pt text font size definitions, \definetextfontsizex 2450} % end of 10pt text font size definitions, \definetextfontsizex
2512 2451
2452% Fonts for short table of contents.
2453\setfont\shortcontrm\rmshape{12}{1000}{OT1}
2454\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
2455\setfont\shortcontsl\slshape{12}{1000}{OT1}
2456\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
2457
2513 2458
2514% We provide the user-level command 2459% We provide the user-level command
2515% @fonttextsize 10 2460% @fonttextsize 10
@@ -2536,20 +2481,55 @@ end
2536 \endgroup 2481 \endgroup
2537} 2482}
2538 2483
2484%
2485% Change the current font style to #1, remembering it in \curfontstyle.
2486% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
2487% italics, not bold italics.
2488%
2489\def\setfontstyle#1{%
2490 \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
2491 \csname #1font\endcsname % change the current font
2492}
2493
2494\def\rm{\fam=0 \setfontstyle{rm}}
2495\def\it{\fam=\itfam \setfontstyle{it}}
2496\def\sl{\fam=\slfam \setfontstyle{sl}}
2497\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
2498\def\tt{\fam=\ttfam \setfontstyle{tt}}
2499
2500% Unfortunately, we have to override this for titles and the like, since
2501% in those cases "rm" is bold. Sigh.
2502\def\rmisbold{\rm\def\curfontstyle{bf}}
2503
2504% Texinfo sort of supports the sans serif font style, which plain TeX does not.
2505% So we set up a \sf.
2506\newfam\sffam
2507\def\sf{\fam=\sffam \setfontstyle{sf}}
2508
2509% We don't need math for this font style.
2510\def\ttsl{\setfontstyle{ttsl}}
2511
2512
2539% In order for the font changes to affect most math symbols and letters, 2513% In order for the font changes to affect most math symbols and letters,
2540% we have to define the \textfont of the standard families. We don't 2514% we have to define the \textfont of the standard families. We don't
2541% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. 2515% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
2542% 2516%
2543\def\resetmathfonts{% 2517\def\resetmathfonts{%
2544 \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy 2518 \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
2545 \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf 2519 \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
2546 \textfont\ttfam=\tentt \textfont\sffam=\tensf 2520 \textfont\ttfam=\ttfont \textfont\sffam=\sffont
2547} 2521}
2548 2522
2549% The font-changing commands redefine the meanings of \tenSTYLE, instead 2523% Select #1 fonts with the current style. Used to change font size
2524% in, e.g., the LaTeX logo and acronyms.
2525%
2526\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
2527
2528% The font-changing commands (all called \...fonts) redefine the meanings of
2529% \STYLEfont, instead
2550% of just \STYLE. We do this because \STYLE needs to also set the 2530% of just \STYLE. We do this because \STYLE needs to also set the
2551% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire 2531% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire
2552% \tenSTYLE to set the current font. 2532% \STYLEfont to set the current font.
2553% 2533%
2554% Each font-changing command also sets the names \lsize (one size lower) 2534% Each font-changing command also sets the names \lsize (one size lower)
2555% and \lllsize (three sizes lower). These relative commands are used 2535% and \lllsize (three sizes lower). These relative commands are used
@@ -2558,78 +2538,72 @@ end
2558% This all needs generalizing, badly. 2538% This all needs generalizing, badly.
2559% 2539%
2560\def\textfonts{% 2540\def\textfonts{%
2561 \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl 2541 \let\rmfont=\textrm \let\itfont=\textit \let\slfont=\textsl
2562 \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc 2542 \let\bffont=\textbf \let\ttfont=\texttt \let\smallcaps=\textsc
2563 \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy 2543 \let\sffont=\textsf \let\ifont=\texti \let\syfont=\textsy
2564 \let\tenttsl=\textttsl 2544 \let\ttfontsl=\textttsl
2565 \def\curfontsize{text}% 2545 \def\curfontsize{text}%
2566 \def\lsize{reduced}\def\lllsize{smaller}% 2546 \def\lsize{reduced}\def\lllsize{smaller}%
2567 \resetmathfonts \setleading{\textleading}} 2547 \resetmathfonts \setleading{\textleading}}
2568\def\titlefonts{% 2548\def\titlefonts{%
2569 \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl 2549 \let\rmfont=\titlerm \let\itfont=\titleit \let\slfont=\titlesl
2570 \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc 2550 \let\bffont=\titlebf \let\ttfont=\titlett \let\smallcaps=\titlesc
2571 \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy 2551 \let\sffont=\titlesf \let\ifont=\titlei \let\syfont=\titlesy
2572 \let\tenttsl=\titlettsl 2552 \let\ttfontsl=\titlettsl
2573 \def\curfontsize{title}% 2553 \def\curfontsize{title}%
2574 \def\lsize{chap}\def\lllsize{subsec}% 2554 \def\lsize{chap}\def\lllsize{subsec}%
2575 \resetmathfonts \setleading{27pt}} 2555 \resetmathfonts \setleading{27pt}}
2576\def\titlefont#1{{\titlefonts\rmisbold #1}} 2556\def\titlefont#1{{\titlefonts\rmisbold #1}}
2577\def\chapfonts{% 2557\def\chapfonts{%
2578 \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl 2558 \let\rmfont=\chaprm \let\itfont=\chapit \let\slfont=\chapsl
2579 \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc 2559 \let\bffont=\chapbf \let\ttfont=\chaptt \let\smallcaps=\chapsc
2580 \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy 2560 \let\sffont=\chapsf \let\ifont=\chapi \let\syfont=\chapsy
2581 \let\tenttsl=\chapttsl 2561 \let\ttfontsl=\chapttsl
2582 \def\curfontsize{chap}% 2562 \def\curfontsize{chap}%
2583 \def\lsize{sec}\def\lllsize{text}% 2563 \def\lsize{sec}\def\lllsize{text}%
2584 \resetmathfonts \setleading{19pt}} 2564 \resetmathfonts \setleading{19pt}}
2585\def\secfonts{% 2565\def\secfonts{%
2586 \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl 2566 \let\rmfont=\secrm \let\itfont=\secit \let\slfont=\secsl
2587 \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc 2567 \let\bffont=\secbf \let\ttfont=\sectt \let\smallcaps=\secsc
2588 \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy 2568 \let\sffont=\secsf \let\ifont=\seci \let\syfont=\secsy
2589 \let\tenttsl=\secttsl 2569 \let\ttfontsl=\secttsl
2590 \def\curfontsize{sec}% 2570 \def\curfontsize{sec}%
2591 \def\lsize{subsec}\def\lllsize{reduced}% 2571 \def\lsize{subsec}\def\lllsize{reduced}%
2592 \resetmathfonts \setleading{17pt}} 2572 \resetmathfonts \setleading{17pt}}
2593\def\subsecfonts{% 2573\def\subsecfonts{%
2594 \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl 2574 \let\rmfont=\ssecrm \let\itfont=\ssecit \let\slfont=\ssecsl
2595 \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc 2575 \let\bffont=\ssecbf \let\ttfont=\ssectt \let\smallcaps=\ssecsc
2596 \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy 2576 \let\sffont=\ssecsf \let\ifont=\sseci \let\syfont=\ssecsy
2597 \let\tenttsl=\ssecttsl 2577 \let\ttfontsl=\ssecttsl
2598 \def\curfontsize{ssec}% 2578 \def\curfontsize{ssec}%
2599 \def\lsize{text}\def\lllsize{small}% 2579 \def\lsize{text}\def\lllsize{small}%
2600 \resetmathfonts \setleading{15pt}} 2580 \resetmathfonts \setleading{15pt}}
2601\let\subsubsecfonts = \subsecfonts 2581\let\subsubsecfonts = \subsecfonts
2602\def\reducedfonts{% 2582\def\reducedfonts{%
2603 \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl 2583 \let\rmfont=\reducedrm \let\itfont=\reducedit \let\slfont=\reducedsl
2604 \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc 2584 \let\bffont=\reducedbf \let\ttfont=\reducedtt \let\reducedcaps=\reducedsc
2605 \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy 2585 \let\sffont=\reducedsf \let\ifont=\reducedi \let\syfont=\reducedsy
2606 \let\tenttsl=\reducedttsl 2586 \let\ttfontsl=\reducedttsl
2607 \def\curfontsize{reduced}% 2587 \def\curfontsize{reduced}%
2608 \def\lsize{small}\def\lllsize{smaller}% 2588 \def\lsize{small}\def\lllsize{smaller}%
2609 \resetmathfonts \setleading{10.5pt}} 2589 \resetmathfonts \setleading{10.5pt}}
2610\def\smallfonts{% 2590\def\smallfonts{%
2611 \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl 2591 \let\rmfont=\smallrm \let\itfont=\smallit \let\slfont=\smallsl
2612 \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc 2592 \let\bffont=\smallbf \let\ttfont=\smalltt \let\smallcaps=\smallsc
2613 \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy 2593 \let\sffont=\smallsf \let\ifont=\smalli \let\syfont=\smallsy
2614 \let\tenttsl=\smallttsl 2594 \let\ttfontsl=\smallttsl
2615 \def\curfontsize{small}% 2595 \def\curfontsize{small}%
2616 \def\lsize{smaller}\def\lllsize{smaller}% 2596 \def\lsize{smaller}\def\lllsize{smaller}%
2617 \resetmathfonts \setleading{10.5pt}} 2597 \resetmathfonts \setleading{10.5pt}}
2618\def\smallerfonts{% 2598\def\smallerfonts{%
2619 \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl 2599 \let\rmfont=\smallerrm \let\itfont=\smallerit \let\slfont=\smallersl
2620 \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc 2600 \let\bffont=\smallerbf \let\ttfont=\smallertt \let\smallcaps=\smallersc
2621 \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy 2601 \let\sffont=\smallersf \let\ifont=\smalleri \let\syfont=\smallersy
2622 \let\tenttsl=\smallerttsl 2602 \let\ttfontsl=\smallerttsl
2623 \def\curfontsize{smaller}% 2603 \def\curfontsize{smaller}%
2624 \def\lsize{smaller}\def\lllsize{smaller}% 2604 \def\lsize{smaller}\def\lllsize{smaller}%
2625 \resetmathfonts \setleading{9.5pt}} 2605 \resetmathfonts \setleading{9.5pt}}
2626 2606
2627% Fonts for short table of contents.
2628\setfont\shortcontrm\rmshape{12}{1000}{OT1}
2629\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
2630\setfont\shortcontsl\slshape{12}{1000}{OT1}
2631\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
2632
2633% Define these just so they can be easily changed for other fonts. 2607% Define these just so they can be easily changed for other fonts.
2634\def\angleleft{$\langle$} 2608\def\angleleft{$\langle$}
2635\def\angleright{$\rangle$} 2609\def\angleright{$\rangle$}
@@ -3535,7 +3509,7 @@ end
3535% 3509%
3536\newbox\errorbox 3510\newbox\errorbox
3537% 3511%
3538{\tentt \global\dimen0 = 3em}% Width of the box. 3512{\ttfont \global\dimen0 = 3em}% Width of the box.
3539\dimen2 = .55pt % Thickness of rules 3513\dimen2 = .55pt % Thickness of rules
3540% The text. (`r' is open on the right, `e' somewhat less so on the left.) 3514% The text. (`r' is open on the right, `e' somewhat less so on the left.)
3541\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} 3515\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt}
@@ -3794,7 +3768,7 @@ end
3794 3768
3795% Macros to be used within @titlepage: 3769% Macros to be used within @titlepage:
3796 3770
3797\let\subtitlerm=\tenrm 3771\let\subtitlerm=\rmfont
3798\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} 3772\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
3799 3773
3800\parseargdef\title{% 3774\parseargdef\title{%
@@ -7946,7 +7920,7 @@ end
7946 \fi % no return type 7920 \fi % no return type
7947 #3% output function name 7921 #3% output function name
7948 }% 7922 }%
7949 {\rm\enskip}% hskip 0.5 em of \tenrm 7923 {\rm\enskip}% hskip 0.5 em of \rmfont
7950 % 7924 %
7951 \boldbrax 7925 \boldbrax
7952 % arguments will be output next, if any. 7926 % arguments will be output next, if any.
@@ -11717,7 +11691,4 @@ directory should work if nowhere else does.}
11717 11691
11718@c vim:sw=2: 11692@c vim:sw=2:
11719 11693
11720@ignore
11721 arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
11722@end ignore
11723@enablebackslashhack 11694@enablebackslashhack