[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Turn off hyphenation for tt fonts completely.
From: |
Gavin D. Smith |
Subject: |
branch master updated: Turn off hyphenation for tt fonts completely. |
Date: |
Sat, 17 Dec 2022 08:41:28 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new f8a325d947 Turn off hyphenation for tt fonts completely.
f8a325d947 is described below
commit f8a325d9471fb0158cbd867c3400ac23ce156c5f
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Dec 17 13:41:18 2022 +0000
Turn off hyphenation for tt fonts completely.
* doc/texinfo.tex (\setfont): Set \hyphenchar to -1 for
font styles tt, ttb and ttsl.
(\nohyphenation): Remove.
(\key, \tclose, \verb): Do not call \nohyphenation.
Werner reported that the restoration of \hyphenchar in
\nohyphenation was wrong as it affected the wrong font.
---
ChangeLog | 12 ++++++++++++
doc/texinfo.tex | 27 ++++++++++-----------------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4b6fbfd7c3..44125bae9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-12-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Turn off hyphenation for tt fonts completely.
+
+ * doc/texinfo.tex (\setfont): Set \hyphenchar to -1 for
+ font styles tt, ttb and ttsl.
+ (\nohyphenation): Remove.
+ (\key, \tclose, \verb): Do not call \nohyphenation.
+
+ Werner reported that the restoration of \hyphenchar in
+ \nohyphenation was wrong as it affected the wrong font.
+
2022-12-15 Gavin Smith <gavinsmith0123@gmail.com>
Configurable index for @def* command
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index d9197b0893..ae151f4ba5 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -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-12-15.20}
+\def\texinfoversion{2022-12-17.13}
%
% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
%
@@ -2136,6 +2136,11 @@ end
\pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
}%
\fi\fi
+%
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+%
+% (end of cmaps)
% Set the font macro #1 to the font named \fontprefix#2.
@@ -2151,11 +2156,10 @@ end
\def\setfont#1#2#3#4#5{%
\font#1=\fontprefix#2#3 scaled #4
\csname cmap#5\endcsname#1%
+ \ifx#2\ttshape\hyphenchar#1=-1 \fi
+ \ifx#2\ttbshape\hyphenchar#1=-1 \fi
+ \ifx#2\ttslshape\hyphenchar#1=-1 \fi
}
-% This is what gets called when #5 of \setfont is empty.
-\let\cmap\gobble
-%
-% (end of cmaps)
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
@@ -2817,13 +2821,6 @@ end
% @sansserif, explicit sans.
\def\sansserif#1{{\sf #1}}
-% We can't just use \exhyphenpenalty, because that only has effect at
-% the end of a paragraph. Restore normal hyphenation at the end of the
-% group within which \nohyphenation is presumably called.
-%
-\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation}
-\def\restorehyphenation{\hyphenchar\font = `- }
-
\newif\iffrenchspacing
\frenchspacingfalse
@@ -2895,9 +2892,6 @@ end
% But `\ ' produces the large typewriter interword space.
\def\ {{\spaceskip = 0pt{} }}%
%
- % Turn off hyphenation.
- \nohyphenation
- %
\plainfrenchspacing
#1%
}%
@@ -3202,7 +3196,7 @@ end
% definition of @key with no lozenge.
%
-\def\key#1{{\setregularquotes \nohyphenation \tt #1}\null}
+\def\key#1{{\setregularquotes \tt #1}\null}
% @clicksequence{File @click{} Open ...}
\def\clicksequence#1{\begingroup #1\endgroup}
@@ -7428,7 +7422,6 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\def\par{\leavevmode\endgraf}%
\setcodequotes
\tabeightspaces
- \nohyphenation
% Respect line breaks,
% print special symbols as themselves, and
% make each space count
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Turn off hyphenation for tt fonts completely.,
Gavin D. Smith <=