Honor trailing spaces in LabelString and friends

[lyx.git] / lib / layouts / lettre.layout

diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout
index 6c9844d37fbfb0857689ac28ce7a4f720c3009b2..a23c686ef24f3e185f031dab19eaa224725886eb 100644 (file)
--- a/lib/layouts/lettre.layout
+++ b/lib/layouts/lettre.layout
@@ -1,5 +1,6 @@
 #% Do not delete the line below; configure depends on this
-#    \DeclareLaTeXClass{letter (lettre)}
+#  \DeclareLaTeXClass{French Letter (lettre)}
+#  \DeclareCategory{Letters}
 # French Letter textclass definition file. 
 # Author : Alain Castera <castera@in2p3.fr>
 # Modifies only some things from letter.layout
@@ -22,9 +23,13 @@
 #  - margins set to dynamic to ensure alignment of line headings
 #  - categories
 #  - ordering control left at the beginning (any other way ?)
+#---------------
+# rev.4; J.-P. Chretien oct 2016
+# update and review for inclusion in lyx-2.2.3
+#  - remove the workaround for page format (not needed after v2.351)
 
 
-Format 29
+Format 64
 
 #(pre)declarations (just to impose some order on the menus)
 Style Standard
@@ -126,12 +131,18 @@ Preamble
     \fi                % if needSendFax
   }    %findemessage
 
+% to get the specified pagesize 
+% (workaround for an a4paper/lettre problem in pdf mode)
+% removed in oct 2016, no more needed since 2.351 and created an error with LuaTeX
+%\@ifpackageloaded{ifpdf}{}{\usepackage{ifpdf}}
+%\ifpdf\input pdftexconfig.tex\fi
+
 EndPreamble
 
 # My Address style used to specify sender name and coordinates
 Style My_Address
   CopyStyle     My_Address
-  Category      Headings
+  Category      "Postal Data"
   Margin        Static
   LatexType     Command
   LatexName     MyAddress