[LyX/master] Fix bug #11497

[Richard Kimberly Heck]

commit fdcb160ed85bedf66b03072115b699fac673904a
Author: Daniel Ramoeller 
Date:   Wed Sep 6 22:52:42 2023 -0400

Fix bug #11497
---
 src/frontends/qt/GuiLabel.cpp |   16 ++--
 src/frontends/qt/GuiLabel.h   |2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt/GuiLabel.cpp b/src/frontends/qt/GuiLabel.cpp
index 78d1e3f..ab902b1 100644
--- a/src/frontends/qt/GuiLabel.cpp
+++ b/src/frontends/qt/GuiLabel.cpp
@@ -46,7 +46,7 @@ void GuiLabel::paramsToDialog(Inset const * inset)
 {
InsetLabel const * label = static_cast(inset);
InsetCommandParams const & params = label->params();
-   keywordED->setText(toqstr(params["name"]));
+   setKeyword(toqstr(params["name"]));
 }
 
 
@@ -63,7 +63,7 @@ bool GuiLabel::initialiseParams(std::string const & sdata)
InsetCommandParams p(insetCode());
if (!InsetCommand::string2params(sdata, p))
return false;
-   keywordED->setText(toqstr(p["name"]));
+   setKeyword(toqstr(p["name"]));
return true;
 }
 
@@ -76,6 +76,18 @@ bool GuiLabel::checkWidgets(bool readonly) const
return !keywordED->text().isEmpty();
 }
 
+
+void GuiLabel::setKeyword(QString const & keyword)
+{
+   keywordED->setText(keyword);
+   // select without prefix
+   int const colonPos = keyword.indexOf(':');
+   if (colonPos == -1)
+   keywordED->selectAll();
+   else
+   keywordED->setSelection(colonPos + 1, keyword.length() - 
colonPos + 1);
+}
+
 } // namespace frontend
 } // namespace lyx
 
diff --git a/src/frontends/qt/GuiLabel.h b/src/frontends/qt/GuiLabel.h
index 7eb6fd4..0997a23 100644
--- a/src/frontends/qt/GuiLabel.h
+++ b/src/frontends/qt/GuiLabel.h
@@ -37,6 +37,8 @@ private:
docstring dialogToParams() const override;
bool checkWidgets(bool readonly) const override;
bool initialiseParams(std::string const &) override;
+   ///
+   void setKeyword(QString const & keyword);
//@}
 };
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Fix lyx2lyx issue reported on ML

[Scott Kostyshak]

commit 77fc67d3f01576070bb51cedc4d578c0457f5bce
Author: Scott Kostyshak 
Date:   Wed Sep 6 13:05:07 2023 -0400

Fix lyx2lyx issue reported on ML

The issue was reported on lyx-users by Chris Menzel [1].

Patch is from José Matos [2].

[1] 
https://www.mail-archive.com/search?l=mid=BD744D7E-54B4-4E95-A4E3-6B28F4987DE1%40gmail.com
[2] 
https://www.mail-archive.com/search?l=mid=c2ac54c2322d24051f171558ad8487ea4f7078ed.camel%40gmail.com
---
 lib/lyx2lyx/parser_tools.py |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index cc22236..96abb1c 100644
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -689,7 +689,8 @@ def count_pars_in_inset(lines, i):
   pars = 0
   for j in range(ins[1], ins[2]):
   m = re.match(r'\\begin_layout (.*)', lines[j])
-  if m and get_containing_inset(lines, j)[1] == ins[1]:
+  found_inset = get_containing_inset(lines, j)
+  if m and found_inset and found_inset[1] == ins[1]:
   pars += 1
 
   return pars
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Update tex2lyx tests

[Juergen Spitzmueller]

commit 5840806a4cb3c75b8f4e2173e5a0aba36f7ef8e5
Author: Juergen Spitzmueller 
Date:   Wed Sep 6 08:42:22 2023 +0200

Update tex2lyx tests
---
 src/tex2lyx/test/CJK.lyx.lyx   |2 +-
 src/tex2lyx/test/CJKutf8.lyx.lyx   |2 +-
 src/tex2lyx/test/DummyDocument.lyx.lyx |2 +-
 src/tex2lyx/test/Dummy~Document.lyx.lyx|2 +-
 src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |2 +-
 src/tex2lyx/test/algo2e.lyx.lyx|2 +-
 src/tex2lyx/test/beamer.lyx.lyx|2 +-
 .../test/box-color-size-space-align.lyx.lyx|2 +-
 src/tex2lyx/test/listpreamble.lyx.lyx  |2 +-
 src/tex2lyx/test/tabular-x-test.lyx.lyx|2 +-
 src/tex2lyx/test/test-insets-basic.lyx.lyx |2 +-
 src/tex2lyx/test/test-insets.lyx.lyx   |2 +-
 src/tex2lyx/test/test-memoir.lyx.lyx   |2 +-
 src/tex2lyx/test/test-minted.lyx.lyx   |2 +-
 src/tex2lyx/test/test-modules.lyx.lyx  |2 +-
 src/tex2lyx/test/test-refstyle-theorems.lyx.lyx|2 +-
 src/tex2lyx/test/test-scr.lyx.lyx  |2 +-
 src/tex2lyx/test/test-structure.lyx.lyx|2 +-
 src/tex2lyx/test/test.lyx.lyx  |2 +-
 src/tex2lyx/test/verbatim.lyx.lyx  |2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 26787e2..1d617c3 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 0430b74..8d9638c 100644
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx 
b/src/tex2lyx/test/DummyDocument.lyx.lyx
index eba602a..e590d6b 100644
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx 
b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index 1ef361c..7608c1c 100644
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx 
b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index 7f61c1c..ff52dfe 100644
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index 8b3dd17..09e4399 100644
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx
index b603a1a..74df814 100644
--- a/src/tex2lyx/test/beamer.lyx.lyx
+++ b/src/tex2lyx/test/beamer.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx 
b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index 03be597..1a81fa7 100644
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/listpreamble.lyx.lyx 
b/src/tex2lyx/test/listpreamble.lyx.lyx
index 88ebbae..a685736 100644
--- a/src/tex2lyx/test/listpreamble.lyx.lyx
+++ b/src/tex2lyx/test/listpreamble.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true
diff --git a/src/tex2lyx/test/tabular-x-test.lyx.lyx 
b/src/tex2lyx/test/tabular-x-test.lyx.lyx
index 69dc6e1..601ca28 100644
--- a/src/tex2lyx/test/tabular-x-test.lyx.lyx
+++ b/src/tex2lyx/test/tabular-x-test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 618
+\lyxformat 619
 \begin_document
 \begin_header
 \save_transient_properties true

[LyX/master] Add forgotten file formatted change (from 2ad57dcb6b9b5)

[Juergen Spitzmueller]

commit 87620d73491fc688b4101cd55d8ba15e694dec80
Author: Juergen Spitzmueller 
Date:   Wed Sep 6 08:37:43 2023 +0200

Add forgotten file formatted change (from 2ad57dcb6b9b5)

This means that lyx2lyx reversion in beta5 is essentially broken
as it ends in a document containing an unknown header
---
 development/FORMAT |4 
 src/version.h  |4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/development/FORMAT b/development/FORMAT
index 2687c18..1711f88 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -7,6 +7,10 @@ changes happened in particular if possible. A good example 
would be
 
 ---
 
+2023-09-06 Richard Kimberly Heck 
+   * Format incremented to 619: New document header \use_formatted_ref
+ for workarea display purposes only.
+
 2023-08-01 Udi Fogiel 
* Format incremented to 618: Hebrew quote style
  New buffer param \quotes_style hebrew
diff --git a/src/version.h b/src/version.h
index ab05f89..adbd763 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 618 // Udi_Fogiel: hebrew quote style 
-#define LYX_FORMAT_TEX2LYX 618
+#define LYX_FORMAT_LYX 619 // rikiheck: formatted ref
+#define LYX_FORMAT_TEX2LYX 619
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs