[LyX/master] harmonize indendation
commit 083e9b44a03b3ee55c70940b93c86ad8d9338d8d
Author: Juergen Spitzmueller
Date: Sat Aug 17 13:22:42 2024 +0200
harmonize indendation
---
lib/layouts/stdinsets.inc | 393 +++---
1 file changed, 199 insertions(+), 194 deletions(-)
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index ea2a3cc50e..000a0d696a 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -30,18 +30,18 @@ InsetLayout Marginal
MultiPar true
NeedProtect true
HTMLStyle
- div.marginal {
- border: 2px solid black;
- padding: 1ex;
- margin: 1ex;
- background-color: #F0F0F0;
- float:right;
- font-size: small;
- font-weight: normal;
- font-family: serif;
- font-variant: normal;
- font-style: normal;
- }
+ div.marginal {
+ border: 2px solid black;
+ padding: 1ex;
+ margin: 1ex;
+ background-color: #F0F0F0;
+ float:right;
+ font-size: small;
+ font-weight: normal;
+ font-family: serif;
+ font-variant: normal;
+ font-style: normal;
+ }
EndHTMLStyle
AddToToc marginalnote
IsTocCaption true
@@ -66,27 +66,27 @@ InsetLayout Foot
HTMLLabel \arabic{footnote}
HTMLInnerTag div
HTMLStyle
- span.foot_label {
- vertical-align: super;
- font-size: smaller;
- font-weight: bold;
- text-decoration: underline;
- }
- div.foot {
- display: inline;
- font-size: small;
- font-weight: normal;
- font-family: serif;
- font-variant: normal;
- font-style: normal;
- }
- div.foot_inner { display: none; }
- div.foot:hover div.foot_inner {
- display: block;
- border: 1px double black;
- margin: 0em 1em;
- padding: 1em;
- }
+ span.foot_label {
+ vertical-align: super;
+ font-size: smaller;
+ font-weight: bold;
+ text-decoration: underline;
+ }
+ div.foot {
+ display: inline;
+ font-size: small;
+ font-weight: normal;
+ font-family: serif;
+ font-variant: normal;
+ font-style: normal;
+ }
+ div.foot_inner { display: none; }
+ div.foot:hover div.foot_inner {
+ display: block;
+ border: 1px double black;
+ margin: 0em 1em;
+ padding: 1em;
+ }
EndHTMLStyle
AddToToc footnote
IsTocCaption true
@@ -103,27 +103,27 @@ InsetLayout Foot:InTitle
HTMLLabel \fnsymbol{thanks}
HTMLInnerTag span
HTMLStyle
- span.foot_intitle_label {
- vertical-align: super;
- font-size: smaller;
- font-weight: bold;
- text-decoration: underline;
- }
- span.foot_intitle {
- display: inline;
- font-size: small;
- font-weight: normal;
- font-family: serif;
- font-variant: normal;
- font-style: normal;
- }
- span.foot_intitle_inner { display: none; }
- span.foot_intitle:hover span.foot_intitle_inner {
- display: block;
- border: 1px double black;
- margin: 0em 1em;
- padding: 1em;
- }
+ span.foot_intitle_label {
+ vertical-align: super;
+ font-size: smaller;
+ font-weight: bold;
+ text-decoration: underline;
+ }
+ span.foot_intitle {
+ display: inline;
+ font-size: small;
+ font-weight: normal;
+ font-family: serif;
+ font-variant: normal;
+ font-style: normal;
+ }
+ span.foot_intitle_inner { display: none; }
+ span.foot_intitle:hover span.foot_intitle_inner {
+ display: block;
+ border: 1px double black;
+ margin: 0em 1em;
+ padding: 1em;
+ }
EndHTMLStyle
End
@@ -150,9 +150,9 @@ InsetLayout Note:Comment
HTMLTag div
HTMLIsB
[LyX/master] fix lyx2lyx functions
commit 01f5efbe13052ac5d0f082a77d888f20b0fdc39e Author: Juergen Spitzmueller Date: Sat Aug 17 16:19:10 2024 +0200 fix lyx2lyx functions --- lib/lyx2lyx/lyx_2_5.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_5.py b/lib/lyx2lyx/lyx_2_5.py index 193455227e..c93a3bfc21 100644 --- a/lib/lyx2lyx/lyx_2_5.py +++ b/lib/lyx2lyx/lyx_2_5.py @@ -653,7 +653,8 @@ def convert_index_sc(document): k = find_substring(document.body, ec, k, j) if k == -1: break -if get_containing_inset(document.body, k)[0] == "ERT": +inInset = get_containing_inset(document.body, k) +if inInset and inInset[0] == "ERT": k += 1 continue @@ -696,7 +697,8 @@ def revert_index_sc(document): k = find_substring(document.body, ec, k, j) if k == -1: break -if get_containing_inset(document.body, k)[0] == "ERT": +inInset = get_containing_inset(document.body, k) +if inInset and inInset[0] == "ERT": k += 1 continue -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] remove useless warning
commit 5b5127891d5faf4d2fb6892084973546b73f41e7
Author: Juergen Spitzmueller
Date: Sat Aug 17 16:15:11 2024 +0200
remove useless warning
---
lib/lyx2lyx/lyx_2_1.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 3155cc2489..e17d784b99 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -558,7 +558,6 @@ def revert_biblio_style(document):
"BibTeX insets with default option use the style defined by
\\biblio_style."
i = find_token(document.header, "\\biblio_style", 0)
if i == -1:
-document.warning("No \\biblio_style line. Nothing to do.")
return
default_style = get_value(document.header, "\\biblio_style", i)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] another lyx2lyx fix for index
commit ccdf8ba7019cae64b4daab101f1825f14b88773b Author: Juergen Spitzmueller Date: Sat Aug 17 16:55:23 2024 +0200 another lyx2lyx fix for index --- lib/lyx2lyx/lyx_2_5.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_5.py b/lib/lyx2lyx/lyx_2_5.py index c93a3bfc21..e3de465948 100644 --- a/lib/lyx2lyx/lyx_2_5.py +++ b/lib/lyx2lyx/lyx_2_5.py @@ -661,8 +661,6 @@ def convert_index_sc(document): line = document.body[k] chunks = line.split(ec) repl = [] -if line[0] == ec: -repl = put_cmd_in_ert(ec) chunks_len = len(chunks)-1 for ch in chunks[:-1]: repl += [ch] -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.x] Add temporary directory to About LyX dialog
commit 3f7569edcd7680af8289ae148c35c5e6b65317e2 Author: Richard Kimberly Heck Date: Tue Jun 25 11:32:26 2024 -0400 Add temporary directory to About LyX dialog (cherry picked from commit e7af6afb01183e2fdf798dd401499839ba0a195a) --- src/frontends/qt/GuiAbout.cpp | 14 src/frontends/qt/GuiAbout.h| 1 + src/frontends/qt/ui/AboutUi.ui | 79 +- status.24x | 2 ++ 4 files changed, 80 insertions(+), 16 deletions(-) diff --git a/src/frontends/qt/GuiAbout.cpp b/src/frontends/qt/GuiAbout.cpp index 0a585f0eac..db7edae3dc 100644 --- a/src/frontends/qt/GuiAbout.cpp +++ b/src/frontends/qt/GuiAbout.cpp @@ -244,6 +244,12 @@ static QString dirUser() } +static QString dirTemp() +{ + return toqstr(makeDisplayPath(package().temp_dir().absFileName())); +} + + static QString version(bool const plain = false) { QString loc_release_date; @@ -321,6 +327,12 @@ void GuiAbout::on_showDirUserPB_clicked() } +void GuiAbout::on_showDirTempPB_clicked() +{ + showDirectory(package().temp_dir()); +} + + void GuiAbout::on_versionCopyPB_clicked() { qApp->clipboard()->setText(version(true)); @@ -350,6 +362,8 @@ GuiAbout::GuiAbout(GuiView & lv) d->ui.iconSW->setFixedSize(iconsize, iconsize); d->ui.dirLibraryLA->setText(dirLibrary()); d->ui.dirLibraryLA->adjustSize(); + d->ui.dirTempLA->setText(dirTemp()); + d->ui.dirTempLA->adjustSize(); d->ui.dirUserLA->setText(dirUser()); d->ui.dirUserLA->adjustSize(); d->ui.buildinfoTB->setText(buildinfo()); diff --git a/src/frontends/qt/GuiAbout.h b/src/frontends/qt/GuiAbout.h index c9b2443689..3ca191d3c7 100644 --- a/src/frontends/qt/GuiAbout.h +++ b/src/frontends/qt/GuiAbout.h @@ -30,6 +30,7 @@ private Q_SLOTS: void on_buttonBox_rejected(); void on_showDirLibraryPB_clicked(); void on_showDirUserPB_clicked(); + void on_showDirTempPB_clicked(); void on_versionCopyPB_clicked(); private: diff --git a/src/frontends/qt/ui/AboutUi.ui b/src/frontends/qt/ui/AboutUi.ui index 4a6adac566..5a03c23180 100644 --- a/src/frontends/qt/ui/AboutUi.ui +++ b/src/frontends/qt/ui/AboutUi.ui @@ -7,7 +7,7 @@ 0 0 552 -470 +504 @@ -30,7 +30,7 @@ - QLayout::SetFixedSize + QLayout::SizeConstraint::SetFixedSize @@ -45,7 +45,7 @@ -Qt::Vertical +Qt::Orientation::Vertical @@ -60,10 +60,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -78,10 +78,10 @@ -Qt::Vertical +Qt::Orientation::Vertical -QSizePolicy::Fixed +QSizePolicy::Policy::Fixed @@ -106,7 +106,7 @@LyX version info goes here.
Qt version (run-time) goes here.
Qt version (compile-time) goes here.
-Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter true @@ -115,17 +115,17 @@ 0 -Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse -Qt::Vertical +Qt::Orientation::Vertical -QSizePolicy::MinimumExpanding +QSizePolicy::Policy::MinimumExpanding @@ -172,13 +172,13 @@ System directory goes here. - Qt::PlainText + Qt::TextFormat::PlainText false - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse @@ -200,13 +200,13 @@ User directory goes here. - Qt::PlainText + Qt::TextFormat::PlainText false - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::TextInteractionFlag::LinksAccessibleByMouse
[LyX/2.4.x] Remerge strings.
commit a9bc7a575264610ac7e68d16b4e21d5b66301765 Author: Richard Kimberly Heck Date: Sat Aug 17 19:38:54 2024 -0400 Remerge strings. po/ar.gmo| Bin 425321 -> 425030 bytes po/ar.po | 911 --- po/bg.gmo| Bin 513961 -> 513473 bytes po/bg.po | 932 --- po/cs.gmo| Bin 629339 -> 628996 bytes po/cs.po | 468 po/de.po | 198 ++-- po/en.po | 861 +++--- po/es.gmo| Bin 431495 -> 431159 bytes po/es.po | 928 --- po/eu.gmo| Bin 482108 -> 481724 bytes po/eu.po | 932 +++ po/fi.gmo| Bin 290282 -> 289986 bytes po/fi.po | 902 +++--- po/fr.gmo| Bin 657276 -> 658409 bytes po/fr.po | 358 +++--- po/he.gmo| Bin 536000 -> 535442 bytes po/he.po | 926 --- po/hu.gmo| Bin 292537 -> 292441 bytes po/hu.po | 904 +++--- po/ia.gmo| Bin 552920 -> 552479 bytes po/ia.po | 928 --- po/id.gmo| Bin 557971 -> 557559 bytes po/id.po | 931 +++ po/it.gmo| Bin 641565 -> 641155 bytes po/it.po | 929 +++ po/ja.gmo| Bin 681160 -> 680594 bytes po/ja.po | 1138 +- po/nb.gmo| Bin 396492 -> 396341 bytes po/nb.po | 910 --- po/nl.gmo| Bin 631132 -> 630731 bytes po/nl.po | 928 --- po/nn.gmo| Bin 315115 -> 315056 bytes po/nn.po | 908 +++--- po/pl.gmo| Bin 314518 -> 318024 bytes po/pl.po | 3600 +--- po/pt_BR.gmo | Bin 648818 -> 648377 bytes po/pt_BR.po | 926 --- po/pt_PT.gmo | Bin 386434 -> 386335 bytes po/pt_PT.po | 905 +++--- po/ru.gmo| Bin 795923 -> 795385 bytes po/ru.po | 918 --- po/sk.gmo| Bin 638712 -> 638582 bytes po/sk.po | 847 +++--- po/sv.gmo| Bin 480452 -> 480039 bytes po/sv.po | 928 --- po/uk.gmo| Bin 819739 -> 819174 bytes po/uk.po | 971 +++ po/zh_CN.gmo | Bin 568118 -> 566088 bytes po/zh_CN.po | 3700 ++ po/zh_TW.gmo | Bin 367692 -> 367554 bytes po/zh_TW.po | 905 +++--- 52 files changed, 14654 insertions(+), 14038 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
