Fix OutlinerNames for Floats

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e11f6f910d7f36b08cd3593f615cc13546f6b9ac..48bef2bfdb1655f32475eb3e141db6230b7352a9 100644 (file)
--- 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 06844dfc93e1409261957aff512e0cc6112a62f0..ba396f976f56521bf555ef0c8c4fc8e3a2796512 100644 (file)
--- 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 43765ea8ecba5dd3fe26826490c9e6ae031c7c02..9363a0dc8f17a44dc9877c9b76a956191757f318 100644 (file)
--- 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 1f0951fc1deb38789a2cd0431240c2ae341d0698..3a04add0108fb3ecacfb2f599938f4552faa0b00 100644 (file)
--- 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 2a795ced8ae09cac561799d1064ce5c990732eca..59f77d93f7f4fc51cfd01e6413eed3331564279c 100644 (file)
--- 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 cd6ef4fefef790254cd475ca547083234d652a37..4a3c52118ef6118b60aad4e22bb0eccb678e1b1a 100644 (file)
--- 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 091e5d43090f500f28ca43c73b2377b40b2cd5e1..8488cd4d3c8d967a652978faf710d0ce9831caef 100644 (file)
--- 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 01a318818f478faf2c761d9e06e908edb1ac4fd5..fe8677a2d1c6f1db50bbd658ddf8aa4f122c6c65 100644 (file)
--- 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 7188e7b671ed18cfb0197c12f583afa29b4f07d2..f99ef26d26de26ccfbeda5393cd1a882d1495925 100644 (file)
--- 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 015f65e88505a3a6cc614c1b2063e9b3fc48bff8..52bbf320abd18bcf44a828641cbcaa8f45421a12 100644 (file)
--- 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 (file)
index 0000000..e8aced3
--- /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 f7f527dac1dae8e4826554ef23664ccd07edaab2..9c91c685f533f47c6fc263464b38276a7ef03f8c 100644 (file)
--- 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