[LyX/master] Run codespell on tex2lyx/, client/, convert/ and graphics/
Jean-Marc Lasgouttes
lasgouttes at lyx.org
Thu Jun 25 21:30:31 UTC 2020
commit 110f8f67ac1afe9892dad5566d1c697044427cf0
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date: Thu Jun 25 23:50:52 2020 +0200
Run codespell on tex2lyx/, client/, convert/ and graphics/
Command was
codespell -w -i 3 -S Makefile.in -L mathed,afe,tthe,ue,fro,uint,larg,alph,te,thes,alle,Claus,pres,pass-thru src/xxx
---
src/client/client.cpp | 6 +++---
src/client/lyxclient.1in | 2 +-
src/convert/lyxconvert.cpp | 2 +-
src/graphics/GraphicsCacheItem.cpp | 2 +-
src/tex2lyx/Context.cpp | 2 +-
src/tex2lyx/Parser.cpp | 2 +-
src/tex2lyx/Parser.h | 4 ++--
src/tex2lyx/Preamble.cpp | 2 +-
src/tex2lyx/table.cpp | 6 +++---
src/tex2lyx/test/beamer.lyx.lyx | 2 +-
src/tex2lyx/test/beamer.tex | 2 +-
src/tex2lyx/test/test-insets.lyx.lyx | 2 +-
src/tex2lyx/tex2lyx.h | 2 +-
src/tex2lyx/text.cpp | 6 +++---
14 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/client/client.cpp b/src/client/client.cpp
index ce6ac7c..dd69fe2 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -348,10 +348,10 @@ void LyXDataSocket::writeln(string const & line)
string linen(line + '\n');
int size = linen.size();
int written = ::write(fd_, linen.c_str(), size);
- if (written < size) { // Allways mean end of connection.
+ if (written < size) { // Always mean end of connection.
if ((written == -1) && (errno == EPIPE)) {
// The program will also receive a SIGPIPE
- // that must be catched
+ // that must be caught
cerr << "lyxclient: connection closed while writing."
<< endl;
} else {
@@ -525,7 +525,7 @@ int a(vector<docstring> const & arg)
<< endl;
return -1;
}
- // -a supercedes LYXSOCKET environment variable
+ // -a supersedes LYXSOCKET environment variable
serverAddress = arg[0];
return 1;
}
diff --git a/src/client/lyxclient.1in b/src/client/lyxclient.1in
index 8b4b6ea..f63e3fb 100644
--- a/src/client/lyxclient.1in
+++ b/src/client/lyxclient.1in
@@ -63,7 +63,7 @@ and terminate the \fBlyxclient\fR process, send the command 'BYE:'.
.SH MISCELLANEOUS OPTIONS
.TP 6
.BI \-n " name"
-when starting communication, \fBlyxclient\fR sends an idenfifier
+when starting communication, \fBlyxclient\fR sends an identifier
string to LyX. By default, this string is "PPID>PID", where PPID is
\fBlyxclient\fR's parent pid and pid is \fBlyxclient\fR's pid.
Use this option to override this default.
diff --git a/src/convert/lyxconvert.cpp b/src/convert/lyxconvert.cpp
index 59e8ea7..fbe20d3 100644
--- a/src/convert/lyxconvert.cpp
+++ b/src/convert/lyxconvert.cpp
@@ -11,7 +11,7 @@
* The code implements an utility program using the Qt-Framework
* to convert an image from a given format to another one.
* The image format of the files is either auto detected by Qt or
- * may explicitely specified with command line arguments.
+ * may explicitly specified with command line arguments.
*
* Syntax:
* lyxconvert [-d] [-f infmt] [-t outfmt] inputfile outputfile
diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index f54ce80..c72ac38 100644
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -61,7 +61,7 @@ public:
* file to this->imageConverted.
*
* convertToDisplayFormat() will set the loading status flag as
- * approriate through calls to setStatus().
+ * appropriate through calls to setStatus().
*/
void convertToDisplayFormat();
diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index f214f77..3ef0550 100644
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -115,7 +115,7 @@ void Context::begin_layout(ostream & os, Layout const * const & l)
// FIXME: This is not enough for things like
// \\Huge par1 \\par par2
// FIXME: If the document language is not english this outputs a
- // superflous language change. Fortunately this is only file format
+ // superfluous language change. Fortunately this is only file format
// bloat and does not change the TeX export of LyX.
output_font_change(os, normalfont, font);
}
diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index a538c76..fa40533 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -347,7 +347,7 @@ Token const Parser::get_token()
bool Parser::isParagraph()
{
- // A new paragraph in TeX ist started
+ // A new paragraph in TeX is started
// - either by a newline, following any amount of whitespace
// characters (including zero), and another newline
// - or the token \par
diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h
index 0912523..d611513 100644
--- a/src/tex2lyx/Parser.h
+++ b/src/tex2lyx/Parser.h
@@ -222,7 +222,7 @@ public:
* If \p allow_escaping is true, a right delimiter escaped by a
* backslash does not count as delimiter, but is included in the
* argument.
- * \returns wether an argument was found in \p Arg.first and the
+ * \returns whether an argument was found in \p Arg.first and the
* argument in \p Arg.second. \see getArg().
*/
Arg getFullArg(char left, char right, bool allow_escaping = true);
@@ -233,7 +233,7 @@ public:
* argument.
* \returns the argument (without \p left and \p right) or the empty
* string if the next non-space token is not \p left. Use
- * getFullArg() if you need to know wether there was an empty
+ * getFullArg() if you need to know whether there was an empty
* argument or no argument at all.
*/
std::string getArg(char left, char right, bool allow_escaping = true);
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 6f75752..19b0446 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -1727,7 +1727,7 @@ void Preamble::handle_package(Parser &p, string const & name,
|| opt == "subsection")
h_multibib = opt;
else
- cerr << "Ignoring unkown refesection value '"
+ cerr << "Ignoring unknown refesection value '"
<< opt << "'.";
}
opt = process_keyval_opt(options, "bibencoding");
diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp
index 411fd5b..bd7225d 100644
--- a/src/tex2lyx/table.cpp
+++ b/src/tex2lyx/table.cpp
@@ -566,7 +566,7 @@ void fix_colalign(vector<ColInfo> & colinfo)
{
// Try to move extra leftlines to the previous column.
// We do this only if both special fields are empty, otherwise we
- // can't tell wether the result will be the same.
+ // can't tell whether the result will be the same.
for (size_t col = 0; col < colinfo.size(); ++col) {
if (colinfo[col].leftlines > 1 &&
colinfo[col].special.empty() && col > 0 &&
@@ -596,7 +596,7 @@ void fix_colalign(vector<ColInfo> & colinfo)
/*!
* Parse hlines and similar stuff.
- * \returns wether the token \p t was parsed
+ * \returns whether the token \p t was parsed
*/
bool parse_hlines(Parser & p, Token const & t, string & hlines,
bool is_long_tabular)
@@ -712,7 +712,7 @@ void parse_table(Parser & p, ostream & os, bool is_long_tabular,
}
// We need to handle structure stuff first in order to
- // determine wether we need to output a HLINE separator
+ // determine whether we need to output a HLINE separator
// before the row or not.
if (t.cat() == catEscape) {
if (parse_hlines(p, t, hlines, is_long_tabular)) {
diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx
index 44617dc..b9de013 100644
--- a/src/tex2lyx/test/beamer.lyx.lyx
+++ b/src/tex2lyx/test/beamer.lyx.lyx
@@ -4186,7 +4186,7 @@ and other places at the Internet
\end_layout
\begin_layout Itemize
-If you still are not satisified or if you need a theme matching to your University's or company's corporate design, the
+If you still are not satisfied or if you need a theme matching to your University's or company's corporate design, the
\begin_inset Flex Structure
status collapsed
diff --git a/src/tex2lyx/test/beamer.tex b/src/tex2lyx/test/beamer.tex
index c5424fe..d8bcf21 100644
--- a/src/tex2lyx/test/beamer.tex
+++ b/src/tex2lyx/test/beamer.tex
@@ -662,7 +662,7 @@ see \alert{Document \textrightarrow Settings \textrightarrow LaTeX~Preamble} for
how we activated and slightly tweaked the theme)
\item In addition to this standard set, you can get more themes from \href{http://www.ctan.org}{CTAN}
and other places at the Internet
-\item If you still are not satisified or if you need a theme matching to
+\item If you still are not satisfied or if you need a theme matching to
your University's or company's corporate design, the \structure{Beamer}
manual \cite{beamer-ug} explains how you can setup your own theme
\end{itemize}
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 51ffc85..b55fe6b 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -872,7 +872,7 @@ literal "false"
\end_inset
- File names containg double quotes are not legal on windows, so no test file is provided. Nevertheless, they are legal on unix, so we test at least the parsing. File names containing spaces can not be handled by automake (make dist would fail), so no test file is provided as well. Since the files do not exist, the variants without extension would not work (tex2lyx can't deduce the correct extension of nonexisting files).
+ File names containing double quotes are not legal on windows, so no test file is provided. Nevertheless, they are legal on unix, so we test at least the parsing. File names containing spaces can not be handled by automake (make dist would fail), so no test file is provided as well. Since the files do not exist, the variants without extension would not work (tex2lyx can't deduce the correct extension of nonexisting files).
\begin_inset CommandInset include
LatexCommand include
preview false
diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 0591be7..883eb75 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -102,7 +102,7 @@ char const * const * is_known(std::string const &, char const * const *);
* Adds the command \p command to the list of known commands.
* \param o1 first optional parameter to the latex command \\newcommand
* (with brackets), or the empty string if there were no optional arguments.
- * \param o2 wether \\newcommand had a second optional parameter.
+ * \param o2 whether \\newcommand had a second optional parameter.
* If \p definition is not empty the command is assumed to be from the LyX
* preamble and added to possible_textclass_commands.
*/
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index ca69221..0d4db90 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -924,7 +924,7 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
*
* 2. could be used to suppress as many spaces as possible. This has two effects:
* - Reimporting LyX generated LaTeX files changes almost no whitespace
- * - Superflous whitespace from non LyX generated LaTeX files is removed.
+ * - Superfluous whitespace from non LyX generated LaTeX files is removed.
* The drawback is that the logic inside the function becomes
* complicated, and that is the reason why it is not implemented.
*/
@@ -1310,7 +1310,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
os << "use_makebox " << (inner_type == "makebox") << '\n';
if (outer_type == "mbox" || (outer_type == "fbox" && inner_type.empty()))
os << "width \"\"\n";
- // for values like "1.5\width" LyX uses "1.5in" as width ad sets "width" as sepecial
+ // for values like "1.5\width" LyX uses "1.5in" as width ad sets "width" as special
else if (contains(width_unit, '\\'))
os << "width \"" << width_value << "in" << "\"\n";
else
@@ -2406,7 +2406,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
if (known_environments.find(name) != known_environments.end()) {
vector<ArgumentType> arguments = known_environments[name];
- // The last "argument" denotes wether we may translate the
+ // The last "argument" denotes whether we may translate the
// environment contents to LyX
// The default required if no argument is given makes us
// compatible with the reLyXre environment.
More information about the lyx-cvs
mailing list