[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: ~ for @tie
From: |
Gavin D. Smith |
Subject: |
branch master updated: ~ for @tie |
Date: |
Thu, 11 Aug 2022 17:21:21 -0400 |
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 6df4fa3569 ~ for @tie
6df4fa3569 is described below
commit 6df4fa3569b1f3d1c6c5d57851b3782c37819ed6
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Aug 11 22:21:13 2022 +0100
~ for @tie
* tp/Texinfo/Convert/LaTeX.pm (LaTeX_no_arg_brace_commands):
Use ~ for @tie.
---
ChangeLog | 7 +++++++
tp/Texinfo/Convert/LaTeX.pm | 14 +-------------
.../definition_commands/res_latex/definition_commands.tex | 8 ++++----
tp/tests/layout/res_parser/formatting_latex/formatting.tex | 10 +++++-----
4 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dcf41bb11e..e8ba839330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-08-11 Gavin Smith <gavinsmith0123@gmail.com>
+
+ ~ for @tie
+
+ * tp/Texinfo/Convert/LaTeX.pm (LaTeX_no_arg_brace_commands):
+ Use ~ for @tie.
+
2022-08-11 Gavin Smith <gavinsmith0123@gmail.com>
tabularx for @def
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index fbc382bee9..b0d8282901 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -36,12 +36,6 @@
#
# @group should also be added together with the non filled environments.
#
-# Texinfo TeX leaves more space for the category on the right
-# if the def line is too long. If the category is formatted with
-# @tie{}, like Escape@tie{}sequence, with Texinfo TeX the space is
-# more or less a normal space, with LaTeX, the space has shrinked so
-# much it seems that the two words are glued together.
-#
# There is something about form feeds to do. There is some processing of form
# feeds right now, which simply amounts to keeping them in ignorable spaces
# (and with another condition that may not be relevant for LaTeX as the code
@@ -49,8 +43,6 @@
# in the input are handled as follows: in PDF/DVI In normal text, treated as
# ending any open paragraph; essentially ignored between paragraphs.
#
-# Should @tie be expanded to ~?
-#
# LaTeX seems to always break at -, and never at _. If @allowcodebreaks
# is true \_ should be set to be a possible break point. Seems that it
# may be done with something like:
@@ -69,8 +61,6 @@
# or two hyphen, no break between __ or hyphen. See near \global\def\code
# in texinfo.tex.
#
-# in @deftype* arguments, spaces after a punctuation mark is stretched
-#
#
# RELEVANT BUT NOT DECISIVE
#
@@ -357,9 +347,7 @@ my %LaTeX_no_arg_brace_commands = (
'leq' => '$\leq{}$',
'textdegree' => '\textdegree{}',
'today' => '\today{}',
- # FIXME according to the manual, it is not \hbox, \hbox is for @w.
- # maybe use ~?
- 'tie' => '\hbox{}',
+ 'tie' => '~'
},
'math' => {
# error in math with \TeX \LaTeX, spacing command used not allowed
diff --git
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
index e73161a453..babb3c2063 100644
---
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
+++
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
@@ -335,7 +335,7 @@ name
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}&
[Escape\hbox{}sequence]
+\noindent\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}&
[Escape~sequence]
\end{tabularx}
\index[fn]{\textbackslash{}ff@\texttt{\texttt{\textbackslash{}f}\textnormal{\textsl{f}}\texttt{}}}%
@@ -343,7 +343,7 @@ name
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}&
[Escape\hbox{}sequence]
+\noindent\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}&
[Escape~sequence]
\end{tabularx}
\index[fn]{\textbackslash{}f(fn@\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}}%
@@ -351,7 +351,7 @@ name
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill
\hangindent=2em
-\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}&
[Escape\hbox{}sequence]
+\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}&
[Escape~sequence]
\end{tabularx}
\ExplSyntaxOn%
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
@@ -369,7 +369,7 @@ name
\begin{quote}
\unskip{\parskip=0pt\noindent}%
The \texttt{ft} request and the \texttt{\textbackslash{}f} escape change the
current font
-to \GNUTexinfocommandstyletextvar{font} (one-character
name\hbox{}\GNUTexinfocommandstyletextvar{f}, two-character name
+to \GNUTexinfocommandstyletextvar{font} (one-character
name~\GNUTexinfocommandstyletextvar{f}, two-character name
\GNUTexinfocommandstyletextvar{fn}).
\end{quote}
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 2a1f82d69b..68bc995ace 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -242,7 +242,7 @@ but , ,\@
@arrow $\rightarrow{}$
@leq $\leq{}$
@geq $\geq{}$
-@tie a\hbox{}b
+@tie a~b
\texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
\texttt{@acronym\{{-}{-}a\}} --a
@@ -1935,7 +1935,7 @@ but , ,\@
@arrow $\rightarrow{}$
@leq $\leq{}$
@geq $\geq{}$
-@tie a\hbox{}b
+@tie a~b
\texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
\texttt{@acronym\{{-}{-}a\}} --a
@@ -3646,7 +3646,7 @@ but , ,\@
@arrow $\rightarrow{}$
@leq $\leq{}$
@geq $\geq{}$
-@tie a\hbox{}b
+@tie a~b
\texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
\texttt{@acronym\{{-}{-}a\}} --a
@@ -5335,7 +5335,7 @@ but , ,\@
@arrow $\rightarrow{}$
@leq $\leq{}$
@geq $\geq{}$
-@tie a\hbox{}b
+@tie a~b
\texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
\texttt{@acronym\{{-}{-}a\}} --a
@@ -7026,7 +7026,7 @@ but ,\ ,\@
@arrow $\rightarrow{}$
@leq $\leq{}$
@geq $\geq{}$
-@tie a\hbox{}b
+@tie a~b
\texttt{@acronym\{{-}{-}a,an accronym\}}\ {-}{-}a\ (an accronym)
\texttt{@acronym\{{-}{-}a\}}\ {-}{-}a
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: ~ for @tie,
Gavin D. Smith <=