Disambiguate Acknowledgment[[credits]] and Acknowledgment[[theorem]]

diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout
index c5267eade8ffcaa0d785428ebffeefcb4ec59b39..d09e14fb742892413aa62b1cebc8762633417251 100644 (file)
--- 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 6804ecf5a113d8c0b6f6510437ceefd7c7ffda41..9c26978a5cfd2795172cab84186d8e632cc7366c 100644 (file)
--- 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 8b54a038f62ceb3610d8cab2e6e969bc98bc361a..fba2a3d938cfe7b0559cd5834dcee4b86c1a49da 100644 (file)
--- 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 1247012425a8f2f7e819afaede43502725722a08..125bde9436d57a3cb24d41b6987d0aa8557205ea 100644 (file)
--- 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 e094fb9b2fdb79a01c8effadef5f0e1412439207..4bf1d25bcb31cf3afbe39985059d5539fba47fd1 100644 (file)
--- 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 100c1fc5eff9d3d01419b9125262e519e2ea03b4..cc923a4e28afd783c7a53c58faca5a0240e78176 100644 (file)
--- 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 5f5f40c945f43305524bd75109c122dd474f621c..049946d016ee0c0eb63e8605df3b5dfd41879335 100644 (file)
--- 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 dfcc89bfa23b2d248da3c298eac2973535c40aa5..408f037ae04cfe25455ea28934a107c3dce8abe4 100644 (file)
--- 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 8985a80995f9b23f25f49a4f845991a47132356c..3e8d85b100349265ed44e3b1a76ae7daaad74fea 100644 (file)
--- 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 b0cd9efa6d0865e3cc81121dbedb98308c793c99..4d66625bce1087fb765684b4892349671e756bdb 100644 (file)
--- 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 7a66e31cb4754556b3aa5925e4e8ca914db57c29..59eeb1bae980e68679ad9d5e07898ae6ab494d31 100644 (file)
--- 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 aeedbbd726414c1f7c5bbff14c917852d6228be2..c96d245c612e14f7dd9f1200d85795732c4811a0 100644 (file)
--- 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 00f818c2b7fd34eab2bd9886b8d6ef12293c8b50..d3a32737aec72ea2652925ec7ddf5f3ea099df89 100644 (file)
--- 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 65a32e29c7d1b127b6d254a3fcea58ad483166d6..bc2d7ccfe5e224c1fa2a93a5881ab5c4ce5a0195 100644 (file)
--- 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 eaad3b5578e4f76358e09ce4874d73c47f951822..989d034dba750b390ffdc01ad573a41e5b164b45 100644 (file)
--- 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 cdc6a6b67953a70552642296af4e9d09cc4206da..79255439ed04889c7a8424243847c4596e1913af 100644 (file)
--- 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 bfcd86eac5e52bbeb3a67783a3ac74a98d6972bd..15c9f2dd0040a621b26a24a4149e5d47f20e6c23 100644 (file)
--- 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 1f4f92a51f14939fdbaa93b29cf8fdcf9a47f514..2362667cacfeed9407e29fdb80c7971c50b4af21 100644 (file)
--- 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 6f2f79d6fb26f7813fe6486c37fc3ea458dc2c74..ca334dbb58ce96af425981033db3e0fdd4b8afc9 100644 (file)
--- 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 ebbd84910b5bd390a638694015a9aee998e70f23..60c43f76c27f82274e836f88256994545ed390d6 100644 (file)
--- 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 af7f0d3796e25830ab6575fe35d8062cc63243d9..267fd1ac50db895c6799792daa052dadf21d10cf 100644 (file)
--- 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 0bb13a9420347c8242849cc52f2903989a314eac..930aeb4211cdefb39a66d63a5dfed39cc927853a 100644 (file)
--- 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 5ef0e9d78a89c18765be5fdef14b636d138f06ee..535a56b3ece2a4cfb46091579768af9cdb21d34a 100644 (file)
--- 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 60a3f9b19873cf0472e97b34120fe69cc2c4a296..657d659ad83790ab1e3792b05213910a3b562639 100644 (file)
--- 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 5bd52be5410c07dcf4928e3e1b39c20ca1d69fa4..3fd05331e8f2e465795937aa29ab7a465b311515 100644 (file)
--- 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 c34fb872283b5a11cbdcba2f0b358b20e44d81a8..6e57ff2d3b31b74b68aa97581bcb6487c5c8f0f5 100644 (file)
--- 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 8e0d9aaa0a29f1e77f6a8f89bcd8a83b060c7dc6..06f41edc5236c5d6fe3050a6c49061bf08f95b06 100644 (file)
--- 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 4644b52f617dbcd8fa2be93e75daa2762843af61..954c50770cd7627c4d3d51352917b7ce34887287 100644 (file)
--- 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 663e984b665bbf53e3dd7c71af7a3d93416c7547..aefaa3ded2e319fe492043404af8761802069c83 100644 (file)
--- 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 f75acfc7ff2e8ccd24e1667f1fde1b8074e3c9cc..d12a8285098646d03419b980b72c496b1c70c498 100644 (file)
--- 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 0a804fea0cc95646dfe7ada2fcc5850b40fd1aa4..c9752faab508cee87f5c3c604eff11818a717406 100644 (file)
--- 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 13c93078b230812cd1ed7d4d8fe9d6df0130db58..f0c5273f6d331e41ce3a0e6f36adf6e0a92dbb04 100644 (file)
--- 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 21e963670fd9f16854be89aa49fc87f9f77f8304..43192ba889faa27eb2848d043f49d80eea9563ba 100644 (file)
--- 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 e31b3f5aab9009992851c97b9414e89af49ad278..914a50ff151e1580d2e7f6c7bdc27e09c42cefa2 100644 (file)
--- 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 9818f1f53d05a04389af447793d870165b01e871..25776f214dea03550ad529d1327bc51bc7e6abe0 100644 (file)
--- 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 71000fe6e6829bd420218f4e21728cc04e692361..1d41f4bec07af85e20add86c8fd2f2641d7d1edd 100644 (file)
--- 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 9c68801f516f6b6f96edf6d45bf11c602fa278e2..9d25fa55890048054003c957c6e0abb38a71890a 100644 (file)
--- 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 ffd5de038643364ef4fddd1687b7e1d8c5d448a2..7ee46b8ea7393d6cd1d2ee982a66635247f7331a 100644 (file)
--- 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