From ce7eb7734bafaf0aedb080a2adce987800367575 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Wed, 1 Feb 2023 16:24:16 +0100 Subject: [PATCH] Disambiguate Acknowledgment[[credits]] and Acknowledgment[[theorem]] --- lib/layouts/AEA.layout | 14 ++++++------ 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 | 14 +++++++----- lib/layouts/acmsiggraph.layout | 14 +++++++----- lib/layouts/agutex.layout | 9 ++++++-- lib/layouts/apa.layout | 10 ++++++--- lib/layouts/apax.inc | 5 ----- lib/layouts/copernicus.layout | 8 +++++-- lib/layouts/egs.layout | 16 ++++++++++---- lib/layouts/elsart.layout | 10 ++++++--- lib/layouts/iopart.layout | 8 +++++-- lib/layouts/isprs.layout | 6 ++++- lib/layouts/iucr.layout | 12 ++++++---- 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 | 8 +++++-- lib/layouts/spie.layout | 8 +++++-- lib/layouts/svcommon.inc | 16 ++++++++++---- lib/layouts/svglobal.layout | 2 +- lib/layouts/svglobal3.layout | 2 +- lib/layouts/svjog.layout | 2 +- lib/layouts/svmono.layout | 2 +- lib/layouts/svmult.layout | 4 ++-- lib/layouts/svprobth.layout | 2 +- .../theorems-ams-extended-bytype.module | 22 +++++++++---------- .../theorems-ams-extended-chap-bytype.module | 22 +++++++++---------- lib/layouts/theorems-ams-extended.module | 22 +++++++++---------- .../theorems-counters-extended-bytype.inc | 2 +- lib/layouts/theorems-refprefix.inc | 2 +- 38 files changed, 218 insertions(+), 118 deletions(-) diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout index c5267eade8..d09e14fb74 100644 --- a/lib/layouts/AEA.layout +++ b/lib/layouts/AEA.layout @@ -13,13 +13,13 @@ Input theorems-ams-extended-bytype.module Provides amsthm 1 NoStyle Part -NoCounter part +NoCounter part NoStyle Chapter -NoCounter chapter +NoCounter chapter NoStyle Paragraph -NoCounter paragraph +NoCounter paragraph NoStyle Subparagraph -NoCounter subparagraph +NoCounter subparagraph NoStyle Part* NoStyle Chapter* NoStyle Section* @@ -32,7 +32,7 @@ NoStyle LyX-Code NoStyle Verse NoStyle Address NoStyle Right_Address -NoStyle Acknowledgment* +NoStyle Acknowledgment*[[theorem]] NoStyle Algorithm* NoStyle Assumption* NoStyle Axiom* @@ -126,9 +126,9 @@ Style Abstract InTitle 1 End -Style Acknowledgment +Style Acknowledgment[[theorem]] Category FrontMatter - LabelString "Acknowledgment." + LabelString "Acknowledgment[[theorem]]." Preamble EndPreamble DocBookTag para diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index 6804ecf5a1..9c26978a5c 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -166,7 +166,7 @@ Style Mail End -Style Acknowledgement +Style Acknowledgments[[credits]] Margin First_Dynamic LatexType Environment LatexName acknowledgements @@ -178,7 +178,7 @@ Style Acknowledgement ParSep 0 Align Block LabelType Static - LabelString "Acknowledgements." + LabelString "Acknowledgements[[credits]]." LabelSep M Font Size Small @@ -193,6 +193,11 @@ Style Acknowledgement 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 8b54a038f6..fba2a3d938 100644 --- a/lib/layouts/aapaper.inc +++ b/lib/layouts/aapaper.inc @@ -79,7 +79,7 @@ Style Offprint End -Style Acknowledgement +Style Acknowledgments[[credits]] Margin Static LatexType Environment LatexName acknowledgements @@ -90,7 +90,7 @@ Style Acknowledgement ParSep 0 Align Block LabelType Above - LabelString "Acknowledgements" + LabelString "Acknowledgments[[credits]]" LabelSep M Font Size Small @@ -104,6 +104,11 @@ Style Acknowledgement 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 1247012425..125bde9436 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aapaper.layout @@ -102,7 +102,7 @@ End Style Abstract End -Style Acknowledgement +Style Acknowledgments[[credits]] End Style Bibliography diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index e094fb9b2f..4bf1d25bcb 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -351,7 +351,7 @@ Style Keywords End -Style Acknowledgements +Style Acknowledgments[[credits]] Category BackMatter Margin Dynamic LatexType Command @@ -362,7 +362,7 @@ Style Acknowledgements BottomSep 0.8 Align Left LabelType Static - LabelString "[Acknowledgements]" + LabelString "[Acknowledgments][[credits]]" KeepEmpty 1 Font Family Roman @@ -374,6 +374,11 @@ Style Acknowledgements 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 100c1fc5ef..cc923a4e28 100644 --- a/lib/layouts/aastex62.layout +++ b/lib/layouts/aastex62.layout @@ -222,7 +222,7 @@ Style Altaffilation Align Center End -Style Acknowledgements +Style Acknowledgments[[credits]] Font Shape Up EndFont diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout index 5f5f40c945..049946d016 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 Acknowledgement +Style Acknowledgments[[credits]] CopyStyle Abstract LatexName acknowledgement Category BackMatter InTitle 0 BottomSep 0.7 LabelType Above - LabelString "Acknowledgement" + LabelString "Acknowledgments[[credits]]" Font Size Normal EndFont @@ -299,8 +299,12 @@ Style Acknowledgement DocBookWrapperTag acknowledgements End +Style Acknowledgement + ObsoletedBy Acknowledgments[[credits]] +End + Style SupplementalInfo - CopyStyle Acknowledgement + CopyStyle Acknowledgments[[credits]] LatexName suppinfo LabelString "Supporting Information Available" DocBookTag para @@ -309,7 +313,7 @@ Style SupplementalInfo End Style TOC_entry - CopyStyle Acknowledgement + CopyStyle Acknowledgments[[credits]] LatexName tocentry ParSep 0.3 LabelString "Graphical TOC Entry" diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout index dfcc89bfa2..408f037ae0 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 +Style Acknowledgments[[credits]] Category BackMatter LatexName acks LatexType Environment - LabelString "Acknowledgments" + LabelString "Acknowledgments[[credits]]" LabelType Above TopSep 1.3 LabelBottomSep 0.7 @@ -672,6 +672,10 @@ Style Acknowledgments 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 8985a80995..3e8d85b100 100644 --- a/lib/layouts/acmsiggraph-0-92.layout +++ b/lib/layouts/acmsiggraph-0-92.layout @@ -343,16 +343,20 @@ InsetLayout "Flex:Thanks" End -Style Acknowledgments +Style Acknowledgments[[credits]] CopyStyle Abstract LatexName acks Category BackMatter InTitle 0 LabelBottomsep 0 LabelType Above - LabelString "Acknowledgments" - DocBookTag para - DocBookWrapperTag acknowledgements - DocBookSection true + LabelString "Acknowledgments[[credits]]" + 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 b0cd9efa6d..4d66625bce 100644 --- a/lib/layouts/acmsiggraph.layout +++ b/lib/layouts/acmsiggraph.layout @@ -299,16 +299,20 @@ InsetLayout "Flex:Thanks" End -Style Acknowledgments +Style Acknowledgments[[credits]] CopyStyle Abstract LatexName acks Category BackMatter InTitle 0 LabelBottomsep 0 LabelType Above - LabelString "Acknowledgments" - DocBookTag para - DocBookWrapperTag acknowledgements - DocBookSection true + LabelString "Acknowledgments[[credits]]" + 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 7a66e31cb4..59eeb1bae9 100644 --- a/lib/layouts/agutex.layout +++ b/lib/layouts/agutex.layout @@ -190,7 +190,7 @@ Style Notation End -Style Acknowledgments +Style Acknowledgments[[credits]] Margin Dynamic LatexType Environment LatexName acknowledgments @@ -202,7 +202,7 @@ Style Acknowledgments BottomSep 0.4 Align Block LabelType Static - LabelString "Acknowledgments." + LabelString "Acknowledgments[[credits]]." Font Size Small EndFont @@ -216,6 +216,11 @@ Style Acknowledgments 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 aeedbbd726..c96d245c61 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -240,7 +240,7 @@ Style Copyright End -Style Acknowledgements +Style Acknowledgments[[credits]] Category BackMatter LatexName acknowledgements LatexType Command @@ -253,7 +253,7 @@ Style Acknowledgements Align Block AlignPossible Block, Left, Right, Center Labeltype Static - LabelString "Acknowledgements:" + LabelString "Acknowledgments[[credits]]:" Labelsep M LabelFont Series Bold @@ -266,7 +266,11 @@ End Style Acknowledgments - ObsoletedBy Acknowledgements + ObsoletedBy Acknowledgments[[credits]] +End + +Style Acknowledgements + ObsoletedBy Acknowledgments[[credits]] End diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc index 00f818c2b7..d3a32737ae 100644 --- a/lib/layouts/apax.inc +++ b/lib/layouts/apax.inc @@ -332,11 +332,6 @@ Style AuthorNote End -Style Acknowledgments - ObsoletedBy AuthorNote -End - - Style Journal Category Preamble LatexName journal diff --git a/lib/layouts/copernicus.layout b/lib/layouts/copernicus.layout index 65a32e29c7..bc2d7ccfe5 100644 --- a/lib/layouts/copernicus.layout +++ b/lib/layouts/copernicus.layout @@ -421,15 +421,19 @@ Style Disclaimer DocBookAttr role='disclaimer' End -Style Acknowledgements +Style Acknowledgments[[credits]] CopyStyle Statements2 LatexName acknowledgements - LabelString "Acknowledgements." + LabelString "Acknowledgments[[credits]]." 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 eaad3b5578..989d034dba 100644 --- a/lib/layouts/egs.layout +++ b/lib/layouts/egs.layout @@ -592,7 +592,7 @@ Style Abstract End -Style Acknowledgements +Style Acknowledgments[[credits]] Category BackMatter Margin First_Dynamic LatexType Environment @@ -607,7 +607,7 @@ Style Acknowledgements Align Block AlignPossible Block, Left LabelType Static - LabelString "Acknowledgements." + LabelString "Acknowledgments[[credits]]." Font Size Small EndFont @@ -617,8 +617,12 @@ Style Acknowledgements EndFont End +Style Acknowledgements + ObsoletedBy Acknowledgments[[credits]] +End -Style Acknowledgement + +Style Acknowledgement[[credits]] Margin First_Dynamic LatexType Environment LatexName acknowledgement @@ -632,7 +636,7 @@ Style Acknowledgement Align Block AlignPossible Block, Left LabelType Static - LabelString "Acknowledgement." + LabelString "Acknowledgement[[credits]]." Font Size Small EndFont @@ -642,6 +646,10 @@ Style Acknowledgement EndFont End +Style Acknowledgement + ObsoletedBy Acknowledgment[[credits]] +End + Style Bibliography Category BackMatter diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index cdc6a6b679..79255439ed 100644 --- a/lib/layouts/elsart.layout +++ b/lib/layouts/elsart.layout @@ -299,7 +299,7 @@ End # - Note # - Claim # - Summary -# - Acknowledgement +# - Acknowledgment # - Case Counter theorem @@ -546,13 +546,13 @@ End # This is not taken from the AMS defs, so as to match the output of the # style file. -Style Acknowledgement +Style Acknowledgment[[theorem]] Margin Static LatexType environment LatexName ack LabelType Above LabelBottomsep 1 - LabelString "Acknowledgements" + LabelString "Acknowledgment[[theorem]]" parsep 0.3 LabelFont Size large @@ -562,4 +562,8 @@ Style Acknowledgement 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 bfcd86eac5..15c9f2dd00 100644 --- a/lib/layouts/iopart.layout +++ b/lib/layouts/iopart.layout @@ -293,7 +293,7 @@ Style submitto End -Style Acknowledgments +Style Acknowledgments[[credits]] Margin Dynamic LatexType Command LatexName ack{} @@ -307,7 +307,7 @@ Style Acknowledgments BottomSep 0.4 Align Block LabelType Static - LabelString "Acknowledgments" + LabelString "Acknowledgments[[credits]]" Font Series Bold Size Normal @@ -317,6 +317,10 @@ Style Acknowledgments 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 1f4f92a51f..2362667cac 100644 --- a/lib/layouts/isprs.layout +++ b/lib/layouts/isprs.layout @@ -218,7 +218,7 @@ Style Subsubsection* End # Acknowledgement(s) style definitions -Style Acknowledgements +Style Acknowledgments[[credits]] Category BackMatter Margin Static LatexType Command @@ -245,3 +245,7 @@ Style Acknowledgements Size Normal EndFont End + +Style Acknowledgements + ObsoletedBy Acknowledgments[[credits]] +End diff --git a/lib/layouts/iucr.layout b/lib/layouts/iucr.layout index 6f2f79d6fb..ca334dbb58 100644 --- a/lib/layouts/iucr.layout +++ b/lib/layouts/iucr.layout @@ -250,15 +250,19 @@ Style Synopsis DocBookAttr role='synopsis' End -Style Acknowledgements +Style Acknowledgments[[credits]] CopyStyle "Short Author" LatexName ack InTitle 0 - LabelString "Acknowledgements:" + LabelString "Acknowledgments[[credits]]:" Category BackMatter TopSep 0.7 - DocBookTag para - DocBookWrapperTag acknowledgements + DocBookTag para + DocBookWrapperTag acknowledgements +End + +Style Acknowledgements + ObsoletedBy Acknowledgments[[credits]] End Style References diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout index ebbd84910b..60c43f76c2 100644 --- a/lib/layouts/jasatex.layout +++ b/lib/layouts/jasatex.layout @@ -281,13 +281,13 @@ Style "Preprint number" End -Style Acknowledgments +Style Acknowledgments[[credits]] CopyStyle Abstract LatexName acknowledgments Category BackMatter InTitle 0 LabelType Above - LabelString "Acknowledgments" + LabelString "Acknowledgments[[credits]]" Font Size Normal EndFont @@ -301,6 +301,10 @@ Style Acknowledgments 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 af7f0d3796..267fd1ac50 100644 --- a/lib/layouts/kluwer.layout +++ b/lib/layouts/kluwer.layout @@ -338,7 +338,7 @@ Style Keywords End -Style Acknowledgements +Style Acknowledgments[[credits]] Category BackMatter Margin Static LatexType Environment @@ -350,7 +350,7 @@ Style Acknowledgements ParSep 0 Align Block LabelType Centered - LabelString "Acknowledgements" + LabelString "Acknowledgments[[credits]]" LabelBottomSep 0.5 LabelFont Series Bold @@ -361,6 +361,11 @@ Style Acknowledgements 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 0bb13a9420..930aeb4211 100644 --- a/lib/layouts/maa-monthly.layout +++ b/lib/layouts/maa-monthly.layout @@ -141,13 +141,13 @@ Style Affiliation DocBookWrapperMergeWithPrevious true End -Style Acknowledgments +Style Acknowledgments[[credits]] Category BackMatter Argument 1 - LabelString "Title of acknowledgment" + LabelString "Title of acknowledgment[[credits]]" Mandatory 1 EndArgument - LabelString "Acknowledgments" + LabelString "Acknowledgments[[credits]]" LabelType Static LabelSep " " LabelFont @@ -162,6 +162,10 @@ Style Acknowledgments 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 5ef0e9d78a..535a56b3ec 100644 --- a/lib/layouts/revtex4-x.inc +++ b/lib/layouts/revtex4-x.inc @@ -258,13 +258,13 @@ End ########### Back matter ############# -Style Acknowledgments +Style Acknowledgments[[credits]] CopyStyle Standard Category BackMatter LatexType Environment LatexName acknowledgments LabelType Centered - LabelString "acknowledgments" + LabelString "acknowledgments[[credits]]" LabelBottomSep 0.5 LabelFont Series Bold @@ -277,6 +277,10 @@ Style Acknowledgments 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 60a3f9b198..657d659ad8 100644 --- a/lib/layouts/revtex4.layout +++ b/lib/layouts/revtex4.layout @@ -278,7 +278,7 @@ Style Abstract End -Style Acknowledgments +Style Acknowledgments[[credits]] Category BackMatter LatexType Environment LatexName acknowledgments @@ -288,7 +288,7 @@ Style Acknowledgments Align Block AlignPossible Block, Left, Right, Center LabelType Centered - LabelString "Acknowledgments" + LabelString "Acknowledgments[[credits]]" LabelBottomSep 0.5 LabelFont Series Bold @@ -299,6 +299,10 @@ Style Acknowledgments 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 5bd52be541..3fd05331e8 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layouts/sigplanconf.layout @@ -232,16 +232,20 @@ Style Abstract End -Style Acknowledgments +Style Acknowledgments[[credits]] CopyStyle Abstract LatexType Command LatexName acks Category BackMatter LabelBottomsep 0 LabelType Above - LabelString "Acknowledgments" + LabelString "Acknowledgments[[credits]]" 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 c34fb87228..6e57ff2d3b 100644 --- a/lib/layouts/spie.layout +++ b/lib/layouts/spie.layout @@ -97,13 +97,17 @@ Style Abstract End -Style Acknowledgments +Style Acknowledgments[[credits]] CopyStyle Abstract # NextNoIndent 1 # LatexType Command LatexName acknowledgments - LabelString "ACKNOWLEDGMENTS" + LabelString "ACKNOWLEDGMENTS[[credits]]" 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 8e0d9aaa0a..06f41edc52 100644 --- a/lib/layouts/svcommon.inc +++ b/lib/layouts/svcommon.inc @@ -622,7 +622,7 @@ Style Preface DocBookSectionTag preface End -Style Acknowledgement +Style Acknowledgment[[credits]] Category BackMatter Margin First_Dynamic LatexType Environment @@ -637,7 +637,7 @@ Style Acknowledgement Align Block AlignPossible Block, Left LabelType Static - LabelString "Acknowledgements" + LabelString "Acknowledgments[[credits]]" Font Size Small EndFont @@ -650,11 +650,19 @@ Style Acknowledgement DocBookWrapperTag acknowledgements End -Style Acknowledgements - CopyStyle Acknowledgement +Style Acknowledgments[[credits]] + CopyStyle Acknowledgment[[credits]] 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 4644b52f61..954c50770c 100644 --- a/lib/layouts/svglobal.layout +++ b/lib/layouts/svglobal.layout @@ -54,7 +54,7 @@ NoStyle Sol NoStyle Abstract* NoStyle TOC_Title NoStyle TOC_Author -NoStyle Acknowledgements +NoStyle Acknowledgments[[credits]] NoStyle Keywords diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout index 663e984b66..aefaa3ded2 100644 --- a/lib/layouts/svglobal3.layout +++ b/lib/layouts/svglobal3.layout @@ -50,7 +50,7 @@ NoStyle TOC_Title NoStyle TOC_Author NoStyle Proof(smartQED) -NoStyle Acknowledgement +NoStyle Acknowledgment[[credits]] NoStyle Keywords diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout index f75acfc7ff..d12a828509 100644 --- a/lib/layouts/svjog.layout +++ b/lib/layouts/svjog.layout @@ -58,7 +58,7 @@ NoStyle Sol NoStyle Abstract* NoStyle TOC_Title NoStyle TOC_Author -NoStyle Acknowledgements +NoStyle Acknowledgments[[credits]] NoStyle Keywords diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout index 0a804fea0c..c9752faab5 100644 --- a/lib/layouts/svmono.layout +++ b/lib/layouts/svmono.layout @@ -18,7 +18,7 @@ ClassOptions FontSize 10 End -NoStyle Acknowledgements +NoStyle Acknowledgements[[credits]] NoStyle Institute Style Abstract diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout index 13c93078b2..f0c5273f6d 100644 --- a/lib/layouts/svmult.layout +++ b/lib/layouts/svmult.layout @@ -19,7 +19,7 @@ ClassOptions FontSize "" End -NoStyle Acknowledgements +NoStyle Acknowledgments[[credits]] # Additional headings @@ -155,7 +155,7 @@ Style Preface Category "For editors" End -Style Acknowledgement +Style Acknowledgment[[credits]] Category "For editors" End diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout index 21e963670f..43192ba889 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 +NoStyle Acknowledgements[[credits]] NoStyle Keywords diff --git a/lib/layouts/theorems-ams-extended-bytype.module b/lib/layouts/theorems-ams-extended-bytype.module index e31b3f5aab..914a50ff15 100644 --- a/lib/layouts/theorems-ams-extended-bytype.module +++ b/lib/layouts/theorems-ams-extended-bytype.module @@ -3,7 +3,7 @@ #DescriptionBegin #Defines some additional theorem environments for use with the #AMS theorems packages. Includes Criterion, Algorithm, Axiom, -#Condition, Note, Notation, Summary, Acknowledgment, Conclusion, +#Condition, Note, Notation, Summary, Acknowledgment[[theorem]], Conclusion, #Assumption, and Case, in both numbered and non-numbered forms. #Contrary to the plain AMS-Extended module, the different theorem #types provided here each have a separate counter (e.g., criterion 1, @@ -322,19 +322,19 @@ Style Summary* End -Style Acknowledgment +Style Acknowledgment[[theorem]] CopyStyle Remark LatexName acknowledgement - LabelString "Acknowledgment \theacknowledgement." + LabelString "Acknowledgment[[theorem]] \theacknowledgement." Preamble \theoremstyle{remark} \newtheorem{acknowledgement}{\protect\acknowledgementname} EndPreamble LangPreamble - \providecommand{\acknowledgementname}{_(Acknowledgment)} + \providecommand{\acknowledgementname}{_(Acknowledgment[[theorem]])} EndLangPreamble BabelPreamble - \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment)}} + \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment[[theorem]])}} EndBabelPreamble LabelCounter acknowledgement DocBookTag para @@ -344,23 +344,23 @@ End Style Acknowledgement - ObsoletedBy Acknowledgment + ObsoletedBy Acknowledgment[[theorem]] End -Style Acknowledgment* +Style Acknowledgment*[[theorem]] CopyStyle Remark* LatexName acknowledgement* - LabelString "Acknowledgment." + LabelString "Acknowledgment[[theorem]]." Preamble \theoremstyle{remark} \newtheorem*{acknowledgement*}{\protect\acknowledgementname} EndPreamble LangPreamble - \providecommand{\acknowledgementname}{_(Acknowledgment)} + \providecommand{\acknowledgementname}{_(Acknowledgment[[theorem]])} EndLangPreamble BabelPreamble - \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment)}} + \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment[[theorem]])}} EndBabelPreamble DocBookTag para DocBookAttr role='acknowledgement' @@ -369,7 +369,7 @@ End Style Acknowledgement* - ObsoletedBy Acknowledgment* + ObsoletedBy Acknowledgment*[[theorem]] End diff --git a/lib/layouts/theorems-ams-extended-chap-bytype.module b/lib/layouts/theorems-ams-extended-chap-bytype.module index 9818f1f53d..25776f214d 100644 --- a/lib/layouts/theorems-ams-extended-chap-bytype.module +++ b/lib/layouts/theorems-ams-extended-chap-bytype.module @@ -3,7 +3,7 @@ #DescriptionBegin #Defines some additional theorem environments for use with the #AMS theorems packages. Includes Criterion, Algorithm, Axiom, -#Condition, Note, Notation, Summary, Acknowledgment, Conclusion, +#Condition, Note, Notation, Summary, Acknowledgment[[theorem]], Conclusion, #Assumption, and Case, in both numbered and non-numbered forms. #Contrary to the plain AMS-Extended module, the different theorem #types provided here each have a separate counter, restarted with each @@ -389,10 +389,10 @@ Style Summary* End -Style Acknowledgment +Style Acknowledgment[[theorem]] CopyStyle Remark LatexName acknowledgement - LabelString "Acknowledgment \theacknowledgement." + LabelString "Acknowledgment[[theorem]] \theacknowledgement." Preamble \theoremstyle{remark} \ifx\thechapter\undefined @@ -402,10 +402,10 @@ Style Acknowledgment \fi EndPreamble LangPreamble - \providecommand{\acknowledgementname}{_(Acknowledgment)} + \providecommand{\acknowledgementname}{_(Acknowledgment[[theorem]])} EndLangPreamble BabelPreamble - \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment)}} + \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment[[theorem]])}} EndBabelPreamble LabelCounter acknowledgement DocBookTag para @@ -415,23 +415,23 @@ End Style Acknowledgement - ObsoletedBy Acknowledgment + ObsoletedBy Acknowledgment[[theorem]] End -Style Acknowledgment* +Style Acknowledgment*[[theorem]] CopyStyle Remark* LatexName acknowledgement* - LabelString "Acknowledgment." + LabelString "Acknowledgment[[theorem]]." Preamble \theoremstyle{remark} \newtheorem*{acknowledgement*}{\protect\acknowledgementname} EndPreamble LangPreamble - \providecommand{\acknowledgementname}{_(Acknowledgment)} + \providecommand{\acknowledgementname}{_(Acknowledgment[[theorem]])} EndLangPreamble BabelPreamble - \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment)}} + \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment[[theorem]])}} EndBabelPreamble DocBookTag para DocBookAttr role='acknowledgement' @@ -440,7 +440,7 @@ End Style Acknowledgement* - ObsoletedBy Acknowledgment* + ObsoletedBy Acknowledgment*[[theorem]] End diff --git a/lib/layouts/theorems-ams-extended.module b/lib/layouts/theorems-ams-extended.module index 71000fe6e6..1d41f4bec0 100644 --- a/lib/layouts/theorems-ams-extended.module +++ b/lib/layouts/theorems-ams-extended.module @@ -3,7 +3,7 @@ #DescriptionBegin #Defines some additional theorem environments for use with the #AMS theorems packages. Includes Criterion, Algorithm, Axiom, -#Condition, Note, Notation, Summary, Acknowledgment, Conclusion, +#Condition, Note, Notation, Summary, Acknowledgment[[theorem]], Conclusion, #Fact, Assumption, Case, and Question, in both numbered and non-numbered #forms. #DescriptionEnd @@ -313,19 +313,19 @@ Style Summary* End -Style Acknowledgment +Style Acknowledgment[[theorem]] CopyStyle Remark LatexName acknowledgement - LabelString "Acknowledgment \thetheorem." + LabelString "Acknowledgment[[theorem]] \thetheorem." Preamble \theoremstyle{remark} \newtheorem{acknowledgement}[thm]{\protect\acknowledgementname} EndPreamble LangPreamble - \providecommand{\acknowledgementname}{_(Acknowledgment)} + \providecommand{\acknowledgementname}{_(Acknowledgment[[theorem]])} EndLangPreamble BabelPreamble - \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment)}} + \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment[[theorem]])}} EndBabelPreamble DocBookTag para DocBookAttr role='acknowledgement' @@ -334,23 +334,23 @@ End Style Acknowledgement - ObsoletedBy Acknowledgment + ObsoletedBy Acknowledgment[[theorem]] End -Style Acknowledgment* +Style Acknowledgment*[[theorem]] CopyStyle Remark* LatexName acknowledgement* - LabelString "Acknowledgment." + LabelString "Acknowledgment[[theorem]]." Preamble \theoremstyle{remark} \newtheorem*{acknowledgement*}{\protect\acknowledgementname} EndPreamble LangPreamble - \providecommand{\acknowledgementname}{_(Acknowledgment)} + \providecommand{\acknowledgementname}{_(Acknowledgment[[theorem]])} EndLangPreamble BabelPreamble - \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment)}} + \addto\captions$$lang{\renewcommand{\acknowledgementname}{_(Acknowledgment[[theorem]])}} EndBabelPreamble DocBookTag para DocBookAttr role='acknowledgement' @@ -359,7 +359,7 @@ End Style Acknowledgement* - ObsoletedBy Acknowledgment* + ObsoletedBy Acknowledgment*[[theorem]] End diff --git a/lib/layouts/theorems-counters-extended-bytype.inc b/lib/layouts/theorems-counters-extended-bytype.inc index 9c68801f51..9d25fa5589 100644 --- a/lib/layouts/theorems-counters-extended-bytype.inc +++ b/lib/layouts/theorems-counters-extended-bytype.inc @@ -25,7 +25,7 @@ Counter summary GuiName Summary End Counter acknowledgement - GuiName Acknowledgement + GuiName Acknowledgement[[theorem]] End Counter conclusion GuiName Conclusion diff --git a/lib/layouts/theorems-refprefix.inc b/lib/layouts/theorems-refprefix.inc index ffd5de0386..7ee46b8ea7 100644 --- a/lib/layouts/theorems-refprefix.inc +++ b/lib/layouts/theorems-refprefix.inc @@ -82,7 +82,7 @@ ModifyStyle Summary RefPrefix sum End -ModifyStyle Acknowledgement +ModifyStyle Acknowledgment[[theorem]] RefPrefix ack End