[latexrefman-commits] [SCM] latexrefman updated: r1028 - trunk
Vincent Belaiche
INVALID.NOREPLY at gnu.org.ua
Thu Aug 26 17:20:01 CEST 2021
Author: vincentb1
Date: 2021-08-26 15:20:00 +0000 (Thu, 26 Aug 2021)
New Revision: 1028
Modified:
trunk/ChangeLog
trunk/latex2e.texi
Log:
[en] insert @ignored text from fr for translation + some clarifications.
* latex2e.texi (\newline): Clarify phrase ``prior text''. Fix
example: ``{...}'' -> ``@{...}''.
(\- (hyphenation)): Clarify that specified hyphenation points are
valid even though TeX might have chosen the same one. ``insist
on'' -> ``force''.
(\discretionary): Fix punctuation. @sample{...}-ize letter f. Add
texi-escaped text from fr, for translation by Jim.
(\fussy & \sloppy): Clarify end of paragraph.
(\hyphenation): Restore text ``no inflections are tried'', and
insert also some @ignored text from fr for Jim to translate.
(\linebreak & \nolinebreak): Add ``lying between 0 and 4'', just
the name of the @var{...} does not says that, as this is arbitrary
text. Clarify what is meant by line extending.
(\linebreak & \nolinebreak, \printindex): Observe 2 empty lines
before next node.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2021-08-26 14:54:24 UTC (rev 1027)
+++ trunk/ChangeLog 2021-08-26 15:20:00 UTC (rev 1028)
@@ -1,3 +1,21 @@
+2021-08-26 Vincent Bela\"iche <vincentb1 at users.sourceforge.net>
+
+ * latex2e.texi (\newline): Clarify phrase ``prior text''. Fix
+ example: ``{...}'' -> ``@{...}''.
+ (\- (hyphenation)): Clarify that specified hyphenation points are
+ valid even though TeX might have chosen the same one. ``insist
+ on'' -> ``force''.
+ (\discretionary): Fix punctuation. @sample{...}-ize letter f. Add
+ texi-escaped text from fr, for translation by Jim.
+ (\fussy & \sloppy): Clarify end of paragraph.
+ (\hyphenation): Restore text ``no inflections are tried'', and
+ insert also some @ignored text from fr for Jim to translate.
+ (\linebreak & \nolinebreak): Add ``lying between 0 and 4'', just
+ the name of the @var{...} does not says that, as this is arbitrary
+ text. Clarify what is meant by line extending.
+ (\linebreak & \nolinebreak, \printindex): Observe 2 empty lines
+ before next node.
+
2021-08-25 Vincent Bela\"iche <vincentb1 at users.sourceforge.net>
* latex2e-fr.texi: (\newline, \- (hyphenation)): Align on en ---
Modified: trunk/latex2e.texi
===================================================================
--- trunk/latex2e.texi 2021-08-26 14:54:24 UTC (rev 1027)
+++ trunk/latex2e.texi 2021-08-26 15:20:00 UTC (rev 1028)
@@ -8644,9 +8644,9 @@
@cindex new line, starting (paragraph mode)
In ordinary text, this ends a line in a way that does not right-justify
-the line, so the prior text is not stretched. That is, in paragraph mode
-(@pxref{Modes}), the @code{\newline} command is equivalent to
-double-backslash (@pxref{\\}). This command is fragile
+it, so the text before the end of line is not stretched. That is, in
+paragraph mode (@pxref{Modes}), the @code{\newline} command is
+equivalent to double-backslash (@pxref{\\}). This command is fragile
(@pxref{\protect}).
However, the two commands are different inside a @code{tabular} or
@@ -8660,7 +8660,7 @@
single cell of the table.
@example
-\begin@{tabular@}@{p@{1in@}@{\hspace@{2in@}@}p@{1in@}@}
+\begin@{tabular@}@{p@{1in@}@@@{\hspace@{2in@}@}p@{1in@}@}
Name: \newline Address: &Date: \\ \hline
\end@{tabular@}
@end example
@@ -8677,8 +8677,9 @@
Tell @LaTeX{} that it may hyphenate the word at that point. When you
insert @code{\-} commands in a word, the word will only be hyphenated at
-those points and not at any of the hyphenation points that @LaTeX{}
-might otherwise have chosen. This command is robust (@pxref{\protect}).
+those points and not at any of the other hyphenation points that
+ at LaTeX{} might otherwise have chosen. This command is robust
+(@pxref{\protect}).
@LaTeX{} is good at hyphenating and usually finds most of the correct
hyphenation points, while almost never using an incorrect one. The
@@ -8705,9 +8706,9 @@
better fit.
The @code{\-} command only allows @LaTeX{} to break there, it does not
-require that it break there. You can insist on a split with something
-like @code{Hef-\linebreak feron}. Of course, if you later change the
-text then this forced break may look very odd, so this approach requires
+require that it break there. You can force a split with something like
+ at code{Hef-\linebreak feron}. Of course, if you later change the text
+then this forced break may look very odd, so this approach requires
care.
@@ -8728,10 +8729,10 @@
If a line break occurs at the point where @code{\discretionary} appears
then @TeX{} puts @var{pre-break} at the end of the current line and puts
@var{post-break} at the start of the next line. If there is no line
-break here then @TeX{} puts @var{no-break}
+break here then @TeX{} puts @var{no-break}.
In @samp{difficult} the three letters @code{ffi} form a ligature. But
- at TeX{} can nonetheless break between the two f's with this.
+ at TeX{} can nonetheless break between the two @samp{f}'s with this.
@example
di\discretionary@{f-@}@{fi@}@{ffi@}cult
@@ -8740,7 +8741,48 @@
Note that users do not have to do this. It is typically handled
automatically by @TeX{}'s hyphenation algorithm.
+ at c xxx TODO, complete this node, see LaTeX-fr (copied & pasted below,
+ at c with accented letter escaped)
+ at ignore
+Les arguments de @code{\discretionary} ne peuvent contenir que des
+caract@`eres, des bo@^{@dotless{i}}tes ou des cr@'enages.
+
+La commande @code{\discretionary} permet de contr@^oler
+finement la c@'esure dans les cas o@`u ne suffisent ni le contr@^ole standard
+de la c@'esure fait l'algorithme de c@'esure de @TeX{} et les r@`egles de
+c@'esures donn@'ees par les paquetages de gestion linguistiques, ni les
+moyens de contr@^ole explicites offerts par les commandes
+ at code{\hyphenation} (@pxref{\hyphenation}) et @code{\-} (@pxref{\-
+(hyphenation),\- (c@'esure @`a gr@'e)}).
+
+L'usage typique de @code{\discretionary} est par exemple de contr@^oler la
+c@'esure au sein d'une formule math@'ematique en mode ligne (voir aussi
+ at ref{Math miscellany,Miscellan@'ees math@'ematique (entr@'ee \*)}). Ci-dessous
+un exemple de contr@^ole de la c@'esure au sein d'une adresse r@'eticulaire,
+o@`u l'on autorise la c@'esure sur les obliques mais en utilisant une
+contr'oblique violette en lieu de trait d'union at tie{}:
+
+ at example
+\documentclass@{article@}
+\usepackage[T1]@{fontenc@}
+\usepackage[utf8]@{inputenc@}
+\usepackage@{xcolor@}
+\usepackage@{hyperref@}
+\usepackage@{french@}
+\newcommand*\DiscrSlash@{\discretionary@{\mbox@{\textcolor
+ @{purple@}@{\textbackslash@}@}@}@{/@}@{/@}@}
+\begin@{document@}
+Allez donc @`a \href@{http://une/tr\%c3\%A8s/tr\%c3\%A8s/longue%
+ /mais/vraiment/tr\%c3\%A8s/longue/adresse/r\%C3\%A9ticulaire%
+ /index.html@}@{http://une\DiscrSlash tr@`es\DiscrSlash tr@`es\DiscrSlash
+ longue\DiscrSlash mais\DiscrSlash vraiment\DiscrSlash
+ tr@`es\DiscrSlash longue\DiscrSlash adresse\DiscrSlash
+ r@'eticulaire\DiscrSlash index.html@}
+\end@{document@}
+ at end example
+ at end ignore
+
@node \fussy & \sloppy
@section @code{\fussy} & @code{\sloppy}
@@ -8755,10 +8797,10 @@
spacing.
The default is @code{\fussy}. Line breaking in a paragraph is
-controlled by whichever declaration is current at the blank line, or
- at code{\par}, or displayed equation ending that paragraph. So to affect
-the line breaks, include that paragraph-ending material in the scope of
-the command.
+controlled by whichever declaration is current at the end of the
+paragraph, ie.@: at the blank line, or @code{\par}, or displayed
+equation ending that paragraph. So to affect the line breaks, include
+that paragraph-ending material in the scope of the command.
@menu
* sloppypar:: Environment version of \sloppy command.
@@ -8824,9 +8866,14 @@
@end example
Use lowercase letters. @TeX{} will only hyphenate if the word matches
-exactly. Multiple @code{\hyphenation} commands accumulate.
+exactly, no inflections are tried. Multiple @code{\hyphenation}
+commands accumulate.
+ at c xx Re-align on LaTeX-fr which also mentions fontenc, and that
+ at c babel/polyglossia already load hyphenation patterns, and you have to
+ at c declare only non existing words.
+
@node \linebreak & \nolinebreak
@section @code{\linebreak} & @code{\nolinebreak}
@@ -8851,12 +8898,12 @@
@end example
Encourage or discourage a line break. The optional @var{zero-to-four}
-is an integer that allows you to soften the instruction. The default is
-4, so that without the optional argument these commands entirely force
-or prevent the break. But for instance, @code{\nolinebreak[1]} is a
-suggestion that another place may be better. The higher the number, the
-more insistent the request. Both commands are fragile
-(@pxref{\protect}).
+is an integer lying between 0 and 4 that allows you to soften the
+instruction. The default is 4, so that without the optional argument
+these commands entirely force or prevent the break. But for instance,
+ at code{\nolinebreak[1]} is a suggestion that another place may be better.
+The higher the number, the more insistent the request. Both commands
+are fragile (@pxref{\protect}).
Here we tell @LaTeX{} that a good place to put a linebreak is after the
standard legal text.
@@ -8868,11 +8915,10 @@
@end example
When you issue @code{\linebreak}, the spaces in the line are stretched
-out so that it extends to the right margin. @xref{\\}
+out so that the break point reaches the right margin. @xref{\\}
and at tie{}@ref{\newline}, to have the spaces not stretched out.
-
@node Page breaking
@chapter Page breaking
@@ -20281,8 +20327,6 @@
discussion and an example of the use of @code{\printindex}.
-
-
@node Glossaries
@section Glossaries
More information about the latexrefman-commits
mailing list.