DocBook: implement French letter.

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index d5f77955a573178b7d5056de20330bc684a3e247..ca86bc4fb60c8949a5f054bfbafdcf71ba0e4348 100644 (file)
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -443,6 +443,8 @@ export/templates/Theses/PhD_Thesis/.*_docbook5
 #   - Hollywood, too much formatting in elements DocBook does not allow to be formatted (like address).
 export/templates/Scripts/Hollywood_docbook5
 export/export/docbook/Hollywood_docbook5
+#   - Lettre, formatting in elements DocBook does not allow to be formatted (like email).
+export/templates/Letters/French_Letter_%28lettre%29_docbook5
 # - Branches may cause problems (especially when mixing with parts that must go in <info>).
 export/export/latex/languages/supported-languages_docbook5
 

diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout
index 0687e1b4be18cf44c92ebb719df9bfa6ed8136ae..bb4d4b1ec7be56fc00adf4bc1c8c706bd0ebda74 100644 (file)
--- a/lib/layouts/lettre.layout
+++ b/lib/layouts/lettre.layout
@@ -28,6 +28,8 @@
 # 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 85
 
@@ -157,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
@@ -187,6 +194,11 @@ Style Place
         \renewcommand{\lylieu}{\lieu{#1}}
         }
   EndPreamble
+  DocBookTag         city
+  DocBookTagType     paragraph
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 #suppress City indication
@@ -213,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
@@ -236,6 +253,9 @@ Style Date
     Shape              Italic
     Color              red
   EndFont
+  DocBookTag      date
+  DocBookTagType  paragraph
+  DocBookInInfo   always
 End
 
 #suppress date indication
@@ -256,6 +276,8 @@ Style NoDate
   EndFont
   Preamble
   EndPreamble
+  DocBookTag     NONE
+  DocBookInInfo  always
 End
 
 # location (i.e. office, department ...)
@@ -286,6 +308,9 @@ Style Location
         \renewcommand{\lylocation}{\location{#1}}
         }
   EndPreamble
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 # telephone Style
@@ -316,6 +341,9 @@ Style Telephone
         \renewcommand{\lytelephone}{\telephone{#1}}
        }
   EndPreamble
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 #suppress telephone indication
@@ -341,7 +369,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
@@ -372,6 +404,11 @@ Style Fax
         \renewcommand{\lyfax}{\fax{#1}}
         }
   EndPreamble
+  DocBookTag         fax
+  DocBookTagType     paragraph
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 #suppress fax indication
@@ -397,6 +434,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
 
 
@@ -428,6 +470,11 @@ Style Email
         \renewcommand{\lyemail}{\email{#1}}
         }
   EndPreamble
+  DocBookTag         email
+  DocBookTagType     paragraph
+  DocBookWrapperTag  address
+  DocBookWrapperMergeWithPrevious  true
+  DocBookInInfo      always
 End
 
 # Subject Style
@@ -450,6 +497,9 @@ Style Subject
     Shape              Italic
     Color              red
   EndFont
+  DocBookTag     title
+  DocBookTagType paragraph
+  DocBookInInfo  maybe
 End
 
 # YourRef Style
@@ -466,6 +516,10 @@ Style YourRef
     Shape              Italic
     Color              red
   EndFont
+  DocBookTag      productnumber
+  DocBookAttr     role='your-ref'
+  DocBookTagType  paragraph
+  DocBookInInfo   always
 End
 
 # MyRef Style
@@ -482,6 +536,10 @@ Style MyRef
     Shape              Italic
     Color              red
   EndFont
+  DocBookTag      productnumber
+  DocBookAttr     role='my-ref'
+  DocBookTagType  paragraph
+  DocBookInInfo   always
 End
 
 Style Send_To_Address
@@ -514,6 +572,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
@@ -536,11 +599,13 @@ Style EndOfMessage
     Shape              Italic
     Color              red
   EndFont
+  DocBookTag  NONE
 End
 
 Style EndOfFile
   CopyStyle            EndOfMessage
   LabelString          EndOfFile.
+  DocBookTag  NONE
 End
 
 # Opening style definition (Accroche)
@@ -674,7 +739,6 @@ Style Post_Scriptum
         \psneededtrue
        }
   EndPreamble
+  DocBookTag   para
+  DocBookAttr  role='post-scriptum'
 End
-
-
-

diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc
index 931fff8aa17bb3a96c7d50eb8afca5eb4988a8ea..23ddbf5b35355a821b9a0edde5b8db9a7e2d2251 100644 (file)
--- a/lib/layouts/stdletter.inc
+++ b/lib/layouts/stdletter.inc
@@ -19,6 +19,7 @@ Style Standard
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             No_Label
+       DocBookTag            para
 End
 
 
@@ -31,6 +32,7 @@ Style My_Address
        BottomSep             1.5
        ParSep                1.5
        Align                 Left
+       DocBookTag            address
 End
 
 
@@ -46,6 +48,8 @@ Style Send_To_Address
        Align                 Left
        AlignPossible         Block, Left, Right, Center
        LabelType             No_Label
+       DocBookTag            address
+       DocBookAttr           role='send-to-address'
 End
 
 
@@ -69,6 +73,8 @@ Style Opening
          Shape               Italic
          Color               red
        EndFont
+       DocBookTag   para
+       DocBookAttr  role='opening'
 End
 
 
@@ -91,6 +97,8 @@ Style Signature
          Shape               Italic
          Color               red
        EndFont
+       DocBookTag   para
+       DocBookAttr  role='signature'
 End
 
 
@@ -98,6 +106,8 @@ Style Closing
        CopyStyle             Signature
        LatexName             closing
        LabelString           "Closing:"
+       DocBookTag   para
+       DocBookAttr  role='opening'
 End
 
 
@@ -110,6 +120,8 @@ Style cc
          Shape               Italic
          Color               green
        EndFont
+       DocBookTag   para
+       DocBookAttr  role='carbon-copy'
 End
 
 
@@ -118,6 +130,8 @@ Style encl
        LatexName             encl
        LabelString           "encl:"
        Spacing               Other 1.5
+       DocBookTag   para
+       DocBookAttr  role='enclosed'
 End
 
 
@@ -125,6 +139,12 @@ Style Location
        CopyStyle             cc
        LatexName             thispagestyle{firstpage}\location
        LabelString           "Location:"
+       DocBookTag         otheraddr
+       DocBookTag         otheraddr
+       DocBookAttr        role='place'
+       DocBookAttr        role='place'
+       DocBookTagType     paragraph
+       DocBookTagType     paragraph
 End
 
 
@@ -132,4 +152,6 @@ Style Telephone
        CopyStyle             cc
        LatexName             thispagestyle{firstpage}\telephone
        LabelString           "Telephone:"
+       DocBookTag         phone
+       DocBookTagType     paragraph
 End