Move RevTeX section in Additional.lyx into Chapter 3 Document classes

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

diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout
index 4908fb33e3033e94e06540ea468e75fc7c3e2081..f24162d06ad429f5e9a0e4f410722cf2eb67b84f 100644 (file)
--- a/lib/layouts/lettre.layout
+++ b/lib/layouts/lettre.layout
@@ -23,9 +23,15 @@
 #  - 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)
+
+# TODO: DocBook doesn't support several letters in the same file.
 
 
-Format 48
+Format 98
 
 #(pre)declarations (just to impose some order on the menus)
 Style Standard
@@ -129,8 +135,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
 
@@ -152,6 +159,11 @@ Style My_Address
        \providecommand{\lyaddress}{\address{#1}}
        }
   EndPreamble
+  # Don't break the sequential bunch of elements going into the wrapper.
+  DocBookTag         NONE
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 # City name style
@@ -173,7 +185,7 @@ Style Place
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
    \newcommand{\Myplace}[1]{   % will save the info for future use
@@ -182,6 +194,11 @@ Style Place
         \renewcommand{\lylieu}{\lieu{#1}}
         }
   EndPreamble
+  DocBookTag         city
+  DocBookTagType     paragraph
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 #suppress City indication
@@ -198,7 +215,7 @@ Style NoPlace
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
 
   Preamble
@@ -208,6 +225,11 @@ Style NoPlace
         \renewcommand{\lylieu}{\nolieu{}}
         }
   EndPreamble
+  # Don't break the sequential bunch of elements going into the wrapper.
+  DocBookTag         NONE
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 # date Style
@@ -229,8 +251,12 @@ Style Date
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
+  DocBookTag      date
+  DocBookTagType  paragraph
+  DocBookInInfo   always
+  DocBookNoFontInside   true
 End
 
 #suppress date indication
@@ -247,10 +273,12 @@ Style NoDate
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
   EndPreamble
+  DocBookTag     NONE
+  DocBookInInfo  always
 End
 
 # location (i.e. office, department ...)
@@ -272,7 +300,7 @@ Style Location
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
    \newcommand{\MyLocation}[1]{ % will save the info for future use
@@ -281,6 +309,9 @@ Style Location
         \renewcommand{\lylocation}{\location{#1}}
         }
   EndPreamble
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 # telephone Style
@@ -302,7 +333,7 @@ Style Telephone
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
     \newcommand{\MyTelephone}[1]{ % will save the info for future use
@@ -311,6 +342,9 @@ Style Telephone
         \renewcommand{\lytelephone}{\telephone{#1}}
        }
   EndPreamble
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 #suppress telephone indication
@@ -327,7 +361,7 @@ Style NoTelephone
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
    \newcommand{\MyNoTelephone}{
@@ -336,7 +370,11 @@ Style NoTelephone
         \renewcommand{\lytelephone}{\notelephone{}}
         }
   EndPreamble
-
+  # Don't break the sequential bunch of elements going into the wrapper.
+  DocBookTag         NONE
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 # telefax Style
@@ -358,7 +396,7 @@ Style Fax
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
    \newcommand{\MyFax}[1]{ % will save the info for future use
@@ -367,6 +405,11 @@ Style Fax
         \renewcommand{\lyfax}{\fax{#1}}
         }
   EndPreamble
+  DocBookTag         fax
+  DocBookTagType     paragraph
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 #suppress fax indication
@@ -383,7 +426,7 @@ Style NoFax
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
    \newcommand{\MyNoFax}{
@@ -392,6 +435,11 @@ Style NoFax
         \renewcommand{\lyfax}{\nofax{}}
         }
   EndPreamble
+  # Don't break the sequential bunch of elements going into the wrapper.
+  DocBookTag         NONE
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 
@@ -414,7 +462,7 @@ Style Email
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
    \newcommand{\MyEmail}[1]{ % will save the info for future use
@@ -423,6 +471,11 @@ Style Email
         \renewcommand{\lyemail}{\email{#1}}
         }
   EndPreamble
+  DocBookTag         email
+  DocBookTagType     paragraph
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 # Subject Style
@@ -443,8 +496,11 @@ Style Subject
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
+  DocBookTag     title
+  DocBookTagType paragraph
+  DocBookInInfo  maybe
 End
 
 # YourRef Style
@@ -459,8 +515,12 @@ Style YourRef
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
+  DocBookTag      productnumber
+  DocBookAttr     role='your-ref'
+  DocBookTagType  paragraph
+  DocBookInInfo   always
 End
 
 # MyRef Style
@@ -475,8 +535,12 @@ Style MyRef
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
+  DocBookTag      productnumber
+  DocBookAttr     role='my-ref'
+  DocBookTagType  paragraph
+  DocBookInInfo   always
 End
 
 Style Send_To_Address
@@ -509,6 +573,11 @@ Style Send_To_Address
          \needsendlettertrue
        }
   EndPreamble
+  DocBookTag         NONE
+  DocBookWrapperTag  address
+  DocBookWrapperAttr role='send-to-address'
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 #As a temporary(?) trick the last(only?) letter of the file must be processed
@@ -529,13 +598,15 @@ Style EndOfMessage
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
+  DocBookTag  NONE
 End
 
 Style EndOfFile
   CopyStyle            EndOfMessage
   LabelString          EndOfFile.
+  DocBookTag  NONE
 End
 
 # Opening style definition (Accroche)
@@ -548,7 +619,7 @@ Style Opening
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
 End
 
@@ -576,7 +647,7 @@ Style Signature
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
       %% automatic assignment of signatures
@@ -614,7 +685,7 @@ Style encl
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
     \newcommand{\lyxenc}[1]{
@@ -635,7 +706,7 @@ Style       cc
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
     \newcommand{\lyxcc}[1]{
@@ -660,7 +731,7 @@ Style Post_Scriptum
   LabelFont 
     Series             Bold
     Shape              Italic
-    Color              red
+    Color              textlabel3
   EndFont
   Preamble
     \newcommand{\lyxps}[1]{
@@ -669,7 +740,6 @@ Style Post_Scriptum
         \psneededtrue
        }
   EndPreamble
+  DocBookTag   para
+  DocBookAttr  role='post-scriptum'
 End
-
-
-