[LyX/master] Properly fix acknowledgment issue part 1/2
Juergen Spitzmueller
spitz at lyx.org
Sat Feb 4 15:48:57 UTC 2023
commit ac6314b83491a5645786353cc7fad3efb6ed825d
Author: Juergen Spitzmueller <spitz at lyx.org>
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."
LabelSep M
Font
Size Small
@@ -193,11 +193,6 @@ Style Acknowledgments[[credits]]
End
-Style Acknowledgement
- ObsoletedBy Acknowledgments[[credits]]
-End
-
-
Style Section
Font
Family Sans
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
Margin Static
LatexType Environment
LatexName acknowledgements
@@ -90,7 +90,7 @@ Style Acknowledgments[[credits]]
ParSep 0
Align Block
LabelType Above
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
LabelSep M
Font
Size Small
@@ -104,11 +104,6 @@ Style Acknowledgments[[credits]]
End
-Style Acknowledgement
- ObsoletedBy Acknowledgments[[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
Category BackMatter
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
Family Roman
@@ -374,11 +374,6 @@ Style Acknowledgments[[credits]]
End
-Style Acknowledgement
- ObsoletedBy Acknowledgments[[credits]]
-End
-
-
Style PlaceFigure
Margin Dynamic
LatexType Command
diff --git a/lib/layouts/aastex62.layout b/lib/layouts/aastex62.layout
index cc923a4..cf92d63 100644
--- a/lib/layouts/aastex62.layout
+++ b/lib/layouts/aastex62.layout
@@ -222,7 +222,7 @@ Style Altaffilation
Align Center
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Font
Shape Up
EndFont
diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index 049946d..e7b0f41 100644
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -280,14 +280,14 @@ End
# insert Abtract and Bibliography style
Input stdstruct.inc
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Abstract
LatexName acknowledgement
Category BackMatter
InTitle 0
BottomSep 0.7
LabelType Above
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
Font
Size Normal
EndFont
@@ -299,12 +299,8 @@ Style Acknowledgments[[credits]]
DocBookWrapperTag acknowledgements
End
-Style Acknowledgement
- ObsoletedBy Acknowledgments[[credits]]
-End
-
Style SupplementalInfo
- CopyStyle Acknowledgments[[credits]]
+ CopyStyle Acknowledgments
LatexName suppinfo
LabelString "Supporting Information Available"
DocBookTag para
@@ -313,7 +309,7 @@ Style SupplementalInfo
End
Style TOC_entry
- CopyStyle Acknowledgments[[credits]]
+ CopyStyle Acknowledgments
LatexName tocentry
ParSep 0.3
LabelString "Graphical TOC Entry"
diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout
index 408f037..dfcc89b 100644
--- a/lib/layouts/acmart.layout
+++ b/lib/layouts/acmart.layout
@@ -654,11 +654,11 @@ InsetLayout Flex:Anonymous_Suppression
LabelString "Non anonymous only"
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Category BackMatter
LatexName acks
LatexType Environment
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
LabelType Above
TopSep 1.3
LabelBottomSep 0.7
@@ -672,10 +672,6 @@ Style Acknowledgments[[credits]]
DocBookSection true
End
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
-
InsetLayout Flex:Grant_Sponsor
LyxType custom
ContentAsLabel 1
diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout
index 3e8d85b..d178788 100644
--- a/lib/layouts/acmsiggraph-0-92.layout
+++ b/lib/layouts/acmsiggraph-0-92.layout
@@ -343,20 +343,16 @@ InsetLayout "Flex:Thanks"
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Abstract
LatexName acks
Category BackMatter
InTitle 0
LabelBottomsep 0
LabelType Above
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
DocBookTag para
DocBookWrapperTag acknowledgements
DocBookSection true
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout
index 4d66625..acb169f 100644
--- a/lib/layouts/acmsiggraph.layout
+++ b/lib/layouts/acmsiggraph.layout
@@ -299,20 +299,16 @@ InsetLayout "Flex:Thanks"
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Abstract
LatexName acks
Category BackMatter
InTitle 0
LabelBottomsep 0
LabelType Above
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
DocBookTag para
DocBookWrapperTag acknowledgements
DocBookSection true
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout
index 59eeb1b..7a66e31 100644
--- a/lib/layouts/agutex.layout
+++ b/lib/layouts/agutex.layout
@@ -190,7 +190,7 @@ Style Notation
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Margin Dynamic
LatexType Environment
LatexName acknowledgments
@@ -202,7 +202,7 @@ Style Acknowledgments[[credits]]
BottomSep 0.4
Align Block
LabelType Static
- LabelString "Acknowledgments[[credits]]."
+ LabelString "Acknowledgments."
Font
Size Small
EndFont
@@ -216,11 +216,6 @@ Style Acknowledgments[[credits]]
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
-
Style Bibliography
Margin First_Dynamic
LatexType Bib_Environment
diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index c96d245..553524c 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -240,7 +240,7 @@ Style Copyright
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Category BackMatter
LatexName acknowledgements
LatexType Command
@@ -253,7 +253,7 @@ Style Acknowledgments[[credits]]
Align Block
AlignPossible Block, Left, Right, Center
Labeltype Static
- LabelString "Acknowledgments[[credits]]:"
+ LabelString "Acknowledgments:"
Labelsep M
LabelFont
Series Bold
@@ -265,15 +265,6 @@ Style Acknowledgments[[credits]]
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
-
-
Style ThickLine
LatexName thickline
LatexType Command
diff --git a/lib/layouts/copernicus.layout b/lib/layouts/copernicus.layout
index bc2d7cc..3d7f052 100644
--- a/lib/layouts/copernicus.layout
+++ b/lib/layouts/copernicus.layout
@@ -421,19 +421,15 @@ Style Disclaimer
DocBookAttr role='disclaimer'
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Statements2
LatexName acknowledgements
- LabelString "Acknowledgments[[credits]]."
+ LabelString "Acknowledgments."
DocBookTag para
DocBookWrapperTag acknowledgements
DocBookSection true
End
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
-
Style Bibliography
Margin First_Dynamic
LatexType Bib_Environment
diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout
index 989d034..3876ec3 100644
--- a/lib/layouts/egs.layout
+++ b/lib/layouts/egs.layout
@@ -592,7 +592,7 @@ Style Abstract
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Category BackMatter
Margin First_Dynamic
LatexType Environment
@@ -607,7 +607,7 @@ Style Acknowledgments[[credits]]
Align Block
AlignPossible Block, Left
LabelType Static
- LabelString "Acknowledgments[[credits]]."
+ LabelString "Acknowledgments."
Font
Size Small
EndFont
@@ -617,12 +617,7 @@ Style Acknowledgments[[credits]]
EndFont
End
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
-
-
-Style Acknowledgement[[credits]]
+Style Acknowledgment
Margin First_Dynamic
LatexType Environment
LatexName acknowledgement
@@ -636,7 +631,7 @@ Style Acknowledgement[[credits]]
Align Block
AlignPossible Block, Left
LabelType Static
- LabelString "Acknowledgement[[credits]]."
+ LabelString "Acknowledgment."
Font
Size Small
EndFont
@@ -646,11 +641,6 @@ Style Acknowledgement[[credits]]
EndFont
End
-Style Acknowledgement
- ObsoletedBy Acknowledgment[[credits]]
-End
-
-
Style Bibliography
Category BackMatter
Margin First_Dynamic
diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout
index 7925543..c877e99 100644
--- a/lib/layouts/elsart.layout
+++ b/lib/layouts/elsart.layout
@@ -546,13 +546,13 @@ End
# This is not taken from the AMS defs, so as to match the output of the
# style file.
-Style Acknowledgment[[theorem]]
+Style Acknowledgment
Margin Static
LatexType environment
LatexName ack
LabelType Above
LabelBottomsep 1
- LabelString "Acknowledgment[[theorem]]"
+ LabelString "Acknowledgment"
parsep 0.3
LabelFont
Size large
@@ -562,8 +562,5 @@ Style Acknowledgment[[theorem]]
DocBookWrapperTag acknowledgements
End
-Style Acknowledgement
- ObsoletedBy Acknowledgment[[theorem]]
-End
Input theorems-refprefix.inc
diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout
index 15c9f2d..bfcd86e 100644
--- a/lib/layouts/iopart.layout
+++ b/lib/layouts/iopart.layout
@@ -293,7 +293,7 @@ Style submitto
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Margin Dynamic
LatexType Command
LatexName ack{}
@@ -307,7 +307,7 @@ Style Acknowledgments[[credits]]
BottomSep 0.4
Align Block
LabelType Static
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
Font
Series Bold
Size Normal
@@ -317,10 +317,6 @@ Style Acknowledgments[[credits]]
DocBookAttr role='acknowledgments'
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
Style "Bibliography (plain)"
Margin First_Dynamic
diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout
index 2362667..49baeb1 100644
--- a/lib/layouts/isprs.layout
+++ b/lib/layouts/isprs.layout
@@ -217,8 +217,8 @@ Style Subsubsection*
EndFont
End
-# Acknowledgement(s) style definitions
-Style Acknowledgments[[credits]]
+# Acknowledgment(s) style definitions
+Style Acknowledgments
Category BackMatter
Margin Static
LatexType Command
@@ -246,6 +246,3 @@ Style Acknowledgments[[credits]]
EndFont
End
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
diff --git a/lib/layouts/iucr.layout b/lib/layouts/iucr.layout
index ca334db..5149304 100644
--- a/lib/layouts/iucr.layout
+++ b/lib/layouts/iucr.layout
@@ -250,21 +250,17 @@ Style Synopsis
DocBookAttr role='synopsis'
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle "Short Author"
LatexName ack
InTitle 0
- LabelString "Acknowledgments[[credits]]:"
+ LabelString "Acknowledgments:"
Category BackMatter
TopSep 0.7
DocBookTag para
DocBookWrapperTag acknowledgements
End
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
-
Style References
Margin Static
Category BackMatter
diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout
index 60c43f7..ebbd849 100644
--- a/lib/layouts/jasatex.layout
+++ b/lib/layouts/jasatex.layout
@@ -281,13 +281,13 @@ Style "Preprint number"
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Abstract
LatexName acknowledgments
Category BackMatter
InTitle 0
LabelType Above
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
Font
Size Normal
EndFont
@@ -301,10 +301,6 @@ Style Acknowledgments[[credits]]
DocBookAbstract false
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
InsetLayout "Flex:Online citation"
LyxType custom
diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout
index 267fd1a..f046a15 100644
--- a/lib/layouts/kluwer.layout
+++ b/lib/layouts/kluwer.layout
@@ -338,7 +338,7 @@ Style Keywords
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Category BackMatter
Margin Static
LatexType Environment
@@ -350,7 +350,7 @@ Style Acknowledgments[[credits]]
ParSep 0
Align Block
LabelType Centered
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
LabelBottomSep 0.5
LabelFont
Series Bold
@@ -361,11 +361,6 @@ Style Acknowledgments[[credits]]
End
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
-
-
Style Appendix
Margin Static
LatexType Command
diff --git a/lib/layouts/maa-monthly.layout b/lib/layouts/maa-monthly.layout
index 930aeb4..0bb13a9 100644
--- a/lib/layouts/maa-monthly.layout
+++ b/lib/layouts/maa-monthly.layout
@@ -141,13 +141,13 @@ Style Affiliation
DocBookWrapperMergeWithPrevious true
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Category BackMatter
Argument 1
- LabelString "Title of acknowledgment[[credits]]"
+ LabelString "Title of acknowledgment"
Mandatory 1
EndArgument
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
LabelType Static
LabelSep " "
LabelFont
@@ -162,10 +162,6 @@ Style Acknowledgments[[credits]]
DocBookSection true
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
InsetLayout Flex:URL
LyxType custom
ContentAsLabel 1
diff --git a/lib/layouts/revtex4-x.inc b/lib/layouts/revtex4-x.inc
index 535a56b..5ef0e9d 100644
--- a/lib/layouts/revtex4-x.inc
+++ b/lib/layouts/revtex4-x.inc
@@ -258,13 +258,13 @@ End
########### Back matter #############
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Standard
Category BackMatter
LatexType Environment
LatexName acknowledgments
LabelType Centered
- LabelString "acknowledgments[[credits]]"
+ LabelString "acknowledgments"
LabelBottomSep 0.5
LabelFont
Series Bold
@@ -277,10 +277,6 @@ Style Acknowledgments[[credits]]
DocBookSection true
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
##### stuff specific to REVTeX 4.1
diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout
index 657d659..60a3f9b 100644
--- a/lib/layouts/revtex4.layout
+++ b/lib/layouts/revtex4.layout
@@ -278,7 +278,7 @@ Style Abstract
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
Category BackMatter
LatexType Environment
LatexName acknowledgments
@@ -288,7 +288,7 @@ Style Acknowledgments[[credits]]
Align Block
AlignPossible Block, Left, Right, Center
LabelType Centered
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
LabelBottomSep 0.5
LabelFont
Series Bold
@@ -299,10 +299,6 @@ Style Acknowledgments[[credits]]
DocBookSection true
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
-
Style PACS
Category FrontMatter
diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout
index 3fd0533..f69dfaf 100644
--- a/lib/layouts/sigplanconf.layout
+++ b/lib/layouts/sigplanconf.layout
@@ -232,20 +232,17 @@ Style Abstract
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Abstract
LatexType Command
LatexName acks
Category BackMatter
LabelBottomsep 0
LabelType Above
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
DocBookTag para
DocBookWrapperTag acknowledgements
DocBookSection true
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout
index 6e57ff2..1f2370a 100644
--- a/lib/layouts/spie.layout
+++ b/lib/layouts/spie.layout
@@ -97,17 +97,14 @@ Style Abstract
End
-Style Acknowledgments[[credits]]
+Style Acknowledgments
CopyStyle Abstract
# NextNoIndent 1
# LatexType Command
LatexName acknowledgments
- LabelString "ACKNOWLEDGMENTS[[credits]]"
+ LabelString "ACKNOWLEDGMENTS"
DocBookTag para
DocBookWrapperTag acknowledgements
DocBookSection true
End
-Style Acknowledgments
- ObsoletedBy Acknowledgments[[credits]]
-End
diff --git a/lib/layouts/svcommon.inc b/lib/layouts/svcommon.inc
index 06f41ed..d3a3ad4 100644
--- a/lib/layouts/svcommon.inc
+++ b/lib/layouts/svcommon.inc
@@ -622,7 +622,7 @@ Style Preface
DocBookSectionTag preface
End
-Style Acknowledgment[[credits]]
+Style Acknowledgment
Category BackMatter
Margin First_Dynamic
LatexType Environment
@@ -637,7 +637,7 @@ Style Acknowledgment[[credits]]
Align Block
AlignPossible Block, Left
LabelType Static
- LabelString "Acknowledgments[[credits]]"
+ LabelString "Acknowledgments"
Font
Size Small
EndFont
@@ -650,19 +650,11 @@ Style Acknowledgment[[credits]]
DocBookWrapperTag acknowledgements
End
-Style Acknowledgments[[credits]]
- CopyStyle Acknowledgment[[credits]]
+Style Acknowledgments
+ CopyStyle Acknowledgment
LatexName acknowledgements
End
-Style Acknowledgement
- ObsoletedBy Acknowledgment[[credits]]
-End
-
-Style Acknowledgements
- ObsoletedBy Acknowledgments[[credits]]
-End
-
Style Bibliography
Margin First_Dynamic
LatexType Bib_Environment
diff --git a/lib/layouts/svglobal.layout b/lib/layouts/svglobal.layout
index ac5c70e..3d3f536 100644
--- a/lib/layouts/svglobal.layout
+++ b/lib/layouts/svglobal.layout
@@ -54,8 +54,7 @@ NoStyle Sol
NoStyle Abstract*
NoStyle TOC_Title
NoStyle TOC_Author
-NoStyle Acknowledgements
-NoStyle Acknowledgments[[credits]]
+NoStyle Acknowledgments
NoStyle Keywords
diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout
index 79cf0a9..ebdbe2d 100644
--- a/lib/layouts/svglobal3.layout
+++ b/lib/layouts/svglobal3.layout
@@ -50,8 +50,7 @@ NoStyle TOC_Title
NoStyle TOC_Author
NoStyle Proof(smartQED)
-NoStyle Acknowledgement
-NoStyle Acknowledgment[[credits]]
+NoStyle Acknowledgment
NoStyle Keywords
diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout
index 48ed142..75b5702 100644
--- a/lib/layouts/svjog.layout
+++ b/lib/layouts/svjog.layout
@@ -58,8 +58,7 @@ NoStyle Sol
NoStyle Abstract*
NoStyle TOC_Title
NoStyle TOC_Author
-NoStyle Acknowledgements
-NoStyle Acknowledgments[[credits]]
+NoStyle Acknowledgments
NoStyle Keywords
diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout
index c9752fa..2348fdd 100644
--- a/lib/layouts/svmono.layout
+++ b/lib/layouts/svmono.layout
@@ -18,7 +18,7 @@ ClassOptions
FontSize 10
End
-NoStyle Acknowledgements[[credits]]
+NoStyle Acknowledgments
NoStyle Institute
Style Abstract
diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout
index 77e932b..f625eb0 100644
--- a/lib/layouts/svmult.layout
+++ b/lib/layouts/svmult.layout
@@ -19,8 +19,7 @@ ClassOptions
FontSize ""
End
-NoStyle Acknowledgements
-NoStyle Acknowledgments[[credits]]
+NoStyle Acknowledgments
# Additional headings
@@ -156,7 +155,7 @@ Style Preface
Category "For editors"
End
-Style Acknowledgment[[credits]]
+Style Acknowledgment
Category "For editors"
End
diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout
index 43192ba..b95f974 100644
--- a/lib/layouts/svprobth.layout
+++ b/lib/layouts/svprobth.layout
@@ -64,7 +64,7 @@ NoStyle Sol
NoStyle Abstract*
NoStyle TOC_Title
NoStyle TOC_Author
-NoStyle Acknowledgements[[credits]]
+NoStyle Acknowledgments
NoStyle Keywords
diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 87cbba2..d3646dc 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -4709,7 +4709,95 @@ def revert_hyper_other(document):
document.body[i:j+1] = ecmd
i += 1
-
+
+ack_layouts_new = {
+ "aa" : "Acknowledgments",
+ "aapaper" : "Acknowledgments",
+ "aastex" : "Acknowledgments",
+ "aastex62" : "Acknowledgments",
+ "achemso" : "Acknowledgments",
+ "acmart" : "Acknowledgments",
+ "apa" : "Acknowledgments",
+ "copernicus" : "Acknowledgments",
+ "egs" : "Acknowledgments",# + Acknowledgment
+ "elsart" : "Acknowledgment",
+ "isprs" : "Acknowledgments",
+ "iucr" : "Acknowledgments",
+ "kluwer" : "Acknowledgments",
+ "svglobal3" : "Acknowledgments",
+ "svglobal" : "Acknowledgment",
+ "svjog" : "Acknowledgment",
+ "svmono" : "Acknowledgment",
+ "svmult" : "Acknowledgment",
+ "svprobth" : "Acknowledgment",
+}
+
+ack_layouts_old = {
+ "aa" : "Acknowledgement",
+ "aapaper" : "Acknowledgement",
+ "aastex" : "Acknowledgement",
+ "aastex62" : "Acknowledgement",
+ "achemso" : "Acknowledgement",
+ "acmart" : "Acknowledgements",
+ "apa" : "Acknowledgements",
+ "copernicus" : "Acknowledgements",
+ "egs" : "Acknowledgements",# + Acknowledgement
+ "elsart" : "Acknowledegment",
+ "isprs" : "Acknowledgements",
+ "kluwer" : "Acknowledgements",
+ "svglobal3" : "Acknowledgements",
+ "svglobal" : "Acknowledgement",
+ "svjog" : "Acknowledgement",
+ "svmono" : "Acknowledgement",
+ "svmult" : "Acknowledgement",
+ "svprobth" : "Acknowledgement",
+}
+
+
+def convert_acknowledgment(document):
+ " Fix spelling of acknowledgment styles "
+
+ if document.textclass not in list(ack_layouts_old.keys()):
+ return
+
+ i = 0
+ while True:
+ i = find_token(document.body, '\\begin_layout ' + ack_layouts_old[document.textclass], i)
+ if i == -1:
+ break
+ document.body[i] = "\\begin_layout " + ack_layouts_new[document.textclass]
+ if document.textclass != "egs":
+ return
+ # egs has two styles
+ i = 0
+ while True:
+ i = find_token(document.body, '\\begin_layout Acknowledgement', i)
+ if i == -1:
+ break
+ document.body[i] = "\\begin_layout Acknowledgment"
+
+
+def revert_acknowledgment(document):
+ " Restore old spelling of acknowledgment styles "
+
+ if document.textclass not in list(ack_layouts_new.keys()):
+ return
+ i = 0
+ while True:
+ i = find_token(document.body, '\\begin_layout ' + ack_layouts_new[document.textclass], i)
+ if i == -1:
+ break
+ document.body[i] = "\\begin_layout " + ack_layouts_old[document.textclass]
+ if document.textclass != "egs":
+ return
+ # egs has two styles
+ i = 0
+ while True:
+ i = find_token(document.body, '\\begin_layout Acknowledgment', i)
+ if i == -1:
+ break
+ document.body[i] = "\\begin_layout Acknowledgement"
+
##
# Conversion hub
#
@@ -4785,10 +4873,12 @@ convert = [
[611, []],
[612, [convert_starred_refs]],
[613, []],
- [614, [convert_hyper_other]]
+ [614, [convert_hyper_other]],
+ [615, [convert_acknowledgment]]
]
-revert = [[613, [revert_hyper_other]],
+revert = [[614, [revert_acknowledgment]],
+ [613, [revert_hyper_other]],
[612, [revert_familydefault]],
[611, [revert_starred_refs]],
[610, []],
diff --git a/src/version.h b/src/version.h
index 51d5678..1bef621 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 614 // rkh: Add 'other' option to hyperlink
-#define LYX_FORMAT_TEX2LYX 614
+#define LYX_FORMAT_LYX 615 // spitz: acknowledgement > acknowledgment
+#define LYX_FORMAT_TEX2LYX 615
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER
More information about the lyx-cvs
mailing list