Honor trailing spaces in LabelString and friends

Remove the trimming operation on LabelString, LabelStringAppendix, EndLabelString and LabelCounter. This trimming meant that quotes strings were not preserved, which is wrong. To preserve layouts, the Layout format has been updated to 64, so that layout2layout can remove extra spaces on existing strings, which ensures that behavior is unchanged for old layouts (courtesy of rgheck). It is now possible to re-add spaces in label strings where it makes sense. Fixes bug #10723.
2024-11-22 10:00:33 +00:00 · 2017-08-31 12:03:54 +02:00 · 2017-08-31 12:03:54 +02:00 · 5c54557350
commit 5c54557350
parent 42c14d0c90
228 changed files with 280 additions and 265 deletions
--- a/lib/layouts/AEA.layout
+++ b/lib/layouts/AEA.layout
@ -4,7 +4,7 @@
 # Authors : Koji Yokota <yokota@res.otaru-uc.ac.jp>
 #           Uwe Stöhr <uwestoehr@web.de>

-Format 63
+Format 64
 Input stdclass.inc
 Input theorems-ams.module
 Input theorems-bytype.module
@ -303,7 +303,7 @@ Style Caption
 	LatexType	Command
 	LatexName	QTR{caption}
 	LabelCounter	caption
-	LabelString	"Caption: "
+	LabelString	"Caption:"
 	LeftMargin	"Caption: "
 	Align		Center
 End
--- a/lib/layouts/IEEEtran-CompSoc.layout
+++ b/lib/layouts/IEEEtran-CompSoc.layout
@ -6,7 +6,7 @@
 # IEEtran Computer Society textclass definition file.


-Format 63
+Format 64

 Input IEEEtran.layout

--- a/lib/layouts/IEEEtran-TransMag.layout
+++ b/lib/layouts/IEEEtran-TransMag.layout
@ -6,7 +6,7 @@
 # IEEtran Magnetics textclass definition file.


-Format 63
+Format 64

 Input IEEEtran.layout

--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@ -9,7 +9,7 @@
 # IEEtran textclass definition file.


-Format 63
+Format 64

 Sides		1
 SecNumDepth	3
--- a/lib/layouts/InStar.module
+++ b/lib/layouts/InStar.module
@ -11,7 +11,7 @@
 #DescriptionEnd
 #Author: Richard Heck <rgheck@lyx.org>

-Format 63
+Format 64

 Style "In Preamble"
 	CopyStyle Standard
--- a/lib/layouts/RJournal.layout
+++ b/lib/layouts/RJournal.layout
@ -4,7 +4,7 @@
 # Author: Yihui Xie
 # Modified by: Scott Kostyshak

-Format 63
+Format 64

 Input stdclass.inc

--- a/lib/layouts/a0poster.layout
+++ b/lib/layouts/a0poster.layout
@ -3,7 +3,7 @@
 #  \DeclareCategory{Posters}
 # Wrapper layout for the a0poster poster class

-Format 63
+Format 64

 # Authors: Günter Milde, Jürgen Spitzmüller

--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@ -18,7 +18,7 @@
 # 2013-05-26  Updated for aa.cls version 8.2


-Format 63
+Format 64
 Columns		2
 Sides		2
 SecNumDepth	3
--- a/lib/layouts/aapaper.inc
+++ b/lib/layouts/aapaper.inc
@ -5,7 +5,7 @@
 # Author: Peter Sütterlin <pit@uni-sw.gwdg.de>


-Format 63
+Format 64
 Style Subtitle
 	Margin                Static
 	LatexType             Command
--- a/lib/layouts/aapaper.layout
+++ b/lib/layouts/aapaper.layout
@ -15,7 +15,7 @@
 # and reconfigure LyX (after running texhash, of course).


-Format 63
+Format 64
 Columns                 2
 Sides                   2
 SecNumDepth             3
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@ -42,7 +42,7 @@
 # 	The new "aastex6.layout" depends on aastex6.cls but inputs this
 #       file for the definitions (cf. LyX ticket #10027)

-Format 63
+Format 64
 Columns			1
 Sides			1
 #SecNumDepth		3
--- a/lib/layouts/aastex6.layout
+++ b/lib/layouts/aastex6.layout
@ -46,7 +46,7 @@
 #       - aastex6.cls loads hyperref (with pre-set options) and url
 #         -> option clash if "Use Hyerref" is selected in Document>Settings

-Format 63
+Format 64

 Input aastex.layout

--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@ -4,7 +4,7 @@
 # textclass definition file for achemso 3.8 and 3.9
 # Author: Uwe Stöhr (uwestoehr@web.de)

-Format 63
+Format 64

 Columns				1
 Sides				1
--- a/lib/layouts/acm-sigs-alt.layout
+++ b/lib/layouts/acm-sigs-alt.layout
@ -9,6 +9,6 @@
 #
 # Author: Gioele Barabucci

-Format 63
+Format 64
 Input acm-sigs.inc

--- a/lib/layouts/acm-sigs.inc
+++ b/lib/layouts/acm-sigs.inc
@ -2,7 +2,7 @@
 #
 # Author: Gioele Barabucci

-Format 63
+Format 64
 Input stdclass.inc

 Columns 2
--- a/lib/layouts/acm-sigs.layout
+++ b/lib/layouts/acm-sigs.layout
@ -9,6 +9,6 @@
 #
 # Author: Gioele Barabucci

-Format 63
+Format 64
 Input acm-sigs.inc

--- a/lib/layouts/acmart.layout
+++ b/lib/layouts/acmart.layout
@ -7,7 +7,7 @@
 # Author : John Perry <john.perry@usm.edu>
 #          Guillaume Munch-Maccagnoni <gm@lyx.org>

-Format 63
+Format 64

 Provides amscls 1
 Provides amsmath 1
@ -95,7 +95,7 @@ Style Thanks
    Family Roman
  EndFont
  LabelType Static
-  LabelString "Thanks: "
+  LabelString "Thanks:"
  LatexType command
  LatexName thanks
  Margin Dynamic
@ -106,7 +106,7 @@ Style ACM_Journal
  AlignPossible left
  Category Preamble
  InPreamble  1
-  LabelString "Journal's Short Name: "
+  LabelString "Journal's Short Name:"
  LabelType Static
  LabelFont
    Color Blue
@ -135,7 +135,7 @@ Style ACM_Conference
    LabelString "Venue"
    Mandatory 1
  EndArgument
-  LabelString "Conference Name: "
+  LabelString "Conference Name:"
  LatexName acmConference
  Margin Dynamic
 End
@ -173,7 +173,7 @@ Style Email
  EndFont
  #InPreamble  1
  InTitle 1
-  LabelString "Email address: "
+  LabelString "Email address:"
  LabelType Static
  LabelFont
    Color Blue
@ -187,7 +187,7 @@ End

 Style ORCID
  CopyStyle Email
-  LabelString "ORCID: "
+  LabelString "ORCID:"
  Font
    Family Roman
  EndFont
@ -207,13 +207,13 @@ Style Affiliation
    Color Blue
    Shape Italic
  EndFont
-  LabelString "Affiliation: "
+  LabelString "Affiliation:"
  LatexName affiliation
 End

 Style Additional_Affiliation
  CopyStyle Affiliation
-  LabelString "Additional Affiliation: "
+  LabelString "Additional Affiliation:"
  LatexName additionalaffiliation
 End

@ -291,7 +291,7 @@ Style TitleNote
    Color Blue
    Shape Italic
  EndFont
-  LabelString "Title Note: "
+  LabelString "Title Note:"
  LatexName titlenote
  TopSep 0.3
  BottomSep 0.3
@ -299,103 +299,103 @@ End

 Style SubtitleNote
  CopyStyle TitleNote
-  LabelString "Subtitle Note: "
+  LabelString "Subtitle Note:"
  LatexName subtitlenote
 End

 Style AuthorNote
  CopyStyle TitleNote
-  LabelString "Author Note: "
+  LabelString "Author Note:"
  LatexName authornote
 End

 Style ACM_Volume
  CopyStyle ACM_Journal
-  LabelString "ACM Volume: "
+  LabelString "ACM Volume:"
  LatexName acmVolume
 End

 Style ACM_Number
  CopyStyle ACM_Journal
-  LabelString "ACM Number: "
+  LabelString "ACM Number:"
  LatexName acmNumber
 End

 Style ACM_Article
  CopyStyle ACM_Journal
-  LabelString "ACM Article: "
+  LabelString "ACM Article:"
  LatexName acmArticle
 End

 Style ACM_Year
  CopyStyle ACM_Journal
-  LabelString "ACM Year: "
+  LabelString "ACM Year:"
  LatexName acmYear
 End

 Style ACM_Month
  CopyStyle ACM_Journal
-  LabelString "ACM Month: "
+  LabelString "ACM Month:"
  LatexName acmMonth
 End

 Style ACM_Art_Seq_Num
  CopyStyle ACM_Journal
-  LabelString "Article Sequential Number: "
+  LabelString "Article Sequential Number:"
  LatexName acmArticleSeq
 End

 Style ACM_Submission_ID
  CopyStyle ACM_Journal
-  LabelString "ACM Submission ID: "
+  LabelString "ACM Submission ID:"
  LatexName acmSubmissionID
 End

 Style ACM_Price
  CopyStyle ACM_Journal
-  LabelString "ACM Price: "
+  LabelString "ACM Price:"
  LatexName acmPrice
 End

 Style ACM_ISBN
  CopyStyle ACM_Journal
-  LabelString "ACM ISBN: "
+  LabelString "ACM ISBN:"
  LatexName acmISBN
 End

 Style ACM_DOI
  CopyStyle ACM_Journal
-  LabelString "ACM DOI: "
+  LabelString "ACM DOI:"
  LatexName acmDOI
 End

 Style ACM_Badge_R
  CopyStyle ACM_Journal
-  LabelString "ACM Badge R: "
+  LabelString "ACM Badge R:"
  LatexName acmBadgeR
 End

 Style ACM_Badge_L
  CopyStyle ACM_Journal
-  LabelString "ACM Badge L: "
+  LabelString "ACM Badge L:"
  LatexName acmBadgeL
 End

 Style Start_Page
  CopyStyle ACM_Journal
-  LabelString "Start Page: "
+  LabelString "Start Page:"
  LatexName startPage
 End

 Style Terms
  CopyStyle TitleNote
-  LabelString "Terms: "
+  LabelString "Terms:"
  LatexName terms
 End

 Style Keywords
  CopyStyle TitleNote
-  LabelString "Keywords: "
+  LabelString "Keywords:"
  LatexName keywords
 End

@ -410,7 +410,7 @@ Style CCSXML
  EndFont
  FreeSpacing 1
  InTitle 1
-  LabelString "Computing Classification Scheme (XML): "
+  LabelString "Computing Classification Scheme (XML):"
  LabelType Centered
  LabelFont
    Family Roman
@ -426,7 +426,7 @@ Style CCS_Description
  Argument 1
    LabelString "Significance"
  EndArgument
-  LabelString "Computing Classification Scheme: "
+  LabelString "Computing Classification Scheme:"
  LatexName ccsdesc
  Font
    Family Typewriter
@ -441,13 +441,13 @@ End

 Style Set_Copyright
  CopyStyle ACM_Journal
-  LabelString "Set Copyright: "
+  LabelString "Set Copyright:"
  LatexName setcopyright
 End

 Style Copyright_Year
  CopyStyle ACM_Journal
-  LabelString "Copyright Year: "
+  LabelString "Copyright Year:"
  LatexName copyrightyear
 End

@ -466,7 +466,7 @@ Style Received
    LabelString "Stage"
    Mandatory 0
  EndArgument
-  LabelString "Received: "
+  LabelString "Received:"
  LatexName received
 End

@ -482,7 +482,7 @@ Style ShortAuthors
  LatexType command
  InTitle 0
  LabelType Static
-  LabelString "Short authors: "
+  LabelString "Short authors:"
  Margin Dynamic
  LabelFont
    Family Roman
--- a/lib/layouts/acmsiggraph-0-92.layout
+++ b/lib/layouts/acmsiggraph-0-92.layout
@ -19,7 +19,7 @@
 #	 "TOG data URL", and "TOG code URL". The corresponding 
 #	 LaTeX commands are no longer supported.

-Format 63
+Format 64

 Columns			1
 Sides			1
--- a/lib/layouts/acmsiggraph.layout
+++ b/lib/layouts/acmsiggraph.layout
@ -11,7 +11,7 @@
 # ACM style files can be obtained at
 # http://www.acm.org/sigs/pubs/proceed/template.html

-Format 63
+Format 64

 Columns			1
 Sides			1
--- a/lib/layouts/agu-dtd.layout
+++ b/lib/layouts/agu-dtd.layout
@ -6,7 +6,7 @@
 #           Martin Vermeer <martin.vermeer@hut.fi>


-Format 63
+Format 64
 Input agu_stdclass.inc

 # Exclude higher, or equal, sections:
--- a/lib/layouts/agu_stdclass.inc
+++ b/lib/layouts/agu_stdclass.inc
@ -6,7 +6,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 OutputType              docbook

 Columns                 1
--- a/lib/layouts/agu_stdcounters.inc
+++ b/lib/layouts/agu_stdcounters.inc
@ -4,7 +4,7 @@
 # This include file contains all the counters that are defined as standard
 # in AGU-Article LyX layouts.

-Format 63
+Format 64
 Counter sect1
 	Within               section
 End
--- a/lib/layouts/agu_stdlists.inc
+++ b/lib/layouts/agu_stdlists.inc
@ -6,7 +6,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdlists.inc


--- a/lib/layouts/agu_stdsections.inc
+++ b/lib/layouts/agu_stdsections.inc
@ -6,7 +6,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdsections.inc

 Style Part
--- a/lib/layouts/agu_stdtitle.inc
+++ b/lib/layouts/agu_stdtitle.inc
@ -6,7 +6,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdtitle.inc


--- a/lib/layouts/agums.layout
+++ b/lib/layouts/agums.layout
@ -5,7 +5,7 @@
 # Author: Martin Vermeer <martin.vermeer@hut.fi>


-Format 63
+Format 64
 Input aguplus.inc

 ClassOptions
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@ -6,7 +6,7 @@
 # ftp://ftp.agu.org/journals/latex/journals


-Format 63
+Format 64
 Input stdclass.inc

 SecNumDepth             4
--- a/lib/layouts/agutex.layout
+++ b/lib/layouts/agutex.layout
@ -4,7 +4,7 @@
 # AGUTeX textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)

-Format 63
+Format 64

 Columns			1
 Sides			1
--- a/lib/layouts/algorithm2e.module
+++ b/lib/layouts/algorithm2e.module
@ -7,7 +7,7 @@
 #
 #Author: Jürgen Spitzmüller

-Format 63
+Format 64

 Requires algorithm2e

--- a/lib/layouts/amsart.layout
+++ b/lib/layouts/amsart.layout
@ -11,7 +11,7 @@
 # Modularized Jan '08 by Richard Heck <rgheck@brown.edu>
 # Moved "number within sections" to modules Aug '09 (Paul Rubin <rubin@msu.edu>)

-Format 63
+Format 64

 Columns                 1
 Sides                   2
--- a/lib/layouts/amsbook.layout
+++ b/lib/layouts/amsbook.layout
@ -12,7 +12,7 @@
 # Moved "number within sections" to modules Aug '09 (Paul Rubin <rubin@msu.edu>)


-Format 63
+Format 64

 Columns                 1
 Sides                   2
--- a/lib/layouts/amsdefs.inc
+++ b/lib/layouts/amsdefs.inc
@ -5,7 +5,7 @@
 # Modularized Jan '08 by Richard Heck <rgheck@brown.edu>

 # Including the maths stuff
-Format 63
+Format 64

 # By default AMS articles & books use leqno option (as SIAM journals).
 Provides leqno 1
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@ -3,7 +3,7 @@
 #  \DeclareCategory{Articles}
 # Author: Randy Gobbel <gobbel@andrew.cmu.edu>

-Format 63
+Format 64
 Columns                 1
 Sides                   1
 PageStyle               Headers
--- a/lib/layouts/apa6.layout
+++ b/lib/layouts/apa6.layout
@ -3,7 +3,7 @@
 #  \DeclareCategory{Articles}
 # Author: Jacob Bishop <bishop.jacob@gmail.com> based on the apa 
 # layout written by Randy Gobbel.
-Format 63
+Format 64
 Columns                 1
 Sides                   1
 PageStyle               Headers
--- a/lib/layouts/arab-article.layout
+++ b/lib/layouts/arab-article.layout
@ -4,5 +4,5 @@
 # Arabic article textclass definition file.
 # Author: Dekel Tsur <dekel@math.tau.ac.il>

-Format 63
+Format 64
 Input article
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@ -3,7 +3,7 @@
 #  \DeclareCategory{Articles}
 # Author: Jürgen Spitzmüller <spitz@lyx.org>

-Format 63
+Format 64

 # Includes
 Input article.layout
--- a/lib/layouts/article.layout
+++ b/lib/layouts/article.layout
@ -6,7 +6,7 @@
 # Transposed by Pascal André <andre@via.ecp.fr>
 # Heavily modifed and enhanced by serveral developers.

-Format 63
+Format 64
 Input stdclass.inc

 SecNumDepth             3
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@ -6,7 +6,7 @@
 #   Richard Heck <rgheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.


-Format 63
+Format 64

 #
 # GLOBAL SETTINGS
--- a/lib/layouts/beamerposter.layout
+++ b/lib/layouts/beamerposter.layout
@ -7,7 +7,7 @@
 #
 # Input general definitions

-Format 63
+Format 64

 Input beamer.layout

--- a/lib/layouts/bicaption.module
+++ b/lib/layouts/bicaption.module
@ -5,7 +5,7 @@
 #DescriptionEnd
 #Author: Uwe Stöhr <uwestoehr@web.de>

-Format 63
+Format 64

 Style "Caption setup"
 	LatexType	command
--- a/lib/layouts/book.layout
+++ b/lib/layouts/book.layout
@ -7,7 +7,7 @@
 # Heavily modifed and enhanced by serveral developers.


-Format 63
+Format 64
 Input stdclass.inc
 Input numreport.inc

--- a/lib/layouts/braille.module
+++ b/lib/layouts/braille.module
@ -5,7 +5,7 @@
 #DescriptionEnd
 # Author: Uwe Stöhr <uwestoehr@web.de>

-Format 63
+Format 64

 AddToPreamble
 	\usepackage{braille}
--- a/lib/layouts/broadway.layout
+++ b/lib/layouts/broadway.layout
@ -4,7 +4,7 @@

 # For theater plays

-Format 63
+Format 64
 Columns                 1
 Sides                   1
 SecNumDepth             2
--- a/lib/layouts/changebars.module
+++ b/lib/layouts/changebars.module
@ -14,7 +14,7 @@
 # tracking is turned off in the document.
 #

-Format 63
+Format 64

 AddToPreamble
  \usepackage{changebar}
--- a/lib/layouts/chess.layout
+++ b/lib/layouts/chess.layout
@ -17,7 +17,7 @@
 # \vspace*{-0.5in})
 #

-Format 63
+Format 64

 Requires	chess

--- a/lib/layouts/cl2emult.layout
+++ b/lib/layouts/cl2emult.layout
@ -4,7 +4,7 @@
 # Springer's cl2emult textclass definition file.
 # Author : André Poenitz

-Format 63
+Format 64
 Columns                   1
 Sides                     1
 SecNumDepth               2
--- a/lib/layouts/ctex-article.layout
+++ b/lib/layouts/ctex-article.layout
@ -2,7 +2,7 @@
 #  \DeclareLaTeXClass[ctexart,savesym.sty,xeCJK.sty]{Chinese Article (CTeX)}
 #  \DeclareCategory{Articles}

-Format 63
+Format 64

 # Read the definitions from article.layout
 Input article.layout
--- a/lib/layouts/ctex-book.layout
+++ b/lib/layouts/ctex-book.layout
@ -2,7 +2,7 @@
 #  \DeclareLaTeXClass[ctexbook,savesym.sty,xeCJK.sty]{Chinese Book (CTeX)}
 #  \DeclareCategory{Books}

-Format 63
+Format 64

 # Read the definitions from book.layout
 Input book.layout
--- a/lib/layouts/ctex-report.layout
+++ b/lib/layouts/ctex-report.layout
@ -2,7 +2,7 @@
 #  \DeclareLaTeXClass[ctexrep,savesym.sty,xeCJK.sty]{Chinese Report (CTeX)}
 #  \DeclareCategory{Reports}

-Format 63
+Format 64

 # Read the definitions from report.layout
 Input report.layout
--- a/lib/layouts/customHeadersFooters.module
+++ b/lib/layouts/customHeadersFooters.module
@ -6,7 +6,7 @@
 #DescriptionEnd
 #Author: Uwe Stöhr

-Format 63
+Format 64

 Style "Left Header"
  Category		Header/Footer
--- a/lib/layouts/db_lyxmacros.inc
+++ b/lib/layouts/db_lyxmacros.inc
@ -5,7 +5,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input lyxmacros.inc

 Style Code
--- a/lib/layouts/db_stdcharstyles.inc
+++ b/lib/layouts/db_stdcharstyles.inc
@ -2,7 +2,7 @@
 # Author : José Abílio Oliveira Matos <jamatos@lyx.org>
 # Character Styles definition

-Format 63
+Format 64
 InsetLayout Flex:Filename
 	LyXType element
 	LabelString Filename
--- a/lib/layouts/db_stdclass.inc
+++ b/lib/layouts/db_stdclass.inc
@ -5,7 +5,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 OutputType              docbook

 Columns                 1
--- a/lib/layouts/db_stdcounters.inc
+++ b/lib/layouts/db_stdcounters.inc
@ -4,7 +4,7 @@
 # This include file contains all the counters that are defined as standard
 # in Docbook LyX layouts.

-Format 63
+Format 64
 Counter sect1
 	Within               chapter
 End
--- a/lib/layouts/db_stdlayouts.inc
+++ b/lib/layouts/db_stdlayouts.inc
@ -5,7 +5,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdlayouts.inc

 Style Literal
--- a/lib/layouts/db_stdlists.inc
+++ b/lib/layouts/db_stdlists.inc
@ -5,7 +5,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdlists.inc


--- a/lib/layouts/db_stdsections.inc
+++ b/lib/layouts/db_stdsections.inc
@ -6,7 +6,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdsections.inc

 Style Part
--- a/lib/layouts/db_stdstarsections.inc
+++ b/lib/layouts/db_stdstarsections.inc
@ -9,7 +9,7 @@
 # modifying the style of the regular sectioning layouts.


-Format 63
+Format 64
 Style Part*
 	CopyStyle             Part
 	Margin                Static
--- a/lib/layouts/db_stdstruct.inc
+++ b/lib/layouts/db_stdstruct.inc
@ -5,7 +5,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdstruct.inc

 Style Abstract
--- a/lib/layouts/db_stdtitle.inc
+++ b/lib/layouts/db_stdtitle.inc
@ -6,7 +6,7 @@
 # It is desirable, as far as possible, to have the same look and feel for
 # related layouts in latex and docbook.

-Format 63
+Format 64
 Input stdtitle.inc


--- a/lib/layouts/dinbrief.layout
+++ b/lib/layouts/dinbrief.layout
@ -14,7 +14,7 @@
 # Modified by: Juergen Spitzmueller <spitz@lyx.org>
 #    use English strings, localization is done by gettext!

-Format 63
+Format 64

 Input letter.layout

--- a/lib/layouts/docbook-book.layout
+++ b/lib/layouts/docbook-book.layout
@ -5,7 +5,7 @@
 # Author : Jose' Matos <jamatos@lyx.org>
 # hacked for books: Luc Abom <luc@abom.com>

-Format 63
+Format 64
 Input report
 Input db_stdclass.inc

--- a/lib/layouts/docbook-chapter.layout
+++ b/lib/layouts/docbook-chapter.layout
@ -4,7 +4,7 @@
 # DocBook textclass definition file.
 # Author : Jose' Matos <jamatos@lyx.org>

-Format 63
+Format 64
 Input db_stdclass.inc

 Style Title
--- a/lib/layouts/docbook-section.layout
+++ b/lib/layouts/docbook-section.layout
@ -4,7 +4,7 @@
 # DocBook textclass definition file.
 # Author : Jose' Matos <jamatos@lyx.org>

-Format 63
+Format 64
 Input db_stdclass.inc

 Style Title
--- a/lib/layouts/docbook.layout
+++ b/lib/layouts/docbook.layout
@ -4,7 +4,7 @@
 # DocBook textclass definition file.
 # Author : Jose' Matos <jamatos@lyx.org>

-Format 63
+Format 64
 Input db_stdclass.inc

 # Exclude higher, or equal, sections:
--- a/lib/layouts/doublecol-new.layout
+++ b/lib/layouts/doublecol-new.layout
@ -6,5 +6,5 @@
 # TeX templates are found at http://www.inderscience.com/mapper.php?id=64
 #
 # Read the definitions from article.layout
-Format 63
+Format 64
 Input article.layout
--- a/lib/layouts/dtk.layout
+++ b/lib/layouts/dtk.layout
@ -7,7 +7,7 @@
 # Author : Herbert Voss <voss@lyx.org> 2001/08/13


-Format 63
+Format 64
 Columns                 1
 Sides                   2
 SecNumDepth             -1              # no counting
--- a/lib/layouts/ectaart.layout
+++ b/lib/layouts/ectaart.layout
@ -3,7 +3,7 @@
 #  \DeclareCategory{Articles}
 # Author : Koji Yokota <yok...@res.otaru-uc.ac.jp>

-Format 63
+Format 64
 Input article.layout

 TitleLatexType		Environment
--- a/lib/layouts/egs.layout
+++ b/lib/layouts/egs.layout
@ -9,7 +9,7 @@
 # Converted article -> egs Martin Vermeer


-Format 63
+Format 64
 Columns                 2
 Sides                   1
 PageStyle               Plain
--- a/lib/layouts/elsart.layout
+++ b/lib/layouts/elsart.layout
@ -23,7 +23,7 @@
 #       numbered sections, as does the class file.


-Format 63
+Format 64
 Columns                 1
 Sides                   2
 PageStyle               headings
--- a/lib/layouts/elsarticle.layout
+++ b/lib/layouts/elsarticle.layout
@ -4,7 +4,7 @@
 # elsarticle textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)

-Format 63
+Format 64

 Columns				1
 Sides				1
--- a/lib/layouts/endnotes.module
+++ b/lib/layouts/endnotes.module
@ -4,7 +4,7 @@
 #\theendnotes in TeX-code where you want the endnotes to appear.
 #DescriptionEnd

-Format 63
+Format 64

 Counter endnotes
    PrettyFormat "Endnote ##"
--- a/lib/layouts/entcs.layout
+++ b/lib/layouts/entcs.layout
@ -4,7 +4,7 @@
 # Based on LyX article class; modified to support ENTCS class
 # Reuben Thomas (rrt@sc3d.org)   27/5-2/6/01

-Format 63
+Format 64
 Input article.layout

 # only font size 11pt is really available
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@ -13,7 +13,7 @@
 #	     both KOMA and non-KOMA document classes.
 # 2011-01-12 bugfix: set elabeling label font to \normalfont.

-Format 63
+Format 64

 # The package enumitem provides user control over the layout of the three
 # basic list environments: enumerate, itemize and description. It supersedes
--- a/lib/layouts/eqs-within-sections.module
+++ b/lib/layouts/eqs-within-sections.module
@ -4,7 +4,7 @@
 #the section number to the equation number, as in '(2.1)'.
 #DescriptionEnd

-Format 63
+Format 64

 Requires amsmath

--- a/lib/layouts/europasscv.layout
+++ b/lib/layouts/europasscv.layout
@ -35,7 +35,7 @@


 # General textclass parameters
-Format 63
+Format 64

 Columns		 1
 Sides		 1
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@ -6,7 +6,7 @@


 # General textclass parameters
-Format 63
+Format 64
 	Columns		1
 	Sides		1
 	SecNumDepth	-1
--- a/lib/layouts/extarticle.layout
+++ b/lib/layouts/extarticle.layout
@ -3,7 +3,7 @@
 #  \DeclareCategory{Articles}
 # Herbert Voss <voss@lyx.org>

-Format 63
+Format 64
 Input article.layout

 # change available fontsizes
--- a/lib/layouts/extbook.layout
+++ b/lib/layouts/extbook.layout
@ -4,7 +4,7 @@
 # Extended book textclass definition file.
 # Herbert Voss <voss@lyx.org>

-Format 63
+Format 64
 Input book.layout

 # change available fontsizes
--- a/lib/layouts/extletter.layout
+++ b/lib/layouts/extletter.layout
@ -4,7 +4,7 @@
 # Extended article textclass definition file.
 # Herbert Voss <voss@lyx.org>

-Format 63
+Format 64
 Input letter.layout

 # change available fontsizes
--- a/lib/layouts/extreport.layout
+++ b/lib/layouts/extreport.layout
@ -4,7 +4,7 @@
 # Extented report textclass definition file.
 # Herbert Voss <voss@lyx.org>

-Format 63
+Format 64
 Input report.layout

 # change available fontsizes
--- a/lib/layouts/figs-within-sections.module
+++ b/lib/layouts/figs-within-sections.module
@ -4,7 +4,7 @@
 #the section number to the figure number, as in 'fig. 2.1'.
 #DescriptionEnd

-Format 63
+Format 64

 Requires amsmath

--- a/lib/layouts/fix-cm.module
+++ b/lib/layouts/fix-cm.module
@ -8,6 +8,6 @@

 # Author : Patrick Atamaniuk <patrick-lyx@frobs.net>

-Format 63
+Format 64

 Requires fix-cm
--- a/lib/layouts/fixltx2e.module
+++ b/lib/layouts/fixltx2e.module
@ -9,6 +9,6 @@

 # Author : Georg Baum <baum@lyx.org>

-Format 63
+Format 64

 Requires fixltx2e
--- a/lib/layouts/fixme.module
+++ b/lib/layouts/fixme.module
@ -12,7 +12,7 @@
 # Authors: Mark Edgington <edgimar@gmail.com>
 #          Jürgen Spitzmüller <spitz@lyx.org>

-Format 63
+Format 64

 OutlinerName fixme "Fixme"

--- a/lib/layouts/foils.layout
+++ b/lib/layouts/foils.layout
@ -7,7 +7,7 @@
 # To do: Define class specific options.


-Format 63
+Format 64
 Columns                 1
 Sides                   1

--- a/lib/layouts/foottoend.module
+++ b/lib/layouts/foottoend.module
@ -4,7 +4,7 @@
 #in TeX-code where you want the endnotes to appear.
 #DescriptionEnd

-Format 63
+Format 64

 Requires	endnotes

--- a/lib/layouts/frletter.layout
+++ b/lib/layouts/frletter.layout
@ -4,7 +4,7 @@
 # Layout file for the frletter class.
 # Author : Liviu Andronic and Uwe Stöhr

-Format 63
+Format 64

 # Read the definitions from letter.layout
 Input letter.layout
--- a/lib/layouts/g-brief.layout
+++ b/lib/layouts/g-brief.layout
@ -4,7 +4,7 @@
 # Letter textclass definition file.
 # Author : Thomas Hartkens <thomas@hartkens.de>

-Format 63
+Format 64
 Input stdinsets.inc
 Input stdfloats.inc
 Input stdcounters.inc
--- a/lib/layouts/g-brief2.layout
+++ b/lib/layouts/g-brief2.layout
@ -6,7 +6,7 @@
 #          Thomas Hartkens <thomas@hartkens.de>

 # Input general definitions
-Format 63
+Format 64
 Input stdfloats.inc
 Input stdcounters.inc
 Input stdinsets.inc
--- a/lib/layouts/graphicboxes.module
+++ b/lib/layouts/graphicboxes.module
@ -6,7 +6,7 @@
 #Author: Jürgen Spitzmüller <spitz@lyx.org>
 #        Uwe Stöhr <uwestoehr@lyx.org>

-Format 63
+Format 64

 InsetLayout Flex:Reflectbox
 	LyXType		custom
--- a/lib/layouts/hanging.module
+++ b/lib/layouts/hanging.module
@ -11,7 +11,7 @@
 #Copyright Peter R. Wilson.
 #Released under the LaTeX Project Public License.

-Format 63
+Format 64

 Style Hanging
  LatexType Environment
--- a/lib/layouts/heb-article.layout
+++ b/lib/layouts/heb-article.layout
@ -5,7 +5,7 @@
 # Author: Dekel Tsur <dekel@math.tau.ac.il>
 # Few changes by Baruch Even <baruch.even@writeme.com>

-Format 63
+Format 64
 Input article

 Preamble
--- a/lib/layouts/heb-letter.layout
+++ b/lib/layouts/heb-letter.layout
@ -4,7 +4,7 @@
 # Hebrew letter textclass definition file.
 # Author: Dekel Tsur <dekel@math.tau.ac.il>

-Format 63
+Format 64
 Input letter


--- a/lib/layouts/hollywood.layout
+++ b/lib/layouts/hollywood.layout
@ -16,7 +16,7 @@
 # Based on course given by Lars Davidson


-Format 63
+Format 64
 Columns                 1
 Sides                   1
 SecNumDepth             2
--- a/lib/layouts/hpstatement.module
+++ b/lib/layouts/hpstatement.module
@ -6,7 +6,7 @@
 #DescriptionEnd
 #Author: Uwe Stöhr <uwestoehr@web.de>

-Format 63
+Format 64

 InsetLayout "Flex:H-P number"
 	LyxType			custom
--- a/lib/layouts/ijmpc.layout
+++ b/lib/layouts/ijmpc.layout
@ -12,7 +12,7 @@
 # Author: Uwe Stöhr (uwestoehr@web.de)


-Format 63
+Format 64

 Sides		1
 Columns		1
--- a/lib/layouts/ijmpd.layout
+++ b/lib/layouts/ijmpd.layout
@ -17,7 +17,7 @@
 # Author: Uwe Stöhr (uwestoehr@web.de)


-Format 63
+Format 64

 Sides		1
 Columns		1
--- a/lib/layouts/initials.module
+++ b/lib/layouts/initials.module
@ -5,7 +5,7 @@
 #DescriptionEnd
 #Authors: Pavel Sanda and Uwe Stöhr

-Format 63
+Format 64

 AddToPreamble
 	\@ifundefined{lettrine}{\usepackage{lettrine}}{}
--- a/lib/layouts/iopart.layout
+++ b/lib/layouts/iopart.layout
@ -4,7 +4,7 @@
 # IOP article textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)

-Format 63
+Format 64

 Columns			1
 Sides			1
--- a/Show More
+++ b/Show More