From: Guillaume MM <gm@lyx.org>
Date: Sat, 13 May 2017 15:36:20 +0000 (+0200)
Subject: Fix OutlinerNames for Floats
X-Git-Tag: 2.3.0beta1~407
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a72873a521fd6d716364666a6314684a734ba94e;p=features.git

Fix OutlinerNames for Floats
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e11f6f910d..48bef2bfdb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2252,6 +2252,7 @@ dist_layouts_DATA =\
 	layouts/stdcharstyles.inc \
 	layouts/stdcounters.inc \
 	layouts/stdcustom.inc \
+	layouts/stdfloatnames.inc \
 	layouts/stdfloats.inc \
 	layouts/stdinsets.inc \
 	layouts/stdlayouts.inc \
diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index 06844dfc93..ba396f976f 100644
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -159,6 +159,8 @@ Style Keywords
 	TopSep			0.3
 End
 
+OutlinerName scheme "Schemes" #no AddToToc
+
 Float
 	Type			scheme
 	GuiName			Scheme
@@ -181,6 +183,8 @@ InsetLayout scheme
 	MultiPar		true
 End
 
+OutlinerName chart "Charts" #no AddToToc
+
 Float
 	Type			chart
 	GuiName			Chart
@@ -203,6 +207,8 @@ InsetLayout chart
 	MultiPar		true
 End
 
+OutlinerName graph "Graphs[[mathematical]]" #no AddToToc
+
 Float
 	# We need the [[mathematical]] context, since graph in the sense of
 	# diagram is not meant (chart is used for this, see above).
diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout
index 43765ea8ec..9363a0dc8f 100644
--- a/lib/layouts/acmart.layout
+++ b/lib/layouts/acmart.layout
@@ -494,33 +494,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
diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 1f0951fc1d..3a04add010 100644
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -179,6 +179,9 @@ Style Bibliography
 End
 
 
+OutlinerName plate        "Plates" #no AddToToc
+OutlinerName planotable  "Planotables" #no AddToToc
+
 Float
 	Type                  plate
 	GuiName               Plate
diff --git a/lib/layouts/algorithm2e.module b/lib/layouts/algorithm2e.module
index 2a795ced8a..59f77d93f7 100644
--- a/lib/layouts/algorithm2e.module
+++ b/lib/layouts/algorithm2e.module
@@ -11,6 +11,8 @@ Format 63
 
 Requires algorithm2e
 
+Input stdfloatnames.inc
+
 Float
 	Type                  algorithm
 	GuiName               Algorithm
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index cd6ef4fefe..4a3c52118e 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1587,6 +1587,8 @@ End
 # FLOATS
 #
 
+Input stdfloatnames.inc
+
 Float
   Type             table
   GuiName          Table
diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 091e5d4309..8488cd4d3c 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -257,6 +257,8 @@ End
 
 
 # Tableaux for Optimality Theory
+OutlinerName tableau        "Tableaux" #no AddToToc
+
 Float
 	Type                  tableau
 	GuiName               Tableau
diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout
index 01a318818f..fe8677a2d1 100644
--- a/lib/layouts/powerdot.layout
+++ b/lib/layouts/powerdot.layout
@@ -499,6 +499,8 @@ End
 ###
 # Float definitions
 ###
+Input stdfloatnames.inc
+
 Float
 	Type                  table
 	GuiName               Table
diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout
index 7188e7b671..f99ef26d26 100644
--- a/lib/layouts/revtex4-1.layout
+++ b/lib/layouts/revtex4-1.layout
@@ -252,6 +252,8 @@ Style Wide_Text
 End
 
 
+Input stdfloatnames.inc
+
 Float
 	Type			algorithm
 	GuiName			Algorithm
diff --git a/lib/layouts/sciposter.layout b/lib/layouts/sciposter.layout
index 015f65e885..52bbf320ab 100644
--- a/lib/layouts/sciposter.layout
+++ b/lib/layouts/sciposter.layout
@@ -82,6 +82,8 @@ InsetLayout Caption:Standard
 	EndArgument
 End
 
+Input stdfloatnames.inc
+
 Float
 	Type                  algorithm
 	GuiName               Algorithm
diff --git a/lib/layouts/stdfloatnames.inc b/lib/layouts/stdfloatnames.inc
new file mode 100644
index 0000000000..e8aced3ee7
--- /dev/null
+++ b/lib/layouts/stdfloatnames.inc
@@ -0,0 +1,10 @@
+# This defines the names used by common Float types.
+
+Format 63
+
+OutlinerName table        "Tables"
+OutlinerName figure       "Figures"
+OutlinerName algorithm    "Algorithms"
+OutlinerName marginfigure "Margin Figures"
+OutlinerName margintable  "Margin Tables"
+
diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc
index f7f527dac1..9c91c685f5 100644
--- a/lib/layouts/stdfloats.inc
+++ b/lib/layouts/stdfloats.inc
@@ -6,9 +6,7 @@
 
 Format 63
 
-OutlinerName table        "Tables" #no AddToToc (built-in)
-OutlinerName figure       "Figures" #no AddToToc (built-in)
-OutlinerName algorithm    "Algorithms" #no AddToToc (built-in)
+Input stdfloatnames.inc
 
 Float
 	Type                  table