[LyX/master] Run codespell on src/frontends
commit 8ceb4f6b58df059f4b6b95240369a840653842ea Author: Jean-Marc Lasgouttes Date: Fri Jun 26 00:04:31 2020 +0200 Run codespell on src/frontends 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/frontends/ --- src/frontends/Application.h|6 +++--- src/frontends/FontMetrics.h|4 ++-- src/frontends/Selection.h |2 +- src/frontends/qt/ButtonPolicy.h|2 +- src/frontends/qt/Dialog.h |4 ++-- src/frontends/qt/GuiApplication.cpp| 10 +- src/frontends/qt/GuiBibtex.h |2 +- src/frontends/qt/GuiCharacter.cpp |2 +- src/frontends/qt/GuiClipboard.cpp |6 +++--- src/frontends/qt/GuiDocument.cpp | 30 +++--- src/frontends/qt/GuiGraphics.cpp |2 +- src/frontends/qt/GuiLog.h |2 +- src/frontends/qt/GuiPainter.cpp|2 +- src/frontends/qt/GuiSearch.h |4 ++-- src/frontends/qt/GuiSelectionManager.h |2 +- src/frontends/qt/GuiTexinfo.cpp|2 +- src/frontends/qt/GuiToolbar.cpp|2 +- src/frontends/qt/GuiView.h |2 +- src/frontends/qt/GuiWorkArea.cpp |8 src/frontends/qt/InGuiThread.h |2 +- src/frontends/qt/Menus.cpp |2 +- src/frontends/qt/PanelStack.cpp|2 +- src/frontends/qt/Validator.h |4 ++-- src/frontends/qt/qt_helpers.cpp|2 +- src/frontends/qt/qt_helpers.h |2 +- src/frontends/qt/ui/CompareUi.ui |4 ++-- src/tex2lyx/text.cpp |2 +- 27 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/frontends/Application.h b/src/frontends/Application.h index af7663d..49bf68d 100644 --- a/src/frontends/Application.h +++ b/src/frontends/Application.h @@ -44,7 +44,7 @@ class Selection; /// The main application class /** There should be only one instance of this class. No Qt object -initialisation should be done before the instanciation of this class. +initialisation should be done before the instantiation of this class. Model/View/Controller separation at frontend level in qt frontend: @@ -101,7 +101,7 @@ initialisation should be done before the instanciation of this class. screen using the Painter. There can be only one Buffer displayed in a BufferView and it is set on construction. Ideally, a BufferView should not be able to change the contents of its associated Buffer. - A BufferView is instanciated and destroyed by a \c WorkArea; it is + A BufferView is instantiated and destroyed by a \c WorkArea; it is automatically destroyed by the parent WorkArea when its Buffer is closed. @@ -140,7 +140,7 @@ initialisation should be done before the instanciation of this class. widget. A GuiView is in charge of creating and closing a View for a given Buffer. In the qt specialisation, \c GuiView, the central widget is a tab - widget. Each tab is reverved to the visualisation of one Buffer and + widget. Each tab is reserved to the visualisation of one Buffer and contains one WorkArea. In the qt frontend, one GuiView thus contains multiple WorkAreas but this number can limited to one for another frontend. The idea is that the kernel should not know how a Buffer diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h index 4472aa7..d1fae1c 100644 --- a/src/frontends/FontMetrics.h +++ b/src/frontends/FontMetrics.h @@ -95,7 +95,7 @@ public: * direction of the string is forced, and the returned value * is from the left edge of the word, not from the start of the string. * \param rtl is true for right-to-left layout -* \param ws is the amount of extra inter-word space applied text justication. +* \param ws is the amount of extra inter-word space applied text justification. */ virtual int pos2x(docstring const & s, int pos, bool rtl, double ws) const = 0; /** @@ -104,7 +104,7 @@ public: * is from the left edge of the word, not from the start of the string. * the offset x is updated to match the closest position in the string. * \param rtl is true for right-to-left layout -* \param ws is the amount of extra inter-word space applied text justication. +* \param ws is the amount of extra inter-word space applied text justification. */ virtual int x2pos(docstring const & s, int & x, bool rtl, double ws) const = 0; /** diff --git a/src/frontends/Selection.h b/src/frontends/Selection.h index ac902ff..10d1698 100644 --- a/src/frontends/Selection.h +++ b/src/frontends/Selection.h @@ -49,7 +49,7 @@ public: * Fill the X selection. * The format is plain text. * Does nothing on systems that don't have a selection. -* Since the X selection protocol is asyncr
[LyX/master] typo left by codespell
commit 7a132f4f8cb4642c1a1749b5e1a18e8311c9045e Author: Pavel Sanda Date: Fri Jun 26 00:07:03 2020 +0200 typo left by codespell --- src/tex2lyx/Preamble.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 19b0446..875b61a 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 unknown refesection value '" + cerr << "Ignoring unknown refsection value '" << opt << "'."; } opt = process_keyval_opt(options, "bibencoding"); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Run codespell on tex2lyx/, client/, convert/ and graphics/
commit 110f8f67ac1afe9892dad5566d1c697044427cf0
Author: Jean-Marc Lasgouttes
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 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
//
[LyX/master] Run codespell on src/insets
commit 5d4e6dfb68cfa045e4929fc0b49a89a8f6686ab0
Author: Jean-Marc Lasgouttes
Date: Thu Jun 25 23:46:16 2020 +0200
Run codespell on src/insets
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/insets/
---
src/insets/Inset.h | 10 +-
src/insets/InsetBibitem.cpp|4 ++--
src/insets/InsetBibtex.cpp |6 +++---
src/insets/InsetBox.cpp|4 ++--
src/insets/InsetCitation.cpp |2 +-
src/insets/InsetERT.h |2 +-
src/insets/InsetFlex.h |2 +-
src/insets/InsetFloat.cpp |2 +-
src/insets/InsetFloat.h|2 +-
src/insets/InsetFootlike.h |2 +-
src/insets/InsetGraphics.h |2 +-
src/insets/InsetGraphicsParams.cpp |2 +-
src/insets/InsetIPA.h |2 +-
src/insets/InsetInclude.cpp|2 +-
src/insets/InsetIndex.h|2 +-
src/insets/InsetInfo.h |2 +-
src/insets/InsetLine.cpp |4 ++--
src/insets/InsetListingsParams.cpp |2 +-
src/insets/InsetListingsParams.h |2 +-
src/insets/InsetNote.h |2 +-
src/insets/InsetPhantom.h |2 +-
src/insets/InsetPreview.h |2 +-
src/insets/InsetQuotes.cpp |2 +-
src/insets/InsetTOC.cpp|2 +-
src/insets/InsetTabular.cpp|6 +++---
src/insets/InsetTabular.h |4 ++--
src/insets/InsetText.h |2 +-
27 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index f70b3c7..c2a4bec 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -130,7 +130,7 @@ public:
/// initialize view for this inset.
/**
* This is typically used after this inset is created interactively.
- * Intented purpose is to sanitize internal state with regard to
current
+ * Intended purpose is to sanitize internal state with regard to
current
* Buffer.
**/
virtual void initView() {}
@@ -511,7 +511,7 @@ public:
virtual LyXAlignment contentAlignment() const { return LYX_ALIGN_NONE; }
/// should we break lines after this inset?
virtual bool isLineSeparator() const { return false; }
- /// should paragraph indendation be omitted in any case?
+ /// should paragraph indentation be omitted in any case?
virtual bool neverIndent() const { return false; }
/// dumps content to lyxerr
virtual void dump() const;
@@ -534,7 +534,7 @@ public:
virtual Text * getText(int /*num*/) const { return 0; }
/** Adds a LaTeX snippet to the Preview Loader for transformation
-* into a bitmap image. Does not start the laoding process.
+* into a bitmap image. Does not start the loading process.
*
* Most insets have no interest in this capability, so the method
* defaults to empty.
@@ -605,7 +605,7 @@ public:
* are reset during editing operations.
* For copy/paste operations the language is never changed, since
* the language of a given text never changes if the text is
-* formatted differently, while other font attribues like size may
+* formatted differently, while other font attributes like size may
* need to change if the text is copied from one environment to
* another one.
* If this method returns false no font attribute is reset.
@@ -650,7 +650,7 @@ protected:
/** The real dispatcher.
* Gets normally called from Cursor::dispatch(). Cursor::dispatch()
* assumes the common case of 'LFUN handled, need update'.
-* This has to be overriden by calling Cursor::undispatched() or
+* This has to be overridden by calling Cursor::undispatched() or
* Cursor::noScreenUpdate() if appropriate.
* If you need to call the dispatch method of some inset directly
* you may have to explicitly request an update at that place. Don't
diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 85c6a59..a3cdeac 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -232,7 +232,7 @@ docstring bibitemWidest(Buffer const & buffer, OutputParams
const & runparams)
InsetBibitem const * bitem = nullptr;
- // FIXME: this font is used unitialized for now but should be set to
+ // FIXME: this font is used uninitialized for now but should be set to
// a proportional font. Here is what Georg Baum has to say about it:
/*
bibitemWidest() is supposed to find the bibitem with the widest label
in the
@@ -347,7 +347,7 @@ docstring InsetBibitem::xhtml(XMLStream & xs, OutputParams
const &) const
{
// FIXME XHTML
// XHTML 1.1 doesn't have the "name" attribute for , so we ha
[LyX/master] Run codespell on src/mathed
commit 3c4e567d44e48ccfbbd1e47e7a138bd782153bf2
Author: Jean-Marc Lasgouttes
Date: Thu Jun 25 23:31:42 2020 +0200
Run codespell on src/mathed
codespell -w -i 3 -S Makefile.in -L
mathed,afe,tthe,ue,fro,uint,larg,alph,te,thes,alle,Claus,wit,nd,numer
src/mathed/
---
src/mathed/BUGS |2 +-
src/mathed/InsetMathGrid.h |4 ++--
src/mathed/InsetMathMacro.cpp |2 +-
src/mathed/InsetMathMacroTemplate.h |2 +-
src/mathed/InsetMathNest.cpp|2 +-
src/mathed/MathData.cpp |2 +-
src/mathed/MathExtern.cpp |4 ++--
src/mathed/MathParser.cpp |6 +++---
src/mathed/MathParser_flags.h |2 +-
src/mathed/MathRow.h|2 +-
src/mathed/texify |2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/mathed/BUGS b/src/mathed/BUGS
index b94eaf1..dc1e4c4 100644
--- a/src/mathed/BUGS
+++ b/src/mathed/BUGS
@@ -68,4 +68,4 @@ I'd like is to let LyX know about TeX's scoping rules...
Angus:
-- make math lables editable
+- make math labels editable
diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 89c8e7f..1c8efd1 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -45,7 +45,7 @@ public:
CellInfo();
/// multicolumn flag
Multicolumn multi;
- /// special multi colums alignment
+ /// special multi columns alignment
docstring align;
};
@@ -95,7 +95,7 @@ public:
};
public:
- /// sets nrows and ncols to 1, vertical alingment to 'c'
+ /// sets nrows and ncols to 1, vertical alignment to 'c'
explicit InsetMathGrid(Buffer * buf);
/// Note: columns first!
InsetMathGrid(Buffer * buf, col_type m, row_type n);
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index b536701..72224f4 100644
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -744,7 +744,7 @@ void InsetMathMacro::draw(PainterInfo & pi, int x, int y)
const
pi.pain.text(x, y, from_ascii(":"), labelFont);
x += strw2;
- // draw paramter
+ // draw parameter
cell(i).draw(pi, x, y);
// next line
diff --git a/src/mathed/InsetMathMacroTemplate.h
b/src/mathed/InsetMathMacroTemplate.h
index 7bdb6a5..bdba221 100644
--- a/src/mathed/InsetMathMacroTemplate.h
+++ b/src/mathed/InsetMathMacroTemplate.h
@@ -48,7 +48,7 @@ public:
void write(std::ostream & os) const;
///
void write(WriteStream & os) const;
- /// Output LaTeX code, but assume that the macro is not definied yet
+ /// Output LaTeX code, but assume that the macro is not defined yet
/// if overwriteRedefinition is true
int write(WriteStream & os, bool overwriteRedefinition) const;
/// Nothing happens. This is simply to suppress the default output.
diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 44091f0..a94ce33 100644
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -1404,7 +1404,7 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest
const & cmd,
case LFUN_INSET_INSERT: {
// Don't test createMathInset_fromDialogStr(), since
// getStatus is not called with a valid reference and the
- // dialog would not be applyable.
+ // dialog would not be applicable.
string const name = cmd.getArg(0);
flag.setEnabled(name == "ref" || name == "mathspace");
break;
diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index a2b044c..42aa3cb 100644
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -322,7 +322,7 @@ void MathData::drawSelection(PainterInfo & pi, int const x,
int const y) const
MathData const & c1 = inset->cell(s1.idx());
if (s1.idx() == s2.idx() && &c1 == this) {
- // selection indide cell
+ // selection inside cell
Dimension const dim = bv->coordCache().getArrays().dim(&c1);
int const beg = c1.pos2x(bv, s1.pos());
int const end = c1.pos2x(bv, s2.pos());
diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 46c5448..311b323 100644
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -342,7 +342,7 @@ void replaceNested(
//
-// split scripts into seperate super- and subscript insets. sub goes in
+// split scripts into separate super- and subscript insets. sub goes in
// front of super...
//
@@ -683,7 +683,7 @@ void extractIntegrals(MathData & ar, ExternalMath kind)
if (!testIntegral(*it))
continue;
- // core ist part from behin
[LyX/master] Run codespell on src/support
commit 9fe1ed4d686d6f959f3c0d8bbe4f05281b8e6fac
Author: Jean-Marc Lasgouttes
Date: Thu Jun 25 23:16:08 2020 +0200
Run codespell on src/support
Codespell is run with command line
codespell -w -S Makefile.in -L
mathed,afe,tthe,ue,fro,uint,larg,alph,te,thes,alle,Claus -i 3 src/support/
---
src/support/FileName.h |2 +-
src/support/ForkedCalls.cpp |2 +-
src/support/ForkedCalls.h |2 +-
src/support/Messages.h |2 +-
src/support/Package.h |2 +-
src/support/Timeout.cpp |2 +-
src/support/debug.cpp |2 +-
src/support/docstream.cpp |4 ++--
src/support/docstring.cpp |2 +-
src/support/filetools.cpp |2 +-
src/support/filetools.h |6 +++---
src/support/lstrings.cpp| 14 +++---
src/support/lstrings.h |4 ++--
src/support/os_win32.h |2 +-
src/support/tests/supporttest.cmake |2 +-
src/support/types.h |2 +-
src/support/unicode.h |2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/support/FileName.h b/src/support/FileName.h
index 3bfdf13..ac351c2 100644
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -213,7 +213,7 @@ private:
friend bool equivalent(FileName const &, FileName const &);
/// Set for tracking of already visited file names.
/// Uses operator==() (which may be case insensitive), and not
- /// equvalent(), so that symlinks are not resolved.
+ /// equivalent(), so that symlinks are not resolved.
typedef std::set FileNameSet;
/// Helper for public copyTo() to find circular symlink chains
bool copyTo(FileName const &, bool, FileNameSet &) const;
diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index 1318bd3..eb07314 100644
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -661,7 +661,7 @@ void handleCompletedProcesses()
forkedCalls.erase(it);
actCall->emitSignal();
- /* start all over: emiting the signal can result
+ /* start all over: emitting the signal can result
* in changing the list (Ab)
*/
it = forkedCalls.begin();
diff --git a/src/support/ForkedCalls.h b/src/support/ForkedCalls.h
index 8a4bf1d..51cacd6 100644
--- a/src/support/ForkedCalls.h
+++ b/src/support/ForkedCalls.h
@@ -141,7 +141,7 @@ private:
/**
* An instance of class ForkedCall represents a single child process.
*
- * Class ForkedCall uses fork() and execvp() to lauch the child process.
+ * Class ForkedCall uses fork() and execvp() to launch the child process.
*
* Once launched, control is returned immediately to the parent process
* but a Signal can be emitted upon completion of the child.
diff --git a/src/support/Messages.h b/src/support/Messages.h
index eb14aac..9f33d45 100644
--- a/src/support/Messages.h
+++ b/src/support/Messages.h
@@ -25,7 +25,7 @@ public:
Messages() {}
/// messages in the language \p l.
Messages(std::string const & l);
- /// Return the tranlation of message \c msg, or the original
+ /// Return the translation of message \c msg, or the original
/// string if no context was found. Context is always removed.
docstring const get(std::string const & msg) const;
///
diff --git a/src/support/Package.h b/src/support/Package.h
index 4e5c6fa..62db5d2 100644
--- a/src/support/Package.h
+++ b/src/support/Package.h
@@ -8,7 +8,7 @@
*
* Full author contact details are available in file CREDITS.
*
- * A store of the paths to the various different directoies used
+ * A store of the paths to the various different directories used
* by LyX. These paths differ markedly from one OS to another,
* following the local Windows, MacOS X or Posix conventions.
*/
diff --git a/src/support/Timeout.cpp b/src/support/Timeout.cpp
index 449fee0..0657119 100644
--- a/src/support/Timeout.cpp
+++ b/src/support/Timeout.cpp
@@ -51,7 +51,7 @@ protected:
private:
///
Timeout & owner_;
- /// timout id
+ /// timeout id
int timeout_id;
};
diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index e72a43d..8bcd2e8 100644
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -200,7 +200,7 @@ void LyXErr::endl()
char const * LyXErr::stripName(char const * n)
{
string const name = n;
- // find the last occurence of /src/ in name
+ // find the last occurrence of /src/ in name
size_t pos = name.rfind("/src/");
if (pos == string::npos)
pos = name.rfind("\\src\\");
diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index eef5b03..c2d2d7e 100644
--- a/src/support/docstream.cpp
+++
[LyX/master] Update sk.po
commit a283edd37667ce2ecef02c3afb87620b5dccc936 Author: Kornel Benko Date: Thu Jun 25 17:34:49 2020 +0200 Update sk.po --- po/sk.po | 24 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/po/sk.po b/po/sk.po index ee20105..9f133f1 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2020-06-12 12:15+0200\n" -"PO-Revision-Date: 2020-06-12 10:20+\n" +"POT-Creation-Date: 2020-06-25 17:30+0200\n" +"PO-Revision-Date: 2020-06-25 15:32+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -19629,6 +19629,14 @@ msgstr "Úzka medzera|k" msgid "Negative Thin Space|N" msgstr "Záporná úzka medzera|Z" +#: lib/ui/stdcontext.inc:248 lib/ui/stdcontext.inc:275 +msgid "Negative Medium Space|v" +msgstr "Záporná stredná medzera|o" + +#: lib/ui/stdcontext.inc:249 lib/ui/stdcontext.inc:276 +msgid "Negative Thick Space|h" +msgstr "Záporná tučná medzera|u" + #: lib/ui/stdcontext.inc:245 lib/ui/stdcontext.inc:272 msgid "Half Quad Space (Enskip)|k" msgstr "Polovička Quad medzery (Enskip)|P" @@ -19685,18 +19693,10 @@ msgstr "Vlastná dĺžka|V" msgid "Medium Space|M" msgstr "Stredná medzera|S" -#: lib/ui/stdcontext.inc:268 -msgid "Thick Space|h" +#: lib/ui/stdcontext.inc:273 +msgid "Thick Space|i" msgstr "Tučná medzera|T" -#: lib/ui/stdcontext.inc:270 -msgid "Negative Medium Space|u" -msgstr "Záporná stredná medzera|o" - -#: lib/ui/stdcontext.inc:271 -msgid "Negative Thick Space|i" -msgstr "Záporná tučná medzera|u" - #: lib/ui/stdcontext.inc:284 msgid "DefSkip|D" msgstr "Štandardná medzera(DefSkip)|t" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] de.po
commit c742a1fdb9c354bb82ae8b9de7b69175888de463 Author: Juergen Spitzmueller Date: Thu Jun 25 16:24:08 2020 +0200 de.po --- po/de.gmo | Bin 611906 -> 612388 bytes po/de.po | 458 +++-- 2 files changed, 232 insertions(+), 226 deletions(-) diff --git a/po/de.gmo b/po/de.gmo index 73f427e..cfc6d12 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index d73a2f8..d3e278c 100644 --- a/po/de.po +++ b/po/de.po @@ -94,8 +94,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.4git\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2020-06-13 10:32+0200\n" -"PO-Revision-Date: 2020-06-13 10:35+0200\n" +"POT-Creation-Date: 2020-06-25 16:10+0200\n" +"PO-Revision-Date: 2020-06-25 16:19+0200\n" "Last-Translator: Jürgen Spitzmüller \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -463,17 +463,17 @@ msgid "&Content:" msgstr "&Inhalt:" #: src/frontends/qt/ui/BibtexUi.ui:338 src/frontends/qt/GuiBibtex.cpp:357 -#: src/insets/InsetBibtex.cpp:214 src/insets/InsetBibtex.cpp:232 +#: src/insets/InsetBibtex.cpp:215 src/insets/InsetBibtex.cpp:233 msgid "all cited references" msgstr "alle zitierten Literatureinträge" #: src/frontends/qt/ui/BibtexUi.ui:343 src/frontends/qt/GuiBibtex.cpp:359 -#: src/insets/InsetBibtex.cpp:212 +#: src/insets/InsetBibtex.cpp:213 msgid "all uncited references" msgstr "alle nicht zitierten Literatureinträge" #: src/frontends/qt/ui/BibtexUi.ui:348 src/frontends/qt/GuiBibtex.cpp:360 -#: src/insets/InsetBibtex.cpp:210 src/insets/InsetBibtex.cpp:230 +#: src/insets/InsetBibtex.cpp:211 src/insets/InsetBibtex.cpp:231 msgid "all references" msgstr "alle Literatureinträge" @@ -599,13 +599,13 @@ msgstr "Bo&x:" #: src/frontends/qt/ui/BoxUi.ui:204 src/frontends/qt/ui/BoxUi.ui:234 #: src/frontends/qt/ui/TabularUi.ui:213 src/frontends/qt/ui/TabularUi.ui:404 -#: lib/ui/stdcontext.inc:452 src/frontends/qt/GuiMathMatrix.cpp:54 +#: lib/ui/stdcontext.inc:454 src/frontends/qt/GuiMathMatrix.cpp:54 msgid "Top" msgstr "Oben" #: src/frontends/qt/ui/BoxUi.ui:209 src/frontends/qt/ui/BoxUi.ui:239 #: src/frontends/qt/ui/TabularUi.ui:218 src/frontends/qt/ui/TabularUi.ui:409 -#: lib/ui/stdcontext.inc:453 src/frontends/qt/GuiMathMatrix.cpp:55 +#: lib/ui/stdcontext.inc:455 src/frontends/qt/GuiMathMatrix.cpp:55 #: src/frontends/qt/GuiTabular.cpp:252 msgid "Middle" msgstr "Mitte" @@ -627,7 +627,7 @@ msgstr "Mitte" #: lib/layouts/g-brief2.layout:589 lib/layouts/g-brief2.layout:609 #: lib/layouts/g-brief2.layout:630 lib/layouts/g-brief2.layout:650 #: lib/layouts/g-brief2.layout:670 lib/layouts/g-brief2.layout:690 -#: lib/layouts/g-brief2.layout:710 lib/ui/stdcontext.inc:454 +#: lib/layouts/g-brief2.layout:710 lib/ui/stdcontext.inc:456 #: src/frontends/qt/GuiMathMatrix.cpp:56 msgid "Bottom" msgstr "Unten" @@ -814,7 +814,7 @@ msgstr "A&lle hinzufügen" #: src/frontends/qt/GuiView.cpp:3073 src/frontends/qt/GuiView.cpp:3310 #: src/frontends/qt/GuiView.cpp:3324 src/frontends/qt/GuiView.cpp:3426 #: src/frontends/qt/GuiView.cpp:3454 src/frontends/qt/GuiView.cpp:4158 -#: src/frontends/qt/GuiView.cpp:4165 src/insets/InsetBibtex.cpp:149 +#: src/frontends/qt/GuiView.cpp:4165 src/insets/InsetBibtex.cpp:150 msgid "&Cancel" msgstr "&Abbrechen" @@ -6165,7 +6165,7 @@ msgstr "Hochgestellt" msgid "Superscript" msgstr "Hochgestellt" -#: lib/citeengines/biblatex.citeengine:2 src/insets/InsetBibtex.cpp:144 +#: lib/citeengines/biblatex.citeengine:2 src/insets/InsetBibtex.cpp:145 msgid "Biblatex" msgstr "Biblatex" @@ -7491,7 +7491,7 @@ msgstr "Kurztitel für den Anhang" #: lib/layouts/stdstruct.inc:54 lib/layouts/svcommon.inc:575 #: lib/layouts/tufte-book.layout:279 lib/layouts/tufte-book.layout:281 #: lib/layouts/tufte-handout.layout:77 lib/examples/Articles:0 -#: src/frontends/qt/GuiDocument.cpp:1773 src/insets/InsetBibtex.cpp:952 +#: src/frontends/qt/GuiDocument.cpp:1773 src/insets/InsetBibtex.cpp:953 msgid "Bibliography" msgstr "Literaturverzeichnis" @@ -7507,7 +7507,7 @@ msgstr "Literaturverzeichnis" #: lib/layouts/kluwer.layout:360 lib/layouts/llncs.layout:285 #: lib/layouts/moderncv.layout:525 lib/layouts/siamltex.layout:342 #: lib/layouts/stdstruct.inc:70 lib/layouts/svcommon.inc:591 -#: src/insets/InsetBibtex.cpp:953 src/insets/InsetBibtex.cpp:1029 +#: src/insets/InsetBibtex.cpp:954 src/insets/InsetBibtex.cpp:1030 #: src/output_plaintext.cpp:155 msgid "References" msgstr "Literaturverzeichnis" @@ -19794,26 +19794,26 @@ msgstr "Formelmarke|m" msgid "Copy as Reference|R" msgstr "Als Querverweis kopieren|k" -#: lib/ui/stdcontext.inc:61 lib/ui/stdcontext.inc:347 lib/ui/stdmenus.inc:108 +#: lib/ui/stdcontext.inc:61 lib/ui/stdcontext.inc:349 lib/ui/stdmenus.inc:108 #: lib/ui/stdtoolbars.inc:86 src/Text3.cpp:1536 #: src/mathed/InsetMathNest.cpp:559 msgid "Cut" msgstr "Ausschneiden" -#: lib/ui/stdcontext.inc:62 lib/ui/stdcontext.inc:348 lib/ui/stdmenus.inc
[LyX/master] Harmonize some space shortcuts (math/text context menu)
commit 3579a13a50f9791ae08fb99538ae8af6c94bc201
Author: Juergen Spitzmueller
Date: Thu Jun 25 16:22:42 2020 +0200
Harmonize some space shortcuts (math/text context menu)
---
lib/ui/stdcontext.inc |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 62d7e4b..120aac4 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -270,10 +270,10 @@ Menuset
Menu "context-mathspace"
Item "Thin Space|T" "inset-modify mathspace \thinspace{}"
Item "Medium Space|M" "inset-modify mathspace \medspace{}"
- Item "Thick Space|h" "inset-modify mathspace \thickspace{}"
+ Item "Thick Space|i" "inset-modify mathspace \thickspace{}"
Item "Negative Thin Space|N" "inset-modify mathspace
\negthinspace{}"
- Item "Negative Medium Space|u" "inset-modify mathspace
\negmedspace{}"
- Item "Negative Thick Space|i" "inset-modify mathspace
\negthickspace{}"
+ Item "Negative Medium Space|v" "inset-modify mathspace
\negmedspace{}"
+ Item "Negative Thick Space|h" "inset-modify mathspace
\negthickspace{}"
Item "Half Quad Space (Enskip)|k" "inset-modify mathspace
\enskip{}"
Item "Quad Space|Q" "inset-modify mathspace \quad{}"
Item "Double Quad Space|u" "inset-modify mathspace \qquad{}"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Tools(listFontWithLang.pl): Added type for small capitals.
commit 7cb50d70086faafb22a7dd8ca779278a0f9310e9
Author: Kornel Benko
Date: Thu Jun 25 11:18:53 2020 +0200
Tools(listFontWithLang.pl): Added type for small capitals.
---
development/tools/listFontWithLang.pl | 23 ---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/development/tools/listFontWithLang.pl
b/development/tools/listFontWithLang.pl
index 780cdf0..03f0c17 100644
--- a/development/tools/listFontWithLang.pl
+++ b/development/tools/listFontWithLang.pl
@@ -43,6 +43,7 @@ use constant {
FANCY => 32,
INITIALS => 64,
SYMBOL => 128,
+ SMALLCAP => 256,
};
sub convertlang($);
@@ -228,6 +229,7 @@ my %ftypes = (
FANCY() => "Fancy",
INITIALS() => "Initials",
SYMBOL() => "Symbol",
+ SMALLCAP() => "SmallCap",
"default" => 1,
);
@@ -360,7 +362,7 @@ my %fraktFonts = (
"j" => qr/^(jsmath.?euf)/i,
"m" => qr/^(missaali)/i,
"o" => qr/^(oldania)/i,
- "q" =>
qr/^qt(blackforest|cloisteredmonk|dublinirish|fraktur|heidelbergtype|(lino|london)scroll)/i,
+ "q" =>
qr/^qt(blackforest|cloisteredmonk|dublinirish|fraktur|heidelbergtype|(lino|london)
?scroll)/i,
"u" => qr/^ukij ?(kufi ?tar|mejnun ?reg)/i,
);
@@ -412,6 +414,17 @@ my %symbolFonts = (
"w" => qr/^w(ebdings|asy|elfare ?brat)/i,
);
+my %smallcapFonts = (
+ "value" => SMALLCAP | SERIF,
+ "c" => qr/^cs[ct]sc\d/i,
+ "d" => qr/^drm(it)?sc\d/i,
+ "f" => qr/^fetamont.?script/i,
+ "n" => qr/^newtxb?ttsc/i,
+ "s" => qr/^(screengem|sf.?kp.?sc)/i,
+ "t" => qr/^t1?xb?ttsc/i,
+ "v" => qr/^vn ?cccsc\d/i,
+);
+
if (open(FI, "$cmd |")) {
NXTLINE: while (my $l = ) {
chomp($l);
@@ -457,7 +470,6 @@ if (open(FI, "$cmd |")) {
}
my $fontname;
($fontname, $style) = &buildFontName($family, $style);
-
if (defined($options{NFontName})) {
for my $fn (@{$options{NFontName}}) {
next NXTLINE if ($fontname =~ /$fn/i);
@@ -780,6 +792,11 @@ sub getftype($$)
if ($fontname =~ /callig/i) {
$resftype |= FANCY;
}
+ if ($fontname =~ /\bS(mall)?C(aps)\b/i) {
+if ($fontname !~ /^noto/i) {
+ $resftype |= SMALLCAP|SERIF;
+}
+ }
# Now check for fonts without a hint in font name
if ($fontname =~ /^([a-z])/i) {
my $key = lc($1);
@@ -792,7 +809,7 @@ sub getftype($$)
}
}
}
-for my $rFonts (\%fancyFonts, \%initialFonts, \%symbolFonts) {
+for my $rFonts (\%fancyFonts, \%initialFonts, \%symbolFonts,
\%smallcapFonts) {
if (defined($rFonts->{$key})) {
if ($fontname =~ $rFonts->{$key}) {
$resftype |= $rFonts->{"value"};
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Consider nesting level when autonesting
commit 9f13bb73f8b2577b22ff129e81e0d9d344889925
Author: Juergen Spitzmueller
Date: Thu Jun 25 10:37:04 2020 +0200
Consider nesting level when autonesting
---
src/Text3.cpp |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/Text3.cpp b/src/Text3.cpp
index 238736b..f5abd44 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1588,8 +1588,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
if (change_layout) {
setLayout(cur, layout);
if (cur.pit() > 0 && !ignoreautonests) {
+ pit_type prev_pit = cur.pit() - 1;
+ depth_type const cur_depth =
pars_[cur.pit()].getDepth();
+ // Scan for the previous par on same nesting
level
+ while (prev_pit > 0 &&
pars_[prev_pit].getDepth() > cur_depth)
+ --prev_pit;
set const & autonests =
- pars_[cur.pit() -
1].layout().autonests();
+
pars_[prev_pit].layout().autonests();
set const & autonested =
pars_[cur.pit()].layout().isAutonestedBy();
if (autonests.find(layout) != autonests.end()
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
