[LyX/master] Work around MSVC compiler limit
commit 05e95b03f3013d2cb185259e473e8551d69ec5d4
Author: Juergen Spitzmueller
Date: Sun Mar 2 18:06:37 2025 +0100
Work around MSVC compiler limit
---
src/BufferParams.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index a871c8c57d..4955a61445 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1013,7 +1013,9 @@ string BufferParams::readToken(Lexer & lex, string const
& token,
string ppsize;
lex >> ppsize;
papersize = papersizetranslator().find(ppsize);
- } else if (token == "\\use_geometry") {
+ }
+ // Start a new chain of conditions to keep MSVC happy.
+ if (token == "\\use_geometry") {
lex >> use_geometry;
} else if (token == "\\use_package") {
string package;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Better way to work around MSVC compiler limit (number of allowed else clauses)
commit b89c8451e1e83e955e7c4c0e5f389eb63667eba4
Author: Juergen Spitzmueller
Date: Sun Mar 2 18:27:54 2025 +0100
Better way to work around MSVC compiler limit (number of allowed else
clauses)
Use while loop and break if a condition is met
---
src/BufferParams.cpp | 1255 ++
1 file changed, 749 insertions(+), 506 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 4955a61445..77fbab1f40 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -778,527 +778,770 @@ string BufferParams::readToken(Lexer & lex, string
const & token,
string result;
FileName const & filepath = filename.onlyPath();
- if (token == "\\textclass") {
- lex.next();
- string const classname = lex.getString();
- // if there exists a local layout file, ignore the system one
- // NOTE: in this case, the textclass (.cls file) is assumed to
- // be available.
- string tcp;
- LayoutFileList & bcl = LayoutFileList::get();
- if (!filepath.empty()) {
- // If classname is an absolute path, the document is
- // using a local layout file which could not be accessed
- // by a relative path. In this case the path is correct
- // even if the document was moved to a different
- // location. However, we will have a problem if the
- // document was generated on a different platform.
- bool isabsolute = FileName::isAbsolute(classname);
- string const classpath = onlyPath(classname);
- string const path = isabsolute ? classpath
- : FileName(addPath(filepath.absFileName(),
- classpath)).realPath();
- string const oldpath = isabsolute ? string()
- : FileName(addPath(origin,
classpath)).realPath();
- tcp = bcl.addLocalLayout(onlyFileName(classname), path,
oldpath);
- }
- // that returns non-empty if a "local" layout file is found.
- if (!tcp.empty()) {
- result = to_utf8(makeRelPath(from_utf8(onlyPath(tcp)),
-
from_utf8(filepath.absFileName(;
- if (result.empty())
- result = ".";
- setBaseClass(onlyFileName(tcp));
- } else
- setBaseClass(onlyFileName(classname));
- // We assume that a tex class exists for local or unknown
- // layouts so this warning, will only be given for system
layouts.
- if (!baseClass()->isTeXClassAvailable()) {
- docstring const desc =
-
translateIfPossible(from_utf8(baseClass()->description()));
- docstring const prereqs =
- from_utf8(baseClass()->prerequisites());
- docstring const msg =
- bformat(_("The selected document class\n"
-"\t%1$s\n"
-"requires external files that
are not available.\n"
-"The document class can still
be used, but the\n"
-"document cannot be compiled
until the following\n"
-"prerequisites are
installed:\n"
-"\t%2$s\n"
-"See section 3.1.2.2 (Class
Availability) of the\n"
-"User's Guide for more
information."), desc, prereqs);
- frontend::Alert::warning(_("Document class not
available"),
- msg, true);
- }
- } else if (token == "\\save_transient_properties") {
- lex >> save_transient_properties;
- } else if (token == "\\origin") {
- lex.eatLine();
- origin = lex.getString();
- string const sysdirprefix = "/systemlyxdir/";
- if (prefixIs(origin, sysdirprefix)) {
- string docsys;
- if (inSystemDir(filepath, docsys))
- origin.replace(0, sysdirprefix.length() - 1,
docsys);
- else
- origin.replace(0, sysdirprefix.length() - 1,
-
package().system_support().absFileName());
- }
- } else if (token == "\\begin_metad
[LyX/master] Initialize Preamble member (spotted by Coverity Scan)
commit 77af6cb3086fcbc437c7e3277d6a9e218228ec82 Author: Jean-Marc Lasgouttes Date: Sun Mar 2 22:46:36 2025 +0100 Initialize Preamble member (spotted by Coverity Scan) --- src/tex2lyx/Preamble.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index e9aabd2bbb..7f672062dc 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -1001,6 +1001,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false), h_spacing = "single"; h_save_transient_properties = "true"; h_suppress_date = "false"; + h_table_alt_row_colors_start = 0; h_textclass = "article"; h_tocdepth= "3"; h_tracking_changes= "false"; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Review layouttranslation strings for fi from Matti Lehtonen.
commit c282e2d85537a9efe2b23ba16a6d74c1d34eedad
Author: Pavel Sanda
Date: Sun Mar 2 20:46:27 2025 +0100
Review layouttranslation strings for fi from Matti Lehtonen.
---
lib/layouttranslations| 6 +++---
lib/layouttranslations.review | 6 +++---
po/fi.po | 7 +++
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/lib/layouttranslations b/lib/layouttranslations
index 89187931a8..11b86e72c6 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -513,7 +513,7 @@ Translation fi
"Nomenclature[[output]]" "Termistö"
"Notation" "Merkintätapa"
"Note" "Muistiinpano"
- "Notes[[Endnotes]]" "Notes"
+ "Notes[[Endnotes]]" "Muistiinpanot"
"Problem" "Ongelma"
"Proof" "Todistus"
"Property" "Ominaisuus"
@@ -525,8 +525,8 @@ Translation fi
"Summary" "Yhteenveto"
"Tableau" "Taulu"
"Theorem" "Lause"
- "page[[nomencl]]" "page"
- "see equation[[nomencl]]" "see equation"
+ "page[[nomencl]]" "sivu"
+ "see equation[[nomencl]]" "katso yhtälö"
End
Translation fr
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index e8263ff7ac..814a0b2f06 100644
--- a/lib/layouttranslations.review
+++ b/lib/layouttranslations.review
@@ -22,12 +22,12 @@ ro sr
(30.11.2017, LyX 2.3.0 release )
Additionally to the top ones, these languages should be reviewed for the
following strings
"List of Listings"
-da fi gl ko nb nn pl ro sl sr tr
+da gl ko nb nn pl ro sl sr tr
"Nomenclature[[output]]" -> The string that is output to PDF for the
nomenclature list
"see equation[[nomencl]]"
"page[[nomencl]]"
-da fi gl ko nb nn pl ro sl sr tr
+da gl ko nb nn pl ro sl sr tr
-
LyX 2.4.0 release
@@ -35,7 +35,7 @@ LyX 2.4.0 release
"Notes[[Endnotes]]" -> The header string of endnotes (with "Endnotes (Basic)"
and "Footnotes as Endnotes
(Basic)" modules). This is to be distinguished from "Notes" used by the Notes
inset (which is more an
annotation than a list of (end)notes)
-ar el en fi hu nb nl nn pl tr
+ar el en hu nb nl nn pl tr
Note that the localized enotez package has the following translations that
probably should be used:
Croatian: Bilje\v{s}ke
French: Remarques
diff --git a/po/fi.po b/po/fi.po
index a6238d1353..c64f294cfd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12380,9 +12380,8 @@ msgstr "Yläreunamuistiinpano"
#: lib/layouts/endnotes.module:32 lib/layouts/endnotes.module:35
#: lib/layouts/foottoend.module:20 lib/layouts/foottoend.module:23
#: lib/layouts/memoir.layout:326 lib/layouts/memoir.layout:329
-#, fuzzy
msgid "Notes[[Endnotes]]"
-msgstr "muistiinpano"
+msgstr "Muistiinpanot"
#: lib/layouts/enotez.module:2
#, fuzzy
@@ -17992,11 +17991,11 @@ msgstr "Esikatselu"
#: lib/layouts/stdinsets.inc:794 lib/layouts/stdinsets.inc:802
msgid "see equation[[nomencl]]"
-msgstr ""
+msgstr "katso yhtälö"
#: lib/layouts/stdinsets.inc:795 lib/layouts/stdinsets.inc:803
msgid "page[[nomencl]]"
-msgstr ""
+msgstr "sivu"
#: lib/layouts/stdinsets.inc:796 lib/layouts/stdinsets.inc:804
msgid "Nomenclature[[output]]"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix combo box shortcut key sequence for Qt 5.15.13
commit f6197bdff38089c4beff670b33293973eab5dcdb
Author: Scott Kostyshak
Date: Sun Mar 2 15:16:20 2025 +0100
Fix combo box shortcut key sequence for Qt 5.15.13
The previous code worked for Qt 6, but for me with Qt 5.15.13, I
received the following (with -Werror):
/home/scott/lyxbuilds/master-master/repo/src/frontends/qt/GuiPrefs.cpp:1047:46:
error: arithmetic between different enumeration types ('Qt::Modifier' and
'Qt::Key') is deprecated
[-Werror,-Wdeprecated-enum-enum-conversion]
1047 | new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L),
this);
| ^ ~
If I changed the guard condition to be < 5.15.0 (so that the Qt 6
code path is triggered with Qt 5.15.13), I then get the following
different failure:
/home/scott/lyxbuilds/master-master/repo/src/frontends/qt/GuiPrefs.cpp:1050:46:
error: bitwise operation between different enumeration types ('Qt::Modifier'
and 'Qt::Key') is deprecated
[-Werror,-Wdeprecated-enum-enum-conversion]
1050 | new QShortcut(QKeySequence(Qt::CTRL |
Qt::Key_L), this);
| ^ ~
This commit fixes it by using an alternative form documented here:
https://doc.qt.io/qtforpython-5/PySide2/QtGui/QKeySequence.html
---
src/frontends/qt/GuiPrefs.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index df43a199b4..b2904bda00 100644
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -1044,7 +1044,7 @@ PrefColors::PrefColors(GuiPreferences * form)
// give a shortcut to the combobox
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QShortcut* sc_load_theme =
- new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this);
+ new QShortcut(QKeySequence(tr("Ctrl+l")), this);
#else
QShortcut* sc_load_theme =
new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_L), this);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend bb15f649
commit 4967a4b6709f7ac2a626735f33e3b53b322ed0e7
Author: Kornel Benko
Date: Sun Mar 2 17:06:50 2025 +0100
Amend bb15f649
No need to double install themes.
---
development/cmake/Install.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index bcd0c23ed5..fbe450a800 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -116,7 +116,7 @@ foreach(_sd "examples" "templates")
lyx_install("data" ${TOP_SRC_DIR}/lib ${_sd}/* *. *)
endforeach()
-foreach(_sd "kbd" "layouts" "themes" "ui" ".")
+foreach(_sd "kbd" "layouts" "ui" ".")
lyx_install("data" ${TOP_SRC_DIR}/lib ${_sd} *. )
endforeach()
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Ensure that InsetTableCell::width is initialized
commit 1b7c8df68fb66782c249670dd30aa36279489143
Author: Jean-Marc Lasgouttes
Date: Sun Mar 2 21:02:03 2025 +0100
Ensure that InsetTableCell::width is initialized
Use this occasion to move initial values to the object declaration.
Spotted by Coverity Scan.
---
src/insets/InsetTabular.cpp | 4 +---
src/insets/InsetTabular.h | 18 +-
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index b629bcb256..4394af3711 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4793,9 +4793,7 @@ bool Tabular::hasNewlines(idx_type cell) const
/
InsetTableCell::InsetTableCell(Buffer * buf)
- : InsetText(buf, InsetText::PlainLayout), isFixedWidth(false),
isVarwidth(false),
- isMultiColumn(false), isMultiRow(false), mr_rows(1),
isCaptionRow(false),
- contentAlign(LYX_ALIGN_CENTER), isDeleted(false)
+ : InsetText(buf, InsetText::PlainLayout)
{}
bool InsetTableCell::allowParagraphCustomization(idx_type) const
diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 5c1aaf79e0..c20b6c014c 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -139,25 +139,25 @@ private:
// So, well, if someone can do better, please do!
// --rkh
///
- bool isFixedWidth;
+ bool isFixedWidth = false;
///
- bool isVarwidth;
+ bool isVarwidth = false;
///
- bool isMultiColumn;
+ bool isMultiColumn = false;
///
- bool isMultiRow;
+ bool isMultiRow = false;
///
- int mr_rows;
+ int mr_rows = 1;
///
- int width;
+ int width = 0;
///
- bool isCaptionRow;
+ bool isCaptionRow = false;
///
- LyXAlignment contentAlign;
+ LyXAlignment contentAlign = LYX_ALIGN_CENTER;
///
std::string background_color;
///
- bool isDeleted;
+ bool isDeleted = false;
/// should paragraph indentation be omitted in any case?
bool neverIndent() const override { return true; }
///
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Pass argument by address (spotted by Coverity Scan)
commit 1c04e5e9318e3482c7dc53c2bbf4695b0d8c6b5e
Author: Jean-Marc Lasgouttes
Date: Sun Mar 2 20:58:28 2025 +0100
Pass argument by address (spotted by Coverity Scan)
---
src/insets/InsetTabular.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 5687e61acf..5c1aaf79e0 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -86,7 +86,7 @@ public:
///
void setContentAlignment(LyXAlignment al) { contentAlign = al; }
///
- void setBackgroundColor(std::string const col) { background_color =
col; }
+ void setBackgroundColor(std::string const & col) { background_color =
col; }
/// writes the contents of the cell as a string, optionally
/// descending into insets
docstring asString(bool intoInsets = true);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.x] Backport layouttrasnlation strings from master.
commit d9c6fd77ee5ce00ff8aac3f063f86928c419b1f1 Author: Pavel Sanda Date: Sun Mar 2 20:52:27 2025 +0100 Backport layouttrasnlation strings from master. po/fi.po | 1361 ++ 1 file changed, 740 insertions(+), 621 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[Wiki-uploads/master] wiki - add color pref panel preview
commit c7747df261867ae42a570272de709c8d9e8e1427 Author: Pavel Sanda Date: Sun Mar 2 11:48:09 2025 +0100 wiki - add color pref panel preview --- LyX/NewInLyX25/color-pref_panel.png | Bin 0 -> 72487 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/LyX/NewInLyX25/color-pref_panel.png b/LyX/NewInLyX25/color-pref_panel.png new file mode 100644 index 000..e688ef4 Binary files /dev/null and b/LyX/NewInLyX25/color-pref_panel.png differ -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] * PrefColorsUi.ui - Modify search strings.
commit 7863183a849528b9d99e850af1f2c561de2cbbab Author: Pavel Sanda Date: Sun Mar 2 10:27:39 2025 +0100 * PrefColorsUi.ui - Modify search strings. "->" render really ugly with some fonts as hyphen is not centered. --- src/frontends/qt/ui/PrefColorsUi.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt/ui/PrefColorsUi.ui b/src/frontends/qt/ui/PrefColorsUi.ui index a15e30e371..1cfc2a9046 100644 --- a/src/frontends/qt/ui/PrefColorsUi.ui +++ b/src/frontends/qt/ui/PrefColorsUi.ui @@ -228,7 +228,7 @@ Search backward - <- + < @@ -253,7 +253,7 @@ Search forward - -> + > -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] * PrefColorsUi - uniform font size with the rest of ui.
commit 58182fb62d60c23aa6029131acc3b937cd3e8e92 Author: Pavel Sanda Date: Sun Mar 2 10:14:05 2025 +0100 * PrefColorsUi - uniform font size with the rest of ui. --- src/frontends/qt/ui/PrefColorsUi.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontends/qt/ui/PrefColorsUi.ui b/src/frontends/qt/ui/PrefColorsUi.ui index b71d58d819..a15e30e371 100644 --- a/src/frontends/qt/ui/PrefColorsUi.ui +++ b/src/frontends/qt/ui/PrefColorsUi.ui @@ -205,7 +205,7 @@ - 12 + 10 -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] With deleted tabular rows/columns, do not attempt to change just the content
commit 280985f9d71ba7f571f5f21ac37110a83a112539
Author: Juergen Spitzmueller
Date: Sun Mar 2 10:44:04 2025 +0100
With deleted tabular rows/columns, do not attempt to change just the content
---
src/insets/InsetTabular.cpp | 28
1 file changed, 28 insertions(+)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 6d1556caa9..b629bcb256 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -6100,6 +6100,34 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest
& cmd)
cur.forceBufferUpdate();
}
break;
+ } else if (ct &&
tabular.row_info[tabular.cellRow(cur.idx())].change.deleted()) {
+ // whole row marked deleted
+ row_type r = tabular.cellRow(cur.idx());
+ if (act == LFUN_CHANGE_ACCEPT)
+ tabular.deleteRow(r, true);
+ else
+ tabular.row_info[r].change.setUnchanged();
+ tabular.updateIndexes();
+ // cursor might be invalid
+ cur.fixIfBroken();
+ // change bar might need to be redrawn
+ cur.screenUpdateFlags(Update::Force);
+ cur.forceBufferUpdate();
+ break;
+ } else if (ct &&
tabular.column_info[tabular.cellColumn(cur.idx())].change.deleted()) {
+ // whole column marked deleted
+ col_type c = tabular.cellColumn(cur.idx());
+ if (act == LFUN_CHANGE_ACCEPT)
+ tabular.deleteColumn(c, true);
+ else
+ tabular.column_info[c].change.setUnchanged();
+ tabular.updateIndexes();
+ // cursor might be invalid
+ cur.fixIfBroken();
+ // change bar might need to be redrawn
+ cur.screenUpdateFlags(Update::Force);
+ cur.forceBufferUpdate();
+ break;
} else {
cell(cur.idx())->dispatch(cur, cmd);
break;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Lock deleted table cell for editing (#12799)
commit c988183d6f5b1e1d24dda3bf0a3694fb7a65590d
Author: Juergen Spitzmueller
Date: Sun Mar 2 09:52:37 2025 +0100
Lock deleted table cell for editing (#12799)
---
src/insets/InsetTabular.cpp | 16 +++-
src/insets/InsetTabular.h | 4
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 2de2caa8ba..6d1556caa9 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4795,7 +4795,7 @@ bool Tabular::hasNewlines(idx_type cell) const
InsetTableCell::InsetTableCell(Buffer * buf)
: InsetText(buf, InsetText::PlainLayout), isFixedWidth(false),
isVarwidth(false),
isMultiColumn(false), isMultiRow(false), mr_rows(1),
isCaptionRow(false),
- contentAlign(LYX_ALIGN_CENTER)
+ contentAlign(LYX_ALIGN_CENTER), isDeleted(false)
{}
bool InsetTableCell::allowParagraphCustomization(idx_type) const
@@ -4819,9 +4819,23 @@ ColorCode InsetTableCell::backgroundColor(PainterInfo
const & pi) const
}
+void InsetTableCell::setChange(Change const & change)
+{
+ // Mark cell deleted
+ isDeleted = change.deleted();
+
+ InsetText::setChange(change);
+}
+
+
bool InsetTableCell::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & status) const
{
+ if (isDeleted) {
+ status.message(from_utf8(N_("This portion of the document is
deleted.")));
+ status.setEnabled(false);
+ return true;
+ }
bool enabled = true;
switch (cmd.action()) {
case LFUN_INSET_SPLIT:
diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index a24d10a845..5687e61acf 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -107,6 +107,8 @@ public:
bool canPaintChange(BufferView const &) const override { return false; }
/// This assures we never output \maketitle in table cells
bool isInTitle() const override { return true; }
+ ///
+ void setChange(Change const & change) override;
private:
///
InsetTableCell() = delete;
@@ -154,6 +156,8 @@ private:
LyXAlignment contentAlign;
///
std::string background_color;
+ ///
+ bool isDeleted;
/// should paragraph indentation be omitted in any case?
bool neverIndent() const override { return true; }
///
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Attempt at fixing qt6.
commit 1e014046301c766b19e331d16a6e970bd48e7173 Author: Pavel Sanda Date: Sun Mar 2 09:43:59 2025 +0100 Attempt at fixing qt6. Amend e75411d395e8. --- src/frontends/qt/ui/PrefColorsUi.ui | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt/ui/PrefColorsUi.ui b/src/frontends/qt/ui/PrefColorsUi.ui index da2414ca99..b71d58d819 100644 --- a/src/frontends/qt/ui/PrefColorsUi.ui +++ b/src/frontends/qt/ui/PrefColorsUi.ui @@ -78,7 +78,7 @@ <= - + @@ -97,7 +97,7 @@ => - + @@ -231,7 +231,7 @@ <- - + @@ -256,7 +256,7 @@ -> - + -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Strike through deleted tabular cells
commit c021e4803a75875af417b3dfc68021a666cd744b
Author: Juergen Spitzmueller
Date: Sun Mar 2 08:48:09 2025 +0100
Strike through deleted tabular cells
---
src/insets/InsetTabular.cpp | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 413cecc812..2de2caa8ba 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4911,15 +4911,17 @@ void InsetTableCell::metrics(MetricsInfo & mi,
Dimension & dim) const
void InsetTableCell::draw(PainterInfo & pi, int x, int y) const
{
- if (background_color == "none" ||
!lcolor.isKnownLyXName(background_color))
+ // We have a specific draw method for the case when we
+ // need to draw on the whole cell rectangle
+ // (= colored cells or deleted cells)
+ // In the other cases we use InsetText::draw()
+ if ((background_color == "none" ||
!lcolor.isKnownLyXName(background_color))
+ && !pi.change.deleted())
return InsetText::draw(pi, x, y);
- // special case for colored cells, where we need to fill out
- // the whole space
TextMetrics & tm = pi.base.bv->textMetrics(&text());
-
// FIXME: This calculation is ugly, but we do not seem to
- // have the proper cell dimensions avaliable here.
+ // have the proper cell dimensions available here.
int const w = width;
int const h = mr_rows * (tm.height() + 2 * topOffset(pi.base.bv) +
bottomOffset(pi.base.bv) + Painter::thin_line);
int const yframe = y - mr_rows * (tm.ascent()) - mr_rows *
(Painter::thin_line) - topOffset(pi.base.bv);
@@ -4937,10 +4939,9 @@ void InsetTableCell::draw(PainterInfo & pi, int x, int
y) const
tm.draw(pi, x + leftOffset(pi.base.bv), y);
}
- if (canPaintChange(*pi.base.bv) && (!change_drawn ||
pi.change.deleted()))
- // Do not draw the change tracking cue if already done by
RowPainter and
- // do not draw the cue for INSERTED if the information is
already in the
- // color of the frame
+ // Strike through the cell if deleted and not already handled by
+ // RowPainter.
+ if (!change_drawn || pi.change.deleted())
pi.change.paintCue(pi, xframe, yframe, xframe + w, yframe + h);
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update man pages.
commit 3d47734e08aabdd7845455cd51723d6d3c8cbb97 Author: Pavel Sanda Date: Sun Mar 2 23:25:33 2025 +0100 Update man pages. --- lyx.1in | 62 -- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/lyx.1in b/lyx.1in index 89736cfd4d..ec31a208cc 100644 --- a/lyx.1in +++ b/lyx.1in @@ -118,9 +118,9 @@ by Qt itself (notably \fB-platform\fR, \fB-style\fR, \fB-geometry\fR, \fB-sessio \fB-display\fR, etc). Please consult Qt documentation for further details, e.g.: .br -https://doc.qt.io/qt-5/qapplication.html#QApplication +https://doc.qt.io/qt-6/qapplication.html#QApplication .br -https://doc.qt.io/qt-5/qguiapplication.html#supported-command-line-options +https://doc.qt.io/qt-6/qguiapplication.html#supported-command-line-options .br .SH ENVIRONMENT @@ -168,30 +168,56 @@ this environment variable, which relieves the need of using the \-f switch. Allowed values are either "\fBall\fR", "\fBmain\fR" or "\fBnone\fR", with same meaning as for the \-f switch. .SH FILES -.nf .ta \w'\fILIBDIR\fR/lyxrc.in 'u +\fILIBDIR\fR +is the system defaults directory. This was at the build time @real_pkgdatadir@. +Most settings can be modified by user by following structure from system +defaults in: ~/.lyx/ + +Most important files/directories: +.nf + ~/.lyx/preferences Personal configuration file ~/.lyx/lyxrc.defaults Personal autodetected configuration file -\fILIBDIR\fR/lyxrc.dist System wide configuration file -\fILIBDIR\fR/configure.py Updates \fBLyX\fR if config has changed -\fILIBDIR\fR/bind/ Keybindings -\fILIBDIR\fR/clipart/ Clipart pictures -\fILIBDIR\fR/doc/ Documentation in \fBLyX\fR format. -\fILIBDIR\fR/examples/ Example documents -\fILIBDIR\fR/images/Images used as icons or in popups -\fILIBDIR\fR/kbd/ Keyboard mappings -\fILIBDIR\fR/layouts/ Layout descriptions -\fILIBDIR\fR/templates/ Templates for documents -\fILIBDIR\fR/tex/ Extra TeX files +~/.lyx/*.dict User-saved words from continuous spell-check +~/.lyx/session Automatically generated session settings +~/.lyx/cache/ Document images converted for preview in editing window + + +\fILIBDIR\fR/bind/Keybindings +\fILIBDIR\fR/citeengines/ Definitions for various citation tools +\fILIBDIR\fR/doc/ Documentation in \fBLyX\fR format +\fILIBDIR\fR/examples/Example documents +\fILIBDIR\fR/images/ Images used as icons or in popups +\fILIBDIR\fR/kbd/ Keyboard mappings +\fILIBDIR\fR/layouts/ Layout descriptions +\fILIBDIR\fR/lyx2lyx/ Scripts for converting between major versions of .lyx files +\fILIBDIR\fR/scripts/ Conversion scripts used in background +\fILIBDIR\fR/templates/ Templates for documents +\fILIBDIR\fR/ui/ Menus, context menus +\fILIBDIR\fR/xtemplates/ Templates for conversion from external tools + +\fILIBDIR\fR/configure.py Updates \fBLyX\fR if systen configuration has changed +\fILIBDIR\fR/autocorrectDatabase for autocorrection substitutions +\fILIBDIR\fR/languages Supported languages and associated definitions +\fILIBDIR\fR/latexfonts Internally supported fonts for typesetting +\fILIBDIR\fR/layouttranslations Translations missing in LaTeX for typesetting +\fILIBDIR\fR/symbolsSymbols supported by mathed, xHTML/DocBook +\fILIBDIR\fR/unicodesymbols Unicode -> LaTeX commands database + +\fILIBDIR\fR/RELEASE-NOTES Important changes for major \fBLyX\fR release + + .sp .fi -.I LIBDIR -is the system directory. This was at build time @real_pkgdatadir@. .SH SEE ALSO tex2lyx@version_suffix@(1), latex(1). -Full documentation in either native \fBLyX\fR or postscript format. +Full documentation is in LyX manuals in either native \fBLyX\fR +format or can be exported to PDF. Some versions can also be directly +downloaded from https://wiki.lyx.org/LyX/Manuals. + .SH BUGS/LIMITATIONS There are still some bugs in \fBLyX\fR. To report one, read if possible the Introduction found under the Help menu in LyX. You'll @@ -205,4 +231,4 @@ Don't forget to mention which version you are having problems with! files. Consult the \fBtex2lyx@version_suffix@\fR documentation. .SH AUTHORS -LyX is Copyright (C) 1995 by Matthias Ettrich, 1995-2023 LyX Team +LyX is Copyright (C) 1995 by Matthias Ettrich, 1995-2025 LyX Team -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] * README.localization
commit 34cde56fe0ca9ed0650e368d67c2160ac7ee4f8c
Author: Pavel Sanda
Date: Sun Mar 2 21:25:31 2025 +0100
* README.localization
---
README.localization | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/README.localization b/README.localization
index 73cfd5339f..0528db4885 100644
--- a/README.localization
+++ b/README.localization
@@ -1,6 +1,6 @@
Localization/Translation FAQ
-(2007-2018)
+(2007-2025)
by Ran Rutenberg, Pavel Sanda, Michael Gerz
@@ -54,6 +54,15 @@ can get an idea of what to do. If you are using a
specialized po editor
then you will see in it the untranslated strings and a place to write your
translation for them.
+There are large chunks of strings which actually do not need to be translated,
+typically coming from layouts of specific journals, e.g. specific strings from
+lib/layouts/AEA.layout presenting the style of American Economic Association
+are unlikely to be ever written in localized form. Or vast set of very
+specific colors probaly does not need translations either...
+In such case you can just "translate" the string by repeating the english
+original as translated string so stats of your language show real number of
+reviewed strings.
+
4) WHAT SHOULD I DO WITH THE '&', '|', '$, '%' {} AND [[]] CHARACTERS?
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
