From: Jean-Marc Lasgouttes Date: Thu, 31 Aug 2017 10:03:54 +0000 (+0200) Subject: Honor trailing spaces in LabelString and friends X-Git-Tag: lyx-2.4.0dev-acb2ca7b~4604 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=5c545573507bbf55f78c294188537c6aff959bc0;p=lyx.git 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. --- diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout index 9934f07876..9f0af7118c 100644 --- a/lib/layouts/AEA.layout +++ b/lib/layouts/AEA.layout @@ -4,7 +4,7 @@ # Authors : Koji Yokota # Uwe Stöhr -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 diff --git a/lib/layouts/IEEEtran-CompSoc.layout b/lib/layouts/IEEEtran-CompSoc.layout index c5d5f1f2b2..e54917e5a4 100644 --- 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 diff --git a/lib/layouts/IEEEtran-TransMag.layout b/lib/layouts/IEEEtran-TransMag.layout index e5b0f38be5..d106671042 100644 --- 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 diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 35859710b0..8c92334260 100644 --- 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 diff --git a/lib/layouts/InStar.module b/lib/layouts/InStar.module index c97a2a731e..1872fb25c0 100644 --- a/lib/layouts/InStar.module +++ b/lib/layouts/InStar.module @@ -11,7 +11,7 @@ #DescriptionEnd #Author: Richard Heck -Format 63 +Format 64 Style "In Preamble" CopyStyle Standard diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout index bd3335d60c..6f0e46e73c 100644 --- 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 diff --git a/lib/layouts/a0poster.layout b/lib/layouts/a0poster.layout index aead96eea8..de0a158785 100644 --- 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 diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index c7c2939faa..de999f4549 100644 --- 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 diff --git a/lib/layouts/aapaper.inc b/lib/layouts/aapaper.inc index acd702217f..728f52e1be 100644 --- a/lib/layouts/aapaper.inc +++ b/lib/layouts/aapaper.inc @@ -5,7 +5,7 @@ # Author: Peter Sütterlin -Format 63 +Format 64 Style Subtitle Margin Static LatexType Command diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout index 514832ec72..e72a5519b4 100644 --- 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 diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index 654d5920fe..5f1d37255f 100644 --- 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 diff --git a/lib/layouts/aastex6.layout b/lib/layouts/aastex6.layout index 9349416875..99211b212f 100644 --- 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 diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout index ba396f976f..a8a00b4a6c 100644 --- 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 diff --git a/lib/layouts/acm-sigs-alt.layout b/lib/layouts/acm-sigs-alt.layout index e341ddfdaf..45a40fd6a8 100644 --- 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 diff --git a/lib/layouts/acm-sigs.inc b/lib/layouts/acm-sigs.inc index b16baf2701..57dd100dfd 100644 --- 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 diff --git a/lib/layouts/acm-sigs.layout b/lib/layouts/acm-sigs.layout index 8e58a0ba3a..69d3a33d50 100644 --- 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 diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout index 621ba81a50..8b95acea73 100644 --- a/lib/layouts/acmart.layout +++ b/lib/layouts/acmart.layout @@ -7,7 +7,7 @@ # Author : John Perry # Guillaume Munch-Maccagnoni -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 diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout index 97d5f92e75..720430a5f9 100644 --- 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 diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index c7cf42cd9b..857e407673 100644 --- 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 diff --git a/lib/layouts/agu-dtd.layout b/lib/layouts/agu-dtd.layout index 769abf9f32..dcdc2dc1c9 100644 --- a/lib/layouts/agu-dtd.layout +++ b/lib/layouts/agu-dtd.layout @@ -6,7 +6,7 @@ # Martin Vermeer -Format 63 +Format 64 Input agu_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc index eb404289ef..a63e1ee31c 100644 --- 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 diff --git a/lib/layouts/agu_stdcounters.inc b/lib/layouts/agu_stdcounters.inc index 9c7130e9fd..d07efb5a76 100644 --- 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 diff --git a/lib/layouts/agu_stdlists.inc b/lib/layouts/agu_stdlists.inc index 777fb70e57..988a39e415 100644 --- 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 diff --git a/lib/layouts/agu_stdsections.inc b/lib/layouts/agu_stdsections.inc index 5abf7498f1..66f7367282 100644 --- 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 diff --git a/lib/layouts/agu_stdtitle.inc b/lib/layouts/agu_stdtitle.inc index aca0be0b70..42684d6ad2 100644 --- 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 diff --git a/lib/layouts/agums.layout b/lib/layouts/agums.layout index bf438701cb..1ece3d1270 100644 --- a/lib/layouts/agums.layout +++ b/lib/layouts/agums.layout @@ -5,7 +5,7 @@ # Author: Martin Vermeer -Format 63 +Format 64 Input aguplus.inc ClassOptions diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc index 3a04add010..9fb7fe5579 100644 --- 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 diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index 1fec8167ca..35d8744e00 100644 --- 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 diff --git a/lib/layouts/algorithm2e.module b/lib/layouts/algorithm2e.module index 59f77d93f7..666a0a0c8e 100644 --- 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 diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout index 86fed14a51..5ed8d981c8 100644 --- a/lib/layouts/amsart.layout +++ b/lib/layouts/amsart.layout @@ -11,7 +11,7 @@ # Modularized Jan '08 by Richard Heck # Moved "number within sections" to modules Aug '09 (Paul Rubin ) -Format 63 +Format 64 Columns 1 Sides 2 diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index 9494342e66..f23f9d0498 100644 --- a/lib/layouts/amsbook.layout +++ b/lib/layouts/amsbook.layout @@ -12,7 +12,7 @@ # Moved "number within sections" to modules Aug '09 (Paul Rubin ) -Format 63 +Format 64 Columns 1 Sides 2 diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc index 5a96707585..53b460b420 100644 --- a/lib/layouts/amsdefs.inc +++ b/lib/layouts/amsdefs.inc @@ -5,7 +5,7 @@ # Modularized Jan '08 by Richard Heck # Including the maths stuff -Format 63 +Format 64 # By default AMS articles & books use leqno option (as SIAM journals). Provides leqno 1 diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index 20484a4ccd..d7b39bf527 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author: Randy Gobbel -Format 63 +Format 64 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout index a1361af557..829f46de6c 100644 --- a/lib/layouts/apa6.layout +++ b/lib/layouts/apa6.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author: Jacob Bishop based on the apa # layout written by Randy Gobbel. -Format 63 +Format 64 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/arab-article.layout b/lib/layouts/arab-article.layout index 22a981773d..9e8ff033c3 100644 --- a/lib/layouts/arab-article.layout +++ b/lib/layouts/arab-article.layout @@ -4,5 +4,5 @@ # Arabic article textclass definition file. # Author: Dekel Tsur -Format 63 +Format 64 Input article diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout index 855201321b..5bdc47744c 100644 --- a/lib/layouts/article-beamer.layout +++ b/lib/layouts/article-beamer.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author: Jürgen Spitzmüller -Format 63 +Format 64 # Includes Input article.layout diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout index df547bfd03..05731cf1be 100644 --- a/lib/layouts/article.layout +++ b/lib/layouts/article.layout @@ -6,7 +6,7 @@ # Transposed by Pascal André # Heavily modifed and enhanced by serveral developers. -Format 63 +Format 64 Input stdclass.inc SecNumDepth 3 diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 4a3c52118e..28a2cb6299 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -6,7 +6,7 @@ # Richard Heck , Martin Vermeer and probably others. -Format 63 +Format 64 # # GLOBAL SETTINGS diff --git a/lib/layouts/beamerposter.layout b/lib/layouts/beamerposter.layout index 0f9814503d..721d8f3c33 100644 --- a/lib/layouts/beamerposter.layout +++ b/lib/layouts/beamerposter.layout @@ -7,7 +7,7 @@ # # Input general definitions -Format 63 +Format 64 Input beamer.layout diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module index 52965d25ed..c2a33a0a17 100644 --- a/lib/layouts/bicaption.module +++ b/lib/layouts/bicaption.module @@ -5,7 +5,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 63 +Format 64 Style "Caption setup" LatexType command diff --git a/lib/layouts/book.layout b/lib/layouts/book.layout index e25fe8d7d3..7a9957ea93 100644 --- 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 diff --git a/lib/layouts/braille.module b/lib/layouts/braille.module index 6da4de7f4c..6e9bc7b020 100644 --- a/lib/layouts/braille.module +++ b/lib/layouts/braille.module @@ -5,7 +5,7 @@ #DescriptionEnd # Author: Uwe Stöhr -Format 63 +Format 64 AddToPreamble \usepackage{braille} diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 8b80e3b2f9..122b1652d0 100644 --- 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 diff --git a/lib/layouts/changebars.module b/lib/layouts/changebars.module index 855200839e..8e1912d49d 100644 --- 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} diff --git a/lib/layouts/chess.layout b/lib/layouts/chess.layout index cd82a2bc25..fb956f0139 100644 --- a/lib/layouts/chess.layout +++ b/lib/layouts/chess.layout @@ -17,7 +17,7 @@ # \vspace*{-0.5in}) # -Format 63 +Format 64 Requires chess diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout index 02bd8fbb8f..f16dc72d9c 100644 --- 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 diff --git a/lib/layouts/ctex-article.layout b/lib/layouts/ctex-article.layout index 9024d28ac0..d72e426497 100644 --- 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 diff --git a/lib/layouts/ctex-book.layout b/lib/layouts/ctex-book.layout index cf497f3bcd..2fd871e7ee 100644 --- 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 diff --git a/lib/layouts/ctex-report.layout b/lib/layouts/ctex-report.layout index 2a4516731d..2ba740f49c 100644 --- 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 diff --git a/lib/layouts/customHeadersFooters.module b/lib/layouts/customHeadersFooters.module index 55f05f66d8..19f7fd63e7 100644 --- 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 diff --git a/lib/layouts/db_lyxmacros.inc b/lib/layouts/db_lyxmacros.inc index ab638ddebd..62e8c07aa8 100644 --- 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 diff --git a/lib/layouts/db_stdcharstyles.inc b/lib/layouts/db_stdcharstyles.inc index f180111796..1e1c5ac0d5 100644 --- a/lib/layouts/db_stdcharstyles.inc +++ b/lib/layouts/db_stdcharstyles.inc @@ -2,7 +2,7 @@ # Author : José Abílio Oliveira Matos # Character Styles definition -Format 63 +Format 64 InsetLayout Flex:Filename LyXType element LabelString Filename diff --git a/lib/layouts/db_stdclass.inc b/lib/layouts/db_stdclass.inc index ca325f4575..105423f637 100644 --- 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 diff --git a/lib/layouts/db_stdcounters.inc b/lib/layouts/db_stdcounters.inc index ef00d85e5d..1cd009a7d4 100644 --- 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 diff --git a/lib/layouts/db_stdlayouts.inc b/lib/layouts/db_stdlayouts.inc index 3054a2e057..5e262beaad 100644 --- 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 diff --git a/lib/layouts/db_stdlists.inc b/lib/layouts/db_stdlists.inc index eafbda6777..b84f1f1406 100644 --- 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 diff --git a/lib/layouts/db_stdsections.inc b/lib/layouts/db_stdsections.inc index 21ecccf4d9..30f4f49ab3 100644 --- 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 diff --git a/lib/layouts/db_stdstarsections.inc b/lib/layouts/db_stdstarsections.inc index 3d4e0f8625..5bbc502d68 100644 --- 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 diff --git a/lib/layouts/db_stdstruct.inc b/lib/layouts/db_stdstruct.inc index dd5d600bc6..d54eb1a4a3 100644 --- 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 diff --git a/lib/layouts/db_stdtitle.inc b/lib/layouts/db_stdtitle.inc index 3587cd308e..66a671598a 100644 --- 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 diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout index c1bc465da0..3544fc2952 100644 --- a/lib/layouts/dinbrief.layout +++ b/lib/layouts/dinbrief.layout @@ -14,7 +14,7 @@ # Modified by: Juergen Spitzmueller # use English strings, localization is done by gettext! -Format 63 +Format 64 Input letter.layout diff --git a/lib/layouts/docbook-book.layout b/lib/layouts/docbook-book.layout index 4a599c012e..04e6cc76ab 100644 --- a/lib/layouts/docbook-book.layout +++ b/lib/layouts/docbook-book.layout @@ -5,7 +5,7 @@ # Author : Jose' Matos # hacked for books: Luc Abom -Format 63 +Format 64 Input report Input db_stdclass.inc diff --git a/lib/layouts/docbook-chapter.layout b/lib/layouts/docbook-chapter.layout index 0a90253eae..bb4fc967f4 100644 --- a/lib/layouts/docbook-chapter.layout +++ b/lib/layouts/docbook-chapter.layout @@ -4,7 +4,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 63 +Format 64 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook-section.layout b/lib/layouts/docbook-section.layout index 297d09e68d..a9ccbdef03 100644 --- a/lib/layouts/docbook-section.layout +++ b/lib/layouts/docbook-section.layout @@ -4,7 +4,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 63 +Format 64 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook.layout b/lib/layouts/docbook.layout index e69db1a09e..2ea9b714a8 100644 --- a/lib/layouts/docbook.layout +++ b/lib/layouts/docbook.layout @@ -4,7 +4,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 63 +Format 64 Input db_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/doublecol-new.layout b/lib/layouts/doublecol-new.layout index 5113937066..7b6fd4f551 100644 --- 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 diff --git a/lib/layouts/dtk.layout b/lib/layouts/dtk.layout index ae8c44af37..b81f0b9dbd 100644 --- a/lib/layouts/dtk.layout +++ b/lib/layouts/dtk.layout @@ -7,7 +7,7 @@ # Author : Herbert Voss 2001/08/13 -Format 63 +Format 64 Columns 1 Sides 2 SecNumDepth -1 # no counting diff --git a/lib/layouts/ectaart.layout b/lib/layouts/ectaart.layout index 9950e45fc1..fa4b75990f 100644 --- a/lib/layouts/ectaart.layout +++ b/lib/layouts/ectaart.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author : Koji Yokota -Format 63 +Format 64 Input article.layout TitleLatexType Environment diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout index a639a626f3..14fed48457 100644 --- 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 diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index 538dc2b953..4305f085d7 100644 --- 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 diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout index ee9c17f436..ad4ccacd64 100644 --- 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 diff --git a/lib/layouts/endnotes.module b/lib/layouts/endnotes.module index b3a5553b61..f83e6dd148 100644 --- 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 ##" diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout index 3a42e1c580..6325050686 100644 --- 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 diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module index 9b4da3760f..6539846886 100644 --- 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 diff --git a/lib/layouts/eqs-within-sections.module b/lib/layouts/eqs-within-sections.module index d9f36149f6..5e2b4e9c95 100644 --- 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 diff --git a/lib/layouts/europasscv.layout b/lib/layouts/europasscv.layout index 79616e7168..8940ecb0f3 100644 --- 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 diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout index 99b04671f7..88ab73de58 100644 --- 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 diff --git a/lib/layouts/extarticle.layout b/lib/layouts/extarticle.layout index f1a0a78640..a3c5ae0698 100644 --- a/lib/layouts/extarticle.layout +++ b/lib/layouts/extarticle.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Herbert Voss -Format 63 +Format 64 Input article.layout # change available fontsizes diff --git a/lib/layouts/extbook.layout b/lib/layouts/extbook.layout index 76442d26f8..84a3670694 100644 --- a/lib/layouts/extbook.layout +++ b/lib/layouts/extbook.layout @@ -4,7 +4,7 @@ # Extended book textclass definition file. # Herbert Voss -Format 63 +Format 64 Input book.layout # change available fontsizes diff --git a/lib/layouts/extletter.layout b/lib/layouts/extletter.layout index b0aa443b3a..cb902adb04 100644 --- a/lib/layouts/extletter.layout +++ b/lib/layouts/extletter.layout @@ -4,7 +4,7 @@ # Extended article textclass definition file. # Herbert Voss -Format 63 +Format 64 Input letter.layout # change available fontsizes diff --git a/lib/layouts/extreport.layout b/lib/layouts/extreport.layout index 5088461989..3c77ecfafd 100644 --- a/lib/layouts/extreport.layout +++ b/lib/layouts/extreport.layout @@ -4,7 +4,7 @@ # Extented report textclass definition file. # Herbert Voss -Format 63 +Format 64 Input report.layout # change available fontsizes diff --git a/lib/layouts/figs-within-sections.module b/lib/layouts/figs-within-sections.module index 347a0945e4..5d8696a976 100644 --- 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 diff --git a/lib/layouts/fix-cm.module b/lib/layouts/fix-cm.module index 7b50857d8f..966e0bf9e7 100644 --- a/lib/layouts/fix-cm.module +++ b/lib/layouts/fix-cm.module @@ -8,6 +8,6 @@ # Author : Patrick Atamaniuk -Format 63 +Format 64 Requires fix-cm diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module index 6bdba21a6c..21ab92c909 100644 --- a/lib/layouts/fixltx2e.module +++ b/lib/layouts/fixltx2e.module @@ -9,6 +9,6 @@ # Author : Georg Baum -Format 63 +Format 64 Requires fixltx2e diff --git a/lib/layouts/fixme.module b/lib/layouts/fixme.module index e4a923c30e..e6ae33e39b 100644 --- a/lib/layouts/fixme.module +++ b/lib/layouts/fixme.module @@ -12,7 +12,7 @@ # Authors: Mark Edgington # Jürgen Spitzmüller -Format 63 +Format 64 OutlinerName fixme "Fixme" diff --git a/lib/layouts/foils.layout b/lib/layouts/foils.layout index 9d3e68950b..6b6e990fd2 100644 --- 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 diff --git a/lib/layouts/foottoend.module b/lib/layouts/foottoend.module index 16d7c6152f..8a5014ec13 100644 --- 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 diff --git a/lib/layouts/frletter.layout b/lib/layouts/frletter.layout index 43dc64e795..a454320590 100644 --- 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 diff --git a/lib/layouts/g-brief.layout b/lib/layouts/g-brief.layout index dd161e2785..0a7a579ef8 100644 --- a/lib/layouts/g-brief.layout +++ b/lib/layouts/g-brief.layout @@ -4,7 +4,7 @@ # Letter textclass definition file. # Author : Thomas Hartkens -Format 63 +Format 64 Input stdinsets.inc Input stdfloats.inc Input stdcounters.inc diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout index aa6f5b7e61..f0ec067d35 100644 --- a/lib/layouts/g-brief2.layout +++ b/lib/layouts/g-brief2.layout @@ -6,7 +6,7 @@ # Thomas Hartkens # Input general definitions -Format 63 +Format 64 Input stdfloats.inc Input stdcounters.inc Input stdinsets.inc diff --git a/lib/layouts/graphicboxes.module b/lib/layouts/graphicboxes.module index 04dcc12654..7b0d76ec15 100644 --- a/lib/layouts/graphicboxes.module +++ b/lib/layouts/graphicboxes.module @@ -6,7 +6,7 @@ #Author: Jürgen Spitzmüller # Uwe Stöhr -Format 63 +Format 64 InsetLayout Flex:Reflectbox LyXType custom diff --git a/lib/layouts/hanging.module b/lib/layouts/hanging.module index 7ff3ca5073..fb7161ca6c 100644 --- 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 diff --git a/lib/layouts/heb-article.layout b/lib/layouts/heb-article.layout index f9ca52d93e..71f11ec942 100644 --- a/lib/layouts/heb-article.layout +++ b/lib/layouts/heb-article.layout @@ -5,7 +5,7 @@ # Author: Dekel Tsur # Few changes by Baruch Even -Format 63 +Format 64 Input article Preamble diff --git a/lib/layouts/heb-letter.layout b/lib/layouts/heb-letter.layout index a848e67006..2ca81f3f19 100644 --- a/lib/layouts/heb-letter.layout +++ b/lib/layouts/heb-letter.layout @@ -4,7 +4,7 @@ # Hebrew letter textclass definition file. # Author: Dekel Tsur -Format 63 +Format 64 Input letter diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout index 99bd4f26d6..464c19b793 100644 --- 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 diff --git a/lib/layouts/hpstatement.module b/lib/layouts/hpstatement.module index de2744d5df..7458bcac31 100644 --- a/lib/layouts/hpstatement.module +++ b/lib/layouts/hpstatement.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 63 +Format 64 InsetLayout "Flex:H-P number" LyxType custom diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout index 0450185940..a576bcecad 100644 --- 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 diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout index e675de34bc..e6ead79692 100644 --- 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 diff --git a/lib/layouts/initials.module b/lib/layouts/initials.module index 3512255a70..ac51c0981d 100644 --- 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}}{} diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index cd26839503..87b93fef69 100644 --- 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 diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout index 64394eaa0f..14e2b000f2 100644 --- a/lib/layouts/isprs.layout +++ b/lib/layouts/isprs.layout @@ -9,7 +9,7 @@ # Heavily modifed and enhanced by serveral developers. # Input general definitions -Format 63 +Format 64 Input stdclass.inc Sides 2 Columns 2 diff --git a/lib/layouts/iucr.layout b/lib/layouts/iucr.layout index 06d4bf342a..50f8e953f9 100644 --- a/lib/layouts/iucr.layout +++ b/lib/layouts/iucr.layout @@ -5,7 +5,7 @@ # Author: Uwe Stöhr (uwestoehr@web.de) # IUCr LaTeX files can be downloaded from ftp://ftp.iucr.org/templates/latex/ -Format 63 +Format 64 Columns 1 Sides 1 diff --git a/lib/layouts/jarticle.layout b/lib/layouts/jarticle.layout index 1d23307c56..ecb64740c9 100644 --- a/lib/layouts/jarticle.layout +++ b/lib/layouts/jarticle.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout index 3b698d22e6..c51c7b21c4 100644 --- a/lib/layouts/jasatex.layout +++ b/lib/layouts/jasatex.layout @@ -4,7 +4,7 @@ # JASATeX textclass definition file. # Author: Uwe Stöhr (uwestoehr@web.de) -Format 63 +Format 64 Columns 1 Sides 1 diff --git a/lib/layouts/jbook.layout b/lib/layouts/jbook.layout index abf090c17e..4a230f22c4 100644 --- a/lib/layouts/jbook.layout +++ b/lib/layouts/jbook.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jgrga.layout b/lib/layouts/jgrga.layout index e7934e5bd6..3ece8f4fd6 100644 --- a/lib/layouts/jgrga.layout +++ b/lib/layouts/jgrga.layout @@ -4,7 +4,7 @@ # AGUplus JGR textclass definition file. # Author: Martin Vermeer -Format 63 +Format 64 Input aguplus.inc ClassOptions diff --git a/lib/layouts/jreport.layout b/lib/layouts/jreport.layout index 97b4f40ff1..e8ac8ecb09 100644 --- a/lib/layouts/jreport.layout +++ b/lib/layouts/jreport.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jsarticle.layout b/lib/layouts/jsarticle.layout index bd99175655..562eeac7a6 100644 --- a/lib/layouts/jsarticle.layout +++ b/lib/layouts/jsarticle.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jsbook.layout b/lib/layouts/jsbook.layout index ca6b3e4263..9cf9c580ad 100644 --- a/lib/layouts/jsbook.layout +++ b/lib/layouts/jsbook.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout index dc053a49e5..43c4993a38 100644 --- a/lib/layouts/jss.layout +++ b/lib/layouts/jss.layout @@ -8,7 +8,7 @@ # License: GNU GPL version 2 or later # JSS LaTeX files can be downloaded from http://www.jstatsoft.org/downloads/JSSstyle.zip -Format 63 +Format 64 # Read the definitions from article.layout Input article.layout diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout index f894d0608a..5ec6c86e63 100644 --- a/lib/layouts/kluwer.layout +++ b/lib/layouts/kluwer.layout @@ -15,7 +15,7 @@ # 2003-03-03 Updated for lyx 1.3.0. -Format 63 +Format 64 Columns 1 Sides 2 SecNumDepth 4 diff --git a/lib/layouts/knitr.module b/lib/layouts/knitr.module index 5b58c680dd..94a84f18e6 100644 --- a/lib/layouts/knitr.module +++ b/lib/layouts/knitr.module @@ -6,7 +6,7 @@ #Category: literate #Excludes: lilypond | sweave -Format 63 +Format 64 Input litinsets.inc diff --git a/lib/layouts/latex8.layout b/lib/layouts/latex8.layout index 5d3eacc369..39051872d2 100644 --- a/lib/layouts/latex8.layout +++ b/lib/layouts/latex8.layout @@ -4,7 +4,7 @@ # Latex8 textclass definition file. # Author : Allan Rae -Format 63 +Format 64 Preamble \usepackage{latex8} \usepackage{times} diff --git a/lib/layouts/letter.layout b/lib/layouts/letter.layout index 53943b2e1b..e30d1c24cf 100644 --- a/lib/layouts/letter.layout +++ b/lib/layouts/letter.layout @@ -5,7 +5,7 @@ # Author : Matthias Ettrich # Heavily modifed and enhanced by serveral developers. -Format 63 +Format 64 Input stdinsets.inc Input stdletter.inc Input stdlists.inc diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout index 6a1b612f99..a23c686ef2 100644 --- a/lib/layouts/lettre.layout +++ b/lib/layouts/lettre.layout @@ -29,7 +29,7 @@ # - remove the workaround for page format (not needed after v2.351) -Format 63 +Format 64 #(pre)declarations (just to impose some order on the menus) Style Standard diff --git a/lib/layouts/lilypond.module b/lib/layouts/lilypond.module index 9cd9fc828b..a52911a220 100644 --- a/lib/layouts/lilypond.module +++ b/lib/layouts/lilypond.module @@ -7,7 +7,7 @@ # Author: Julien Rioux -Format 63 +Format 64 OutputFormat lilypond-book InsetLayout "Flex:LilyPond" diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module index 8488cd4d3c..eade3d60f6 100644 --- a/lib/layouts/linguistics.module +++ b/lib/layouts/linguistics.module @@ -7,7 +7,7 @@ # Author: Jürgen Spitzmüller -Format 63 +Format 64 Counter example Within chapter diff --git a/lib/layouts/litinsets.inc b/lib/layouts/litinsets.inc index 8876a0882f..4aed3b46ce 100644 --- a/lib/layouts/litinsets.inc +++ b/lib/layouts/litinsets.inc @@ -6,7 +6,7 @@ # Note that this file is included in sweave.module, # knitr.module and noweb.module. -Format 63 +Format 64 Counter chunk PrettyFormat "Chunk ##" diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout index 870f48ee02..c68dce0e2c 100644 --- a/lib/layouts/llncs.layout +++ b/lib/layouts/llncs.layout @@ -15,7 +15,7 @@ # Modified for LyX 12 by Jean-Marc Lasgouttes and MV. -Format 63 +Format 64 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module index 5f75acdf6e..7abcf180a2 100644 --- a/lib/layouts/logicalmkup.module +++ b/lib/layouts/logicalmkup.module @@ -6,7 +6,7 @@ # Author : Martin vermeer -Format 63 +Format 64 InsetLayout Flex:Noun LyxType charstyle diff --git a/lib/layouts/ltugboat.layout b/lib/layouts/ltugboat.layout index 425ddee2ac..05d63ee370 100644 --- a/lib/layouts/ltugboat.layout +++ b/lib/layouts/ltugboat.layout @@ -6,7 +6,7 @@ # Author : Herbert Voss 2001/08/13 -Format 63 +Format 64 Columns 2 Sides 2 #SecNumDepth # no counting diff --git a/lib/layouts/lyxmacros.inc b/lib/layouts/lyxmacros.inc index 567a435f0b..a805f98ad5 100644 --- a/lib/layouts/lyxmacros.inc +++ b/lib/layouts/lyxmacros.inc @@ -8,7 +8,7 @@ # be removed later. -Format 63 +Format 64 Style LyX-Code Category MainText Margin Static diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index b5c787c590..e423029d90 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -7,7 +7,7 @@ # feel free to contribute missing features! -Format 63 +Format 64 Columns 1 Sides 2 SecNumDepth 1 diff --git a/lib/layouts/minimalistic.module b/lib/layouts/minimalistic.module index 844b4590a8..3480d877e2 100644 --- a/lib/layouts/minimalistic.module +++ b/lib/layouts/minimalistic.module @@ -3,7 +3,7 @@ # Redefines several insets (Index, Branch, URL) as being Minimalistic. #DescriptionEnd -Format 63 +Format 64 InsetLayout Index Decoration minimalistic diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index 7a57b77ec7..163ad4097b 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -7,7 +7,7 @@ # General textclass parameters -Format 63 +Format 64 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module index 4eb9953f74..080737145d 100644 --- a/lib/layouts/multicol.module +++ b/lib/layouts/multicol.module @@ -6,7 +6,7 @@ #DescriptionEnd #Authors: Uwe Stöhr and Jürgen Spitzmüller -Format 63 +Format 64 InsetLayout Flex:Multiple_Columns LyXType custom diff --git a/lib/layouts/mwart.layout b/lib/layouts/mwart.layout index 9d15fa961e..ee6086138a 100644 --- a/lib/layouts/mwart.layout +++ b/lib/layouts/mwart.layout @@ -6,7 +6,7 @@ # Transposed by Tomasz Łuczak # Heavily modifed and enhanced by several developers. -Format 63 +Format 64 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/mwbk.layout b/lib/layouts/mwbk.layout index 63d6616bb7..20c8721a05 100644 --- a/lib/layouts/mwbk.layout +++ b/lib/layouts/mwbk.layout @@ -6,7 +6,7 @@ # Transposed by Tomasz Łuczak # Heavily modifed and enhanced by serveral developers. -Format 63 +Format 64 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/mwrep.layout b/lib/layouts/mwrep.layout index ef0df770ff..f19a591d84 100644 --- a/lib/layouts/mwrep.layout +++ b/lib/layouts/mwrep.layout @@ -6,7 +6,7 @@ # Transposed by Tomasz Łuczak # Heavily modifed and enhanced by serveral developers. -Format 63 +Format 64 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/natbibapa.module b/lib/layouts/natbibapa.module index 029abb6e5b..6dd874b40c 100644 --- a/lib/layouts/natbibapa.module +++ b/lib/layouts/natbibapa.module @@ -9,7 +9,7 @@ # # Author: Jacob Bishop -Format 63 +Format 64 AddToPreamble \usepackage[natbibapa]{apacite} diff --git a/lib/layouts/noweb.module b/lib/layouts/noweb.module index f790f542f4..0807b3c495 100644 --- a/lib/layouts/noweb.module +++ b/lib/layouts/noweb.module @@ -4,7 +4,7 @@ #DescriptionEnd #Category: literate -Format 63 +Format 64 Input litinsets.inc OutputType literate diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc index 77717a1a4f..1976af6417 100644 --- a/lib/layouts/numarticle.inc +++ b/lib/layouts/numarticle.inc @@ -1,7 +1,7 @@ # Author : André Pönitz # This include file contains label definitions for an article-like numbering. -Format 63 +Format 64 # appendix applies to sections. Counter section diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc index 90b7b145af..6337c709a5 100644 --- a/lib/layouts/numreport.inc +++ b/lib/layouts/numreport.inc @@ -1,7 +1,7 @@ # Author : André Pönitz # This include file contains label definitions for a report-like numbering. -Format 63 +Format 64 Counter chapter Within "" diff --git a/lib/layouts/numrevtex.inc b/lib/layouts/numrevtex.inc index 9735e76c9a..5bc135a7c4 100644 --- a/lib/layouts/numrevtex.inc +++ b/lib/layouts/numrevtex.inc @@ -2,7 +2,7 @@ # This include files contains label definitions for a article-like numbering. -Format 63 +Format 64 Style Section LabelType Static LabelCounter section diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index 61ba81cddc..a2d392ee25 100644 --- a/lib/layouts/paper.layout +++ b/lib/layouts/paper.layout @@ -5,7 +5,7 @@ # Created by Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) -Format 63 +Format 64 Columns 1 Sides 1 SecNumDepth 3 diff --git a/lib/layouts/paralist.module b/lib/layouts/paralist.module index 4a9581cc25..ebc902f869 100644 --- a/lib/layouts/paralist.module +++ b/lib/layouts/paralist.module @@ -11,7 +11,7 @@ # Author: Georg Baum # (structuring taken from enumitem.module by Günter Milde) -Format 63 +Format 64 AddToPreamble \usepackage{paralist} diff --git a/lib/layouts/pdfcomment.module b/lib/layouts/pdfcomment.module index eca8534581..fa79efb652 100644 --- a/lib/layouts/pdfcomment.module +++ b/lib/layouts/pdfcomment.module @@ -7,7 +7,7 @@ # Author: Juergen Spitzmueller # Uwe Stöhr -Format 63 +Format 64 # # helper commands diff --git a/lib/layouts/pdfform.module b/lib/layouts/pdfform.module index 5fd94616e5..16c9bda09b 100644 --- a/lib/layouts/pdfform.module +++ b/lib/layouts/pdfform.module @@ -6,7 +6,7 @@ #DescriptionEnd # Author: Uwe Stöhr -Format 63 +Format 64 # # the form environment diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout index fe8677a2d1..5a1798fc90 100644 --- a/lib/layouts/powerdot.layout +++ b/lib/layouts/powerdot.layout @@ -5,7 +5,7 @@ # Created: 29-Aug-05 by Mael Hilléreau # Modified: 20-May-06 by Uwe Stöhr, 18-Mar-2013 Jürgen Spitzmüller -Format 63 +Format 64 Input stdcounters.inc Input stdinsets.inc @@ -137,7 +137,7 @@ Style Slide Align Center LabelType Static LabelCounter subsection - LabelString " " + LabelString "" Argument 1 LabelString "Slide Option" Tooltip "Optional arguments to the slide command (see powerdot manual)" diff --git a/lib/layouts/recipebook.layout b/lib/layouts/recipebook.layout index 11eaef94f1..4f98a7858e 100644 --- a/lib/layouts/recipebook.layout +++ b/lib/layouts/recipebook.layout @@ -27,7 +27,7 @@ # Another command, \ingred{...}, is defined to typeset a # list of ingredients. -Format 63 +Format 64 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/report.layout b/lib/layouts/report.layout index 60cc6e82cd..9e736304b2 100644 --- a/lib/layouts/report.layout +++ b/lib/layouts/report.layout @@ -6,7 +6,7 @@ # Transposed by Pascal André # Heavily modifed and enhanced by serveral developers. -Format 63 +Format 64 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/revtex.layout b/lib/layouts/revtex.layout index 52a02b6ec1..bbd6be71a8 100644 --- a/lib/layouts/revtex.layout +++ b/lib/layouts/revtex.layout @@ -10,7 +10,7 @@ # Amir Karger (LyX v11.34 style modifications - using changes # made by Jean-Marc Lasgouttes to amsart.layout) -Format 63 +Format 64 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout index f99ef26d26..48cb420f17 100644 --- a/lib/layouts/revtex4-1.layout +++ b/lib/layouts/revtex4-1.layout @@ -16,7 +16,7 @@ # - add support for \onlinecite{} -Format 63 +Format 64 Input stdclass.inc Input numrevtex.inc diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout index 8116416183..2517a77307 100644 --- a/lib/layouts/revtex4.layout +++ b/lib/layouts/revtex4.layout @@ -11,7 +11,7 @@ # Amir Karger (RevTeX 4 beta) 9/1999, 7/2000 # Heavily modifed and enhanced by serveral developers. -Format 63 +Format 64 Columns 1 Sides 1 diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module index f1226bf934..9e56e114c5 100644 --- a/lib/layouts/rsphrase.module +++ b/lib/layouts/rsphrase.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 63 +Format 64 InsetLayout "Flex:R-S number" LyxType custom diff --git a/lib/layouts/sciposter.layout b/lib/layouts/sciposter.layout index 52bbf320ab..d82acfb8c3 100644 --- a/lib/layouts/sciposter.layout +++ b/lib/layouts/sciposter.layout @@ -7,7 +7,7 @@ # # Input general definitions -Format 63 +Format 64 Input stdclass.inc diff --git a/lib/layouts/scrartcl.layout b/lib/layouts/scrartcl.layout index e60303eb75..af065c38ef 100644 --- a/lib/layouts/scrartcl.layout +++ b/lib/layouts/scrartcl.layout @@ -4,7 +4,7 @@ # KOMA scrartcl textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11. -Format 63 +Format 64 Input scrclass.inc SecNumDepth 3 diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout index ed135e76e1..60dfa35ba8 100644 --- a/lib/layouts/scrarticle-beamer.layout +++ b/lib/layouts/scrarticle-beamer.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author: Jürgen Spitzmüller -Format 63 +Format 64 # Includes Input scrartcl.layout diff --git a/lib/layouts/scrbook.layout b/lib/layouts/scrbook.layout index 56cf27a68e..2615818330 100644 --- a/lib/layouts/scrbook.layout +++ b/lib/layouts/scrbook.layout @@ -4,7 +4,7 @@ # KOMA scrbook textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11. -Format 63 +Format 64 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc index f9cf9ba9fd..b5355640b6 100644 --- a/lib/layouts/scrclass.inc +++ b/lib/layouts/scrclass.inc @@ -8,7 +8,7 @@ # Labeling is now used also in non-KOMA classes -Format 63 +Format 64 SecNumDepth 2 TocDepth 2 DefaultStyle Standard diff --git a/lib/layouts/scrlettr.layout b/lib/layouts/scrlettr.layout index 994b6ac6ba..d94ce34c18 100644 --- a/lib/layouts/scrlettr.layout +++ b/lib/layouts/scrlettr.layout @@ -4,7 +4,7 @@ # KOMA scrlettr textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1999/2/17. -Format 63 +Format 64 Style Standard Category MainText LatexName dummy diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout index de968435d4..8304550ac5 100644 --- a/lib/layouts/scrlttr2.layout +++ b/lib/layouts/scrlttr2.layout @@ -5,7 +5,7 @@ # Juergen Spitzmueller , 2003/2/17. # Uwe Stöhr , 2008/2/03. -Format 63 +Format 64 Provides subscript 1 Style Standard diff --git a/lib/layouts/scrreprt.layout b/lib/layouts/scrreprt.layout index 23fc74d864..9bf1d9d79f 100644 --- a/lib/layouts/scrreprt.layout +++ b/lib/layouts/scrreprt.layout @@ -4,7 +4,7 @@ # KOMA scrreprt textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11. -Format 63 +Format 64 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/sectionbox.module b/lib/layouts/sectionbox.module index 5e0ed54c8d..aef1a15e31 100644 --- a/lib/layouts/sectionbox.module +++ b/lib/layouts/sectionbox.module @@ -6,7 +6,7 @@ # Author: Jürgen Spitzmüller -Format 63 +Format 64 InsetLayout Flex:SectionBox LyXType custom diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout index 71a7605522..9dfccb75b1 100644 --- a/lib/layouts/seminar.layout +++ b/lib/layouts/seminar.layout @@ -11,7 +11,7 @@ # 1.4 2008-10-08 Günter Milde (use --Separator-- "look") # 1.5 2011-06-09 Günter Milde (Use Flex insets) -Format 63 +Format 64 Sides 1 Columns 1 diff --git a/lib/layouts/shapepar.module b/lib/layouts/shapepar.module index f87a944fed..c99d0b338a 100644 --- a/lib/layouts/shapepar.module +++ b/lib/layouts/shapepar.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 63 +Format 64 AddToPreamble % used for custom paragraph shapes diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout index c3094cc922..d90eacd2fb 100644 --- a/lib/layouts/siamltex.layout +++ b/lib/layouts/siamltex.layout @@ -11,7 +11,7 @@ # Modified from amsart.layout May '08 by Andrew Corrigan -Format 63 +Format 64 Columns 1 Sides 2 PageStyle Headers diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index d5cba5ec70..06449436d5 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layouts/sigplanconf.layout @@ -17,7 +17,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 diff --git a/lib/layouts/simplecv.layout b/lib/layouts/simplecv.layout index dc9671a7a1..c9bfbecbac 100644 --- a/lib/layouts/simplecv.layout +++ b/lib/layouts/simplecv.layout @@ -5,7 +5,7 @@ # Author : Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) -Format 63 +Format 64 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/singlecol-new.layout b/lib/layouts/singlecol-new.layout index 9e7f7bfaaa..2888f81cce 100644 --- a/lib/layouts/singlecol-new.layout +++ b/lib/layouts/singlecol-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 diff --git a/lib/layouts/singlecol.layout b/lib/layouts/singlecol.layout index 467738efa3..29aea2cda0 100644 --- a/lib/layouts/singlecol.layout +++ b/lib/layouts/singlecol.layout @@ -3,5 +3,5 @@ # \DeclareCategory{Obsolete} # Read the definitions from article.layout -Format 63 +Format 64 Input article.layout diff --git a/lib/layouts/slides.layout b/lib/layouts/slides.layout index f7832b69a9..e514486b4b 100644 --- a/lib/layouts/slides.layout +++ b/lib/layouts/slides.layout @@ -8,7 +8,7 @@ # -Format 63 +Format 64 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout index 898354dc6f..ef0716db01 100644 --- a/lib/layouts/spie.layout +++ b/lib/layouts/spie.layout @@ -6,7 +6,7 @@ # to be used with the spie.cls LaTex-style available at # http://public.lanl.gov/kmh/spie/ -Format 63 +Format 64 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/stdcharstyles.inc b/lib/layouts/stdcharstyles.inc index 04e32e9cd5..5224bb0eb4 100644 --- a/lib/layouts/stdcharstyles.inc +++ b/lib/layouts/stdcharstyles.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Character Styles definition -Format 63 +Format 64 # Error fallback: InsetLayout Flex diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc index 0a24fdd864..01f42a3b5a 100644 --- a/lib/layouts/stdciteformats.inc +++ b/lib/layouts/stdciteformats.inc @@ -11,7 +11,7 @@ # Author: Richard Heck # Jürgen Spitzmüller -Format 63 +Format 64 CiteFormat default # diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index a942aa9a9e..562f27e521 100644 --- a/lib/layouts/stdclass.inc +++ b/lib/layouts/stdclass.inc @@ -7,7 +7,7 @@ # ``standard'' layouts, like article and friends. -Format 63 +Format 64 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/stdcounters.inc b/lib/layouts/stdcounters.inc index b6e07a3e04..e8f5acb3f0 100644 --- a/lib/layouts/stdcounters.inc +++ b/lib/layouts/stdcounters.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 63 +Format 64 Counter part LabelString "\Roman{part}" PrettyFormat "Part \Roman{part}" diff --git a/lib/layouts/stdcustom.inc b/lib/layouts/stdcustom.inc index 5149ae1c8b..81d54f8828 100644 --- a/lib/layouts/stdcustom.inc +++ b/lib/layouts/stdcustom.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Custom Inset layouts definition -Format 63 +Format 64 # Error fallback: InsetLayout "Flex:Custom" diff --git a/lib/layouts/stdfloatnames.inc b/lib/layouts/stdfloatnames.inc index e8aced3ee7..3f85f3547a 100644 --- a/lib/layouts/stdfloatnames.inc +++ b/lib/layouts/stdfloatnames.inc @@ -1,6 +1,6 @@ # This defines the names used by common Float types. -Format 63 +Format 64 OutlinerName table "Tables" OutlinerName figure "Figures" diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc index 9c91c685f5..361e9e038d 100644 --- a/lib/layouts/stdfloats.inc +++ b/lib/layouts/stdfloats.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 63 +Format 64 Input stdfloatnames.inc diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index 53949e5931..c55b0d60c8 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -4,7 +4,7 @@ # # Detailed format description is available in the customization manual -Format 63 +Format 64 Provides stdinsets 1 diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc index ec29646fc4..3749540a76 100644 --- a/lib/layouts/stdlayouts.inc +++ b/lib/layouts/stdlayouts.inc @@ -7,7 +7,7 @@ # quotations and such. -Format 63 +Format 64 Style Quotation Category MainText diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc index 30b28d4bbc..9eeff98823 100644 --- a/lib/layouts/stdletter.inc +++ b/lib/layouts/stdletter.inc @@ -3,7 +3,7 @@ # Heavily modifed and enhanced by several developers. -Format 63 +Format 64 Columns 1 Sides 1 PageStyle Empty diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc index 182c4f34ec..60f90ccacd 100644 --- a/lib/layouts/stdlists.inc +++ b/lib/layouts/stdlists.inc @@ -6,7 +6,7 @@ # This include files contains various standard environments for lists. -Format 63 +Format 64 Input stdlyxlist.inc diff --git a/lib/layouts/stdlyxlist.inc b/lib/layouts/stdlyxlist.inc index f4f9f4405b..db1d41565a 100644 --- a/lib/layouts/stdlyxlist.inc +++ b/lib/layouts/stdlyxlist.inc @@ -1,7 +1,7 @@ # The special "LyXList". Separated out for inclusion where the # whole of stdlist.inc is not needed. -Format 63 +Format 64 Style Labeling Category List diff --git a/lib/layouts/stdrefprefix.inc b/lib/layouts/stdrefprefix.inc index a637723610..ef2daaaa92 100644 --- a/lib/layouts/stdrefprefix.inc +++ b/lib/layouts/stdrefprefix.inc @@ -7,7 +7,7 @@ # in stdclass.inc, so any file that includes either of these will get # the standard RefPrefix definitions. -Format 63 +Format 64 ModifyStyle Part RefPrefix part diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index 1aa19dc34f..8d1bba27f9 100644 --- a/lib/layouts/stdsections.inc +++ b/lib/layouts/stdsections.inc @@ -7,7 +7,7 @@ # commands that are useful for article-like document classes, but not # for letters. -Format 63 +Format 64 Style Part Category Sectioning diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc index 620bde0dc3..ae9da55229 100644 --- a/lib/layouts/stdstarsections.inc +++ b/lib/layouts/stdstarsections.inc @@ -9,7 +9,7 @@ # modifying the style of the regular sectioning layouts. -Format 63 +Format 64 Style Part* CopyStyle Part Category Unnumbered diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc index 646c8ebf24..2c0bdf6751 100644 --- a/lib/layouts/stdstruct.inc +++ b/lib/layouts/stdstruct.inc @@ -8,7 +8,7 @@ # a document, like abstract, bibliography and such. -Format 63 +Format 64 Style Abstract Margin Static LatexType Environment diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc index da24cb9c47..9de652f7d4 100644 --- a/lib/layouts/stdtitle.inc +++ b/lib/layouts/stdtitle.inc @@ -8,7 +8,7 @@ # a document, like title, author and such. -Format 63 +Format 64 Style Title diff --git a/lib/layouts/subequations.module b/lib/layouts/subequations.module index 98dbe35ada..f2807cb3fd 100644 --- a/lib/layouts/subequations.module +++ b/lib/layouts/subequations.module @@ -5,7 +5,7 @@ # Author: Joel A. Kulesza (jkulesza@gmail.com) -Format 63 +Format 64 InsetLayout Flex:Subequations LyxType custom diff --git a/lib/layouts/svcommon.inc b/lib/layouts/svcommon.inc index 42ed24b6f3..6b76f3d065 100644 --- a/lib/layouts/svcommon.inc +++ b/lib/layouts/svcommon.inc @@ -19,7 +19,7 @@ # see http://www.springer.com/authors for class files and further instructions -Format 63 +Format 64 PageStyle Plain diff --git a/lib/layouts/svglobal.layout b/lib/layouts/svglobal.layout index 245a55e6b0..5ee2654168 100644 --- a/lib/layouts/svglobal.layout +++ b/lib/layouts/svglobal.layout @@ -20,7 +20,7 @@ # see www.springer.de/author/tex/help-journals.html for class files -Format 63 +Format 64 Input svcommon.inc NoStyle Front_Matter diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout index e578ca6957..0fd2b73762 100644 --- a/lib/layouts/svglobal3.layout +++ b/lib/layouts/svglobal3.layout @@ -15,7 +15,7 @@ # # see ftp://ftp.springer.de/pub/tex/latex/svjour3/ for class files -Format 63 +Format 64 Input svcommon.inc diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout index 3f9910c043..ff73980c89 100644 --- a/lib/layouts/svjog.layout +++ b/lib/layouts/svjog.layout @@ -24,7 +24,7 @@ # see www.springer.de/author/tex/help-journals.html for class files -Format 63 +Format 64 Input svcommon.inc NoStyle Front_Matter diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout index 8e8e80e9bc..659cec4a44 100644 --- a/lib/layouts/svmono.layout +++ b/lib/layouts/svmono.layout @@ -8,7 +8,7 @@ # Class and style files and templates are found at: # http://wiki.lyx.org/Examples/Springer # -Format 63 +Format 64 Input svcommon.inc TocDepth 2 diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout index 9cf8a45bc9..bf93bc1588 100644 --- a/lib/layouts/svmult.layout +++ b/lib/layouts/svmult.layout @@ -8,7 +8,7 @@ # Class and style files and templates are found at: # http://wiki.lyx.org/Examples/Springer # -Format 63 +Format 64 Input svcommon.inc @@ -34,7 +34,7 @@ NoStyle Acknowledgements Style Title* CopyStyle Title LatexName title* - LabelString "Title*: " + LabelString "Title*:" LabelSep "xxx" LabelType Static Margin First_Dynamic diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout index b0052f5587..9f7e446f45 100644 --- a/lib/layouts/svprobth.layout +++ b/lib/layouts/svprobth.layout @@ -31,7 +31,7 @@ # see www.springer.de/author/tex/help-journals.html for class files -Format 63 +Format 64 Input svcommon.inc NoStyle Front_Matter diff --git a/lib/layouts/sweave.module b/lib/layouts/sweave.module index cd1b11c62e..9011e0ccf6 100644 --- a/lib/layouts/sweave.module +++ b/lib/layouts/sweave.module @@ -6,7 +6,7 @@ #Category: literate #Excludes: lilypond -Format 63 +Format 64 Input litinsets.inc diff --git a/lib/layouts/tabs-within-sections.module b/lib/layouts/tabs-within-sections.module index e8811e5d1a..15b1105a87 100644 --- a/lib/layouts/tabs-within-sections.module +++ b/lib/layouts/tabs-within-sections.module @@ -4,7 +4,7 @@ #the section number to the table number, as in 'Table 2.1'. #DescriptionEnd -Format 63 +Format 64 Requires amsmath diff --git a/lib/layouts/tarticle.layout b/lib/layouts/tarticle.layout index bcd14cb8af..d252630cb5 100644 --- a/lib/layouts/tarticle.layout +++ b/lib/layouts/tarticle.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tbook.layout b/lib/layouts/tbook.layout index 6ee6be20c3..1be93492cb 100644 --- a/lib/layouts/tbook.layout +++ b/lib/layouts/tbook.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tcolorbox.module b/lib/layouts/tcolorbox.module index 4bb1009957..5a133e25fe 100644 --- a/lib/layouts/tcolorbox.module +++ b/lib/layouts/tcolorbox.module @@ -6,7 +6,7 @@ #Authors: Jürgen Spitzmüller # Uwe Stöhr -Format 63 +Format 64 InsetLayout Flex:Color_Box LyXType custom diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc index f18b8cfda4..2669befe82 100644 --- a/lib/layouts/theorems-ams-bytype.inc +++ b/lib/layouts/theorems-ams-bytype.inc @@ -22,7 +22,7 @@ # - Case (by inclusion) # We need separate counters for each theorem-like style. -Format 63 +Format 64 Counter theorem End Counter corollary diff --git a/lib/layouts/theorems-ams-bytype.module b/lib/layouts/theorems-ams-bytype.module index 098b6ca991..23e0e1742f 100644 --- a/lib/layouts/theorems-ams-bytype.module +++ b/lib/layouts/theorems-ams-bytype.module @@ -17,7 +17,7 @@ # Modularized Jan 08 by Richard Heck # Hacked June '09 by Paul Rubin to use separate counters -Format 63 +Format 64 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-ams-chap-bytype.inc b/lib/layouts/theorems-ams-chap-bytype.inc index bf907183b4..959da59a98 100644 --- a/lib/layouts/theorems-ams-chap-bytype.inc +++ b/lib/layouts/theorems-ams-chap-bytype.inc @@ -24,7 +24,7 @@ # We need separate counters for each theorem-like style. -Format 63 +Format 64 Counter theorem End Counter corollary diff --git a/lib/layouts/theorems-ams-chap-bytype.module b/lib/layouts/theorems-ams-chap-bytype.module index 8259c4ab17..fa79b3ce3e 100644 --- a/lib/layouts/theorems-ams-chap-bytype.module +++ b/lib/layouts/theorems-ams-chap-bytype.module @@ -18,7 +18,7 @@ # Hacked June '09 by Paul Rubin to use separate counters # Chapter dependence added Oct '16 by Andrew Parsloe -Format 63 +Format 64 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-ams-extended-bytype.module b/lib/layouts/theorems-ams-extended-bytype.module index 7654cefcb3..e76fdc661f 100644 --- a/lib/layouts/theorems-ams-extended-bytype.module +++ b/lib/layouts/theorems-ams-extended-bytype.module @@ -18,7 +18,7 @@ # Modularized Jan 08 by Richard Heck # Hacked June '09 by Paul Rubin to use separate counters -Format 63 +Format 64 Requires amsmath diff --git a/lib/layouts/theorems-ams-extended-chap-bytype.module b/lib/layouts/theorems-ams-extended-chap-bytype.module index 44cc2b951e..2aebce8582 100644 --- a/lib/layouts/theorems-ams-extended-chap-bytype.module +++ b/lib/layouts/theorems-ams-extended-chap-bytype.module @@ -19,7 +19,7 @@ # Hacked June '09 by Paul Rubin to use separate counters # Chapter dependence added Oct '16 by Andrew Parsloe -Format 63 +Format 64 Requires amsmath diff --git a/lib/layouts/theorems-ams-extended.module b/lib/layouts/theorems-ams-extended.module index 50d42276a6..a1889e38de 100644 --- a/lib/layouts/theorems-ams-extended.module +++ b/lib/layouts/theorems-ams-extended.module @@ -15,7 +15,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard Heck -Format 63 +Format 64 Requires amsmath diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index c4345be129..4409059680 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -20,7 +20,7 @@ # - Proof # - Case (by inclusion) -Format 63 +Format 64 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module index 3cbacb7d89..d4ee390204 100644 --- a/lib/layouts/theorems-ams.module +++ b/lib/layouts/theorems-ams.module @@ -14,7 +14,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard Heck -Format 63 +Format 64 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-bytype.inc b/lib/layouts/theorems-bytype.inc index 60dc2f79a5..8aa35c4398 100644 --- a/lib/layouts/theorems-bytype.inc +++ b/lib/layouts/theorems-bytype.inc @@ -22,7 +22,7 @@ # - Proof # - Case (by inclusion) -Format 63 +Format 64 Style Theorem Category Reasoning diff --git a/lib/layouts/theorems-bytype.module b/lib/layouts/theorems-bytype.module index 06ef099dcf..f458ce7620 100644 --- a/lib/layouts/theorems-bytype.module +++ b/lib/layouts/theorems-bytype.module @@ -11,7 +11,7 @@ # Author: Paul Rubin (hacked from Richard Heck's theorems-std.module) -Format 63 +Format 64 # We need separate counters for each theorem-like style. Counter theorem diff --git a/lib/layouts/theorems-case.inc b/lib/layouts/theorems-case.inc index 8954f02f1c..6875bf0c52 100644 --- a/lib/layouts/theorems-case.inc +++ b/lib/layouts/theorems-case.inc @@ -6,7 +6,7 @@ # Define Case as an enumeration environment # with its own counters -Format 63 +Format 64 Counter casei LabelString "Case \arabic{casei}." diff --git a/lib/layouts/theorems-chap-bytype.module b/lib/layouts/theorems-chap-bytype.module index 69d0e93d62..82f64617d1 100644 --- a/lib/layouts/theorems-chap-bytype.module +++ b/lib/layouts/theorems-chap-bytype.module @@ -11,7 +11,7 @@ # Author: Paul Rubin (hacked from Richard Heck's various modules) -Format 63 +Format 64 # We need separate counters for each theorem-like style. Counter theorem diff --git a/lib/layouts/theorems-chap.module b/lib/layouts/theorems-chap.module index b41b5a2d3f..8885d39e75 100644 --- a/lib/layouts/theorems-chap.module +++ b/lib/layouts/theorems-chap.module @@ -10,7 +10,7 @@ # Author: Richard Heck -Format 63 +Format 64 Counter theorem Within chapter diff --git a/lib/layouts/theorems-named.module b/lib/layouts/theorems-named.module index 57b916e436..7c1b033177 100644 --- a/lib/layouts/theorems-named.module +++ b/lib/layouts/theorems-named.module @@ -6,7 +6,7 @@ #DescriptionEnd #Original Author: John Perry -Format 63 +Format 64 ProvideStyle Theorem* Category Reasoning diff --git a/lib/layouts/theorems-order.inc b/lib/layouts/theorems-order.inc index 1c8ee9bca1..4f4204901d 100644 --- a/lib/layouts/theorems-order.inc +++ b/lib/layouts/theorems-order.inc @@ -1,7 +1,7 @@ # Sets the order of the main theorem environments # Author: Richard Heck -Format 63 +Format 64 #Get the order right Style Theorem diff --git a/lib/layouts/theorems-proof-std.inc b/lib/layouts/theorems-proof-std.inc index 22bc536f9e..18b42976f4 100644 --- a/lib/layouts/theorems-proof-std.inc +++ b/lib/layouts/theorems-proof-std.inc @@ -1,6 +1,6 @@ # Moved here by rgheck. Original author cloudy. -Format 63 +Format 64 #This is just a hacked version of the AMS proof environment Style Proof diff --git a/lib/layouts/theorems-proof.inc b/lib/layouts/theorems-proof.inc index 83d6979251..4c22c76c17 100644 --- a/lib/layouts/theorems-proof.inc +++ b/lib/layouts/theorems-proof.inc @@ -8,7 +8,7 @@ # Tinkered with Sep. '07 by Paul Rubin # Modularized Jan 08 by Richard Heck -Format 63 +Format 64 Style Proof Category Reasoning diff --git a/lib/layouts/theorems-refprefix.inc b/lib/layouts/theorems-refprefix.inc index ed0d9e4ce7..6f5fec9118 100644 --- a/lib/layouts/theorems-refprefix.inc +++ b/lib/layouts/theorems-refprefix.inc @@ -1,6 +1,6 @@ # Reference prefixes for theorem environments -Format 63 +Format 64 ModifyStyle Theorem RefPrefix thm diff --git a/lib/layouts/theorems-sec-bytype.module b/lib/layouts/theorems-sec-bytype.module index 52f02ac854..f90e0693b3 100644 --- a/lib/layouts/theorems-sec-bytype.module +++ b/lib/layouts/theorems-sec-bytype.module @@ -11,7 +11,7 @@ # Author: Paul Rubin (hacked from Richard Heck's various modules) -Format 63 +Format 64 # We need separate counters for each theorem-like style. Counter theorem diff --git a/lib/layouts/theorems-sec.module b/lib/layouts/theorems-sec.module index 1252a7b68d..87305f7994 100644 --- a/lib/layouts/theorems-sec.module +++ b/lib/layouts/theorems-sec.module @@ -9,7 +9,7 @@ # Author: Richard Heck -Format 63 +Format 64 Counter theorem Within section diff --git a/lib/layouts/theorems-starred-equivalents.inc b/lib/layouts/theorems-starred-equivalents.inc index 9e723d0f50..da821a696b 100644 --- a/lib/layouts/theorems-starred-equivalents.inc +++ b/lib/layouts/theorems-starred-equivalents.inc @@ -1,7 +1,7 @@ # Sets the order of the main theorem environments # Author: Richard Heck -Format 63 +Format 64 Style Theorem CopyStyle Theorem* diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc index c00ff70b12..c90d821b5f 100644 --- a/lib/layouts/theorems-starred.inc +++ b/lib/layouts/theorems-starred.inc @@ -19,7 +19,7 @@ # - Claim # - Proof -Format 63 +Format 64 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/theorems-starred.module b/lib/layouts/theorems-starred.module index 3aba949013..e8c1232cd9 100644 --- a/lib/layouts/theorems-starred.module +++ b/lib/layouts/theorems-starred.module @@ -8,7 +8,7 @@ # Author: Richard Heck -Format 63 +Format 64 Input theorems-order.inc Input theorems-starred.inc diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module index 83950b9441..dccefa0b1e 100644 --- a/lib/layouts/theorems-std.module +++ b/lib/layouts/theorems-std.module @@ -9,7 +9,7 @@ # Author: Richard Heck -Format 63 +Format 64 Counter theorem End diff --git a/lib/layouts/theorems-without-preamble.inc b/lib/layouts/theorems-without-preamble.inc index fcefc0e8e8..87226ae1e9 100644 --- a/lib/layouts/theorems-without-preamble.inc +++ b/lib/layouts/theorems-without-preamble.inc @@ -26,7 +26,7 @@ # - Note -Format 63 +Format 64 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc index 75f45c3169..a0a8dd9d24 100644 --- a/lib/layouts/theorems.inc +++ b/lib/layouts/theorems.inc @@ -20,7 +20,7 @@ # - Claim # - Case (by inclusion) -Format 63 +Format 64 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/todonotes.module b/lib/layouts/todonotes.module index e5f5bc2bad..4dc146fa6d 100644 --- a/lib/layouts/todonotes.module +++ b/lib/layouts/todonotes.module @@ -9,7 +9,7 @@ # Authors: Stephen # Jürgen Spitzmüller -Format 63 +Format 64 OutlinerName todonotes "TODO" diff --git a/lib/layouts/treport.layout b/lib/layouts/treport.layout index 19301d45b2..91c152f188 100644 --- a/lib/layouts/treport.layout +++ b/lib/layouts/treport.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp) # This style provides japanese features -Format 63 +Format 64 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout index f91298177a..4572900281 100644 --- a/lib/layouts/tufte-book.layout +++ b/lib/layouts/tufte-book.layout @@ -5,7 +5,7 @@ # Jason Waskiewicz , 2009/10/18 # Modified by Uwe Stöhr , 2009/11/15 -Format 63 +Format 64 Provides geometry 1 Provides natbib-internal 1 diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout index ef349d23c6..569bc6a5a6 100644 --- a/lib/layouts/tufte-handout.layout +++ b/lib/layouts/tufte-handout.layout @@ -5,7 +5,7 @@ # Juergen Spitzmueller , 2008/10/22 # Modified by Uwe Stöhr , 2009/11/15 -Format 63 +Format 64 # import other layouts Input stdlayouts.inc diff --git a/lib/layouts/varwidth.module b/lib/layouts/varwidth.module index 95e76745bf..2c299c4e65 100644 --- a/lib/layouts/varwidth.module +++ b/lib/layouts/varwidth.module @@ -12,7 +12,7 @@ # Authors: Guillaume Munch # Jürgen Spitzmüller -Format 63 +Format 64 InsetLayout Flex:Minipage_(Var._Width) LyXType custom diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py index 56b433994c..eebacf883d 100644 --- a/lib/scripts/layout2layout.py +++ b/lib/scripts/layout2layout.py @@ -11,7 +11,7 @@ # This script will update a .layout file to current format # The latest layout format is also defined in src/TextClass.cpp -currentFormat = 63 +currentFormat = 64 # Incremented to format 4, 6 April 2007, lasgouttes @@ -212,6 +212,11 @@ currentFormat = 63 # - New textclass tags CiteFramework, MaxCiteNames (for cite engines) # - Extended InsetCite syntax. +# Incremented to format 64, 30 August 2017 by rgh +# Strip leading and trailing spaces from LabelString, +# LabelStringAppendix, and EndLabelString, and LabelCounter, +# to conform to what we used to do. + # Do not forget to document format change in Customization # Manual (section "Declaring a new text class"). @@ -345,6 +350,11 @@ def convert(lines, end_format): re_CenteredEnvironment = re.compile(b'^(\\s*)LabelType(\\s+)Centered_Top_Environment\\s*$', re.IGNORECASE) re_ChapterStyle = re.compile(b'^\\s*Style\\s+Chapter\\s*$', re.IGNORECASE) re_InsetLayout_CaptionLTNN = re.compile(b'^(\\s*InsetLayout\\s+)(Caption:LongTableNonumber)', re.IGNORECASE) + # for format 64 + re_trimLabelString = re.compile(b'^(\\s*LabelString\s+)"\\s*(.*?)\\s*"\\s*$') + re_trimLabelStringAppendix = re.compile(b'^(\\s*LabelStringAppendix\s+)"\\s*(.*?)\\s*"\\s*$') + re_trimEndLabelString = re.compile(b'^(\\s*EndLabelString\s+)"\\s*(.*?)\\s*"\\s*$') + re_trimLabelCounter = re.compile(b'^(\\s*LabelCounter\s+)"\\s*(.*?)\\s*"\\s*$') # counters for sectioning styles (hardcoded in 1.3) @@ -456,6 +466,15 @@ def convert(lines, end_format): i += 1 continue + if format == 63: + for r in (re_trimLabelString, re_trimLabelStringAppendix,\ + re_trimEndLabelString, re_trimLabelCounter): + m = r.match(lines[i]) + if m: + lines[i] = m.group(1) + '"' + m.group(2) + '"' + i += 1 + continue + if format >= 60 and format <= 62: # nothing to do. i += 1 diff --git a/src/Layout.cpp b/src/Layout.cpp index f9d181db73..285511a104 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -545,23 +545,19 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass) // FIXME: this means LT_LABELSTRING_APPENDIX may only // occur after LT_LABELSTRING lex >> labelstring_; - labelstring_ = trim(labelstring_); labelstring_appendix_ = labelstring_; break; case LT_ENDLABELSTRING: lex >> endlabelstring_; - endlabelstring_ = trim(endlabelstring_); break; case LT_LABELSTRING_APPENDIX: lex >> labelstring_appendix_; - labelstring_appendix_ = trim(labelstring_appendix_); break; case LT_LABELCOUNTER: lex >> counter; - counter = trim(counter); break; case LT_PAR_GROUP: diff --git a/src/TextClass.cpp b/src/TextClass.cpp index eb79e13eae..e4757b5ee9 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -62,7 +62,7 @@ namespace lyx { // You should also run the development/tools/updatelayouts.py script, // to update the format of all of our layout files. // -int const LAYOUT_FORMAT = 63; //spitz: new tags CiteFramework, MaxCiteNames, extended InsetCite syntax. +int const LAYOUT_FORMAT = 64; //lasgouttes/rgheck: do not trim LabeString and friends. // Layout format for the current lyx file format. Controls which format is