[LyX/master] Update tex2lyx tests

2023-02-04 Thread Juergen Spitzmueller 
commit 97a5433bed9032bb7e3bf20a1e8f564ca61f0ca9
Author: Juergen Spitzmueller 
Date:   Sat Feb 4 17:48:57 2023 +0100

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 5ebc1bf..884553b 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 614
+\lyxformat 615
 \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 4c64650..eac7f50 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 614
+\lyxformat 615
 \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 447fb66..12be303 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 614
+\lyxformat 615
 \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 3de2e28..3ad3bfd 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 614
+\lyxformat 615
 \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 4d88b39..47ba3a9 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 614
+\lyxformat 615
 \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 0f98d8e..c1fb6f2 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 614
+\lyxformat 615
 \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 37f7447..b3fafa0 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 614
+\lyxformat 615
 \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 9caaa57..9e0d06e 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 614
+\lyxformat 615
 \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 27869ea..c36e285 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 614
+\lyxformat 615
 \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 d9bf322..d592af3 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 614
+\lyxformat 615
 \begin_document
 \begin_header
 \save_transient_properties true
d

[LyX/master] Properly fix acknowledgment issue part 1/2

2023-02-04 Thread Juergen Spitzmueller 
commit ac6314b83491a5645786353cc7fad3efb6ed825d
Author: Juergen Spitzmueller 
Date:   Sat Feb 4 17:47:52 2023 +0100

Properly fix acknowledgment issue part 1/2

Bump file format and convert/revert styles to unique spelling
---
 lib/layouts/aa.layout   |9 +---
 lib/layouts/aapaper.inc |9 +---
 lib/layouts/aapaper.layout  |2 +-
 lib/layouts/aastex.layout   |9 +---
 lib/layouts/aastex62.layout |2 +-
 lib/layouts/achemso.layout  |   12 ++---
 lib/layouts/acmart.layout   |8 +--
 lib/layouts/acmsiggraph-0-92.layout |8 +--
 lib/layouts/acmsiggraph.layout  |8 +--
 lib/layouts/agutex.layout   |9 +---
 lib/layouts/apa.layout  |   13 +
 lib/layouts/copernicus.layout   |8 +--
 lib/layouts/egs.layout  |   18 ++-
 lib/layouts/elsart.layout   |7 +--
 lib/layouts/iopart.layout   |8 +--
 lib/layouts/isprs.layout|7 +--
 lib/layouts/iucr.layout |8 +--
 lib/layouts/jasatex.layout  |8 +--
 lib/layouts/kluwer.layout   |9 +---
 lib/layouts/maa-monthly.layout  |   10 +---
 lib/layouts/revtex4-x.inc   |8 +--
 lib/layouts/revtex4.layout  |8 +--
 lib/layouts/sigplanconf.layout  |7 +--
 lib/layouts/spie.layout |7 +--
 lib/layouts/svcommon.inc|   16 ++
 lib/layouts/svglobal.layout |3 +-
 lib/layouts/svglobal3.layout|3 +-
 lib/layouts/svjog.layout|3 +-
 lib/layouts/svmono.layout   |2 +-
 lib/layouts/svmult.layout   |5 +-
 lib/layouts/svprobth.layout |2 +-
 lib/lyx2lyx/lyx_2_4.py  |   96 +-
 src/version.h   |4 +-
 33 files changed, 157 insertions(+), 179 deletions(-)

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 9c26978..2745515 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -166,7 +166,7 @@ Style Mail
 End
 
 
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Margin  First_Dynamic
LatexType   Environment
LatexName   acknowledgements
@@ -178,7 +178,7 @@ Style Acknowledgments[[credits]]
ParSep  0
Align   Block
LabelType   Static
-   LabelString "Acknowledgements[[credits]]."
+   LabelString "Acknowledgments."
LabelSepM
Font
  Size  Small
@@ -193,11 +193,6 @@ Style Acknowledgments[[credits]]
 End
 
 
-Style Acknowledgement
-   ObsoletedByAcknowledgments[[credits]]
-End
-
-
 Style Section
Font
  FamilySans
diff --git a/lib/layouts/aapaper.inc b/lib/layouts/aapaper.inc
index fba2a3d..07c9098 100644
--- a/lib/layouts/aapaper.inc
+++ b/lib/layouts/aapaper.inc
@@ -79,7 +79,7 @@ Style Offprint
 End
 
 
-Style Acknowledgments[[credits]]
+Style Acknowledgments
MarginStatic
LatexType Environment
LatexName acknowledgements
@@ -90,7 +90,7 @@ Style Acknowledgments[[credits]]
ParSep0
Align Block
LabelType Above
-   LabelString   "Acknowledgments[[credits]]"
+   LabelString   "Acknowledgments"
LabelSep  M
Font
  SizeSmall
@@ -104,11 +104,6 @@ Style Acknowledgments[[credits]]
 End
 
 
-Style Acknowledgement
-   ObsoletedByAcknowledgments[[credits]]
-End
-
-
 Style Thesaurus
LabelType Static
LatexType Command
diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout
index 125bde9..b6e654a 100644
--- a/lib/layouts/aapaper.layout
+++ b/lib/layouts/aapaper.layout
@@ -102,7 +102,7 @@ End
 Style Abstract
 End
 
-Style Acknowledgments[[credits]]
+Style Acknowledgments
 End
 
 Style Bibliography
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 4bf1d25..11210e9 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -351,7 +351,7 @@ Style Keywords
 End
 
 
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CategoryBackMatter
Margin  Dynamic
LatexType   Command
@@ -362,7 +362,7 @@ Style Acknowledgments[[credits]]
BottomSep   0.8
Align   Left
LabelType   Static
-   LabelString "[Acknowledgments][[credits]]"
+   LabelString "[Acknowledgments]"
KeepEmpty   1
Font
  FamilyRoman
@@ -374,11 +374,6 @@ Style Acknowledgments[[credits]]
 End
 
 
-Style Acknowledgement
-   ObsoletedByAcknowledgments[[credits]]
-End
-
-
 Style PlaceFigure
Margin  Dynamic
LatexType   Command
diff --git a/lib/layouts/aastex62.layout b/lib/layouts/aastex62