aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Berry2006-09-30 21:07:21 +0000
committerKarl Berry2006-09-30 21:07:21 +0000
commitb644f1dcee292f3d1e1ea5b70f816167384c83a5 (patch)
treef12746b44c7e6210dcc02af3a075345a74c6c818
parent0e71e4a86811d6d6c70902fef1012241f56d104a (diff)
downloademacs-b644f1dcee292f3d1e1ea5b70f816167384c83a5.tar.gz
emacs-b644f1dcee292f3d1e1ea5b70f816167384c83a5.zip
improve more page breaks
-rw-r--r--man/ChangeLog5
-rw-r--r--man/programs.texi1
-rw-r--r--man/text.texi72
3 files changed, 44 insertions, 34 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 42fbf90b706..4e5305fe751 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
12006-09-30 Karl Berry <karl@gnu.org>
2
3 * programs.texi (Basic Indent): @need to improve page break.
4 * text.texi: rewording to improve page breaks, and use @LaTeX{}.
5
12006-09-29 Glenn Morris <rgm@gnu.org> 62006-09-29 Glenn Morris <rgm@gnu.org>
2 7
3 * calendar.texi (Date Formats): Doc fix for european-calendar-style. 8 * calendar.texi (Date Formats): Doc fix for european-calendar-style.
diff --git a/man/programs.texi b/man/programs.texi
index 17aa9c9cb12..fb85e470f86 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -366,6 +366,7 @@ This program reformats a Lisp object with indentation chosen to look nice.
366 The basic indentation commands indent a single line according to the 366 The basic indentation commands indent a single line according to the
367usual conventions of the language you are editing. 367usual conventions of the language you are editing.
368 368
369@need 1000
369@table @kbd 370@table @kbd
370@item @key{TAB} 371@item @key{TAB}
371Adjust indentation of current line. 372Adjust indentation of current line.
diff --git a/man/text.texi b/man/text.texi
index b764a83d8db..c2546530b42 100644
--- a/man/text.texi
+++ b/man/text.texi
@@ -34,10 +34,10 @@ structure.
34@end iftex 34@end iftex
35 35
36 For text which contains embedded commands for text formatters, Emacs 36 For text which contains embedded commands for text formatters, Emacs
37has other major modes, each for a particular text formatter. Thus, for 37has other major modes, each for a particular formatter. Thus, for
38input to @TeX{}, you would use @TeX{} 38input to @TeX{}, you would use @TeX{}
39@iftex 39@iftex
40mode (@pxref{TeX Mode}). 40mode (@pxref{TeX Mode,,@TeX{} Mode}).
41@end iftex 41@end iftex
42@ifnottex 42@ifnottex
43mode. 43mode.
@@ -106,7 +106,7 @@ Kill back to the beginning of a word (@code{backward-kill-word}).
106@item M-@@ 106@item M-@@
107Mark the end of the next word (@code{mark-word}). 107Mark the end of the next word (@code{mark-word}).
108@item M-t 108@item M-t
109Transpose two words or drag a word across other words 109Transpose two words or drag a word across others
110(@code{transpose-words}). 110(@code{transpose-words}).
111@end table 111@end table
112 112
@@ -156,7 +156,7 @@ of @kbd{M-@key{DEL}}.
156containing point with the following word. The delimiter characters between 156containing point with the following word. The delimiter characters between
157the words do not move. For example, @w{@samp{FOO, BAR}} transposes into 157the words do not move. For example, @w{@samp{FOO, BAR}} transposes into
158@w{@samp{BAR, FOO}} rather than @samp{@w{BAR FOO,}}. @xref{Transpose}, for 158@w{@samp{BAR, FOO}} rather than @samp{@w{BAR FOO,}}. @xref{Transpose}, for
159more on transposition and on arguments to transposition commands. 159more on transposition.
160 160
161@kindex M-@@ 161@kindex M-@@
162@findex mark-word 162@findex mark-word
@@ -230,7 +230,7 @@ A sentence also begins or ends wherever a paragraph begins or ends.
230It is useful to follow this convention, because it makes a distinction 230It is useful to follow this convention, because it makes a distinction
231between periods that end a sentence and periods that indicate 231between periods that end a sentence and periods that indicate
232abbreviations; that enables the Emacs sentence commands to distinguish, 232abbreviations; that enables the Emacs sentence commands to distinguish,
233too. These commands to not stop for periods that indicate abbreviations. 233too. These commands do not stop for periods that indicate abbreviations.
234 234
235@vindex sentence-end-double-space 235@vindex sentence-end-double-space
236 If you want to use just one space between sentences, you can set the 236 If you want to use just one space between sentences, you can set the
@@ -253,10 +253,10 @@ a detailed explanation of one of the regular expressions Emacs uses
253for this purpose. 253for this purpose.
254 254
255@vindex sentence-end-without-period 255@vindex sentence-end-without-period
256 Some languages do not use period to indicate end of sentence. For 256 Some languages do not use periods to indicate the end of a sentence.
257example, a sentence in Thai text ends with double space but without a 257For example, sentences in Thai end with a double space but without a
258period. Set the variable @code{sentence-end-without-period} to 258period. Set the variable @code{sentence-end-without-period} to
259@code{t} to tell the sentence commands that a period is not necessary. 259@code{t} in such cases.
260 260
261@node Paragraphs 261@node Paragraphs
262@section Paragraphs 262@section Paragraphs
@@ -267,7 +267,7 @@ period. Set the variable @code{sentence-end-without-period} to
267@findex backward-paragraph 267@findex backward-paragraph
268@findex forward-paragraph 268@findex forward-paragraph
269 269
270 The Emacs commands for manipulating paragraphs are also Meta keys. 270 The Emacs commands for manipulating paragraphs are also on Meta keys.
271 271
272@table @kbd 272@table @kbd
273@item M-@{ 273@item M-@{
@@ -938,7 +938,7 @@ which of these modes is actually being entered. @xref{Hooks}.
938 Emacs provides two other modes for editing text that is to be passed 938 Emacs provides two other modes for editing text that is to be passed
939through a text formatter to produce fancy formatted printed output. 939through a text formatter to produce fancy formatted printed output.
940@xref{Nroff Mode}, for editing input to the formatter nroff. 940@xref{Nroff Mode}, for editing input to the formatter nroff.
941@xref{TeX Mode}, for editing input to the formatter TeX. 941@xref{TeX Mode,,@TeX{} Mode}, for editing input to the formatter TeX.
942 942
943 Another mode is used for editing outlines. It allows you to view the 943 Another mode is used for editing outlines. It allows you to view the
944text at various levels of detail. You can view either the outline 944text at various levels of detail. You can view either the outline
@@ -1370,26 +1370,26 @@ automatically by putting this in your @file{.emacs} file:
1370@findex doctex-mode 1370@findex doctex-mode
1371 1371
1372 @TeX{} is a powerful text formatter written by Donald Knuth; it is 1372 @TeX{} is a powerful text formatter written by Donald Knuth; it is
1373also free software, like GNU Emacs. La@TeX{} is a simplified input 1373also free software, like GNU Emacs. @LaTeX{} is a simplified input
1374format for @TeX{}, implemented by @TeX{} macros; it comes with @TeX{}. 1374format for @TeX{}, implemented by @TeX{} macros; it comes with @TeX{}.
1375Sli@TeX{} is a special form of La@TeX{}.@footnote{Sli@TeX{} is 1375Sli@TeX{} is a special form of @LaTeX{}.@footnote{Sli@TeX{} is
1376obsoleted by the @samp{slides} document class in recent La@TeX{} 1376obsoleted by the @samp{slides} document class and other alternative
1377versions.} Doc@TeX{} (@file{.dtx}) is a special file format in which 1377packages in recent @LaTeX{} versions.} Doc@TeX{} (@file{.dtx}) is a
1378the La@TeX{} sources are written, combining sources with 1378special file format in which the La@TeX{} sources are written,
1379documentation. 1379combining sources with documentation.
1380 1380
1381 Emacs has a special @TeX{} mode for editing @TeX{} input files. 1381 Emacs has a special @TeX{} mode for editing @TeX{} input files.
1382It provides facilities for checking the balance of delimiters and for 1382It provides facilities for checking the balance of delimiters and for
1383invoking @TeX{} on all or part of the file. 1383invoking @TeX{} on all or part of the file.
1384 1384
1385@vindex tex-default-mode 1385@vindex tex-default-mode
1386 @TeX{} mode has four variants: Plain @TeX{} mode, La@TeX{} mode, 1386 @TeX{} mode has four variants: Plain @TeX{} mode, @LaTeX{} mode,
1387Sli@TeX{} mode, and Doc@TeX{} mode (these distinct major modes differ 1387Sli@TeX{} mode, and Doc@TeX{} mode (these distinct major modes differ
1388only slightly). They are designed for editing the four different 1388only slightly). They are designed for editing the four different
1389formats. The command @kbd{M-x tex-mode} looks at the contents of the 1389formats. The command @kbd{M-x tex-mode} looks at the contents of the
1390buffer to determine whether the contents appear to be either La@TeX{} 1390buffer to determine whether the contents appear to be either @LaTeX{}
1391input, Sli@TeX{}, or Doc@TeX{} input; if so, it selects the 1391input, Sli@TeX{}, or Doc@TeX{} input; if so, it selects the
1392appropriate mode. If the file contents do not appear to be La@TeX{}, 1392appropriate mode. If the file contents do not appear to be @LaTeX{},
1393Sli@TeX{} or Doc@TeX{}, it selects Plain @TeX{} mode. If the contents 1393Sli@TeX{} or Doc@TeX{}, it selects Plain @TeX{} mode. If the contents
1394are insufficient to determine this, the variable 1394are insufficient to determine this, the variable
1395@code{tex-default-mode} controls which mode is used. 1395@code{tex-default-mode} controls which mode is used.
@@ -1487,22 +1487,22 @@ work with them.
1487@node LaTeX Editing 1487@node LaTeX Editing
1488@subsection La@TeX{} Editing Commands 1488@subsection La@TeX{} Editing Commands
1489 1489
1490 La@TeX{} mode, and its variant, Sli@TeX{} mode, provide a few extra 1490 @LaTeX{} mode, and its variant, Sli@TeX{} mode, provide a few extra
1491features not applicable to plain @TeX{}. 1491features not applicable to plain @TeX{}.
1492 1492
1493@table @kbd 1493@table @kbd
1494@item C-c C-o 1494@item C-c C-o
1495Insert @samp{\begin} and @samp{\end} for La@TeX{} block and position 1495Insert @samp{\begin} and @samp{\end} for @LaTeX{} block and position
1496point on a line between them (@code{tex-latex-block}). 1496point on a line between them (@code{tex-latex-block}).
1497@item C-c C-e 1497@item C-c C-e
1498Close the innermost La@TeX{} block not yet closed 1498Close the innermost @LaTeX{} block not yet closed
1499(@code{tex-close-latex-block}). 1499(@code{tex-close-latex-block}).
1500@end table 1500@end table
1501 1501
1502@findex tex-latex-block 1502@findex tex-latex-block
1503@kindex C-c C-o @r{(La@TeX{} mode)} 1503@kindex C-c C-o @r{(@LaTeX{} mode)}
1504@vindex latex-block-names 1504@vindex latex-block-names
1505 In La@TeX{} input, @samp{\begin} and @samp{\end} commands are used to 1505 In @LaTeX{} input, @samp{\begin} and @samp{\end} commands are used to
1506group blocks of text. To insert a @samp{\begin} and a matching 1506group blocks of text. To insert a @samp{\begin} and a matching
1507@samp{\end} (on a new line following the @samp{\begin}), use @kbd{C-c 1507@samp{\end} (on a new line following the @samp{\begin}), use @kbd{C-c
1508C-o} (@code{tex-latex-block}). A blank line is inserted between the 1508C-o} (@code{tex-latex-block}). A blank line is inserted between the
@@ -1516,8 +1516,8 @@ how to add @samp{theorem}, @samp{corollary}, and @samp{proof}:
1516@end example 1516@end example
1517 1517
1518@findex tex-close-latex-block 1518@findex tex-close-latex-block
1519@kindex C-c C-e @r{(La@TeX{} mode)} 1519@kindex C-c C-e @r{(@LaTeX{} mode)}
1520 In La@TeX{} input, @samp{\begin} and @samp{\end} commands must 1520 In @LaTeX{} input, @samp{\begin} and @samp{\end} commands must
1521balance. You can use @kbd{C-c C-e} (@code{tex-close-latex-block}) to 1521balance. You can use @kbd{C-c C-e} (@code{tex-close-latex-block}) to
1522insert automatically a matching @samp{\end} to match the last unmatched 1522insert automatically a matching @samp{\end} to match the last unmatched
1523@samp{\begin}. It indents the @samp{\end} to match the corresponding 1523@samp{\begin}. It indents the @samp{\end} to match the corresponding
@@ -1645,9 +1645,9 @@ after. The lines containing the two strings are included in the header.
1645If @samp{%**start of header} does not appear within the first 100 lines of 1645If @samp{%**start of header} does not appear within the first 100 lines of
1646the buffer, @kbd{C-c C-r} assumes that there is no header. 1646the buffer, @kbd{C-c C-r} assumes that there is no header.
1647 1647
1648 In La@TeX{} mode, the header begins with @samp{\documentclass} or 1648 In @LaTeX{} mode, the header begins with @samp{\documentclass} or
1649@samp{\documentstyle} and ends with @samp{\begin@{document@}}. These 1649@samp{\documentstyle} and ends with @samp{\begin@{document@}}. These
1650are commands that La@TeX{} requires you to use in any case, so nothing 1650are commands that @LaTeX{} requires you to use in any case, so nothing
1651special needs to be done to identify the header. 1651special needs to be done to identify the header.
1652 1652
1653@findex tex-file 1653@findex tex-file
@@ -1689,7 +1689,7 @@ Variables}.
1689@findex tex-bibtex-file 1689@findex tex-bibtex-file
1690@kindex C-c TAB @r{(@TeX{} mode)} 1690@kindex C-c TAB @r{(@TeX{} mode)}
1691@vindex tex-bibtex-command 1691@vindex tex-bibtex-command
1692 For La@TeX{} files, you can use Bib@TeX{} to process the auxiliary 1692 For @LaTeX{} files, you can use Bib@TeX{} to process the auxiliary
1693file for the current buffer's file. Bib@TeX{} looks up bibliographic 1693file for the current buffer's file. Bib@TeX{} looks up bibliographic
1694citations in a data base and prepares the cited references for the 1694citations in a data base and prepares the cited references for the
1695bibliography section. The command @kbd{C-c @key{TAB}} 1695bibliography section. The command @kbd{C-c @key{TAB}}
@@ -1751,9 +1751,9 @@ required. This is set up for Czech---customize the group
1751@end ignore 1751@end ignore
1752 1752
1753@cindex Ref@TeX{} package 1753@cindex Ref@TeX{} package
1754@cindex references, La@TeX{} 1754@cindex references, @LaTeX{}
1755@cindex La@TeX{} references 1755@cindex @LaTeX{} references
1756 For managing all kinds of references for La@TeX{}, you can use 1756 For managing all kinds of references for @LaTeX{}, you can use
1757Ref@TeX{}. @inforef{Top,, reftex}. 1757Ref@TeX{}. @inforef{Top,, reftex}.
1758 1758
1759@node HTML Mode 1759@node HTML Mode
@@ -2356,8 +2356,8 @@ format, so other editors may not respect it.
2356 2356
2357 Normally, Emacs knows when you are editing formatted text because it 2357 Normally, Emacs knows when you are editing formatted text because it
2358recognizes the special annotations used in the file that you visited. 2358recognizes the special annotations used in the file that you visited.
2359However, there are situations in which you must take special actions 2359However, sometimes you must take special actions to convert file
2360to convert file contents or turn on Enriched mode: 2360contents or turn on Enriched mode:
2361 2361
2362@itemize @bullet 2362@itemize @bullet
2363@item 2363@item
@@ -2398,6 +2398,7 @@ appropriate, use @code{format-find-file} with suitable arguments.
2398text-based tables. Here is an example of such a table: 2398text-based tables. Here is an example of such a table:
2399 2399
2400@smallexample 2400@smallexample
2401@group
2401+-----------------+--------------------------------+-----------------+ 2402+-----------------+--------------------------------+-----------------+
2402| Command | Description | Key Binding | 2403| Command | Description | Key Binding |
2403+-----------------+--------------------------------+-----------------+ 2404+-----------------+--------------------------------+-----------------+
@@ -2414,6 +2415,7 @@ text-based tables. Here is an example of such a table:
2414| |end of buffer, stop and signal | | 2415| |end of buffer, stop and signal | |
2415| |error. | | 2416| |error. | |
2416+-----------------+--------------------------------+-----------------+ 2417+-----------------+--------------------------------+-----------------+
2418@end group
2417@end smallexample 2419@end smallexample
2418 2420
2419 Table mode allows the contents of the table such as this one to be 2421 Table mode allows the contents of the table such as this one to be
@@ -2800,6 +2802,7 @@ following one.
2800@c sticks out to accommodate for the removal of @samp in the 2802@c sticks out to accommodate for the removal of @samp in the
2801@c produced output!! 2803@c produced output!!
2802@smallexample 2804@smallexample
2805@group
2803+-----------------------------------------------------------------+ 2806+-----------------------------------------------------------------+
2804|@samp{table-capture} is a powerful command, but mastering its | 2807|@samp{table-capture} is a powerful command, but mastering its |
2805|power requires some practice. Here are some things it can do: | 2808|power requires some practice. Here are some things it can do: |
@@ -2816,6 +2819,7 @@ following one.
2816| the specified region is placed in that | 2819| the specified region is placed in that |
2817| cell. | 2820| cell. |
2818+-----------------------------------------------------------------+ 2821+-----------------------------------------------------------------+
2822@end group
2819@end smallexample 2823@end smallexample
2820 2824
2821@noindent 2825@noindent