From a214d95513567d9f0a7f8136b5ca4443db94431b Mon Sep 17 00:00:00 2001
From: jpc <jpc@lyx.org>
Date: Thu, 6 Oct 2016 13:52:16 +0100
Subject: [PATCH]    lettre: remove old workaround about page format in layout
 and update template

---
 lib/layouts/lettre.layout | 11 +++++--
 lib/templates/lettre.lyx  | 65 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout
index a26a54d609..f8512fe85c 100644
--- a/lib/layouts/lettre.layout
+++ b/lib/layouts/lettre.layout
@@ -23,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 60
+Format 68
 
 #(pre)declarations (just to impose some order on the menus)
 Style Standard
@@ -129,8 +133,9 @@ Preamble
 
 % to get the specified pagesize 
 % (workaround for an a4paper/lettre problem in pdf mode)
-\@ifpackageloaded{ifpdf}{}{\usepackage{ifpdf}}
-\ifpdf\input pdftexconfig.tex\fi
+% 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
 
diff --git a/lib/templates/lettre.lyx b/lib/templates/lettre.lyx
index 27371db209..33cb076343 100644
--- a/lib/templates/lettre.lyx
+++ b/lib/templates/lettre.lyx
@@ -1,5 +1,5 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 512
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -11,7 +11,7 @@
 \language_package default
 \inputencoding auto
 \fontencoding global
-\font_roman "default" "default"
+\font_roman "default" "FreeSans"
 \font_sans "default" "default"
 \font_typewriter "default" "default"
 \font_math "auto" "auto"
@@ -21,6 +21,7 @@
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -29,7 +30,7 @@
 \paperfontsize 11
 \spacing single
 \use_hyperref false
-\papersize a4paper
+\papersize default
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
@@ -85,6 +86,62 @@ La liste des styles couvre tous les éléments d'une lettre qui apparaissent
 L'ordre des éléments est indifférent.
 \end_layout
 
+\begin_layout Plain Layout
+Le format de la page est codé en dur en Iso A4 jusqu'à le version 2.351 de
+ la classe (09/09/2014, TeXLive 2015), qui interprète correctement l'option
+ de classe 
+\family typewriter
+a4paper
+\family default
+.
+ Par contre, les options de classe 
+\family typewriter
+letterpaper
+\family default
+, 
+\family typewriter
+legalpaper
+\family default
+ et 
+\family typewriter
+executivepaper
+\family default
+ (appelés respectivement par 
+\family typewriter
+Lettre US
+\family default
+, 
+\family typewriter
+Légal US
+\family default
+ et 
+\family typewriter
+Executive US
+\family default
+ dans la fenêtre 
+\family sans
+Documents\SpecialChar menuseparator
+Paramètres\SpecialChar menuseparator
+Format de la Page
+\family default
+) donnent des tailles de page inexactes, il faut installer la version 2.354
+ pour un fonctionnement correct si vous résidez dans un pays utilisant les
+ normes US.
+ Elle peut être téléchargée 
+\series bold
+
+\begin_inset CommandInset href
+LatexCommand href
+name "ici"
+target "http://download.gna.org/lettre_observatoire/release/20151201_v2.354/lettre.zip"
+
+\end_inset
+
+
+\series default
+, et installée localement en attendant sa ditribution officielle.
+\end_layout
+
 \end_inset