diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 4f97516332..41eaf63356 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -18011,7 +18011,7 @@ status collapsed ] Whether this inset should use the font of its surrounding environment or uses its own. - Default is true: uses its own. + Default is false: use the font of the surrounding environment. \end_layout \begin_layout Description diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx index fafc6c6aa0..a21cc818de 100644 --- a/lib/doc/de/Customization.lyx +++ b/lib/doc/de/Customization.lyx @@ -17022,8 +17022,8 @@ status collapsed \end_inset -] Ob die Einfügung die Schrift der benachbarten Umgebungen verwenden soll - oder seine eigene. +] Ob die Einfügung die Schrift der übergeordneten Umgebung verwenden soll + oder ihre eigene. Voreinstellung ist \begin_inset Flex Code status collapsed @@ -17031,12 +17031,12 @@ status collapsed \begin_layout Plain Layout \emph on -1 +0 \end_layout \end_inset -: verwendet seine Eigene. +: verwendet die Schrift der übergeordneten Umgebung. \end_layout \begin_layout Description diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx index 290bf35a67..cc85eff1ad 100644 --- a/lib/doc/es/Customization.lyx +++ b/lib/doc/es/Customization.lyx @@ -18263,7 +18263,7 @@ status collapsed \end_inset ] Si este recuadro debería usar la tipografía de su entorno o la suya propia. - Por omisión es su propia tipografía. + Por omisión es la tipografía de su entorno. \end_layout \begin_layout Description diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index fa2fdb823c..e98a427b88 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -19600,7 +19600,7 @@ status collapsed ] indique si l'insert doit utiliser la police de caractères environnante ou bien utiliser la sienne propre. - Valeur implicite: vrai, utiliser sa propre police. + Valeur implicite: faux, utiliser la police de caractères environnante. \end_layout \begin_layout Description diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout index a5d7beb05a..721d3661c0 100644 --- a/lib/layouts/AEA.layout +++ b/lib/layouts/AEA.layout @@ -4,7 +4,7 @@ # Authors : Koji Yokota # Uwe Stöhr -Format 48 +Format 49 Input stdclass.inc Input theorems-ams.module Input theorems-bytype.module diff --git a/lib/layouts/IEEEtran-CompSoc.layout b/lib/layouts/IEEEtran-CompSoc.layout index 7f07cedfda..b5b26e8d6c 100644 --- a/lib/layouts/IEEEtran-CompSoc.layout +++ b/lib/layouts/IEEEtran-CompSoc.layout @@ -6,7 +6,7 @@ # IEEtran Computer Society textclass definition file. -Format 48 +Format 49 Input IEEEtran.layout @@ -42,6 +42,7 @@ InsetLayout Flex:Author_Footnote Color blue Size Small EndFont + ResetsFont true End diff --git a/lib/layouts/IEEEtran-TransMag.layout b/lib/layouts/IEEEtran-TransMag.layout index 4e0509c60d..e60c78d0dc 100644 --- a/lib/layouts/IEEEtran-TransMag.layout +++ b/lib/layouts/IEEEtran-TransMag.layout @@ -6,7 +6,7 @@ # IEEtran Magnetics textclass definition file. -Format 48 +Format 49 Input IEEEtran.layout diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 3556b2b196..bdd44b5d9f 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -9,7 +9,7 @@ # IEEtran textclass definition file. -Format 48 +Format 49 Sides 1 SecNumDepth 3 @@ -100,6 +100,7 @@ InsetLayout Flex:IEEE_membership Color green Size Small EndFont + ResetsFont true End @@ -151,6 +152,7 @@ InsetLayout Flex:Author_Name Color blue Size Small EndFont + ResetsFont true End @@ -188,6 +190,7 @@ InsetLayout Flex:Author_Mark Color latex Size Small EndFont + ResetsFont true End @@ -294,6 +297,7 @@ InsetLayout Flex:Paragraph_Start Font Size Small EndFont + ResetsFont true End diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout index 0f0943d0cf..1a230d8fda 100644 --- a/lib/layouts/RJournal.layout +++ b/lib/layouts/RJournal.layout @@ -4,7 +4,7 @@ # Author: Yihui Xie # Modified by: Scott Kostyshak -Format 48 +Format 49 Input stdclass.inc diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index b43c23ce7f..9435845a1a 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 48 +Format 49 Columns 2 Sides 2 SecNumDepth 3 @@ -355,6 +355,7 @@ InsetLayout Flex:Institute Font Color blue EndFont + ResetsFont true End @@ -366,6 +367,7 @@ InsetLayout Flex:E-Mail Family Typewriter Color blue EndFont + ResetsFont true End diff --git a/lib/layouts/aapaper.inc b/lib/layouts/aapaper.inc index db5a54b4a7..d38eacae9e 100644 --- a/lib/layouts/aapaper.inc +++ b/lib/layouts/aapaper.inc @@ -5,7 +5,7 @@ # Author: Peter Sütterlin -Format 48 +Format 49 Style Subtitle Margin Static LatexType Command diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout index 927e06079d..276a1929de 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aapaper.layout @@ -15,7 +15,7 @@ # and reconfigure LyX (after running texhash, of course). -Format 48 +Format 49 Columns 2 Sides 2 SecNumDepth 3 diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index c851727ee7..9c3b866881 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -35,7 +35,7 @@ # Version 1.5 26/11/12 - added mandatory argument for \altaffiltext -Format 48 +Format 49 Columns 1 Sides 1 #SecNumDepth 3 diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout index 22fff341a9..26b44f0284 100644 --- a/lib/layouts/achemso.layout +++ b/lib/layouts/achemso.layout @@ -4,7 +4,7 @@ # textclass definition file for achemso 3.7c # Author: Uwe Stöhr (uwestoehr@web.de) -Format 48 +Format 49 Columns 1 Sides 1 @@ -279,6 +279,7 @@ InsetLayout Flex:Bibnote Size Small EndFont MultiPar true + ResetsFont true End diff --git a/lib/layouts/acm-sigs-alt.layout b/lib/layouts/acm-sigs-alt.layout index fdc0e6f4d8..8d37dd2d98 100644 --- a/lib/layouts/acm-sigs-alt.layout +++ b/lib/layouts/acm-sigs-alt.layout @@ -6,6 +6,6 @@ # # Author: Gioele Barabucci -Format 48 +Format 49 Input acm-sigs.inc diff --git a/lib/layouts/acm-sigs.inc b/lib/layouts/acm-sigs.inc index a195abfa69..d294c1c35a 100644 --- a/lib/layouts/acm-sigs.inc +++ b/lib/layouts/acm-sigs.inc @@ -2,7 +2,7 @@ # # Author: Gioele Barabucci -Format 48 +Format 49 Input stdclass.inc Columns 2 diff --git a/lib/layouts/acm-sigs.layout b/lib/layouts/acm-sigs.layout index c0c6c81653..3921f94337 100644 --- a/lib/layouts/acm-sigs.layout +++ b/lib/layouts/acm-sigs.layout @@ -6,6 +6,6 @@ # # Author: Gioele Barabucci -Format 48 +Format 49 Input acm-sigs.inc diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index 3e59b9e10d..0de41d5ebd 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 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/agu-dtd.layout b/lib/layouts/agu-dtd.layout index e17ebf9120..5b91ff0c52 100644 --- a/lib/layouts/agu-dtd.layout +++ b/lib/layouts/agu-dtd.layout @@ -6,7 +6,7 @@ # Martin Vermeer -Format 48 +Format 49 Input agu_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc index ac50165990..7dc05d6fd6 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 48 +Format 49 OutputType docbook Columns 1 @@ -44,6 +44,7 @@ InsetLayout Flex:Firstname Shape Up Color blue EndFont + ResetsFont true End InsetLayout Flex:Fname @@ -58,6 +59,7 @@ InsetLayout Flex:Fname Shape Up Color blue EndFont + ResetsFont true End @@ -73,6 +75,7 @@ InsetLayout Flex:Surname Shape Up Color blue EndFont + ResetsFont true End @@ -88,6 +91,7 @@ InsetLayout Flex:Filename Family Roman Color blue EndFont + ResetsFont true End @@ -103,6 +107,7 @@ InsetLayout Flex:Literal Family Roman Color blue EndFont + ResetsFont true End @@ -119,6 +124,7 @@ InsetLayout Flex:Emph Shape Up Color blue EndFont + ResetsFont true End @@ -130,6 +136,7 @@ InsetLayout Flex:Abbrev LabelFont Color blue EndFont + ResetsFont true End @@ -141,6 +148,7 @@ InsetLayout Flex:Citation-number LabelFont Color blue EndFont + ResetsFont true End @@ -152,6 +160,7 @@ InsetLayout Flex:Volume LabelFont Color blue EndFont + ResetsFont true End @@ -163,6 +172,7 @@ InsetLayout Flex:Day LabelFont Color blue EndFont + ResetsFont true End @@ -174,6 +184,7 @@ InsetLayout Flex:Month LabelFont Color blue EndFont + ResetsFont true End @@ -185,6 +196,7 @@ InsetLayout Flex:Year LabelFont Color blue EndFont + ResetsFont true End @@ -196,6 +208,7 @@ InsetLayout Flex:Issue-number LabelFont Color blue EndFont + ResetsFont true End @@ -207,6 +220,7 @@ InsetLayout Flex:Issue-day LabelFont Color blue EndFont + ResetsFont true End @@ -218,6 +232,7 @@ InsetLayout Flex:Issue-months LabelFont Color blue EndFont + ResetsFont true End diff --git a/lib/layouts/agu_stdcounters.inc b/lib/layouts/agu_stdcounters.inc index 529016460c..9b14c980ce 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 48 +Format 49 Counter sect1 Within section End diff --git a/lib/layouts/agu_stdlists.inc b/lib/layouts/agu_stdlists.inc index 4deecfd077..7df4bfc851 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 48 +Format 49 Input stdlists.inc diff --git a/lib/layouts/agu_stdsections.inc b/lib/layouts/agu_stdsections.inc index ba25523507..db762d60e1 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 48 +Format 49 Input stdsections.inc Style Part diff --git a/lib/layouts/agu_stdtitle.inc b/lib/layouts/agu_stdtitle.inc index a9f6c285e6..ffb2dbe5b5 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 48 +Format 49 Input stdtitle.inc @@ -327,6 +327,7 @@ InsetLayout Flex:ISSN LabelFont Color blue EndFont + ResetsFont true End @@ -338,6 +339,7 @@ InsetLayout Flex:CODEN LabelFont Color blue EndFont + ResetsFont true End # Inside Special-section: @@ -350,6 +352,7 @@ InsetLayout Flex:SS-Code LabelFont Color blue EndFont + ResetsFont true End @@ -361,6 +364,7 @@ InsetLayout Flex:SS-Title LabelFont Color blue EndFont + ResetsFont true End # Inside Copyright: @@ -373,6 +377,7 @@ InsetLayout Flex:CCC-Code LabelFont Color blue EndFont + ResetsFont true End @@ -386,6 +391,7 @@ InsetLayout Flex:Code LabelFont Color blue EndFont + ResetsFont true End @@ -397,6 +403,7 @@ InsetLayout Flex:Dscr LabelFont Color blue EndFont + ResetsFont true End # Inside Keywords: @@ -409,6 +416,7 @@ InsetLayout Flex:Keyword LabelFont Color blue EndFont + ResetsFont true End #inside Affiliation: @@ -421,6 +429,7 @@ InsetLayout Flex:Orgdiv LabelFont Color blue EndFont + ResetsFont true End @@ -432,6 +441,7 @@ InsetLayout Flex:Orgname LabelFont Color blue EndFont + ResetsFont true End @@ -443,6 +453,7 @@ InsetLayout Flex:Street LabelFont Color blue EndFont + ResetsFont true End @@ -454,6 +465,7 @@ InsetLayout Flex:City LabelFont Color blue EndFont + ResetsFont true End @@ -465,6 +477,7 @@ InsetLayout Flex:State LabelFont Color blue EndFont + ResetsFont true End @@ -476,6 +489,7 @@ InsetLayout Flex:Postcode LabelFont Color blue EndFont + ResetsFont true End @@ -487,6 +501,7 @@ InsetLayout Flex:Country LabelFont Color blue EndFont + ResetsFont true End diff --git a/lib/layouts/agums.layout b/lib/layouts/agums.layout index 71089388a1..3700852ae4 100644 --- a/lib/layouts/agums.layout +++ b/lib/layouts/agums.layout @@ -5,7 +5,7 @@ # Author: Martin Vermeer -Format 48 +Format 49 Input aguplus.inc ClassOptions diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc index c07a54113d..508c0234bc 100644 --- a/lib/layouts/aguplus.inc +++ b/lib/layouts/aguplus.inc @@ -6,7 +6,7 @@ # ftp://ftp.agu.org/journals/latex/journals -Format 48 +Format 49 Input stdclass.inc SecNumDepth 4 diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index 3ba7814689..6cf2882eb8 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 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/algorithm2e.module b/lib/layouts/algorithm2e.module index 51d140b96d..8125506edb 100644 --- a/lib/layouts/algorithm2e.module +++ b/lib/layouts/algorithm2e.module @@ -6,7 +6,7 @@ # #Author: Jürgen Spitzmüller -Format 48 +Format 49 Requires algorithm2e diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout index 2a2a999648..b0a677481e 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 48 +Format 49 Columns 1 Sides 2 diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index 4451b8113c..1cf61ab9f3 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 48 +Format 49 Columns 1 Sides 2 diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc index 924ccfab2c..fcc1a29d83 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 48 +Format 49 # the environments copied from the old amsart.layout are: # - Bibliography diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index 6d540c7863..578918c07a 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author: Randy Gobbel -Format 48 +Format 49 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout index 1297c17a5c..f8c22f96c8 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 48 +Format 49 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/arab-article.layout b/lib/layouts/arab-article.layout index 28755c823b..4d56634d61 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 48 +Format 49 Input article diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout index eb1a067d2e..d4145e425e 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 48 +Format 49 # Includes Input beamer.layout diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout index 62cf5f94f9..bdae6a1a50 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 48 +Format 49 Input stdclass.inc SecNumDepth 3 diff --git a/lib/layouts/basic.module b/lib/layouts/basic.module index 42282a1126..c0e69cfc76 100644 --- a/lib/layouts/basic.module +++ b/lib/layouts/basic.module @@ -7,7 +7,7 @@ # Author: Julien Rioux -Format 48 +Format 49 CiteEngineType default DefaultBiblio plain diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 2bc95a37f9..f5dfe60a74 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -6,7 +6,7 @@ # Richard Heck , Martin Vermeer and probably others. -Format 48 +Format 49 # # GLOBAL SETTINGS @@ -1339,6 +1339,7 @@ InsetLayout Flex:Bold LeftDelim < RightDelim > EndArgument + ResetsFont true End InsetLayout Flex:Emphasize @@ -1356,6 +1357,7 @@ InsetLayout Flex:Emphasize LeftDelim < RightDelim > EndArgument + ResetsFont true End InsetLayout Flex:Alert @@ -1373,6 +1375,7 @@ InsetLayout Flex:Alert LeftDelim < RightDelim > EndArgument + ResetsFont true End InsetLayout Flex:Structure @@ -1390,6 +1393,7 @@ InsetLayout Flex:Structure LeftDelim < RightDelim > EndArgument + ResetsFont true End InsetLayout Flex:Only @@ -1408,6 +1412,7 @@ InsetLayout Flex:Only RightDelim > AutoInsert 1 EndArgument + ResetsFont true End InsetLayout Flex:Uncover @@ -1426,6 +1431,7 @@ InsetLayout Flex:Uncover RightDelim > AutoInsert 1 EndArgument + ResetsFont true End InsetLayout Flex:Visible @@ -1444,6 +1450,7 @@ InsetLayout Flex:Visible RightDelim > AutoInsert 1 EndArgument + ResetsFont true End InsetLayout Flex:Invisible @@ -1462,6 +1469,7 @@ InsetLayout Flex:Invisible RightDelim > AutoInsert 1 EndArgument + ResetsFont true End InsetLayout Flex:Alternative @@ -1484,6 +1492,7 @@ InsetLayout Flex:Alternative Tooltip "Enter the default text here" Mandatory 1 EndArgument + ResetsFont true End InsetLayout Flex:Beamer_Note @@ -1506,6 +1515,7 @@ InsetLayout Flex:Beamer_Note LabelString "Note Options" Tooltip "Specifiy note options (see beamer manual)" EndArgument + ResetsFont true End InsetLayout Flex:ArticleMode @@ -1516,6 +1526,7 @@ InsetLayout Flex:ArticleMode Decoration classic LabelString Article MultiPar true + ResetsFont true End InsetLayout Flex:PresentationMode @@ -1526,6 +1537,7 @@ InsetLayout Flex:PresentationMode Decoration classic LabelString Presentation MultiPar true + ResetsFont true End diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module index 6f6648dc8a..41379fc32c 100644 --- a/lib/layouts/bicaption.module +++ b/lib/layouts/bicaption.module @@ -5,7 +5,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 48 +Format 49 Style "Caption setup" LatexType command diff --git a/lib/layouts/book.layout b/lib/layouts/book.layout index 85189e3ab9..b677dbc516 100644 --- a/lib/layouts/book.layout +++ b/lib/layouts/book.layout @@ -7,7 +7,7 @@ # Heavily modifed and enhanced by serveral developers. -Format 48 +Format 49 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/braille.module b/lib/layouts/braille.module index 0b937b5b4f..9f7dbfa5e9 100644 --- a/lib/layouts/braille.module +++ b/lib/layouts/braille.module @@ -5,7 +5,7 @@ #DescriptionEnd # Author: Uwe Stöhr -Format 48 +Format 49 AddToPreamble \usepackage{braille} diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 4bfbca4f68..a3bceeafe1 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -4,7 +4,7 @@ # For theater plays -Format 48 +Format 49 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/chess.layout b/lib/layouts/chess.layout index a3009448b2..cb719e0530 100644 --- a/lib/layouts/chess.layout +++ b/lib/layouts/chess.layout @@ -17,7 +17,7 @@ # \vspace*{-0.5in}) # -Format 48 +Format 49 Requires chess diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout index 3b804067d2..e012f996e3 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 48 +Format 49 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/ctex-article.layout b/lib/layouts/ctex-article.layout index 5fcbc41667..d373445bcf 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 48 +Format 49 # Read the definitions from article.layout Input article.layout diff --git a/lib/layouts/ctex-book.layout b/lib/layouts/ctex-book.layout index cba1c4707b..00bf672498 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 48 +Format 49 # Read the definitions from book.layout Input book.layout diff --git a/lib/layouts/ctex-report.layout b/lib/layouts/ctex-report.layout index d2b98e8ffb..aeebc75aea 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 48 +Format 49 # Read the definitions from report.layout Input report.layout diff --git a/lib/layouts/customHeadersFooters.module b/lib/layouts/customHeadersFooters.module index 529a47817a..de45e5a040 100644 --- a/lib/layouts/customHeadersFooters.module +++ b/lib/layouts/customHeadersFooters.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 48 +Format 49 Style "Left Header" Category Header/Footer diff --git a/lib/layouts/db_lyxmacros.inc b/lib/layouts/db_lyxmacros.inc index c971fd16c7..3920d92d13 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 48 +Format 49 Input lyxmacros.inc Style Code diff --git a/lib/layouts/db_stdcharstyles.inc b/lib/layouts/db_stdcharstyles.inc index 473b8c9a5a..87279adf56 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 48 +Format 49 InsetLayout Flex:Filename LyXType element LabelString Filename @@ -15,6 +15,7 @@ InsetLayout Flex:Filename Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:Directory @@ -30,6 +31,7 @@ InsetLayout Flex:Directory Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:Firstname @@ -41,6 +43,7 @@ InsetLayout Flex:Firstname Shape Up Color blue EndFont + ResetsFont true End InsetLayout Flex:Surname @@ -52,6 +55,7 @@ InsetLayout Flex:Surname Shape Up Color blue EndFont + ResetsFont true End InsetLayout Flex:Literal @@ -66,6 +70,7 @@ InsetLayout Flex:Literal Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:Email @@ -80,6 +85,7 @@ InsetLayout Flex:Email Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:KeyCombo @@ -94,6 +100,7 @@ InsetLayout Flex:KeyCombo Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:KeyCap @@ -108,6 +115,7 @@ InsetLayout Flex:KeyCap Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:GuiMenu @@ -122,6 +130,7 @@ InsetLayout Flex:GuiMenu Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:GuiMenuItem @@ -136,6 +145,7 @@ InsetLayout Flex:GuiMenuItem Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:GuiButton @@ -150,6 +160,7 @@ InsetLayout Flex:GuiButton Family Roman Color blue EndFont + ResetsFont true End InsetLayout Flex:MenuChoice @@ -164,4 +175,5 @@ InsetLayout Flex:MenuChoice Family Roman Color blue EndFont + ResetsFont true End diff --git a/lib/layouts/db_stdclass.inc b/lib/layouts/db_stdclass.inc index 5b11aca758..3612f3a2ba 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 48 +Format 49 OutputType docbook Columns 1 diff --git a/lib/layouts/db_stdcounters.inc b/lib/layouts/db_stdcounters.inc index 8594663699..7e8bff50be 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 48 +Format 49 Counter sect1 Within chapter End diff --git a/lib/layouts/db_stdlayouts.inc b/lib/layouts/db_stdlayouts.inc index fcd85c2b44..3a47a178ca 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 48 +Format 49 Input stdlayouts.inc Style Literal diff --git a/lib/layouts/db_stdlists.inc b/lib/layouts/db_stdlists.inc index a4360ec1b9..1b04730776 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 48 +Format 49 Input stdlists.inc diff --git a/lib/layouts/db_stdsections.inc b/lib/layouts/db_stdsections.inc index 1b52432c95..24cba6fb45 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 48 +Format 49 Input stdsections.inc Style Part diff --git a/lib/layouts/db_stdstarsections.inc b/lib/layouts/db_stdstarsections.inc index 45f85b1be8..d7a9621308 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 48 +Format 49 Style Part* CopyStyle Part Margin Static diff --git a/lib/layouts/db_stdstruct.inc b/lib/layouts/db_stdstruct.inc index 4bb2cc143c..5a04535788 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 48 +Format 49 Input stdstruct.inc Style Abstract diff --git a/lib/layouts/db_stdtitle.inc b/lib/layouts/db_stdtitle.inc index f8af2fa500..72c9faea8d 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 48 +Format 49 Input stdtitle.inc diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout index 495c9f1e6b..d1ebc18c3b 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 48 +Format 49 Input letter.layout diff --git a/lib/layouts/docbook-book.layout b/lib/layouts/docbook-book.layout index d749b4a1a3..2c05d41129 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 48 +Format 49 Input report Input db_stdclass.inc diff --git a/lib/layouts/docbook-chapter.layout b/lib/layouts/docbook-chapter.layout index d7dec27a1d..dc4a919700 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 48 +Format 49 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook-section.layout b/lib/layouts/docbook-section.layout index 178584c076..7f6f540043 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 48 +Format 49 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook.layout b/lib/layouts/docbook.layout index 0a45d15563..1bf057603b 100644 --- a/lib/layouts/docbook.layout +++ b/lib/layouts/docbook.layout @@ -4,7 +4,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 48 +Format 49 Input db_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/doublecol-new.layout b/lib/layouts/doublecol-new.layout index a11a384fda..94332b176b 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 48 +Format 49 Input article.layout diff --git a/lib/layouts/dtk.layout b/lib/layouts/dtk.layout index bf65c58656..c0fc98576d 100644 --- a/lib/layouts/dtk.layout +++ b/lib/layouts/dtk.layout @@ -7,7 +7,7 @@ # Author : Herbert Voss 2001/08/13 -Format 48 +Format 49 Columns 1 Sides 2 SecNumDepth -1 # no counting diff --git a/lib/layouts/ectaart.layout b/lib/layouts/ectaart.layout index 51ec457d70..085f978b96 100644 --- a/lib/layouts/ectaart.layout +++ b/lib/layouts/ectaart.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author : Koji Yokota -Format 48 +Format 49 Input article.layout TitleLatexType Environment @@ -166,6 +166,7 @@ InsetLayout Flex:Thanks_Reference LabelString "Thanks Ref" ForcePlain 1 BgColor background + ResetsFont true End InsetLayout Flex:Internet_Address_Reference diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout index 3040b0f6b3..18cac86dcc 100644 --- a/lib/layouts/egs.layout +++ b/lib/layouts/egs.layout @@ -9,7 +9,7 @@ # Converted article -> egs Martin Vermeer -Format 48 +Format 49 Columns 2 Sides 1 PageStyle Plain diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index 5f6ecfdeeb..744c763907 100644 --- a/lib/layouts/elsart.layout +++ b/lib/layouts/elsart.layout @@ -23,7 +23,7 @@ # numbered sections, as does the class file. -Format 48 +Format 49 Columns 1 Sides 2 PageStyle headings diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout index b581c32396..a5720e93c7 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 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/endnotes.module b/lib/layouts/endnotes.module index b2bff13439..a5a5c3f1c1 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 48 +Format 49 Counter endnotes PrettyFormat "Endnote ##" diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout index ce005ae2a0..b88c491c7e 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 48 +Format 49 Input article.layout # only font size 11pt is really available diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module index d7598d8049..b986dfcb40 100644 --- a/lib/layouts/enumitem.module +++ b/lib/layouts/enumitem.module @@ -11,7 +11,7 @@ # both KOMA and non-KOMA document classes. # 2011-01-12 bugfix: set elabeling label font to \normalfont. -Format 48 +Format 49 # 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 d1864123c9..6e025e4ddf 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 48 +Format 49 Requires amsmath diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout index 2763d4aba9..4b36347904 100644 --- a/lib/layouts/europecv.layout +++ b/lib/layouts/europecv.layout @@ -6,7 +6,7 @@ # General textclass parameters -Format 48 +Format 49 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/extarticle.layout b/lib/layouts/extarticle.layout index 0cae9f2887..b0c28197a0 100644 --- a/lib/layouts/extarticle.layout +++ b/lib/layouts/extarticle.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Herbert Voss -Format 48 +Format 49 Input article.layout # change available fontsizes diff --git a/lib/layouts/extbook.layout b/lib/layouts/extbook.layout index ba29b9b3f2..3e8da972cb 100644 --- a/lib/layouts/extbook.layout +++ b/lib/layouts/extbook.layout @@ -4,7 +4,7 @@ # Extended book textclass definition file. # Herbert Voss -Format 48 +Format 49 Input book.layout # change available fontsizes diff --git a/lib/layouts/extletter.layout b/lib/layouts/extletter.layout index d3ac68b854..13f9fd2989 100644 --- a/lib/layouts/extletter.layout +++ b/lib/layouts/extletter.layout @@ -4,7 +4,7 @@ # Extended article textclass definition file. # Herbert Voss -Format 48 +Format 49 Input letter.layout # change available fontsizes diff --git a/lib/layouts/extreport.layout b/lib/layouts/extreport.layout index 9b09d8fbe5..a0162521be 100644 --- a/lib/layouts/extreport.layout +++ b/lib/layouts/extreport.layout @@ -4,7 +4,7 @@ # Extented report textclass definition file. # Herbert Voss -Format 48 +Format 49 Input report.layout # change available fontsizes diff --git a/lib/layouts/figs-within-sections.module b/lib/layouts/figs-within-sections.module index 0e56fe4315..ff9dff0627 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 48 +Format 49 Requires amsmath diff --git a/lib/layouts/fix-cm.module b/lib/layouts/fix-cm.module index 52280b92fa..82fd3219d6 100644 --- a/lib/layouts/fix-cm.module +++ b/lib/layouts/fix-cm.module @@ -8,6 +8,6 @@ # Author : Patrick Atamaniuk -Format 48 +Format 49 Requires fix-cm diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module index becc8fcb4f..55034cba0a 100644 --- a/lib/layouts/fixltx2e.module +++ b/lib/layouts/fixltx2e.module @@ -9,6 +9,6 @@ # Author : Georg Baum -Format 48 +Format 49 Requires fixltx2e diff --git a/lib/layouts/foils.layout b/lib/layouts/foils.layout index d5cfcf698a..2342a2cb4d 100644 --- a/lib/layouts/foils.layout +++ b/lib/layouts/foils.layout @@ -7,7 +7,7 @@ # To do: Define class specific options. -Format 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/foottoend.module b/lib/layouts/foottoend.module index 4297052f5c..f907432791 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 48 +Format 49 Requires endnotes diff --git a/lib/layouts/frletter.layout b/lib/layouts/frletter.layout index ee4ac4fea2..273b5ec60e 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 48 +Format 49 # Read the definitions from letter.layout Input letter.layout diff --git a/lib/layouts/g-brief.layout b/lib/layouts/g-brief.layout index 38d3c4b8a5..edbe56d031 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 48 +Format 49 Input stdinsets.inc Input stdfloats.inc Input stdcounters.inc diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout index ccfdc423bc..6eaa9fa5f0 100644 --- a/lib/layouts/g-brief2.layout +++ b/lib/layouts/g-brief2.layout @@ -6,7 +6,7 @@ # Thomas Hartkens # Input general definitions -Format 48 +Format 49 Input stdfloats.inc Input stdcounters.inc Input stdinsets.inc diff --git a/lib/layouts/hanging.module b/lib/layouts/hanging.module index ea90d42c52..abc3046d98 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 48 +Format 49 Style Hanging LatexType Environment diff --git a/lib/layouts/heb-article.layout b/lib/layouts/heb-article.layout index 0ee6c24b2c..01d2bb0520 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 48 +Format 49 Input article Preamble diff --git a/lib/layouts/heb-letter.layout b/lib/layouts/heb-letter.layout index c3a9d4a3e0..5c09f2f575 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 48 +Format 49 Input letter diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout index 9881864e68..ae1e4664c8 100644 --- a/lib/layouts/hollywood.layout +++ b/lib/layouts/hollywood.layout @@ -16,7 +16,7 @@ # Based on course given by Lars Davidson -Format 48 +Format 49 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout index 405e941029..bca85d3658 100644 --- a/lib/layouts/ijmpc.layout +++ b/lib/layouts/ijmpc.layout @@ -12,7 +12,7 @@ # Author: Uwe Stöhr (uwestoehr@web.de) -Format 48 +Format 49 Sides 1 Columns 1 @@ -185,6 +185,7 @@ InsetLayout Flex:Received Color green Size Small EndFont + ResetsFont true End InsetLayout Flex:Revised @@ -202,6 +203,7 @@ InsetLayout Flex:Revised Color green Size Small EndFont + ResetsFont true End Style Abstract @@ -232,6 +234,7 @@ InsetLayout Flex:Keywords Color green Size Small EndFont + ResetsFont true End Style Classification_Codes @@ -256,6 +259,7 @@ InsetLayout Flex:TableCaption Color green Size Small EndFont + ResetsFont true End InsetLayout Flex:Refcite @@ -273,6 +277,7 @@ InsetLayout Flex:Refcite Color green Size Small EndFont + ResetsFont true End Style ItemList diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout index be85288333..008a752f76 100644 --- a/lib/layouts/ijmpd.layout +++ b/lib/layouts/ijmpd.layout @@ -17,7 +17,7 @@ # Author: Uwe Stöhr (uwestoehr@web.de) -Format 48 +Format 49 Sides 1 Columns 1 @@ -175,6 +175,7 @@ InsetLayout Flex:Received Color green Size Small EndFont + ResetsFont true End InsetLayout Flex:Revised @@ -192,6 +193,7 @@ InsetLayout Flex:Revised Color green Size Small EndFont + ResetsFont true End InsetLayout Flex:Comby @@ -209,6 +211,7 @@ InsetLayout Flex:Comby Color green Size Small EndFont + ResetsFont true End Style Abstract @@ -259,6 +262,7 @@ InsetLayout Flex:TableCaption Color green Size Small EndFont + ResetsFont true End InsetLayout Flex:Refcite @@ -276,6 +280,7 @@ InsetLayout Flex:Refcite Color green Size Small EndFont + ResetsFont true End Style ItemList diff --git a/lib/layouts/initials.module b/lib/layouts/initials.module index dc7934886f..7902cd1c2f 100644 --- a/lib/layouts/initials.module +++ b/lib/layouts/initials.module @@ -5,7 +5,7 @@ #DescriptionEnd #Authors: Pavel Sanda and Uwe Stöhr -Format 48 +Format 49 AddToPreamble \@ifundefined{lettrine}{\usepackage{lettrine}}{} @@ -20,6 +20,7 @@ InsetLayout Flex:Initial Size Large EndFont Requires lettrine + ResetsFont true End Style Initial diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index fb5fe08a1d..55d1941354 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 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout index 46034bed88..b568e3af94 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 48 +Format 49 Input stdclass.inc Sides 2 Columns 2 diff --git a/lib/layouts/jarticle.layout b/lib/layouts/jarticle.layout index e8f727d1b3..49a910ed9b 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout index a11013c320..a67dea4def 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 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/jbook.layout b/lib/layouts/jbook.layout index e96334aa77..bf4db5ab88 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jgrga.layout b/lib/layouts/jgrga.layout index 6c9b1b1283..f501faeda5 100644 --- a/lib/layouts/jgrga.layout +++ b/lib/layouts/jgrga.layout @@ -4,7 +4,7 @@ # AGUplus JGR textclass definition file. # Author: Martin Vermeer -Format 48 +Format 49 Input aguplus.inc ClassOptions diff --git a/lib/layouts/jreport.layout b/lib/layouts/jreport.layout index b10c1fcb47..36e46b5831 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jsarticle.layout b/lib/layouts/jsarticle.layout index 989cdf31bc..a7c9e82ac4 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jsbook.layout b/lib/layouts/jsbook.layout index c46f010951..af1131cc51 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout index b32519190c..18d6aab072 100644 --- a/lib/layouts/jss.layout +++ b/lib/layouts/jss.layout @@ -6,7 +6,7 @@ # License: GNU GPL version 2 or later # JSS LaTeX files can be downloaded from http://www.jstatsoft.org/downloads/JSSstyle.zip -Format 48 +Format 49 # Read the definitions from article.layout Input article.layout diff --git a/lib/layouts/jurabib.module b/lib/layouts/jurabib.module index 69f05b5e65..d826adbea0 100644 --- a/lib/layouts/jurabib.module +++ b/lib/layouts/jurabib.module @@ -9,7 +9,7 @@ # Author: Julien Rioux -Format 48 +Format 49 Requires jurabib diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout index 4577695217..872af1eee1 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 48 +Format 49 Columns 1 Sides 2 SecNumDepth 4 diff --git a/lib/layouts/knitr.module b/lib/layouts/knitr.module index 401557bf53..a2008cc9fe 100644 --- a/lib/layouts/knitr.module +++ b/lib/layouts/knitr.module @@ -6,7 +6,7 @@ #Category: literate #Excludes: lilypond | sweave -Format 48 +Format 49 Input litinsets.inc diff --git a/lib/layouts/latex8.layout b/lib/layouts/latex8.layout index 976aa28814..0d413dfac4 100644 --- a/lib/layouts/latex8.layout +++ b/lib/layouts/latex8.layout @@ -4,7 +4,7 @@ # Latex8 textclass definition file. # Author : Allan Rae -Format 48 +Format 49 Preamble \usepackage{latex8} \usepackage{times} diff --git a/lib/layouts/letter.layout b/lib/layouts/letter.layout index d80ee29bc7..662cfa19db 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 48 +Format 49 Input stdinsets.inc Input stdletter.inc Input stdlists.inc diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout index 4908fb33e3..628fd34594 100644 --- a/lib/layouts/lettre.layout +++ b/lib/layouts/lettre.layout @@ -25,7 +25,7 @@ # - ordering control left at the beginning (any other way ?) -Format 48 +Format 49 #(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 a41990ff58..a9abb2fdc1 100644 --- a/lib/layouts/lilypond.module +++ b/lib/layouts/lilypond.module @@ -7,7 +7,7 @@ # Author: Julien Rioux -Format 48 +Format 49 OutputFormat lilypond-book InsetLayout "Flex:LilyPond" diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module index 7e61254029..70f97a6e35 100644 --- a/lib/layouts/linguistics.module +++ b/lib/layouts/linguistics.module @@ -7,7 +7,7 @@ # Author: Jürgen Spitzmüller -Format 48 +Format 49 # single numbered example with covington.sty Style Numbered_Example_(multiline) @@ -87,6 +87,7 @@ InsetLayout Flex:Glosse {\glend}}{} EndPreamble InToc true + ResetsFont true End @@ -116,6 +117,7 @@ InsetLayout Flex:Tri-Glosse \glll #1} {\glend}}{} EndPreamble + ResetsFont true End @@ -132,6 +134,7 @@ InsetLayout Flex:Expression \newcommand{\lingexpr}[1]{\emph{#1}} EndPreamble InToc true + ResetsFont true End @@ -147,6 +150,7 @@ InsetLayout Flex:Concepts \newcommand{\lingconcept}[1]{\textsc{#1}} EndPreamble InToc true + ResetsFont true End @@ -160,6 +164,7 @@ InsetLayout Flex:Meaning \newcommand{\lingmeaning}[1]{\enquote*{#1}} EndPreamble InToc true + ResetsFont true End diff --git a/lib/layouts/litinsets.inc b/lib/layouts/litinsets.inc index 8bcee5048e..05440cbfe2 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 48 +Format 49 Counter chunk PrettyFormat "Chunk ##" @@ -43,4 +43,5 @@ InsetLayout "Flex:Chunk" LeftDelim << RightDelim >>=
EndArgument + ResetsFont false End diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout index 9b4145cd82..a8b07f656e 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 48 +Format 49 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module index ffdcb576d5..c485e2d813 100644 --- a/lib/layouts/logicalmkup.module +++ b/lib/layouts/logicalmkup.module @@ -6,7 +6,7 @@ # Author : Martin vermeer -Format 48 +Format 49 InsetLayout Flex:Noun LyxType charstyle @@ -25,6 +25,7 @@ InsetLayout Flex:Noun font-family: sans-serif; } EndHTMLStyle + ResetsFont true End @@ -38,6 +39,7 @@ InsetLayout Flex:Emph EndFont InToc true HTMLTag em + ResetsFont true End @@ -54,6 +56,7 @@ InsetLayout Flex:Strong EndPreamble InToc true HTMLTag strong + ResetsFont true End @@ -70,4 +73,5 @@ InsetLayout Flex:Code EndPreamble InToc true HTMLTag code + ResetsFont true End diff --git a/lib/layouts/ltugboat.layout b/lib/layouts/ltugboat.layout index 07efd7214f..b182893b2d 100644 --- a/lib/layouts/ltugboat.layout +++ b/lib/layouts/ltugboat.layout @@ -6,7 +6,7 @@ # Author : Herbert Voss 2001/08/13 -Format 48 +Format 49 Columns 2 Sides 2 #SecNumDepth # no counting diff --git a/lib/layouts/lyxmacros.inc b/lib/layouts/lyxmacros.inc index 185f401027..45fd1767f1 100644 --- a/lib/layouts/lyxmacros.inc +++ b/lib/layouts/lyxmacros.inc @@ -8,7 +8,7 @@ # be removed later. -Format 48 +Format 49 Style LyX-Code Category MainText Margin Static diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index db54cb5422..979e84e030 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -7,7 +7,7 @@ # feel free to contribute missing features! -Format 48 +Format 49 Columns 1 Sides 2 SecNumDepth 1 diff --git a/lib/layouts/minimalistic.module b/lib/layouts/minimalistic.module index 887577459a..eef7537d4c 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 48 +Format 49 InsetLayout Index Decoration minimalistic diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index 9738a187fd..61d2e593ef 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -6,7 +6,7 @@ # General textclass parameters -Format 48 +Format 49 Columns 1 Sides 1 SecNumDepth -1 @@ -285,6 +285,7 @@ InsetLayout Flex:Column Series Bold Color Blue EndFont + ResetsFont true End Style Entry diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module index e850afcef1..5a44bc7d25 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 48 +Format 49 InsetLayout Flex:Multiple_Columns LyXType custom @@ -30,5 +30,6 @@ InsetLayout Flex:Multiple_Columns Tooltip "Free space that needs to be on the page to start the multiple columns on this page" Requires 2 EndArgument + ResetsFont true End diff --git a/lib/layouts/mwart.layout b/lib/layouts/mwart.layout index ba1a119f0b..0d4306bffa 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 48 +Format 49 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/mwbk.layout b/lib/layouts/mwbk.layout index cdb3af4518..b23b1ee502 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 48 +Format 49 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/mwrep.layout b/lib/layouts/mwrep.layout index 1a0e9e436a..598bea436c 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 48 +Format 49 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/natbib.module b/lib/layouts/natbib.module index 09452b5dd7..68af0ad76c 100644 --- a/lib/layouts/natbib.module +++ b/lib/layouts/natbib.module @@ -10,7 +10,7 @@ # Author: Julien Rioux -Format 48 +Format 49 Requires natbib diff --git a/lib/layouts/natbibapa.module b/lib/layouts/natbibapa.module index 563b5fc089..92cd4552ab 100644 --- a/lib/layouts/natbibapa.module +++ b/lib/layouts/natbibapa.module @@ -7,7 +7,7 @@ # packages.) #DescriptionEnd -Format 48 +Format 49 Preamble \usepackage[natbibapa]{apacite} diff --git a/lib/layouts/noweb.module b/lib/layouts/noweb.module index 7b59fa28d1..fa07e38ca0 100644 --- a/lib/layouts/noweb.module +++ b/lib/layouts/noweb.module @@ -4,7 +4,7 @@ #DescriptionEnd #Category: literate -Format 48 +Format 49 Input litinsets.inc OutputType literate diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc index ff543fb54b..b7bef94ebe 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 48 +Format 49 # appendix applies to sections. Counter section diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc index 74fb0215a3..6e4b6f00fa 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 48 +Format 49 Counter chapter Within "" diff --git a/lib/layouts/numrevtex.inc b/lib/layouts/numrevtex.inc index 2fe644a42a..fbeef23c2c 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 48 +Format 49 Style Section LabelType Static LabelCounter section diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index 379e1536cf..df35903788 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 48 +Format 49 Columns 1 Sides 1 SecNumDepth 3 diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout index a119b81f60..7a3f19c98a 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 48 +Format 49 Input stdcounters.inc Input stdinsets.inc @@ -578,6 +578,7 @@ InsetLayout Flex:Onslide Mandatory 1 DefaultArg "1-" EndArgument + ResetsFont true End InsetLayout Flex:Onslide+ diff --git a/lib/layouts/recipebook.layout b/lib/layouts/recipebook.layout index 5e812db89f..3287ea5fd7 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 48 +Format 49 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/report.layout b/lib/layouts/report.layout index 466d4b1388..e1749421cc 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 48 +Format 49 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/revtex.layout b/lib/layouts/revtex.layout index 86aadc2b89..8b0b63a935 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 48 +Format 49 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout index 4a95ad4e63..d1830b3a61 100644 --- a/lib/layouts/revtex4-1.layout +++ b/lib/layouts/revtex4-1.layout @@ -12,7 +12,7 @@ # - We provide natbib-internal according to LyX bug #5182. # - The command \lovname is missing from the class file. -Format 48 +Format 49 Input stdclass.inc Input numrevtex.inc @@ -299,6 +299,7 @@ InsetLayout Flex:Lowercase # Keep empty to preserve font settings # from the surrounding environment EndFont + ResetsFont true End @@ -312,6 +313,7 @@ InsetLayout Flex:Surname # Keep empty to preserve font settings # from the surrounding environment EndFont + ResetsFont true End diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout index cd94b7122e..190ee55d0c 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 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module index 627dda3573..44e94769cd 100644 --- a/lib/layouts/rsphrase.module +++ b/lib/layouts/rsphrase.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 48 +Format 49 InsetLayout "Flex:R-S number" LyxType custom diff --git a/lib/layouts/scrartcl.layout b/lib/layouts/scrartcl.layout index c54dbfd8c7..c0aa695c9a 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 48 +Format 49 Input scrclass.inc SecNumDepth 3 diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout index be34f57d53..f0b48fc965 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 48 +Format 49 # Includes Input beamer.layout diff --git a/lib/layouts/scrbook.layout b/lib/layouts/scrbook.layout index cac8297f6e..3c84e76245 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 48 +Format 49 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc index 69400a3a71..fc52fddb1e 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 48 +Format 49 SecNumDepth 2 TocDepth 2 DefaultStyle Standard diff --git a/lib/layouts/scrlettr.layout b/lib/layouts/scrlettr.layout index e5353978af..edcec5589f 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 48 +Format 49 Style Standard Category MainText LatexName dummy diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout index 51a3c43ed8..863f27a518 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 48 +Format 49 Provides subscript 1 Style Standard diff --git a/lib/layouts/scrreprt.layout b/lib/layouts/scrreprt.layout index 4bce0efc35..f3a36e9947 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 48 +Format 49 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout index c08c8fad4d..6c86edc2a4 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 48 +Format 49 Sides 1 Columns 1 @@ -34,6 +34,7 @@ InsetLayout Flex:LandscapeSlide LabelFont Size Small EndFont + ResetsFont true End InsetLayout Flex:PortraitSlide diff --git a/lib/layouts/shapepar.module b/lib/layouts/shapepar.module index 5a04388deb..677f15fd2c 100644 --- a/lib/layouts/shapepar.module +++ b/lib/layouts/shapepar.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 48 +Format 49 AddToPreamble % used for custom paragraph shapes diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout index 7721a788c0..282eee0442 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 48 +Format 49 Columns 1 Sides 2 PageStyle Headers diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index 5779537d6b..2aaa90d2ac 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layouts/sigplanconf.layout @@ -14,7 +14,7 @@ # ACM style files can be obtained at # http://www.acm.org/sigs/pubs/proceed/template.html -Format 48 +Format 49 Columns 1 Sides 1 diff --git a/lib/layouts/simplecv.layout b/lib/layouts/simplecv.layout index 8e1b1394d2..ee4b0333ae 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 48 +Format 49 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/singlecol-new.layout b/lib/layouts/singlecol-new.layout index c802cf3eda..13109e3a7f 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 48 +Format 49 Input article.layout diff --git a/lib/layouts/singlecol.layout b/lib/layouts/singlecol.layout index 57e4ce1bc5..51990add30 100644 --- a/lib/layouts/singlecol.layout +++ b/lib/layouts/singlecol.layout @@ -3,5 +3,5 @@ # \DeclareCategory{Articles} # Read the definitions from article.layout -Format 48 +Format 49 Input article.layout diff --git a/lib/layouts/slides.layout b/lib/layouts/slides.layout index aea35d065e..8c98a37cbe 100644 --- a/lib/layouts/slides.layout +++ b/lib/layouts/slides.layout @@ -8,7 +8,7 @@ # -Format 48 +Format 49 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout index d9ab7d42a7..4a3a906011 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 48 +Format 49 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/stdcharstyles.inc b/lib/layouts/stdcharstyles.inc index bac22e54bd..4c6be6f06d 100644 --- a/lib/layouts/stdcharstyles.inc +++ b/lib/layouts/stdcharstyles.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Character Styles definition -Format 48 +Format 49 # Error fallback: InsetLayout Flex @@ -11,4 +11,5 @@ InsetLayout Flex Font Color error EndFont + ResetsFont true End diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc index 6edcc50cf4..a176c7e1e4 100644 --- a/lib/layouts/stdciteformats.inc +++ b/lib/layouts/stdciteformats.inc @@ -2,7 +2,7 @@ # # Author: Richard Heck -Format 48 +Format 49 CiteFormat default # translatable bits diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index 7ec00a8600..5224de7a05 100644 --- a/lib/layouts/stdclass.inc +++ b/lib/layouts/stdclass.inc @@ -7,7 +7,7 @@ # ``standard'' layouts, like article and friends. -Format 48 +Format 49 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/stdcounters.inc b/lib/layouts/stdcounters.inc index 85bf38157f..f5b6e2f585 100644 --- a/lib/layouts/stdcounters.inc +++ b/lib/layouts/stdcounters.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 48 +Format 49 Counter part LabelString "\Roman{part}" PrettyFormat "Part \Roman{part}" diff --git a/lib/layouts/stdcustom.inc b/lib/layouts/stdcustom.inc index 8726d71195..f4bc74b94c 100644 --- a/lib/layouts/stdcustom.inc +++ b/lib/layouts/stdcustom.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Custom Inset layouts definition -Format 48 +Format 49 # Error fallback: InsetLayout "Flex:Custom" diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc index 17b6499660..0010c64506 100644 --- a/lib/layouts/stdfloats.inc +++ b/lib/layouts/stdfloats.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 48 +Format 49 Float Type table diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index a83ece52cf..356e49d8e7 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 48 +Format 49 Provides stdinsets 1 @@ -433,7 +433,6 @@ InsetLayout "Flex:URL" PassThru true FreeSpacing true ForceLTR true - ResetsFont false Font Family Typewriter Color urltext diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc index 04b6430120..47be8a3cd8 100644 --- a/lib/layouts/stdlayouts.inc +++ b/lib/layouts/stdlayouts.inc @@ -7,7 +7,7 @@ # quotations and such. -Format 48 +Format 49 Style Quotation Category MainText diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc index b4d7c9527e..2117feb55d 100644 --- a/lib/layouts/stdletter.inc +++ b/lib/layouts/stdletter.inc @@ -3,7 +3,7 @@ # Heavily modifed and enhanced by several developers. -Format 48 +Format 49 Columns 1 Sides 1 PageStyle Empty diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc index e79122cf56..de794b6f85 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 48 +Format 49 Input stdlyxlist.inc diff --git a/lib/layouts/stdlyxlist.inc b/lib/layouts/stdlyxlist.inc index f17bc7efa7..94c62e1836 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 48 +Format 49 Style Labeling Category List diff --git a/lib/layouts/stdrefprefix.inc b/lib/layouts/stdrefprefix.inc index 9a79b18f38..0729d6a7d3 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 48 +Format 49 IfStyle Part RefPrefix part diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index 4724d33697..82c3cec930 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 48 +Format 49 Style Part Category Sectioning diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc index 6820f930fa..bc00b4dbdc 100644 --- a/lib/layouts/stdstarsections.inc +++ b/lib/layouts/stdstarsections.inc @@ -9,7 +9,7 @@ # modifying the style of the regular sectioning layouts. -Format 48 +Format 49 Style Part* CopyStyle Part Category Unnumbered diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc index ee79fb641b..da792408df 100644 --- a/lib/layouts/stdstruct.inc +++ b/lib/layouts/stdstruct.inc @@ -8,7 +8,7 @@ # a document, like abstract, bibliography and such. -Format 48 +Format 49 Style Abstract Margin Static LatexType Environment diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc index 7eed78897e..6aa7b216a5 100644 --- a/lib/layouts/stdtitle.inc +++ b/lib/layouts/stdtitle.inc @@ -8,7 +8,7 @@ # a document, like title, author and such. -Format 48 +Format 49 Style Title diff --git a/lib/layouts/svcommon.inc b/lib/layouts/svcommon.inc index cec0f03a0c..dd139ad922 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 48 +Format 49 PageStyle Plain @@ -693,5 +693,6 @@ InsetLayout Flex:Email Color urltext Size Small EndFont + ResetsFont true End diff --git a/lib/layouts/svglobal.layout b/lib/layouts/svglobal.layout index ac692d82f4..25cbeb89cc 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 48 +Format 49 Input svcommon.inc NoStyle Front_Matter @@ -97,6 +97,7 @@ InsetLayout Flex:thanks Size Small Color Green EndFont + ResetsFont true End InsetLayout Flex:Inst diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout index 696e65f9a2..597ba2c8cd 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 48 +Format 49 Input svcommon.inc diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout index 3048a1f88d..ae443b81e4 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 48 +Format 49 Input svcommon.inc NoStyle Front_Matter @@ -101,6 +101,7 @@ InsetLayout Flex:thanks Size Small Color Green EndFont + ResetsFont true End InsetLayout Flex:Inst diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout index 7f3faa0bda..cdfb5cff4b 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 48 +Format 49 Input svcommon.inc TocDepth 2 diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout index a06657c8d0..d5d44251fe 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 48 +Format 49 Input svcommon.inc diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout index 465686bbfb..1c558bd443 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 48 +Format 49 Input svcommon.inc NoStyle Front_Matter @@ -131,6 +131,7 @@ InsetLayout Flex:thanks Size Small Color Green EndFont + ResetsFont true End InsetLayout Flex:Inst diff --git a/lib/layouts/sweave.module b/lib/layouts/sweave.module index 8f5cc80ad9..ace12bf5b8 100644 --- a/lib/layouts/sweave.module +++ b/lib/layouts/sweave.module @@ -6,7 +6,7 @@ #Category: literate #Excludes: lilypond -Format 48 +Format 49 Input litinsets.inc diff --git a/lib/layouts/tabs-within-sections.module b/lib/layouts/tabs-within-sections.module index e7daf16649..1bc1bce359 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 48 +Format 49 Requires amsmath diff --git a/lib/layouts/tarticle.layout b/lib/layouts/tarticle.layout index 2d80a50f84..f057a1aec6 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tbook.layout b/lib/layouts/tbook.layout index 8198641313..edcb8c9f60 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc index a6db1a7236..d5093c1cdd 100644 --- a/lib/layouts/theorems-ams-bytype.inc +++ b/lib/layouts/theorems-ams-bytype.inc @@ -21,7 +21,7 @@ # - Case (by inclusion) # We need separate counters for each theorem-like style. -Format 48 +Format 49 Counter theorem End Counter corollary diff --git a/lib/layouts/theorems-ams-bytype.module b/lib/layouts/theorems-ams-bytype.module index 46d3a7ac36..7917a56eed 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 48 +Format 49 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-ams-extended-bytype.module b/lib/layouts/theorems-ams-extended-bytype.module index 31cedc3ef2..b887a21d63 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 48 +Format 49 Requires amsmath diff --git a/lib/layouts/theorems-ams-extended.module b/lib/layouts/theorems-ams-extended.module index b4a886c9db..0fbe1ce76e 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 48 +Format 49 Requires amsmath diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 9d4f1b4d13..a292422253 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -19,7 +19,7 @@ # - Proof # - Case (by inclusion) -Format 48 +Format 49 Style Theorem Category Reasoning diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module index 1bacc0df0d..504c4f0675 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 48 +Format 49 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-bytype.inc b/lib/layouts/theorems-bytype.inc index 1155ebfa71..263cdcb3d6 100644 --- a/lib/layouts/theorems-bytype.inc +++ b/lib/layouts/theorems-bytype.inc @@ -21,7 +21,7 @@ # - Proof # - Case (by inclusion) -Format 48 +Format 49 Style Theorem Category Reasoning diff --git a/lib/layouts/theorems-bytype.module b/lib/layouts/theorems-bytype.module index 414d080464..01b22037da 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 48 +Format 49 # 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 988d85c394..62ecb0d4b5 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 48 +Format 49 Counter casei LabelString "Case \arabic{casei}." diff --git a/lib/layouts/theorems-chap-bytype.module b/lib/layouts/theorems-chap-bytype.module index a2bd3e1796..20decf168d 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 48 +Format 49 # 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 9bd573738b..399eb73013 100644 --- a/lib/layouts/theorems-chap.module +++ b/lib/layouts/theorems-chap.module @@ -10,7 +10,7 @@ # Author: Richard Heck -Format 48 +Format 49 Counter theorem Within chapter diff --git a/lib/layouts/theorems-named.module b/lib/layouts/theorems-named.module index 9925de7b56..3e9b1eec88 100644 --- a/lib/layouts/theorems-named.module +++ b/lib/layouts/theorems-named.module @@ -7,7 +7,7 @@ #Requires: theorems-ams | theorems-starred #Original Author: John Perry -Format 48 +Format 49 Style "Named Theorem" CopyStyle Theorem* Category Reasoning diff --git a/lib/layouts/theorems-order.inc b/lib/layouts/theorems-order.inc index 307fccf260..24763969ab 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 48 +Format 49 #Get the order right Style Theorem diff --git a/lib/layouts/theorems-proof-std.inc b/lib/layouts/theorems-proof-std.inc index d9e338999b..a338ecea3e 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 48 +Format 49 #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 dbf4835bbd..9ae5ffd368 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 48 +Format 49 Style Proof Category Reasoning diff --git a/lib/layouts/theorems-refprefix.inc b/lib/layouts/theorems-refprefix.inc index b055d0e90b..be67cc0e83 100644 --- a/lib/layouts/theorems-refprefix.inc +++ b/lib/layouts/theorems-refprefix.inc @@ -1,6 +1,6 @@ # Reference prefixes for theorem environments -Format 48 +Format 49 IfStyle Theorem RefPrefix thm diff --git a/lib/layouts/theorems-sec-bytype.module b/lib/layouts/theorems-sec-bytype.module index d4e12d665c..d7aa9b6051 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 48 +Format 49 # 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 14dddcd6fd..790fb275fc 100644 --- a/lib/layouts/theorems-sec.module +++ b/lib/layouts/theorems-sec.module @@ -9,7 +9,7 @@ # Author: Richard Heck -Format 48 +Format 49 Counter theorem Within section diff --git a/lib/layouts/theorems-starred-equivalents.inc b/lib/layouts/theorems-starred-equivalents.inc index 214493f87d..865732221a 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 48 +Format 49 Style Theorem CopyStyle Theorem* diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc index c9119f94ec..dbbb602586 100644 --- a/lib/layouts/theorems-starred.inc +++ b/lib/layouts/theorems-starred.inc @@ -18,7 +18,7 @@ # - Claim # - Proof -Format 48 +Format 49 Style Theorem* Category Reasoning diff --git a/lib/layouts/theorems-starred.module b/lib/layouts/theorems-starred.module index bf70f83083..92ec9a08d4 100644 --- a/lib/layouts/theorems-starred.module +++ b/lib/layouts/theorems-starred.module @@ -8,7 +8,7 @@ # Author: Richard Heck -Format 48 +Format 49 Input theorems-order.inc Input theorems-starred.inc diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module index f08cbea6a7..9b5206c292 100644 --- a/lib/layouts/theorems-std.module +++ b/lib/layouts/theorems-std.module @@ -9,7 +9,7 @@ # Author: Richard Heck -Format 48 +Format 49 Counter theorem End diff --git a/lib/layouts/theorems-without-preamble.inc b/lib/layouts/theorems-without-preamble.inc index 8159cbd673..3ea7b8282a 100644 --- a/lib/layouts/theorems-without-preamble.inc +++ b/lib/layouts/theorems-without-preamble.inc @@ -26,7 +26,7 @@ # - Note -Format 48 +Format 49 Counter theorem diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc index 20b9beb9ce..c60bb31ab7 100644 --- a/lib/layouts/theorems.inc +++ b/lib/layouts/theorems.inc @@ -19,7 +19,7 @@ # - Claim # - Case (by inclusion) -Format 48 +Format 49 Style Theorem Category Reasoning diff --git a/lib/layouts/treport.layout b/lib/layouts/treport.layout index 50e0575dab..808adad5bd 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 48 +Format 49 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout index 55f1058bfb..c48ce0ada3 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 48 +Format 49 Provides geometry 1 Provides natbib-internal 1 @@ -144,6 +144,7 @@ InsetLayout Flex:Sidenote Color marginlabel Size Small EndFont + ResetsFont true End InsetLayout Flex:Marginnote @@ -171,6 +172,7 @@ InsetLayout Flex:NewThought Family Roman Color red EndFont + ResetsFont true End InsetLayout Flex:AllCaps diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout index 03ff33cb1f..bbca3059af 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 48 +Format 49 # import other layouts Input stdlayouts.inc diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py index 36e4130d9a..32f095663e 100644 --- a/lib/scripts/layout2layout.py +++ b/lib/scripts/layout2layout.py @@ -162,6 +162,9 @@ import os, re, string, sys # Incremented to format 48, 31 May 2013 by rgh # Add InitialValue tag for counters +# Incremented to format 49, 10 Feb 2014 by gb +# Change default of "ResetsFont" tag to false + # Do not forget to document format change in Customization # Manual (section "Declaring a new text class"). @@ -169,7 +172,7 @@ import os, re, string, sys # development/tools/updatelayouts.sh script to update all # layout files to the new format. -currentFormat = 48 +currentFormat = 49 def usage(prog_name): @@ -255,6 +258,7 @@ def convert(lines): re_Builtin = re.compile(r'^(\s*)LaTeXBuiltin\s+(\w*)', re.IGNORECASE) re_True = re.compile(r'^\s*(?:true|1)\s*$', re.IGNORECASE) re_InsetLayout = re.compile(r'^\s*InsetLayout\s+(?:Custom|CharStyle|Element):(\S+)\s*$', re.IGNORECASE) + re_ResetsFont = re.compile(r'^(\s*)ResetsFont(\s+)(\S+)$', re.IGNORECASE) # with quotes re_QInsetLayout = re.compile(r'^\s*InsetLayout\s+"(?:Custom|CharStyle|Element):([^"]+)"\s*$', re.IGNORECASE) re_InsetLayout_CopyStyle = re.compile(r'^\s*CopyStyle\s+(?:Custom|CharStyle|Element):(\S+)\s*$', re.IGNORECASE) @@ -330,6 +334,11 @@ def convert(lines): opts = 0 reqs = 0 inchapter = False + isflexlayout = False # only used for 48 -> 49 + # Whether a style is inherited (works only for CopyStyle currently, + # not for true inherited styles, see bug 8920 + inherited = False # only used for 48 -> 49 + resetsfont_found = False # only used for 48 -> 49 while i < len(lines): # Skip comments and empty lines @@ -386,6 +395,42 @@ def convert(lines): i += 1 continue + if format == 48: + # The default of ResetsFont in LyX changed from true to false, + # because it is now used for all InsetLayouts, not only flex ones. + # Therefore we need to set it to true for all flex insets which do + # do not already have a ResetsFont. + match = re_InsetLayout2.match(lines[i]) + if match: + resetsfont_found = False + inherited = False + name = string.lower(match.group(1)) + if name == "flex" or name[:5] == "flex:": + isflexlayout = True + else: + isflexlayout = False + match = re_ResetsFont.match(lines[i]) + if match: + resetsfont_found = True + match = re_End.match(lines[i]) + if match: + if isflexlayout and not resetsfont_found and not inherited: + lines.insert(i, "\tResetsFont true") + i += 1 + match = re_Style.match(lines[i]) + if match: + isflexlayout = False + inherited = False + match = re_Counter.match(lines[i]) + if match: + isflexlayout = False + inherited = False + match = re_CopyStyle.match(lines[i]) + if match: + inherited = True + i += 1 + continue + if format >= 44 and format <= 47: # nothing to do. i += 1 diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 391073d8ed..31f27d9223 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -61,7 +61,7 @@ namespace lyx { // development/tools/updatelayouts.sh script, to update the format of // all of our layout files. // -int const LAYOUT_FORMAT = 48; //rgh: initial values for counter +int const LAYOUT_FORMAT = 49; //gb: change default of ResetsFont namespace { diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp index 8b741b7b0a..66bdf0b38b 100644 --- a/src/insets/Inset.cpp +++ b/src/insets/Inset.cpp @@ -642,6 +642,12 @@ Buffer const * Inset::updateFrontend() const } +bool Inset::resetFontEdit() const +{ + return getLayout().resetsFont() || !inheritFont(); +} + + docstring Inset::completionPrefix(Cursor const &) const { return docstring(); diff --git a/src/insets/Inset.h b/src/insets/Inset.h index 8165b4c7c1..b18f8a5f02 100644 --- a/src/insets/Inset.h +++ b/src/insets/Inset.h @@ -534,17 +534,18 @@ public: /** * If this method returns true all explicitly set font attributes * are reset during editing operations. - * For copy/paste the operations the language is never changed, since + * For copy/paste operations the language is never changed, since * the language of a given text never changes if the text is * formatted differently, while other font attribues like size may * need to change if the text is copied from one environment to * another one. - * If it returns false no font attribute is reset. - * The default implementation returns the negation of inheritFont(), + * If this method returns false no font attribute is reset. + * The default implementation returns true if the resetFont layout + * tag is set and otherwise the negation of inheritFont(), * since inherited inset font attributes do not need to be changed, * and non-inherited ones need to be set explicitly. */ - virtual bool resetFontEdit() const { return !inheritFont(); } + virtual bool resetFontEdit() const; /// set the change for the entire inset virtual void setChange(Change const &) {} diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp index 9a0db9a097..70de9fd2eb 100644 --- a/src/insets/InsetFlex.cpp +++ b/src/insets/InsetFlex.cpp @@ -57,14 +57,6 @@ InsetLayout const & InsetFlex::getLayout() const } -bool InsetFlex::resetFontEdit() const -{ - if (getLayout().resetsFont()) - return true; - return InsetCollapsable::resetFontEdit(); -} - - InsetLayout::InsetDecoration InsetFlex::decoration() const { InsetLayout::InsetDecoration const dec = getLayout().decoration(); diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h index 04fbb5f73d..82770026c3 100644 --- a/src/insets/InsetFlex.h +++ b/src/insets/InsetFlex.h @@ -30,8 +30,6 @@ public: InsetLayout const & getLayout() const; /// InsetCode lyxCode() const { return FLEX_CODE; } - /// - bool resetFontEdit() const; /// Default looks InsetLayout::InsetDecoration decoration() const; /// diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index aa35f50254..6f1a02fdc1 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -41,7 +41,7 @@ InsetLayout::InsetLayout() : passthru_(false), parbreakisnewline_(false), freespacing_(false), keepempty_(false), forceltr_(false), needprotect_(false), intoc_(false), spellcheck_(true), - resetsfont_(true), display_(true), forcelocalfontswitch_(false) + resetsfont_(false), display_(true), forcelocalfontswitch_(false) { labelfont_.setColor(Color_error); }