X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Facmart.layout;h=f76c1c583c00e2550f376431592a8bcecf6174df;hb=d0379db1aab1aeeefeea8cf31db7ab7d88396fed;hp=5b5903b4c73f924073f66362f4475af8fd43a4cd;hpb=41b039723afc82ea4ffab2feade99b97f3713aca;p=lyx.git

diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout
index 5b5903b4c7..f76c1c583c 100644
--- a/lib/layouts/acmart.layout
+++ b/lib/layouts/acmart.layout
@@ -1,13 +1,15 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[acmart]{Association for Computing Machinery (ACM) article}
+#  \DeclareLaTeXClass[acmart]{Association for Computing Machinery (ACM)}
 #  \DeclareCategory{Articles}
 #
 # Layout for typesetting publications of the Association for Computing Machinery.
 #
 # Author : John Perry <john.perry@usm.edu>
 #          Guillaume Munch-Maccagnoni <gm@lyx.org>
+# Reviewed following tickets #10722 & #10723
+#          by Jean-Pierre Chrétien <jpc@lyx.org>
 
-Format 60
+Format 80
 
 Provides amscls 1
 Provides amsmath 1
@@ -30,6 +32,7 @@ Provides ifxetex 1
 Provides inconsolata 1
 Provides latex-tools 1
 Provides libertine 1
+Provides makeidx 1
 Provides manyfoot 1
 Provides microtype 1
 Provides mmap 1
@@ -304,37 +307,37 @@ End
 
 Style AuthorNote
   CopyStyle TitleNote
-  LabelString "Author Note: "
+  LabelString "Note: "
   LatexName authornote
 End
 
 Style ACM_Volume
   CopyStyle ACM_Journal
-  LabelString "ACM Volume: "
+  LabelString "Volume: "
   LatexName acmVolume
 End
 
 Style ACM_Number
   CopyStyle ACM_Journal
-  LabelString "ACM Number: "
+  LabelString "Number: "
   LatexName acmNumber
 End
 
 Style ACM_Article
   CopyStyle ACM_Journal
-  LabelString "ACM Article: "
+  LabelString "Article: "
   LatexName acmArticle
 End
 
 Style ACM_Year
   CopyStyle ACM_Journal
-  LabelString "ACM Year: "
+  LabelString "Year: "
   LatexName acmYear
 End
 
 Style ACM_Month
   CopyStyle ACM_Journal
-  LabelString "ACM Month: "
+  LabelString "Month: "
   LatexName acmMonth
 End
 
@@ -346,19 +349,19 @@ End
 
 Style ACM_Submission_ID
   CopyStyle ACM_Journal
-  LabelString "ACM Submission ID: "
+  LabelString "Submission ID: "
   LatexName acmSubmissionID
 End
 
 Style ACM_Price
   CopyStyle ACM_Journal
-  LabelString "ACM Price: "
+  LabelString "Price: "
   LatexName acmPrice
 End
 
 Style ACM_ISBN
   CopyStyle ACM_Journal
-  LabelString "ACM ISBN: "
+  LabelString "ISBN: "
   LatexName acmISBN
 End
 
@@ -494,33 +497,8 @@ Style ShortAuthors
   LatexName redefineshortauthors
 End
 
-Float
-	Type                  table*
-	GuiName               "Two-column table"
-	Placement             tbp
-	Extension             lot
-	NumberWithin          none
-	Style                 plain
-	ListName              "List of Tables"
-	IsPredefined          true
-	UsesFloatPkg          false
-	ListCommand           listoftables
-	RefPrefix             tab
-End
 
-Float
-  Type                  figure*
-  GuiName               "Two-column figure"
-  Placement             tbp
-  Extension             lof
-  NumberWithin          none
-  Style                 plain
-  ListName              "List of Figures"
-  IsPredefined          true
-  UsesFloatPkg          false
-  ListCommand           listoffigures
-  RefPrefix             fig
-End
+OutlinerName sidebar    "Sidebar" #no AddToToc
 
 Float
   Type                  sidebar
@@ -560,6 +538,10 @@ End
 
 OutlinerName thm "Definitions & Theorems"
 
+Counter theorem
+	Within                section
+End
+
 Style Theorem
 	Category              Reasoning
 	Margin                First_Dynamic