teximpatient.git -

diff --git a/teximpatient/NEWS b/teximpatient/NEWS
index 819fd2c..14748ec 100644
--- a/teximpatient/NEWS
+++ b/teximpatient/NEWS

@@ -1,17 +1,18 @@

$Id$

This NEWS file records noteworthy changes, very tersely.

- Copyright 2013 Karl Berry.

+ Copyright 2013, 2014 Karl Berry.

Copying and distribution of this file, with or without modification,

are permitted in any medium without royalty provided the copyright

notice and this notice are preserved.

-Version 2.3 (21 May 2013)

+Typo fixes from Chinese translator, Zou Hu.

+

+ Version 2.3 (21 May 2013)

- first release on ftp.gnu.org. Now looking for a maintainer.

- update to GFDLv1.3.

- simple configure script and Makefile added.

- no changes to the text.

-

-* There is now a `NEWS' file (this one), giving a history of

+- There is now a `NEWS' file (this one), giving a history of

user-visible changes.

diff --git a/teximpatient/concepts.tex b/teximpatient/concepts.tex
index ad5f4cc..2b38675 100644
--- a/teximpatient/concepts.tex
+++ b/teximpatient/concepts.tex

@@ -1,5 +1,5 @@

% This is part of the book TeX for the Impatient.

-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

+% Copyright (C) 2003, 2014 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

% See file fdl.tex for copying conditions.

\input macros

@@ -2075,8 +2075,8 @@ of the inherently vertical commands.

{\tighten

You should be aware of a subtle but important property of restricted

-horizontal mode: \emph{you can't enter restricted horizontal mode

-when you're in ordinary horizontal mode}. What this means in practice is that

+horizontal mode: \emph{you can't enter ordinary horizontal mode

+when you're in restricted horizontal mode}. What this means in practice is that

when \TeX\ is assembling an hbox it

won't handle paragraph-like text, i.e., text for which it does

\refterm{line breaking}. You can get

diff --git a/teximpatient/math.tex b/teximpatient/math.tex
index 31d7f1a..975c806 100644
--- a/teximpatient/math.tex
+++ b/teximpatient/math.tex

@@ -1,5 +1,5 @@

% This is part of the book TeX for the Impatient.

-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

+% Copyright (C) 2003, 2014 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

% See file fdl.tex for copying conditions.

\input macros

@@ -664,9 +664,9 @@ $${\int_0^\pi \sin^2 ax,円dx} = {\pi \over 2}$$

\begindesc

\cts limits {}

\explain

-When it's in text style, \TeX\ normally places limits after a large operator.

-This command tells \TeX\ to place

-limits above and below a large operator rather than after it.

+In text style, \TeX\ normally places limits after a large operator.

+This command tells \TeX\ to place limits above and below a large

+operator rather than after it.

If you specify more than one of |\limits|, |\nolimits|,

and |\display!-limits|, the last command rules.

@@ -684,13 +684,16 @@ two elements.

\begindesc

\cts nolimits {}

\explain

-When it's in display

-style, \TeX\ normally places limits above and below a large operator.

-(The |\int| operator is an exception---\TeX\

-places limits for |\int| after the operator in all cases.)

+In display style, \TeX\ normally places limits above and below a large

+operator. This command tells \TeX\ to place limits after a large

+operator rather than above and below it.

+

+The integral operators |\int| and |\oint| are exceptions---\TeX\ places

+limits after them in all cases, unless overridden, as in |\int\limits|.

+(\plainTeX\ defines ^|\int| and ^|\oint| as macros that specify the

+operator symbol followed by |\nolimits|---this is what causes them to

+behave differently by default.)

^^|\int//limits after|

-This command tells \TeX\ to place

-limits after a large operator rather than above and below it.

If you specify more than one of |\limits|, |\nolimits|,

and |\display!-limits|, the last command rules.

@@ -706,22 +709,9 @@ $$\bigcap\nolimits_{i=1}^Nq_i$$

\begindesc

\cts displaylimits {}

\explain

-This command tells \TeX\ to

-follow its normal rules for placement of limits:

-\olist\compact

-\li Limits on ^|\int| are placed after the operator.

-\li Limits on other large operators are placed after the

-operator in text style.

-\li Limits on other large operators are placed above and below the operator

-in display style.

-\endolist

-It's usually simpler to use |\limits| or |\nolimits|

-to produce a specific effect, but |\display!-limits| is sometimes

-useful in \minref{macro} definitions.

-

-Note that \plainTeX\ defines ^|\int| as a macro that sets |\nolimits|,

-so |\int\displaylimits| in text style restores the |\limits|

-convention.

+This command tells \TeX\ to place limits above and below all operators

+(including the integrals) if in display style, and after all operators

+if in text style.

If you specify more than one of |\limits|, |\nolimits|,

and |\display!-limits|, the last command rules.

diff --git a/teximpatient/paras.tex b/teximpatient/paras.tex
index 81501f5..91aad27 100644
--- a/teximpatient/paras.tex
+++ b/teximpatient/paras.tex

@@ -1,5 +1,5 @@

% This is part of the book TeX for the Impatient.

-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

+% Copyright (C) 2003, 2014 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

% See file fdl.tex for copying conditions.

\input macros

@@ -1710,7 +1710,7 @@ individually for each one or put the change into |\everypar|

\cts linepenalty {\param{number}}

\explain

\minrefs{line break}

-This parameter specifies \minref{demerits} that \TeX\ assesses for each line

+This parameter specifies the \minref{penalty} that \TeX\ assesses for each line

break when it is breaking a paragraph into lines.

The penalty is independent of where the line break occurs.

Increasing the value

@@ -2145,8 +2145,8 @@ italics. \<arg\-u\-ment> must be followed by a period and a space token,

which serve

to set off \<argument> from \<general text>.

\<general text> consists of the text up to the next paragraph

-boundary, except that you can include multiple paragraphs by putting them

-within braces and ending a paragraph after the closing right brace.

+boundary. You can include multiple paragraphs by using |\endgraf|

+instead of a blank line or |\par|.

\example

\proclaim Theorem 1.

What I say is not to be believed.

diff --git a/teximpatient/tips.tex b/teximpatient/tips.tex
index b55408f..3d0f1b8 100644
--- a/teximpatient/tips.tex
+++ b/teximpatient/tips.tex

@@ -1,5 +1,5 @@

% This is part of the book TeX for the Impatient.

-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

+% Copyright (C) 2003, 2014 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

% See file fdl.tex for copying conditions.

\input macros

@@ -81,7 +81,7 @@ if the page boundaries in your document change,

the page breaks that you've inserted may no longer be where you want them.

If you don't provide \TeX\ with a |\vfill| command to fill out the page

-after an |\eject|,

+before an |\eject|,

\TeX\ redistributes the extra blank space as best it can and then usually

complains that ``an

underfull |\vbox| (badness 10000ドル$) has occurred while |\output| is active.''

diff --git a/teximpatient/usermacs.tex b/teximpatient/usermacs.tex
index 71d8d64..e19d7b5 100644
--- a/teximpatient/usermacs.tex
+++ b/teximpatient/usermacs.tex

@@ -1,5 +1,5 @@

% This is part of the book TeX for the Impatient.

-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

+% Copyright (C) 2003, 2014 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.

% See file fdl.tex for copying conditions.

\input macros

@@ -629,18 +629,14 @@ You can also |\write| to |\tocfile| yourself.

\tocfileopenedtrue

\immediate\openout\tocfile = \jobname.toc

\fi}%

+\def\writetocentry#1#2{%

+ \writenumberedtocentry{#1}{#2}\empty}%

\def\writenumberedtocentry#1#2#3{\ifrewritetocfile

\opentocfile

\write\tocfile{%

\expandafter\noexpand \csname toc#1entry\endcsname

{#2}{#3}{\folio}}%

-\ignorespaces\fi}%

-\def\writenumberedtocentry#1#2#3{\ifrewritetocfile

- \opentocfile

- \write\tocfile{%

- \expandafter\noexpand \csname toc#1entry\endcsname

- {#2}{#3}{\folio}}%

-\ignorespaces\fi}%

+\fi\ignorespaces}%

|

To produce a table of contents, read the |.toc| file with