From b124adbd3837b2e413e3f859e631e7c689a2cf1d Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 17 Aug 2018 10:22:32 +0200 Subject: [PATCH] Introduce listpreamble argument type This uses the InsetArgument interface to provide access to a document part hitherto inaccessible by LyX: the part between \begin and the first \item in a list (where lengths and counters can be redefined, for instance). Fixes: #11098 File format change, layout format change --- development/FORMAT | 5 ++ lib/citeengines/basic.citeengine | 2 +- lib/citeengines/biblatex-natbib.citeengine | 2 +- lib/citeengines/biblatex.citeengine | 2 +- lib/citeengines/jurabib.citeengine | 2 +- lib/citeengines/natbib.citeengine | 2 +- lib/doc/Customization.lyx | 81 +++++++++++++++++++ lib/doc/de/Customization.lyx | 65 +++++++++++++++ lib/layouts/AEA.layout | 2 +- lib/layouts/IEEEtran-CompSoc.layout | 2 +- lib/layouts/IEEEtran-TransMag.layout | 2 +- lib/layouts/IEEEtran.layout | 12 ++- lib/layouts/InStar.module | 2 +- lib/layouts/RJournal.layout | 2 +- lib/layouts/a0poster.layout | 2 +- lib/layouts/aa.layout | 2 +- lib/layouts/aapaper.inc | 2 +- lib/layouts/aapaper.layout | 2 +- lib/layouts/aastex.layout | 12 ++- lib/layouts/aastex6.layout | 2 +- lib/layouts/aastex62.layout | 2 +- lib/layouts/achemso.layout | 2 +- lib/layouts/acm-sigs-alt.layout | 2 +- lib/layouts/acm-sigs.inc | 2 +- lib/layouts/acm-sigs.layout | 2 +- lib/layouts/acmart.layout | 2 +- lib/layouts/acmsiggraph-0-92.layout | 2 +- lib/layouts/acmsiggraph.layout | 2 +- lib/layouts/agu-dtd.layout | 2 +- lib/layouts/agu_stdclass.inc | 2 +- lib/layouts/agu_stdcounters.inc | 2 +- lib/layouts/agu_stdlists.inc | 2 +- lib/layouts/agu_stdsections.inc | 2 +- lib/layouts/agu_stdtitle.inc | 2 +- lib/layouts/agums.layout | 2 +- lib/layouts/aguplus.inc | 2 +- lib/layouts/agutex.layout | 12 ++- lib/layouts/algorithm2e.module | 2 +- lib/layouts/amsart.layout | 2 +- lib/layouts/amsbook.layout | 12 ++- lib/layouts/amsdefs.inc | 12 ++- lib/layouts/apa.layout | 32 +++++++- lib/layouts/apa6.layout | 32 +++++++- lib/layouts/arab-article.layout | 2 +- lib/layouts/article-beamer.layout | 2 +- lib/layouts/article.layout | 2 +- lib/layouts/beamer.layout | 52 +++++++++++- lib/layouts/beamerposter.layout | 2 +- lib/layouts/bicaption.module | 2 +- lib/layouts/book.layout | 2 +- lib/layouts/braille.module | 2 +- lib/layouts/broadway.layout | 2 +- lib/layouts/bxjsarticle.layout | 2 +- lib/layouts/bxjsbook.layout | 2 +- lib/layouts/bxjsreport.layout | 2 +- lib/layouts/bxjsslide.layout | 2 +- lib/layouts/changebars.module | 2 +- lib/layouts/chess.layout | 2 +- lib/layouts/cl2emult.layout | 12 ++- lib/layouts/copernicus.layout | 12 ++- lib/layouts/ctex-article.layout | 2 +- lib/layouts/ctex-book.layout | 2 +- lib/layouts/ctex-report.layout | 2 +- lib/layouts/customHeadersFooters.module | 2 +- lib/layouts/db_lyxmacros.inc | 2 +- lib/layouts/db_stdcharstyles.inc | 2 +- lib/layouts/db_stdclass.inc | 2 +- lib/layouts/db_stdcounters.inc | 2 +- lib/layouts/db_stdlayouts.inc | 2 +- lib/layouts/db_stdlists.inc | 2 +- lib/layouts/db_stdsections.inc | 2 +- lib/layouts/db_stdstarsections.inc | 2 +- lib/layouts/db_stdstruct.inc | 2 +- lib/layouts/db_stdtitle.inc | 2 +- lib/layouts/dinbrief.layout | 2 +- lib/layouts/docbook-book.layout | 2 +- lib/layouts/docbook-chapter.layout | 2 +- lib/layouts/docbook-section.layout | 2 +- lib/layouts/docbook.layout | 2 +- lib/layouts/doublecol-new.layout | 2 +- lib/layouts/dtk.layout | 2 +- lib/layouts/ectaart.layout | 2 +- lib/layouts/egs.layout | 52 +++++++++++- lib/layouts/elsart.layout | 2 +- lib/layouts/elsarticle.layout | 18 ++++- lib/layouts/endnotes.module | 2 +- lib/layouts/entcs.layout | 2 +- lib/layouts/enumitem.module | 2 +- lib/layouts/eqs-within-sections.module | 2 +- lib/layouts/europasscv.layout | 12 ++- lib/layouts/europecv.layout | 2 +- lib/layouts/extarticle.layout | 2 +- lib/layouts/extbook.layout | 2 +- lib/layouts/extletter.layout | 2 +- lib/layouts/extreport.layout | 2 +- lib/layouts/figs-within-sections.module | 2 +- lib/layouts/fix-cm.module | 2 +- lib/layouts/fixltx2e.module | 2 +- lib/layouts/fixme.module | 2 +- lib/layouts/foils.layout | 22 ++++- lib/layouts/foottoend.module | 2 +- lib/layouts/frletter.layout | 2 +- lib/layouts/g-brief.layout | 2 +- lib/layouts/g-brief2.layout | 2 +- lib/layouts/graphicboxes.module | 2 +- lib/layouts/hanging.module | 2 +- lib/layouts/heb-article.layout | 2 +- lib/layouts/heb-letter.layout | 2 +- lib/layouts/hollywood.layout | 2 +- lib/layouts/hpstatement.module | 2 +- lib/layouts/ijmpc.layout | 32 +++++++- lib/layouts/ijmpd.layout | 32 +++++++- lib/layouts/initials.module | 2 +- lib/layouts/iopart.layout | 12 ++- lib/layouts/isprs.layout | 2 +- lib/layouts/iucr.layout | 68 +++++++++------- lib/layouts/jarticle.layout | 2 +- lib/layouts/jasatex.layout | 12 ++- lib/layouts/jbook.layout | 2 +- lib/layouts/jgrga.layout | 2 +- lib/layouts/jreport.layout | 2 +- lib/layouts/jsarticle.layout | 2 +- lib/layouts/jsbook.layout | 2 +- lib/layouts/jss.layout | 2 +- lib/layouts/kluwer.layout | 12 ++- lib/layouts/knitr.module | 2 +- lib/layouts/landscape.module | 2 +- lib/layouts/latex8.layout | 2 +- lib/layouts/letter.layout | 2 +- lib/layouts/lettre.layout | 2 +- lib/layouts/lilypond.module | 2 +- lib/layouts/linguistics.module | 12 ++- lib/layouts/litinsets.inc | 2 +- lib/layouts/llncs.layout | 12 ++- lib/layouts/logicalmkup.module | 2 +- lib/layouts/ltugboat.layout | 2 +- lib/layouts/lyxmacros.inc | 2 +- lib/layouts/memoir.layout | 2 +- lib/layouts/minimalistic.module | 2 +- lib/layouts/moderncv.layout | 12 ++- lib/layouts/multicol.module | 2 +- lib/layouts/mwart.layout | 2 +- lib/layouts/mwbk.layout | 2 +- lib/layouts/mwrep.layout | 2 +- lib/layouts/natbibapa.module | 2 +- lib/layouts/noweb.module | 2 +- lib/layouts/numarticle.inc | 2 +- lib/layouts/numreport.inc | 2 +- lib/layouts/numrevtex.inc | 2 +- lib/layouts/paper.layout | 2 +- lib/layouts/paralist.module | 2 +- lib/layouts/pdfcomment.module | 2 +- lib/layouts/pdfform.module | 2 +- lib/layouts/powerdot.layout | 32 +++++++- lib/layouts/recipebook.layout | 2 +- lib/layouts/report.layout | 2 +- lib/layouts/revtex.layout | 2 +- lib/layouts/revtex4-1.layout | 2 +- lib/layouts/revtex4.layout | 2 +- lib/layouts/rsphrase.module | 2 +- lib/layouts/sciposter.layout | 2 +- lib/layouts/scrartcl.layout | 2 +- lib/layouts/scrarticle-beamer.layout | 2 +- lib/layouts/scrbook.layout | 2 +- lib/layouts/scrclass.inc | 2 +- lib/layouts/scrlettr.layout | 2 +- lib/layouts/scrlttr2.layout | 2 +- lib/layouts/scrreprt.layout | 2 +- lib/layouts/sectionbox.module | 2 +- lib/layouts/seminar.layout | 2 +- lib/layouts/shapepar.module | 2 +- lib/layouts/siamltex.layout | 12 ++- lib/layouts/sigplanconf.layout | 2 +- lib/layouts/simplecv.layout | 32 +++++++- lib/layouts/singlecol-new.layout | 2 +- lib/layouts/singlecol.layout | 2 +- lib/layouts/slides.layout | 2 +- lib/layouts/spie.layout | 2 +- lib/layouts/stdcharstyles.inc | 2 +- lib/layouts/stdciteformats.inc | 2 +- lib/layouts/stdclass.inc | 2 +- lib/layouts/stdcounters.inc | 2 +- lib/layouts/stdcustom.inc | 2 +- lib/layouts/stdfloatnames.inc | 2 +- lib/layouts/stdfloats.inc | 2 +- lib/layouts/stdinsets.inc | 2 +- lib/layouts/stdlayouts.inc | 2 +- lib/layouts/stdletter.inc | 2 +- lib/layouts/stdlists.inc | 32 +++++++- lib/layouts/stdlyxlist.inc | 12 ++- lib/layouts/stdrefprefix.inc | 2 +- lib/layouts/stdsections.inc | 2 +- lib/layouts/stdstarsections.inc | 2 +- lib/layouts/stdstruct.inc | 12 ++- lib/layouts/stdtitle.inc | 2 +- lib/layouts/subequations.module | 2 +- lib/layouts/svcommon.inc | 12 ++- lib/layouts/svglobal.layout | 2 +- lib/layouts/svglobal3.layout | 2 +- lib/layouts/svjog.layout | 2 +- lib/layouts/svmono.layout | 2 +- lib/layouts/svmult.layout | 2 +- lib/layouts/svprobth.layout | 2 +- lib/layouts/sweave.module | 2 +- lib/layouts/tabs-within-sections.module | 2 +- lib/layouts/tarticle.layout | 2 +- lib/layouts/tbook.layout | 2 +- lib/layouts/tcolorbox.module | 2 +- lib/layouts/theorems-ams-bytype.inc | 2 +- lib/layouts/theorems-ams-bytype.module | 2 +- lib/layouts/theorems-ams-chap-bytype.inc | 2 +- lib/layouts/theorems-ams-chap-bytype.module | 2 +- .../theorems-ams-extended-bytype.module | 2 +- .../theorems-ams-extended-chap-bytype.module | 2 +- lib/layouts/theorems-ams-extended.module | 2 +- lib/layouts/theorems-ams.inc | 2 +- lib/layouts/theorems-ams.module | 2 +- lib/layouts/theorems-bytype.inc | 2 +- lib/layouts/theorems-bytype.module | 2 +- lib/layouts/theorems-case.inc | 13 ++- lib/layouts/theorems-chap-bytype.module | 2 +- lib/layouts/theorems-chap.module | 2 +- lib/layouts/theorems-named.module | 2 +- lib/layouts/theorems-order.inc | 2 +- lib/layouts/theorems-proof-std.inc | 2 +- lib/layouts/theorems-proof.inc | 2 +- lib/layouts/theorems-refprefix.inc | 2 +- lib/layouts/theorems-sec-bytype.module | 2 +- lib/layouts/theorems-sec.module | 2 +- lib/layouts/theorems-starred-equivalents.inc | 2 +- lib/layouts/theorems-starred.inc | 2 +- lib/layouts/theorems-starred.module | 2 +- lib/layouts/theorems-std.module | 2 +- lib/layouts/theorems-without-preamble.inc | 2 +- lib/layouts/theorems.inc | 2 +- lib/layouts/todonotes.module | 2 +- lib/layouts/treport.layout | 2 +- lib/layouts/tufte-book.layout | 2 +- lib/layouts/tufte-handout.layout | 2 +- lib/layouts/varwidth.module | 2 +- lib/lyx2lyx/lyx_2_4.py | 34 +++++++- lib/scripts/layout2layout.py | 7 +- src/Layout.cpp | 16 +++- src/Layout.h | 5 ++ src/TextClass.cpp | 2 +- src/insets/InsetArgument.cpp | 3 +- src/output_latex.cpp | 18 ++++- src/tex2lyx/TODO.txt | 1 + src/version.h | 4 +- 249 files changed, 1036 insertions(+), 282 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 2ae38024b7..61a460caa2 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -7,6 +7,11 @@ changes happened in particular if possible. A good example would be ----------------------- + +2018-08-16 Jürgen Spitzmüller + * format incremented to 563: New inset argument type "listpreamble". The content will + be inserted between environment begin and first \item of a list. + 2018-08-13 Jürgen Spitzmüller * format incremented to 562: New info-inset type l7n. This returns a localized version of a string (in the GUI language) if available, removing trailing colons and diff --git a/lib/citeengines/basic.citeengine b/lib/citeengines/basic.citeengine index 1523aa34fb..bb60158212 100644 --- a/lib/citeengines/basic.citeengine +++ b/lib/citeengines/basic.citeengine @@ -6,7 +6,7 @@ # Author: Julien Rioux -Format 68 +Format 69 # The framework (biblatex|bibtex) CiteFramework bibtex diff --git a/lib/citeengines/biblatex-natbib.citeengine b/lib/citeengines/biblatex-natbib.citeengine index ef992ee51e..8ec9ef0082 100644 --- a/lib/citeengines/biblatex-natbib.citeengine +++ b/lib/citeengines/biblatex-natbib.citeengine @@ -10,7 +10,7 @@ # Author: Jürgen Spitzmüller -Format 68 +Format 69 Requires biblatex diff --git a/lib/citeengines/biblatex.citeengine b/lib/citeengines/biblatex.citeengine index 248364e919..0300aa3d3d 100644 --- a/lib/citeengines/biblatex.citeengine +++ b/lib/citeengines/biblatex.citeengine @@ -8,7 +8,7 @@ # Author: Jürgen Spitzmüller -Format 68 +Format 69 Requires biblatex diff --git a/lib/citeengines/jurabib.citeengine b/lib/citeengines/jurabib.citeengine index 636b1d39da..7d35a6645e 100644 --- a/lib/citeengines/jurabib.citeengine +++ b/lib/citeengines/jurabib.citeengine @@ -7,7 +7,7 @@ # Author: Julien Rioux -Format 68 +Format 69 Requires jurabib diff --git a/lib/citeengines/natbib.citeengine b/lib/citeengines/natbib.citeengine index 1e1af3fb00..5d81962640 100644 --- a/lib/citeengines/natbib.citeengine +++ b/lib/citeengines/natbib.citeengine @@ -8,7 +8,7 @@ # Author: Julien Rioux -Format 68 +Format 69 Requires natbib diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 082466282a..27986fd7e3 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -12393,6 +12393,87 @@ Argument item:1 \end_inset ). +\change_inserted -712698321 1534487781 + +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1534488561 +Finally, there is a special argument type with the prefix +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout + +\change_inserted -712698321 1534487844 +listpreamble: +\change_unchanged + +\end_layout + +\end_inset + +. + It is not really an argument, but uses the argument interface (thus, the + prefix is also followed by a number, e. +\begin_inset space \thinspace{} +\end_inset + +g. + +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout + +\change_inserted -712698321 1534488412 +Argument listpreamble:1 +\end_layout + +\end_inset + +). + As the name implies, it is targeted at lists such as +\family sans +Itemize +\family default +, +\family sans +Enumerate +\family default +, +\family sans +Description +\family default +, or +\family sans +Bibliography +\family default +. + Its content will be output at the list start, before the first +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout + +\change_inserted -712698321 1534488058 + +\backslash +item +\change_unchanged + +\end_layout + +\end_inset + +, on an own line (a place that is otherwise not accessible in \SpecialChar LyX +). + This way, users can insert redefinitions (of lengths etc.) to individual + lists. + By default, these arguments do not have a delimiter. +\change_unchanged + \end_layout \end_deeper diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx index 886e7e2222..25cac0bb19 100644 --- a/lib/doc/de/Customization.lyx +++ b/lib/doc/de/Customization.lyx @@ -10683,6 +10683,71 @@ Argument item:1 ) \end_layout +\begin_layout Standard +Schließlich gibt es noch einen Argumenttyp mit dem Präfix +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout +listpreamble: +\end_layout + +\end_inset + +. + Strenggenommen ist das, was damit erfasst wird, kein Argument, aber der + Mechanismus der \SpecialChar LyX +-Argumente wird verwendet (daher folgt dem Präfix auch + wie üblich eine Nummer, bspw. + +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout +Argument listpreamble:1 +\end_layout + +\end_inset + +). + Wie der Name andeutet, zielt dieser Argumenttyp auf Listen wie +\family sans +Auflistung, +\family default + +\family sans +Aufzählung +\family default +, +\family sans +Beschreibung +\family default + oder +\family sans +Literaturverzeichnis +\family default +. + Sein Inhalt wird am Start der Liste, vor dem ersten +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout + +\backslash +item +\end_layout + +\end_inset + +, auf einer eigenen Zeile ausgegeben (eine Stelle, die sonst in \SpecialChar LyX + nicht zugänglic +h ist). + Auf diese Weise können Benutzer in individuellen Listen Re-Definitionen + (bspw. + von Längen) vornehmen. + In der Voreinstellung haben diese Argumente keine Begrenzungszeichen. +\end_layout + \end_deeper \begin_layout Description \begin_inset Flex Code diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout index 2a122c2e48..243dcd704c 100644 --- a/lib/layouts/AEA.layout +++ b/lib/layouts/AEA.layout @@ -4,7 +4,7 @@ # Authors : Koji Yokota # Uwe Stöhr -Format 68 +Format 69 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 3e2c1a14f5..5837663c91 100644 --- a/lib/layouts/IEEEtran-CompSoc.layout +++ b/lib/layouts/IEEEtran-CompSoc.layout @@ -6,7 +6,7 @@ # IEEtran Computer Society textclass definition file. -Format 68 +Format 69 Input IEEEtran.layout diff --git a/lib/layouts/IEEEtran-TransMag.layout b/lib/layouts/IEEEtran-TransMag.layout index e695fe5aa0..ace856e5d2 100644 --- a/lib/layouts/IEEEtran-TransMag.layout +++ b/lib/layouts/IEEEtran-TransMag.layout @@ -6,7 +6,7 @@ # IEEtran Magnetics textclass definition file. -Format 68 +Format 69 Input IEEEtran.layout diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index c375ccbbaf..5f48a24a1c 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -9,7 +9,7 @@ # IEEtran textclass definition file. -Format 68 +Format 69 Sides 1 SecNumDepth 3 @@ -365,6 +365,16 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/InStar.module b/lib/layouts/InStar.module index d9252ffcf9..9e2ff8f9bd 100644 --- a/lib/layouts/InStar.module +++ b/lib/layouts/InStar.module @@ -11,7 +11,7 @@ #DescriptionEnd #Author: Richard Heck -Format 68 +Format 69 Style "In Preamble" CopyStyle Standard diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout index d61e9d8000..19d56be8a3 100644 --- a/lib/layouts/RJournal.layout +++ b/lib/layouts/RJournal.layout @@ -4,7 +4,7 @@ # Author: Yihui Xie # Modified by: Scott Kostyshak -Format 68 +Format 69 Input stdclass.inc diff --git a/lib/layouts/a0poster.layout b/lib/layouts/a0poster.layout index 66fcc54003..2c52ef2872 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 68 +Format 69 # Authors: Günter Milde, Jürgen Spitzmüller diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index d8ddef4e39..7943c2ada2 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 68 +Format 69 Columns 2 Sides 2 SecNumDepth 3 diff --git a/lib/layouts/aapaper.inc b/lib/layouts/aapaper.inc index e3bdd0ccd2..525d03da8f 100644 --- a/lib/layouts/aapaper.inc +++ b/lib/layouts/aapaper.inc @@ -5,7 +5,7 @@ # Author: Peter Sütterlin -Format 68 +Format 69 Style Subtitle Margin Static LatexType Command diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout index 43e51aa4aa..a8301b4d35 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aapaper.layout @@ -15,7 +15,7 @@ # and reconfigure LyX (after running texhash, of course). -Format 68 +Format 69 Columns 2 Sides 2 SecNumDepth 3 diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index 694089a0f7..4f68e9ce7e 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 68 +Format 69 Columns 1 Sides 1 #SecNumDepth 3 @@ -430,6 +430,16 @@ Style References Size Normal Series Bold EndFont + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/aastex6.layout b/lib/layouts/aastex6.layout index 95a8ee89b4..a5896f48b8 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 68 +Format 69 Input aastex.layout diff --git a/lib/layouts/aastex62.layout b/lib/layouts/aastex62.layout index dfdb970cbc..2fb51af1e7 100644 --- a/lib/layouts/aastex62.layout +++ b/lib/layouts/aastex62.layout @@ -50,7 +50,7 @@ # - aastex6.cls loads hyperref (with pre-set options) and url # -> option clash if "Use Hyerref" is selected in Document>Settings -Format 68 +Format 69 Provides hyperref 1 diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout index 6dcb56e3c3..c387f1585f 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 68 +Format 69 Columns 1 Sides 1 diff --git a/lib/layouts/acm-sigs-alt.layout b/lib/layouts/acm-sigs-alt.layout index 4bb24aa430..224698867a 100644 --- a/lib/layouts/acm-sigs-alt.layout +++ b/lib/layouts/acm-sigs-alt.layout @@ -9,6 +9,6 @@ # # Author: Gioele Barabucci -Format 68 +Format 69 Input acm-sigs.inc diff --git a/lib/layouts/acm-sigs.inc b/lib/layouts/acm-sigs.inc index 798a8c51e5..02ba58b70f 100644 --- a/lib/layouts/acm-sigs.inc +++ b/lib/layouts/acm-sigs.inc @@ -2,7 +2,7 @@ # # Author: Gioele Barabucci -Format 68 +Format 69 Input stdclass.inc Columns 2 diff --git a/lib/layouts/acm-sigs.layout b/lib/layouts/acm-sigs.layout index 661a04a092..6f4ee10a52 100644 --- a/lib/layouts/acm-sigs.layout +++ b/lib/layouts/acm-sigs.layout @@ -9,6 +9,6 @@ # # Author: Gioele Barabucci -Format 68 +Format 69 Input acm-sigs.inc diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout index e8fc70b689..2000d1dbf4 100644 --- a/lib/layouts/acmart.layout +++ b/lib/layouts/acmart.layout @@ -9,7 +9,7 @@ # Reviewed following tickets #10722 & #10723 # by Jean-Pierre Chrétien -Format 68 +Format 69 Provides amscls 1 Provides amsmath 1 diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout index 221c980c7e..8159302c20 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 68 +Format 69 Columns 1 Sides 1 diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index 4332ec47ad..a1b8521b90 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 68 +Format 69 Columns 1 Sides 1 diff --git a/lib/layouts/agu-dtd.layout b/lib/layouts/agu-dtd.layout index bb8bf16454..273c93452b 100644 --- a/lib/layouts/agu-dtd.layout +++ b/lib/layouts/agu-dtd.layout @@ -6,7 +6,7 @@ # Martin Vermeer -Format 68 +Format 69 Input agu_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc index 54196a03ad..4a1d6d0f7e 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 68 +Format 69 OutputType docbook Columns 1 diff --git a/lib/layouts/agu_stdcounters.inc b/lib/layouts/agu_stdcounters.inc index b53d17595e..24434f7f11 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 68 +Format 69 Counter sect1 Within section End diff --git a/lib/layouts/agu_stdlists.inc b/lib/layouts/agu_stdlists.inc index 71459cfb2f..bb6c8678fb 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 68 +Format 69 Input stdlists.inc diff --git a/lib/layouts/agu_stdsections.inc b/lib/layouts/agu_stdsections.inc index 2350a161c0..0432ada860 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 68 +Format 69 Input stdsections.inc Style Part diff --git a/lib/layouts/agu_stdtitle.inc b/lib/layouts/agu_stdtitle.inc index f030817063..38957b6acf 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 68 +Format 69 Input stdtitle.inc diff --git a/lib/layouts/agums.layout b/lib/layouts/agums.layout index 18d5953015..6f06b7054d 100644 --- a/lib/layouts/agums.layout +++ b/lib/layouts/agums.layout @@ -5,7 +5,7 @@ # Author: Martin Vermeer -Format 68 +Format 69 Input aguplus.inc ClassOptions diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc index 9a0dce9f4f..c5774ec58b 100644 --- a/lib/layouts/aguplus.inc +++ b/lib/layouts/aguplus.inc @@ -6,7 +6,7 @@ # ftp://ftp.agu.org/journals/latex/journals -Format 68 +Format 69 Input stdclass.inc SecNumDepth 4 diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index 55f65edef2..283da00676 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 68 +Format 69 Columns 1 Sides 1 @@ -229,5 +229,15 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/algorithm2e.module b/lib/layouts/algorithm2e.module index 62ee077933..af5dbc6d21 100644 --- a/lib/layouts/algorithm2e.module +++ b/lib/layouts/algorithm2e.module @@ -7,7 +7,7 @@ # #Author: Jürgen Spitzmüller -Format 68 +Format 69 Requires algorithm2e diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout index a6906f80cc..65cf05ae3c 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 68 +Format 69 Columns 1 Sides 2 diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index f303026035..1beffcfe98 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 68 +Format 69 Columns 1 Sides 2 @@ -160,4 +160,14 @@ Style Chapter_Exercises \newenvironment{lyxxcb}{\begin{xcb}{Exercises}\begin{enumerate}} {\end{enumerate}\end{xcb}} EndPreamble + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc index 58cc4e6179..c04bd9fd61 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 68 +Format 69 # By default AMS articles & books use leqno option (as SIAM journals). Provides leqno 1 @@ -227,4 +227,14 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index f631428d93..e11907d8a9 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author: Randy Gobbel -Format 68 +Format 69 Columns 1 Sides 1 PageStyle Headers @@ -374,6 +374,16 @@ Style Itemize LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -399,6 +409,16 @@ Style Enumerate LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -422,5 +442,15 @@ Style Seriate LabelString "(\alph{enumii})" LabelStringAppendix "(\alph{enumii})" RefPrefix ser + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout index 8df144972b..4b91a5049f 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 68 +Format 69 Columns 1 Sides 1 PageStyle Headers @@ -475,6 +475,16 @@ Style Itemize LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -500,6 +510,16 @@ Style Enumerate LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -523,4 +543,14 @@ Style Seriate LabelString "(\alph{enumii})" LabelStringAppendix "(\alph{enumii})" RefPrefix ser + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/arab-article.layout b/lib/layouts/arab-article.layout index 53c462f98d..44bb2fcc14 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 68 +Format 69 Input article diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout index 5d49a709d5..cbccf6fade 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 68 +Format 69 # Includes Input article.layout diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout index 41de5e4ccf..d5f0a925af 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 68 +Format 69 Input stdclass.inc SecNumDepth 3 diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 10aa70fe6a..3503d5b3d4 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -6,7 +6,7 @@ # Richard Heck , Martin Vermeer and probably others. -Format 68 +Format 69 # # GLOBAL SETTINGS @@ -101,6 +101,16 @@ Style Itemize RightDelim > PassThru 1 EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 ToggleIndent Never LeftMargin MMN @@ -141,6 +151,16 @@ Style Enumerate RightDelim > PassThru 1 EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 ToggleIndent Never LeftMargin MMN @@ -171,6 +191,16 @@ Style Description LabelString "Longest label|s" Tooltip "The longest label in this list (to determine the indendation width)" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument Argument item:1 MenuString "Item Overlay Specifications" LabelString "On Slide" @@ -744,6 +774,16 @@ Style Overprint LabelString "Width" Tooltip "The width of the overprint area (default: text width)" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument Argument item:1 MenuString "Item Overlay Specifications" LabelString "On Slide" @@ -1127,6 +1167,16 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/beamerposter.layout b/lib/layouts/beamerposter.layout index 814345a7a3..93eb366ce1 100644 --- a/lib/layouts/beamerposter.layout +++ b/lib/layouts/beamerposter.layout @@ -7,7 +7,7 @@ # # Input general definitions -Format 68 +Format 69 Input beamer.layout diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module index 34c77d7791..d28b29071d 100644 --- a/lib/layouts/bicaption.module +++ b/lib/layouts/bicaption.module @@ -5,7 +5,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 68 +Format 69 Style "Caption setup" LatexType command diff --git a/lib/layouts/book.layout b/lib/layouts/book.layout index 132c98a624..9d94209139 100644 --- a/lib/layouts/book.layout +++ b/lib/layouts/book.layout @@ -7,7 +7,7 @@ # Heavily modifed and enhanced by serveral developers. -Format 68 +Format 69 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/braille.module b/lib/layouts/braille.module index afeb0c19fe..5a1fb42a45 100644 --- a/lib/layouts/braille.module +++ b/lib/layouts/braille.module @@ -5,7 +5,7 @@ #DescriptionEnd # Author: Uwe Stöhr -Format 68 +Format 69 AddToPreamble \usepackage{braille} diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 7993ffbb2d..536876a79f 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -4,7 +4,7 @@ # For theater plays -Format 68 +Format 69 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/bxjsarticle.layout b/lib/layouts/bxjsarticle.layout index 1923f88ada..5438c366d8 100644 --- a/lib/layouts/bxjsarticle.layout +++ b/lib/layouts/bxjsarticle.layout @@ -6,7 +6,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/bxjsbook.layout b/lib/layouts/bxjsbook.layout index e971af7bac..4004e17ca6 100644 --- a/lib/layouts/bxjsbook.layout +++ b/lib/layouts/bxjsbook.layout @@ -6,7 +6,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/bxjsreport.layout b/lib/layouts/bxjsreport.layout index 186ab1629d..750575ea9d 100644 --- a/lib/layouts/bxjsreport.layout +++ b/lib/layouts/bxjsreport.layout @@ -6,7 +6,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/bxjsslide.layout b/lib/layouts/bxjsslide.layout index f0b69a85dd..ff5a58c3f6 100644 --- a/lib/layouts/bxjsslide.layout +++ b/lib/layouts/bxjsslide.layout @@ -6,7 +6,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/changebars.module b/lib/layouts/changebars.module index 557ffe6a28..d01215ae5f 100644 --- a/lib/layouts/changebars.module +++ b/lib/layouts/changebars.module @@ -14,7 +14,7 @@ # tracking is turned off in the document. # -Format 68 +Format 69 AddToPreamble \usepackage{changebar} diff --git a/lib/layouts/chess.layout b/lib/layouts/chess.layout index 5fe3bbad94..871f01f2f4 100644 --- a/lib/layouts/chess.layout +++ b/lib/layouts/chess.layout @@ -17,7 +17,7 @@ # \vspace*{-0.5in}) # -Format 68 +Format 69 Requires chess diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout index e470b21df6..8acd8dad9c 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 68 +Format 69 Columns 1 Sides 1 SecNumDepth 2 @@ -127,6 +127,16 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/copernicus.layout b/lib/layouts/copernicus.layout index 546fb4fb8e..be5b819389 100644 --- a/lib/layouts/copernicus.layout +++ b/lib/layouts/copernicus.layout @@ -5,7 +5,7 @@ # Please do not edit this file unless you know what you are doing. # At least make backup copies of all your project files! -Format 68 +Format 69 Provides babel 1 Provides inputenc 1 @@ -372,6 +372,16 @@ Style Bibliography EndFont TocLevel 0 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End NoStyle Statements diff --git a/lib/layouts/ctex-article.layout b/lib/layouts/ctex-article.layout index 052dd8a1ad..c1f95ef15d 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 68 +Format 69 # Read the definitions from article.layout Input article.layout diff --git a/lib/layouts/ctex-book.layout b/lib/layouts/ctex-book.layout index 674f869e63..7a8b48f82d 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 68 +Format 69 # Read the definitions from book.layout Input book.layout diff --git a/lib/layouts/ctex-report.layout b/lib/layouts/ctex-report.layout index 5a7c318ee4..b265315205 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 68 +Format 69 # Read the definitions from report.layout Input report.layout diff --git a/lib/layouts/customHeadersFooters.module b/lib/layouts/customHeadersFooters.module index 8ee735a4d6..0d4d7a6daa 100644 --- a/lib/layouts/customHeadersFooters.module +++ b/lib/layouts/customHeadersFooters.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 68 +Format 69 Style "Left Header" Category Header/Footer diff --git a/lib/layouts/db_lyxmacros.inc b/lib/layouts/db_lyxmacros.inc index 3e0a0493dd..8c1de65954 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 68 +Format 69 Input lyxmacros.inc Style Code diff --git a/lib/layouts/db_stdcharstyles.inc b/lib/layouts/db_stdcharstyles.inc index 6d30137b14..11ee6cfb30 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 68 +Format 69 InsetLayout Flex:Filename LyXType element LabelString Filename diff --git a/lib/layouts/db_stdclass.inc b/lib/layouts/db_stdclass.inc index 30d541dad7..b19dd06005 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 68 +Format 69 OutputType docbook Columns 1 diff --git a/lib/layouts/db_stdcounters.inc b/lib/layouts/db_stdcounters.inc index 8d403be788..d24fae94cf 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 68 +Format 69 Counter sect1 Within chapter End diff --git a/lib/layouts/db_stdlayouts.inc b/lib/layouts/db_stdlayouts.inc index 031825248f..af9cd2e2d9 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 68 +Format 69 Input stdlayouts.inc Style Literal diff --git a/lib/layouts/db_stdlists.inc b/lib/layouts/db_stdlists.inc index 016e11505c..8d0682744a 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 68 +Format 69 Input stdlists.inc diff --git a/lib/layouts/db_stdsections.inc b/lib/layouts/db_stdsections.inc index 37a302cccd..b404cc24b4 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 68 +Format 69 Input stdsections.inc Style Part diff --git a/lib/layouts/db_stdstarsections.inc b/lib/layouts/db_stdstarsections.inc index 5f11401b57..91f810b8d4 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 68 +Format 69 Style Part* CopyStyle Part Margin Static diff --git a/lib/layouts/db_stdstruct.inc b/lib/layouts/db_stdstruct.inc index 27e2ecc01f..b432dc46b6 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 68 +Format 69 Input stdstruct.inc Style Abstract diff --git a/lib/layouts/db_stdtitle.inc b/lib/layouts/db_stdtitle.inc index 69e9d3f4c2..8db31fa737 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 68 +Format 69 Input stdtitle.inc diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout index d9b3f0c873..aeefe6bfa0 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 68 +Format 69 Input letter.layout diff --git a/lib/layouts/docbook-book.layout b/lib/layouts/docbook-book.layout index 5466969e63..e83a471557 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 68 +Format 69 Input report Input db_stdclass.inc diff --git a/lib/layouts/docbook-chapter.layout b/lib/layouts/docbook-chapter.layout index 9aefb9beb0..59eeb2d18e 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 68 +Format 69 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook-section.layout b/lib/layouts/docbook-section.layout index af0cf1429c..1aa6bd81a0 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 68 +Format 69 Input db_stdclass.inc Style Title diff --git a/lib/layouts/docbook.layout b/lib/layouts/docbook.layout index f93342c0c6..295d00c7bc 100644 --- a/lib/layouts/docbook.layout +++ b/lib/layouts/docbook.layout @@ -4,7 +4,7 @@ # DocBook textclass definition file. # Author : Jose' Matos -Format 68 +Format 69 Input db_stdclass.inc # Exclude higher, or equal, sections: diff --git a/lib/layouts/doublecol-new.layout b/lib/layouts/doublecol-new.layout index 5c386e97f8..09c27d0180 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 68 +Format 69 Input article.layout diff --git a/lib/layouts/dtk.layout b/lib/layouts/dtk.layout index 644c482ce3..f0efe73c90 100644 --- a/lib/layouts/dtk.layout +++ b/lib/layouts/dtk.layout @@ -7,7 +7,7 @@ # Author : Herbert Voss 2001/08/13 -Format 68 +Format 69 Columns 1 Sides 2 SecNumDepth -1 # no counting diff --git a/lib/layouts/ectaart.layout b/lib/layouts/ectaart.layout index bb70f3e21e..1eeef362e7 100644 --- a/lib/layouts/ectaart.layout +++ b/lib/layouts/ectaart.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Author : Koji Yokota -Format 68 +Format 69 Input article.layout TitleLatexType Environment diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout index c263453211..d9128bd6ea 100644 --- a/lib/layouts/egs.layout +++ b/lib/layouts/egs.layout @@ -9,7 +9,7 @@ # Converted article -> egs Martin Vermeer -Format 68 +Format 69 Columns 2 Sides 1 PageStyle Plain @@ -149,6 +149,16 @@ Style List AlignPossible Block, Left LabelType Manual LabelString "00.00.0000" + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -173,6 +183,16 @@ Style Enumerate LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -196,6 +216,16 @@ Style Itemize LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -218,6 +248,16 @@ Style Description LabelFont Series Bold EndFont + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -597,6 +637,16 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index 2976d6df09..365ff3e6f0 100644 --- a/lib/layouts/elsart.layout +++ b/lib/layouts/elsart.layout @@ -23,7 +23,7 @@ # numbered sections, as does the class file. -Format 68 +Format 69 Columns 1 Sides 2 PageStyle headings diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout index 943962cd69..856af150f0 100644 --- a/lib/layouts/elsarticle.layout +++ b/lib/layouts/elsarticle.layout @@ -4,15 +4,15 @@ # elsarticle textclass definition file. # Author: Uwe Stöhr (uwestoehr@web.de) -Format 68 +Format 69 Columns 1 Sides 1 SecNumDepth 3 TocDepth 3 -DefaultStyle Standard -Provides natbib 1 -Provides refstyle 1 +DefaultStyle Standard +Provides natbib 1 +Provides refstyle 1 ClassOptions FontSize 10|11|12 @@ -305,5 +305,15 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/endnotes.module b/lib/layouts/endnotes.module index 91e2b3ef9d..0c94a13994 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 68 +Format 69 Counter endnotes PrettyFormat "Endnote ##" diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout index b2599b4e54..1fc463a868 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 68 +Format 69 Input article.layout # only font size 11pt is really available diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module index 1b78f936a5..2408c40e92 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 68 +Format 69 # 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 3dc666c5ff..688cd6e9f3 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 68 +Format 69 Requires amsmath diff --git a/lib/layouts/europasscv.layout b/lib/layouts/europasscv.layout index 2b8f8a4317..3673d4be27 100644 --- a/lib/layouts/europasscv.layout +++ b/lib/layouts/europasscv.layout @@ -35,7 +35,7 @@ # General textclass parameters -Format 68 +Format 69 Columns 1 Sides 1 @@ -314,6 +314,16 @@ Style EcvItemize Margin Static LatexType Item_Environment LatexName ecvitemize + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 LeftMargin MMN LabelSep xx diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout index 457f5b9f06..4cf6b780ab 100644 --- a/lib/layouts/europecv.layout +++ b/lib/layouts/europecv.layout @@ -6,7 +6,7 @@ # General textclass parameters -Format 68 +Format 69 Columns 1 Sides 1 SecNumDepth -1 diff --git a/lib/layouts/extarticle.layout b/lib/layouts/extarticle.layout index 1ff7d098ae..330aa0cf8a 100644 --- a/lib/layouts/extarticle.layout +++ b/lib/layouts/extarticle.layout @@ -3,7 +3,7 @@ # \DeclareCategory{Articles} # Herbert Voss -Format 68 +Format 69 Input article.layout # change available fontsizes diff --git a/lib/layouts/extbook.layout b/lib/layouts/extbook.layout index 2301cf1747..3500f34688 100644 --- a/lib/layouts/extbook.layout +++ b/lib/layouts/extbook.layout @@ -4,7 +4,7 @@ # Extended book textclass definition file. # Herbert Voss -Format 68 +Format 69 Input book.layout # change available fontsizes diff --git a/lib/layouts/extletter.layout b/lib/layouts/extletter.layout index 804dd861f3..a26f482d7e 100644 --- a/lib/layouts/extletter.layout +++ b/lib/layouts/extletter.layout @@ -4,7 +4,7 @@ # Extended article textclass definition file. # Herbert Voss -Format 68 +Format 69 Input letter.layout # change available fontsizes diff --git a/lib/layouts/extreport.layout b/lib/layouts/extreport.layout index 5f40ba4a7c..b956303fcc 100644 --- a/lib/layouts/extreport.layout +++ b/lib/layouts/extreport.layout @@ -4,7 +4,7 @@ # Extented report textclass definition file. # Herbert Voss -Format 68 +Format 69 Input report.layout # change available fontsizes diff --git a/lib/layouts/figs-within-sections.module b/lib/layouts/figs-within-sections.module index 60542e908d..77350f2884 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 68 +Format 69 Requires amsmath diff --git a/lib/layouts/fix-cm.module b/lib/layouts/fix-cm.module index 4c8b35880b..898027aca8 100644 --- a/lib/layouts/fix-cm.module +++ b/lib/layouts/fix-cm.module @@ -8,6 +8,6 @@ # Author : Patrick Atamaniuk -Format 68 +Format 69 Requires fix-cm diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module index 7d4c40b962..f18cb33a0c 100644 --- a/lib/layouts/fixltx2e.module +++ b/lib/layouts/fixltx2e.module @@ -10,6 +10,6 @@ # Author : Georg Baum -Format 68 +Format 69 Requires fixltx2e diff --git a/lib/layouts/fixme.module b/lib/layouts/fixme.module index 08c12bbb0b..1967c1120d 100644 --- a/lib/layouts/fixme.module +++ b/lib/layouts/fixme.module @@ -12,7 +12,7 @@ # Authors: Mark Edgington # Jürgen Spitzmüller -Format 68 +Format 69 OutlinerName fixme "Fixme" diff --git a/lib/layouts/foils.layout b/lib/layouts/foils.layout index 17bccd27e4..5f9e51fded 100644 --- a/lib/layouts/foils.layout +++ b/lib/layouts/foils.layout @@ -7,7 +7,7 @@ # To do: Define class specific options. -Format 68 +Format 69 Columns 1 Sides 1 @@ -100,6 +100,16 @@ Style TickList LabelType Itemize LabelString "_/" Requires pifont + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End Style CrossList @@ -120,6 +130,16 @@ Style CrossList LabelType Itemize LabelString "><" Requires pifont + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/foottoend.module b/lib/layouts/foottoend.module index 4c9c756af7..02bb0e286a 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 68 +Format 69 Requires endnotes diff --git a/lib/layouts/frletter.layout b/lib/layouts/frletter.layout index 72e6af0a52..e45a1fba10 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 68 +Format 69 # Read the definitions from letter.layout Input letter.layout diff --git a/lib/layouts/g-brief.layout b/lib/layouts/g-brief.layout index 3e6f0a3221..bc6dea07ef 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 68 +Format 69 Input stdinsets.inc Input stdfloats.inc Input stdcounters.inc diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout index f38a017136..b6dd35de00 100644 --- a/lib/layouts/g-brief2.layout +++ b/lib/layouts/g-brief2.layout @@ -6,7 +6,7 @@ # Thomas Hartkens # Input general definitions -Format 68 +Format 69 Input stdfloats.inc Input stdcounters.inc Input stdinsets.inc diff --git a/lib/layouts/graphicboxes.module b/lib/layouts/graphicboxes.module index e7568100e7..86cfc58e3e 100644 --- a/lib/layouts/graphicboxes.module +++ b/lib/layouts/graphicboxes.module @@ -6,7 +6,7 @@ #Author: Jürgen Spitzmüller # Uwe Stöhr -Format 68 +Format 69 InsetLayout Flex:Reflectbox LyXType custom diff --git a/lib/layouts/hanging.module b/lib/layouts/hanging.module index a8fd2bdf68..876b25ec38 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 68 +Format 69 Style Hanging LatexType Environment diff --git a/lib/layouts/heb-article.layout b/lib/layouts/heb-article.layout index 3e544a81af..66e1d0725b 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 68 +Format 69 Input article Preamble diff --git a/lib/layouts/heb-letter.layout b/lib/layouts/heb-letter.layout index 7c830eb8c4..14d09a2482 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 68 +Format 69 Input letter diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout index c2d6108a2c..9978911e0e 100644 --- a/lib/layouts/hollywood.layout +++ b/lib/layouts/hollywood.layout @@ -16,7 +16,7 @@ # Based on course given by Lars Davidson -Format 68 +Format 69 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/hpstatement.module b/lib/layouts/hpstatement.module index a9fad85530..b9cf95cab4 100644 --- a/lib/layouts/hpstatement.module +++ b/lib/layouts/hpstatement.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 68 +Format 69 InsetLayout "Flex:H-P number" LyxType custom diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout index b73e635594..9958aa08f2 100644 --- a/lib/layouts/ijmpc.layout +++ b/lib/layouts/ijmpc.layout @@ -12,7 +12,7 @@ # Author: Uwe Stöhr (uwestoehr@web.de) -Format 68 +Format 69 Sides 1 Columns 1 @@ -285,6 +285,16 @@ Style ItemList Margin Static LatexType Item_Environment LatexName itemlist + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 ToggleIndent Never LeftMargin MMN @@ -311,6 +321,16 @@ Style RomanList Tooltip "Use the largest item number in your list, e.g. '(iv)' for 4 Roman numbered items" PassThru 1 EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 LeftMargin MMN LabelSep xx @@ -469,4 +489,14 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout index 0650b9cb8a..5e8f50a050 100644 --- a/lib/layouts/ijmpd.layout +++ b/lib/layouts/ijmpd.layout @@ -17,7 +17,7 @@ # Author: Uwe Stöhr (uwestoehr@web.de) -Format 68 +Format 69 Sides 1 Columns 1 @@ -288,6 +288,16 @@ Style ItemList Margin Static LatexType Item_Environment LatexName itemlist + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 ToggleIndent Never LeftMargin MMN @@ -314,6 +324,16 @@ Style RomanList Tooltip "Use the largest item number in your list, e.g. '(iv)' for 4 Roman numbered items" PassThru 1 EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 LeftMargin MMN LabelSep xx @@ -482,4 +502,14 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/initials.module b/lib/layouts/initials.module index 2165fe3dd6..c57be0e565 100644 --- a/lib/layouts/initials.module +++ b/lib/layouts/initials.module @@ -5,7 +5,7 @@ #DescriptionEnd #Authors: Pavel Sanda and Uwe Stöhr -Format 68 +Format 69 AddToPreamble \@ifundefined{lettrine}{\usepackage{lettrine}}{} diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index 794294f59b..4de57d09b8 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 68 +Format 69 Columns 1 Sides 1 @@ -289,6 +289,16 @@ Style "Bibliography (plain)" EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout index 7f44ed28fb..dbdc5b881a 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 68 +Format 69 Input stdclass.inc Sides 2 Columns 2 diff --git a/lib/layouts/iucr.layout b/lib/layouts/iucr.layout index 06a7aa16eb..4c54215ae7 100644 --- a/lib/layouts/iucr.layout +++ b/lib/layouts/iucr.layout @@ -5,13 +5,13 @@ # Author: Uwe Stöhr (uwestoehr@web.de) # IUCr LaTeX files can be downloaded from ftp://ftp.iucr.org/templates/latex/ -Format 68 +Format 69 Columns 1 Sides 1 SecNumDepth 3 TocDepth 3 -DefaultStyle Standard +DefaultStyle Standard ClassOptions FontSize 10 @@ -25,7 +25,7 @@ Style Standard ParIndent MM ParSkip 0.4 Align Block - AlignPossible Block, Left, Right, Center + AlignPossible Block, Left, Right, Center LabelType No_Label End @@ -44,23 +44,23 @@ NoStyle Author NoStyle Bibliography Style Section - LabelString \thesection. + LabelString \thesection. LabelStringAppendix \thesection - Align Center + Align Center End Style Subsection - LabelString \thesubsection. + LabelString \thesubsection. Font - Shape Italic - Size Normal + Shape Italic + Size Normal EndFont End Style Subsubsection - LabelString \thesubsubsection. + LabelString \thesubsubsection. Font - Shape Italic + Shape Italic EndFont End @@ -112,24 +112,24 @@ Style "Main Author" LatexName cauthor Category FrontMatter InTitle 1 - NextNoIndent 1 + NextNoIndent 1 Argument 1 - LabelString "Affiliation Key" + LabelString "Affiliation Key" Tooltip "Affiliation key of the author" EndArgument Argument 2 Mandatory 1 - LabelString "Forename" + LabelString "Forename" Tooltip "Forename" EndArgument Argument 3 Mandatory 1 - LabelString "Surname" + LabelString "Surname" Tooltip "Surname" EndArgument Argument 4 Mandatory 1 - LabelString "Email" + LabelString "Email" Tooltip "Email" Font Shape Italic @@ -147,12 +147,12 @@ Style "Co Author" LabelString "Co-author" ResetArgs 1 Argument 1 - LabelString "Affiliation Key" + LabelString "Affiliation Key" Tooltip "Affiliation key of the co-author" EndArgument Argument 2 Mandatory 1 - LabelString "Forename" + LabelString "Forename" Tooltip "Forename" EndArgument End @@ -178,7 +178,7 @@ Style Affiliation Category FrontMatter LabelString "Affiliation:" Argument 1 - LabelString "Affiliation Key" + LabelString "Affiliation Key" Tooltip "Affiliation key" EndArgument Font @@ -208,7 +208,7 @@ Style "PDB reference" LatexName PDBreference LabelString "PDB reference:" Argument 1 - LabelString "Name" + LabelString "Name" Tooltip "Optional name" EndArgument End @@ -222,16 +222,16 @@ End Style Synopsis CopyStyle Abstract LatexName synopsis - LabelString "Synopsis" + LabelString "Synopsis" Align Left - AlignPossible Left + AlignPossible Left End Style Acknowledgements CopyStyle "Short Author" LatexName ack InTitle 0 - LabelString "Acknowledgements:" + LabelString "Acknowledgements:" Category BackMatter TopSep 0.7 End @@ -241,21 +241,31 @@ Style References Category BackMatter LatexType Item_Environment LatexName references - ItemCommand reference + ItemCommand reference LabelType Centered - LabelString "References" + LabelString "References" LabelFont Size larger Series bold EndFont - ParagraphGroup 1 - NextNoIndent 1 + ParagraphGroup 1 + NextNoIndent 1 TopSep 0.7 BottomSep 0.7 + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument Argument item:1 - LabelString "Reference" - Mandatory 1 - AutoInsert 1 + LabelString "Reference" + Mandatory 1 + AutoInsert 1 EndArgument Align Left End diff --git a/lib/layouts/jarticle.layout b/lib/layouts/jarticle.layout index f950b1fcec..4d21d0c57b 100644 --- a/lib/layouts/jarticle.layout +++ b/lib/layouts/jarticle.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout index 0e679c7cfe..9ca0df99f3 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 68 +Format 69 Columns 1 Sides 1 @@ -290,5 +290,15 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/jbook.layout b/lib/layouts/jbook.layout index 4cd32d6e31..0f7c6b3c73 100644 --- a/lib/layouts/jbook.layout +++ b/lib/layouts/jbook.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jgrga.layout b/lib/layouts/jgrga.layout index 4e1a6b6233..d3604acebb 100644 --- a/lib/layouts/jgrga.layout +++ b/lib/layouts/jgrga.layout @@ -4,7 +4,7 @@ # AGUplus JGR textclass definition file. # Author: Martin Vermeer -Format 68 +Format 69 Input aguplus.inc ClassOptions diff --git a/lib/layouts/jreport.layout b/lib/layouts/jreport.layout index 7e45c2e7e2..231d1e3feb 100644 --- a/lib/layouts/jreport.layout +++ b/lib/layouts/jreport.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jsarticle.layout b/lib/layouts/jsarticle.layout index c225eb6084..ca59fcabae 100644 --- a/lib/layouts/jsarticle.layout +++ b/lib/layouts/jsarticle.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jsbook.layout b/lib/layouts/jsbook.layout index 2a9a0a719b..d7e2fca3b0 100644 --- a/lib/layouts/jsbook.layout +++ b/lib/layouts/jsbook.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout index ad165dda6a..a29d1445fe 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 68 +Format 69 # Read the definitions from article.layout Input article.layout diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout index 27484a53b1..28b89215e6 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 68 +Format 69 Columns 1 Sides 2 SecNumDepth 4 @@ -368,4 +368,14 @@ Style References EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/knitr.module b/lib/layouts/knitr.module index 296c502434..08b003b5ae 100644 --- a/lib/layouts/knitr.module +++ b/lib/layouts/knitr.module @@ -6,7 +6,7 @@ #Category: literate #Excludes: lilypond | sweave -Format 68 +Format 69 Input litinsets.inc diff --git a/lib/layouts/landscape.module b/lib/layouts/landscape.module index 1d20c61dfd..35a1318ecb 100644 --- a/lib/layouts/landscape.module +++ b/lib/layouts/landscape.module @@ -5,7 +5,7 @@ # #Author: Jürgen Spitzmüller -Format 68 +Format 69 InsetLayout Flex:Landscape LyXType custom diff --git a/lib/layouts/latex8.layout b/lib/layouts/latex8.layout index 601bbb9c6d..6791302460 100644 --- a/lib/layouts/latex8.layout +++ b/lib/layouts/latex8.layout @@ -4,7 +4,7 @@ # Latex8 textclass definition file. # Author : Allan Rae -Format 68 +Format 69 Preamble \usepackage{latex8} \usepackage{times} diff --git a/lib/layouts/letter.layout b/lib/layouts/letter.layout index 8d49de2ac9..76d5fecb96 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 68 +Format 69 Input stdinsets.inc Input stdletter.inc Input stdlists.inc diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout index f8512fe85c..0b1f925a77 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 68 +Format 69 #(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 9b8acffdec..1859a2d896 100644 --- a/lib/layouts/lilypond.module +++ b/lib/layouts/lilypond.module @@ -7,7 +7,7 @@ # Author: Julien Rioux -Format 68 +Format 69 OutputFormat lilypond-book InsetLayout "Flex:LilyPond" diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module index caebadc237..ead4a42255 100644 --- a/lib/layouts/linguistics.module +++ b/lib/layouts/linguistics.module @@ -7,7 +7,7 @@ # Author: Jürgen Spitzmüller -Format 68 +Format 69 Counter example Within chapter @@ -71,6 +71,16 @@ Style Numbered_Examples_(consecutive) LabelType Enumerate LabelCounter "example" ResumeCounter true + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument Argument item:1 LabelString "Custom Numbering|s" Tooltip "Customize the numeration" diff --git a/lib/layouts/litinsets.inc b/lib/layouts/litinsets.inc index 3f0a3f8757..5cd74e1f1c 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 68 +Format 69 Counter chunk PrettyFormat "Chunk ##" diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout index e0368963aa..bf6bf72a30 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 68 +Format 69 Columns 1 Sides 1 PageStyle Plain @@ -289,6 +289,16 @@ Style Bibliography EndFont TocLevel 0 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module index 6d36fd1d43..532a413473 100644 --- a/lib/layouts/logicalmkup.module +++ b/lib/layouts/logicalmkup.module @@ -6,7 +6,7 @@ # Author : Martin vermeer -Format 68 +Format 69 InsetLayout Flex:Noun LyxType charstyle diff --git a/lib/layouts/ltugboat.layout b/lib/layouts/ltugboat.layout index c82c5218c5..6fce053f52 100644 --- a/lib/layouts/ltugboat.layout +++ b/lib/layouts/ltugboat.layout @@ -6,7 +6,7 @@ # Author : Herbert Voss 2001/08/13 -Format 68 +Format 69 Columns 2 Sides 2 #SecNumDepth # no counting diff --git a/lib/layouts/lyxmacros.inc b/lib/layouts/lyxmacros.inc index 96fe740e09..f655a390cf 100644 --- a/lib/layouts/lyxmacros.inc +++ b/lib/layouts/lyxmacros.inc @@ -8,7 +8,7 @@ # be removed later. -Format 68 +Format 69 Style LyX-Code Category MainText Margin Static diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index ab79afce9c..6445e64de8 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -7,7 +7,7 @@ # feel free to contribute missing features! -Format 68 +Format 69 Columns 1 Sides 2 SecNumDepth 1 diff --git a/lib/layouts/minimalistic.module b/lib/layouts/minimalistic.module index fdbe9bebac..f5f1afb4f3 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 68 +Format 69 InsetLayout Index Decoration minimalistic diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index 687184e80e..f658229acf 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -7,7 +7,7 @@ # General textclass parameters -Format 68 +Format 69 Columns 1 Sides 1 SecNumDepth -1 @@ -521,6 +521,16 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End Style Recipient diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module index 427e974cf9..c1f4a76500 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 68 +Format 69 InsetLayout Flex:Multiple_Columns LyXType custom diff --git a/lib/layouts/mwart.layout b/lib/layouts/mwart.layout index 9d66a50dad..da8e1983ec 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 68 +Format 69 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/mwbk.layout b/lib/layouts/mwbk.layout index 66077d1eac..e7bd385a35 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 68 +Format 69 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/mwrep.layout b/lib/layouts/mwrep.layout index 5f92fcae1d..2dcf6c524e 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 68 +Format 69 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/natbibapa.module b/lib/layouts/natbibapa.module index 9c36349fb4..d7fb28f3c0 100644 --- a/lib/layouts/natbibapa.module +++ b/lib/layouts/natbibapa.module @@ -9,7 +9,7 @@ # # Author: Jacob Bishop -Format 68 +Format 69 AddToPreamble \usepackage[natbibapa]{apacite} diff --git a/lib/layouts/noweb.module b/lib/layouts/noweb.module index b044f88230..0b6d41315f 100644 --- a/lib/layouts/noweb.module +++ b/lib/layouts/noweb.module @@ -4,7 +4,7 @@ #DescriptionEnd #Category: literate -Format 68 +Format 69 Input litinsets.inc OutputType literate diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc index 9cf0679d29..ebded4136f 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 68 +Format 69 # appendix applies to sections. Counter section diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc index 77ee00a441..47eb909459 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 68 +Format 69 Counter chapter Within "" diff --git a/lib/layouts/numrevtex.inc b/lib/layouts/numrevtex.inc index 839ff6f17e..1391f97cf2 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 68 +Format 69 Style Section LabelType Static LabelCounter section diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index c194ab0835..d063570ca2 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 68 +Format 69 Columns 1 Sides 1 SecNumDepth 3 diff --git a/lib/layouts/paralist.module b/lib/layouts/paralist.module index b84dec7514..2760f58658 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 68 +Format 69 AddToPreamble \usepackage{paralist} diff --git a/lib/layouts/pdfcomment.module b/lib/layouts/pdfcomment.module index 274cb3d039..6fb0f4ffd1 100644 --- a/lib/layouts/pdfcomment.module +++ b/lib/layouts/pdfcomment.module @@ -7,7 +7,7 @@ # Author: Juergen Spitzmueller # Uwe Stöhr -Format 68 +Format 69 # # helper commands diff --git a/lib/layouts/pdfform.module b/lib/layouts/pdfform.module index a3294ca42b..88f81205fc 100644 --- a/lib/layouts/pdfform.module +++ b/lib/layouts/pdfform.module @@ -6,7 +6,7 @@ #DescriptionEnd # Author: Uwe Stöhr -Format 68 +Format 69 # # the form environment diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout index a2c253a8b0..35d7d3b36a 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 68 +Format 69 Input stdcounters.inc Input stdinsets.inc @@ -276,6 +276,16 @@ Style Itemize LabelString "Itemize Options" Tooltip "Optional arguments for this list (see enumitem manual)" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument Argument item:1 LabelString "Custom Item|s" Tooltip "A customized item string" @@ -328,6 +338,16 @@ Style Enumerate Tooltip "Optional arguments for this list (see enumitem manual)" Requires 1 EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument Argument item:1 LabelString "Custom Item|s" Tooltip "A customized item string" @@ -373,6 +393,16 @@ Style Bibliography LabelBottomSep 0 TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End ### diff --git a/lib/layouts/recipebook.layout b/lib/layouts/recipebook.layout index 9fe3340e55..ca361347de 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 68 +Format 69 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/report.layout b/lib/layouts/report.layout index 490d5b6053..10c7280661 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 68 +Format 69 Input stdclass.inc Input numreport.inc diff --git a/lib/layouts/revtex.layout b/lib/layouts/revtex.layout index 6cc666ab09..516ff30c7f 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 68 +Format 69 Columns 1 Sides 1 PageStyle Headers diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout index 9cd9888a8b..e66cf213c5 100644 --- a/lib/layouts/revtex4-1.layout +++ b/lib/layouts/revtex4-1.layout @@ -16,7 +16,7 @@ # - add support for \onlinecite{} -Format 68 +Format 69 Input stdclass.inc Input numrevtex.inc diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout index a6181c5fce..e2fc97d08d 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 68 +Format 69 Columns 1 Sides 1 diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module index fe10782aec..1c1c3f0c37 100644 --- a/lib/layouts/rsphrase.module +++ b/lib/layouts/rsphrase.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 68 +Format 69 InsetLayout "Flex:R-S number" LyxType custom diff --git a/lib/layouts/sciposter.layout b/lib/layouts/sciposter.layout index 8ce2239939..a1fc2ad32c 100644 --- a/lib/layouts/sciposter.layout +++ b/lib/layouts/sciposter.layout @@ -7,7 +7,7 @@ # # Input general definitions -Format 68 +Format 69 Input stdclass.inc diff --git a/lib/layouts/scrartcl.layout b/lib/layouts/scrartcl.layout index d852628a8d..fe0631f444 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 68 +Format 69 Input scrclass.inc SecNumDepth 3 diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout index 197c0d7fe2..db95cc862a 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 68 +Format 69 # Includes Input scrartcl.layout diff --git a/lib/layouts/scrbook.layout b/lib/layouts/scrbook.layout index b5ca89fbb4..bb743be1b7 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 68 +Format 69 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc index 8fd30ba0a9..ee182807c5 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 68 +Format 69 SecNumDepth 2 TocDepth 2 DefaultStyle Standard diff --git a/lib/layouts/scrlettr.layout b/lib/layouts/scrlettr.layout index 451c393b19..20c342e907 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 68 +Format 69 Style Standard Category MainText LatexName dummy diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout index 913759ce2f..c00010014c 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 68 +Format 69 Provides subscript 1 Style Standard diff --git a/lib/layouts/scrreprt.layout b/lib/layouts/scrreprt.layout index dc0899146b..ae9bfbde20 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 68 +Format 69 Input scrclass.inc Input numreport.inc diff --git a/lib/layouts/sectionbox.module b/lib/layouts/sectionbox.module index 0b4696ba0c..6580e524ae 100644 --- a/lib/layouts/sectionbox.module +++ b/lib/layouts/sectionbox.module @@ -6,7 +6,7 @@ # Author: Jürgen Spitzmüller -Format 68 +Format 69 InsetLayout Flex:SectionBox LyXType custom diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout index 9fa19f691a..c4ae13265a 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 68 +Format 69 Sides 1 Columns 1 diff --git a/lib/layouts/shapepar.module b/lib/layouts/shapepar.module index 96dc193a6a..094d0aad32 100644 --- a/lib/layouts/shapepar.module +++ b/lib/layouts/shapepar.module @@ -6,7 +6,7 @@ #DescriptionEnd #Author: Uwe Stöhr -Format 68 +Format 69 AddToPreamble % used for custom paragraph shapes diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout index 76ab0da137..34f2489f49 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 68 +Format 69 Columns 1 Sides 2 PageStyle Headers @@ -350,6 +350,16 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End NoStyle Chapter diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index 0613e2dc5e..f0d7747d1e 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 68 +Format 69 Columns 1 Sides 1 diff --git a/lib/layouts/simplecv.layout b/lib/layouts/simplecv.layout index 7cb8b38441..77a9b2032b 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 68 +Format 69 Columns 1 Sides 1 SecNumDepth -1 @@ -68,6 +68,16 @@ Style Topic Margin Manual LatexType Item_environment LatexName topic + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 LabelSep xxx ParSkip 0.4 @@ -90,6 +100,16 @@ Style Itemize Margin Static LatexType Item_Environment LatexName itemize + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument NextNoIndent 1 ToggleIndent Never LeftMargin MMN @@ -166,4 +186,14 @@ Style Bibliography EndFont TocLevel 1 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/singlecol-new.layout b/lib/layouts/singlecol-new.layout index 7e392bab6f..aca0b5e1e9 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 68 +Format 69 Input article.layout diff --git a/lib/layouts/singlecol.layout b/lib/layouts/singlecol.layout index afe30c902a..5f18d431e9 100644 --- a/lib/layouts/singlecol.layout +++ b/lib/layouts/singlecol.layout @@ -3,5 +3,5 @@ # \DeclareCategory{Obsolete} # Read the definitions from article.layout -Format 68 +Format 69 Input article.layout diff --git a/lib/layouts/slides.layout b/lib/layouts/slides.layout index 191c6e52ff..3d47cfee20 100644 --- a/lib/layouts/slides.layout +++ b/lib/layouts/slides.layout @@ -8,7 +8,7 @@ # -Format 68 +Format 69 Columns 1 Sides 1 PageStyle Plain diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout index d41456c853..d0cfd1d5af 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 68 +Format 69 Input stdclass.inc NoStyle Chapter diff --git a/lib/layouts/stdcharstyles.inc b/lib/layouts/stdcharstyles.inc index 687bf9aa45..aa79adb8ae 100644 --- a/lib/layouts/stdcharstyles.inc +++ b/lib/layouts/stdcharstyles.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Character Styles definition -Format 68 +Format 69 # Error fallback: InsetLayout Flex diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc index a589cf0260..895605eac8 100644 --- a/lib/layouts/stdciteformats.inc +++ b/lib/layouts/stdciteformats.inc @@ -11,7 +11,7 @@ # Author: Richard Heck # Jürgen Spitzmüller -Format 68 +Format 69 CiteFormat default # diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index 40c32fa081..b60d2f5322 100644 --- a/lib/layouts/stdclass.inc +++ b/lib/layouts/stdclass.inc @@ -7,7 +7,7 @@ # ``standard'' layouts, like article and friends. -Format 68 +Format 69 Columns 1 Sides 1 SecNumDepth 2 diff --git a/lib/layouts/stdcounters.inc b/lib/layouts/stdcounters.inc index 60d51d46c7..30a9e0dc6c 100644 --- a/lib/layouts/stdcounters.inc +++ b/lib/layouts/stdcounters.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 68 +Format 69 Counter part LabelString "\Roman{part}" PrettyFormat "Part \Roman{part}" diff --git a/lib/layouts/stdcustom.inc b/lib/layouts/stdcustom.inc index 80f744f4b1..18cd241ce7 100644 --- a/lib/layouts/stdcustom.inc +++ b/lib/layouts/stdcustom.inc @@ -2,7 +2,7 @@ # Author : Martin vermeer # Custom Inset layouts definition -Format 68 +Format 69 # Error fallback: InsetLayout "Flex:Custom" diff --git a/lib/layouts/stdfloatnames.inc b/lib/layouts/stdfloatnames.inc index ade6673088..6116ce2510 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 68 +Format 69 OutlinerName table "Tables" OutlinerName figure "Figures" diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc index 3eff2b8347..8fd6981e63 100644 --- a/lib/layouts/stdfloats.inc +++ b/lib/layouts/stdfloats.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 68 +Format 69 Input stdfloatnames.inc diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index 72847d1abc..e1705d317f 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 68 +Format 69 Provides stdinsets 1 diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc index ccea39c1ed..5982f6f936 100644 --- a/lib/layouts/stdlayouts.inc +++ b/lib/layouts/stdlayouts.inc @@ -7,7 +7,7 @@ # quotations and such. -Format 68 +Format 69 Style Quotation Category MainText diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc index c834b64bd6..ad49c41b2e 100644 --- a/lib/layouts/stdletter.inc +++ b/lib/layouts/stdletter.inc @@ -3,7 +3,7 @@ # Heavily modifed and enhanced by several developers. -Format 68 +Format 69 Columns 1 Sides 1 PageStyle Empty diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc index b1e93a7f92..dcfefbf3ef 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 68 +Format 69 Input stdlyxlist.inc @@ -33,6 +33,16 @@ Style Itemize LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End @@ -62,6 +72,16 @@ Style Enumerate LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End Style Description @@ -91,6 +111,16 @@ Style Description HTMLStyle dl.description dt { font-weight: bold; } EndHTMLStyle + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/stdlyxlist.inc b/lib/layouts/stdlyxlist.inc index 310ff6bbc5..0d7ccb067f 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 68 +Format 69 Style Labeling Category List @@ -18,6 +18,16 @@ Style Labeling AlignPossible Block, Left LabelType Manual LabelString "00.00.0000" + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument HTMLTag ol HTMLAttr class='lyxlist' HTMLItem li diff --git a/lib/layouts/stdrefprefix.inc b/lib/layouts/stdrefprefix.inc index 852e46868d..a828b1320e 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 68 +Format 69 ModifyStyle Part RefPrefix part diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index e752ee197a..7bbb19188d 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 68 +Format 69 Style Part Category Sectioning diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc index 85d544ffac..118cc6d976 100644 --- a/lib/layouts/stdstarsections.inc +++ b/lib/layouts/stdstarsections.inc @@ -9,7 +9,7 @@ # modifying the style of the regular sectioning layouts. -Format 68 +Format 69 Style Part* CopyStyle Part Category Unnumbered diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc index 10bcfe8464..60196a7d33 100644 --- a/lib/layouts/stdstruct.inc +++ b/lib/layouts/stdstruct.inc @@ -8,7 +8,7 @@ # a document, like abstract, bibliography and such. -Format 68 +Format 69 Style Abstract Margin Static LatexType Environment @@ -83,4 +83,14 @@ Style Bibliography EndHTMLStyle TocLevel 1 ISTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc index 773477d907..419d4df04a 100644 --- a/lib/layouts/stdtitle.inc +++ b/lib/layouts/stdtitle.inc @@ -8,7 +8,7 @@ # a document, like title, author and such. -Format 68 +Format 69 Style Title diff --git a/lib/layouts/subequations.module b/lib/layouts/subequations.module index cbbd1b918d..2009b37773 100644 --- a/lib/layouts/subequations.module +++ b/lib/layouts/subequations.module @@ -5,7 +5,7 @@ # Author: Joel A. Kulesza (jkulesza@gmail.com) -Format 68 +Format 69 InsetLayout Flex:Subequations LyxType custom diff --git a/lib/layouts/svcommon.inc b/lib/layouts/svcommon.inc index 4c8094df2a..b285ab5585 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 68 +Format 69 PageStyle Plain @@ -595,6 +595,16 @@ Style Bibliography EndFont TocLevel 0 IsTocCaption 0 + Argument listpreamble:1 + LabelString "Bib preamble" + MenuString "Bibiography Preamble" + Tooltip "LaTeX code to be inserted before the first bibliography item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument End Style Description diff --git a/lib/layouts/svglobal.layout b/lib/layouts/svglobal.layout index 60dbe9420c..77e874ffbc 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 68 +Format 69 Input svcommon.inc NoStyle Front_Matter diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout index c40d46041a..4b3fa4252f 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 68 +Format 69 Input svcommon.inc diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout index 04feb3f5ff..241d94deed 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 68 +Format 69 Input svcommon.inc NoStyle Front_Matter diff --git a/lib/layouts/svmono.layout b/lib/layouts/svmono.layout index 2be711b637..7ec1afab38 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 68 +Format 69 Input svcommon.inc TocDepth 2 diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout index 0e833a5cab..577fddf90b 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 68 +Format 69 Input svcommon.inc diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout index 7010743857..167763de77 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 68 +Format 69 Input svcommon.inc NoStyle Front_Matter diff --git a/lib/layouts/sweave.module b/lib/layouts/sweave.module index 511c78fe5d..0c8253b5cd 100644 --- a/lib/layouts/sweave.module +++ b/lib/layouts/sweave.module @@ -6,7 +6,7 @@ #Category: literate #Excludes: lilypond -Format 68 +Format 69 Input litinsets.inc diff --git a/lib/layouts/tabs-within-sections.module b/lib/layouts/tabs-within-sections.module index 423d4b98d1..fdb9a9b68b 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 68 +Format 69 Requires amsmath diff --git a/lib/layouts/tarticle.layout b/lib/layouts/tarticle.layout index 0f98395ac2..e18fe05079 100644 --- a/lib/layouts/tarticle.layout +++ b/lib/layouts/tarticle.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota6@gmail.com)1 # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tbook.layout b/lib/layouts/tbook.layout index 93cc824124..ca48200e1c 100644 --- a/lib/layouts/tbook.layout +++ b/lib/layouts/tbook.layout @@ -5,7 +5,7 @@ # Author : Koji Yokota (yokota6@gmail.com) # This style provides japanese features -Format 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tcolorbox.module b/lib/layouts/tcolorbox.module index 1907cac4b9..be0ed9044e 100644 --- a/lib/layouts/tcolorbox.module +++ b/lib/layouts/tcolorbox.module @@ -6,7 +6,7 @@ #Authors: Jürgen Spitzmüller # Uwe Stöhr -Format 68 +Format 69 InsetLayout Flex:Color_Box LyXType custom diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc index ce42eabed2..a17ce77c63 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 68 +Format 69 Counter theorem End Counter corollary diff --git a/lib/layouts/theorems-ams-bytype.module b/lib/layouts/theorems-ams-bytype.module index bf66f514a1..aea0a135d2 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 68 +Format 69 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-ams-chap-bytype.inc b/lib/layouts/theorems-ams-chap-bytype.inc index 76a6efb776..af6e296799 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 68 +Format 69 Counter theorem End Counter corollary diff --git a/lib/layouts/theorems-ams-chap-bytype.module b/lib/layouts/theorems-ams-chap-bytype.module index 5018df05f6..ad5ed4bcff 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 68 +Format 69 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-ams-extended-bytype.module b/lib/layouts/theorems-ams-extended-bytype.module index a5b4773cdf..b09fad3804 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 68 +Format 69 Requires amsmath diff --git a/lib/layouts/theorems-ams-extended-chap-bytype.module b/lib/layouts/theorems-ams-extended-chap-bytype.module index ca7c92d2a1..05b6596a86 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 68 +Format 69 Requires amsmath diff --git a/lib/layouts/theorems-ams-extended.module b/lib/layouts/theorems-ams-extended.module index b17ab6dba5..ac4f75d94c 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 68 +Format 69 Requires amsmath diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 800ec0b6f0..ad11627183 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -20,7 +20,7 @@ # - Proof # - Case (by inclusion) -Format 68 +Format 69 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/theorems-ams.module b/lib/layouts/theorems-ams.module index 6fe5ee8a88..385d40f80f 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 68 +Format 69 Requires amsmath,amsthm diff --git a/lib/layouts/theorems-bytype.inc b/lib/layouts/theorems-bytype.inc index fcdda28ffd..270483c4ac 100644 --- a/lib/layouts/theorems-bytype.inc +++ b/lib/layouts/theorems-bytype.inc @@ -22,7 +22,7 @@ # - Proof # - Case (by inclusion) -Format 68 +Format 69 Style Theorem Category Reasoning diff --git a/lib/layouts/theorems-bytype.module b/lib/layouts/theorems-bytype.module index e7c385bb04..7ca429cf9d 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 68 +Format 69 # 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 cb54e0277e..bff286409d 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 68 +Format 69 Counter casei LabelString "Case \arabic{casei}." @@ -26,7 +26,6 @@ End Style Case Category Reasoning - Margin Static LatexType Item_Environment LatexName casenv @@ -49,6 +48,16 @@ Style Case HTMLItem li HTMLLabel NONE RefPrefix enu + Argument listpreamble:1 + LabelString "List preamble" + MenuString "List Preamble" + Tooltip "LaTeX code to be inserted before the first item" + PassThru 1 + Font + Family typewriter + Color latex + EndFont + EndArgument Argument item:1 LabelString "Custom Item|s" Tooltip "A customized item string" diff --git a/lib/layouts/theorems-chap-bytype.module b/lib/layouts/theorems-chap-bytype.module index c202639238..592b75eab7 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 68 +Format 69 # 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 1b754ee4b6..95b8c57313 100644 --- a/lib/layouts/theorems-chap.module +++ b/lib/layouts/theorems-chap.module @@ -10,7 +10,7 @@ # Author: Richard Heck -Format 68 +Format 69 Counter theorem Within chapter diff --git a/lib/layouts/theorems-named.module b/lib/layouts/theorems-named.module index f84c7e9450..2f0db8f5f2 100644 --- a/lib/layouts/theorems-named.module +++ b/lib/layouts/theorems-named.module @@ -6,7 +6,7 @@ #DescriptionEnd #Original Author: John Perry -Format 68 +Format 69 ProvideStyle Theorem* Category Reasoning diff --git a/lib/layouts/theorems-order.inc b/lib/layouts/theorems-order.inc index 48dbdb23af..6539644c3c 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 68 +Format 69 #Get the order right Style Theorem diff --git a/lib/layouts/theorems-proof-std.inc b/lib/layouts/theorems-proof-std.inc index 587f0c9acc..4cf020a4aa 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 68 +Format 69 #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 ce0785c860..282c2b9f26 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 68 +Format 69 Style Proof Category Reasoning diff --git a/lib/layouts/theorems-refprefix.inc b/lib/layouts/theorems-refprefix.inc index a0e7193044..1dc0af04e3 100644 --- a/lib/layouts/theorems-refprefix.inc +++ b/lib/layouts/theorems-refprefix.inc @@ -1,6 +1,6 @@ # Reference prefixes for theorem environments -Format 68 +Format 69 ModifyStyle Theorem RefPrefix thm diff --git a/lib/layouts/theorems-sec-bytype.module b/lib/layouts/theorems-sec-bytype.module index a87767130d..69c0bf8f05 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 68 +Format 69 # 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 f22e8a3de7..ea256355e5 100644 --- a/lib/layouts/theorems-sec.module +++ b/lib/layouts/theorems-sec.module @@ -9,7 +9,7 @@ # Author: Richard Heck -Format 68 +Format 69 Counter theorem Within section diff --git a/lib/layouts/theorems-starred-equivalents.inc b/lib/layouts/theorems-starred-equivalents.inc index 320afeac4b..d00345d0af 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 68 +Format 69 Style Theorem CopyStyle Theorem* diff --git a/lib/layouts/theorems-starred.inc b/lib/layouts/theorems-starred.inc index efe899e7f4..6cdc45c02b 100644 --- a/lib/layouts/theorems-starred.inc +++ b/lib/layouts/theorems-starred.inc @@ -19,7 +19,7 @@ # - Claim # - Proof -Format 68 +Format 69 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/theorems-starred.module b/lib/layouts/theorems-starred.module index 3c768130b1..c91716977e 100644 --- a/lib/layouts/theorems-starred.module +++ b/lib/layouts/theorems-starred.module @@ -8,7 +8,7 @@ # Author: Richard Heck -Format 68 +Format 69 Input theorems-order.inc Input theorems-starred.inc diff --git a/lib/layouts/theorems-std.module b/lib/layouts/theorems-std.module index 4ae64ea194..5ac3aec6ee 100644 --- a/lib/layouts/theorems-std.module +++ b/lib/layouts/theorems-std.module @@ -9,7 +9,7 @@ # Author: Richard Heck -Format 68 +Format 69 Counter theorem End diff --git a/lib/layouts/theorems-without-preamble.inc b/lib/layouts/theorems-without-preamble.inc index 1bed3ccfe3..54cc31e9d9 100644 --- a/lib/layouts/theorems-without-preamble.inc +++ b/lib/layouts/theorems-without-preamble.inc @@ -26,7 +26,7 @@ # - Note -Format 68 +Format 69 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/theorems.inc b/lib/layouts/theorems.inc index f7d7b3e2f3..1e7dd2ffab 100644 --- a/lib/layouts/theorems.inc +++ b/lib/layouts/theorems.inc @@ -20,7 +20,7 @@ # - Claim # - Case (by inclusion) -Format 68 +Format 69 OutlinerName thm "Definitions & Theorems" diff --git a/lib/layouts/todonotes.module b/lib/layouts/todonotes.module index 2ed5b481ad..2a4b698184 100644 --- a/lib/layouts/todonotes.module +++ b/lib/layouts/todonotes.module @@ -9,7 +9,7 @@ # Authors: Stephen # Jürgen Spitzmüller -Format 68 +Format 69 OutlinerName todonotes "TODO" diff --git a/lib/layouts/treport.layout b/lib/layouts/treport.layout index 8e1ec279c5..b4b1512ec1 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 68 +Format 69 Provides japanese 1 # Input general definitions diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout index 1d41ffde92..67696db0f0 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 68 +Format 69 Provides geometry 1 Provides natbib-internal 1 diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout index 60847d6c5a..043e9d2482 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 68 +Format 69 # import other layouts Input stdlayouts.inc diff --git a/lib/layouts/varwidth.module b/lib/layouts/varwidth.module index a486c1bb4f..544b4c4983 100644 --- a/lib/layouts/varwidth.module +++ b/lib/layouts/varwidth.module @@ -12,7 +12,7 @@ # Authors: Guillaume Munch # Jürgen Spitzmüller -Format 68 +Format 69 InsetLayout Flex:Minipage_(Var._Width) LyXType custom diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py index 2d6caabaa4..019366f5b5 100644 --- a/lib/lyx2lyx/lyx_2_4.py +++ b/lib/lyx2lyx/lyx_2_4.py @@ -27,11 +27,12 @@ from datetime import (datetime, date, time) # Uncomment only what you need to import, please. from parser_tools import (count_pars_in_inset, find_end_of_inset, find_end_of_layout, - find_token, find_re, get_bool_value, get_option_value, get_value, get_quoted_value) + find_token, find_re, get_bool_value, get_containing_layout, + get_option_value, get_value, get_quoted_value) # del_token, del_value, del_complete_lines, # find_complete_lines, find_end_of, # find_re, find_substring, find_token_backwards, -# get_containing_inset, get_containing_layout, +# get_containing_inset, # is_in_inset, set_bool_value # find_tokens, find_token_exact, check_token @@ -1155,6 +1156,31 @@ def revert_l7ninfo(document): i = i + 1 +def revert_listpargs(document): + " Reverts listpreamble arguments to TeX-code " + i = 0 + while True: + i = find_token(document.body, "\\begin_inset Argument listpreamble:", i) + if i == -1: + return + j = find_end_of_inset(document.body, i) + # Find containing paragraph layout + parent = get_containing_layout(document.body, i) + if parent == False: + document.warning("Malformed LyX document: Can't find parent paragraph layout") + i += 1 + continue + parbeg = parent[3] + beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i) + endPlain = find_end_of_layout(document.body, beginPlain) + content = document.body[beginPlain + 1 : endPlain] + del document.body[i:j+1] + subst = ["\\begin_inset ERT", "status collapsed", "", "\\begin_layout Plain Layout", + "{"] + content + ["}", "\\end_layout", "", "\\end_inset", ""] + document.body[parbeg : parbeg] = subst + i += 1 + + ## # Conversion hub # @@ -1178,10 +1204,12 @@ convert = [ [559, []], [560, []], [561, [convert_dejavu]], - [562, []] + [562, []], + [563, []] ] revert = [ + [562, [revert_listpargs]], [561, [revert_l7ninfo]], [560, [revert_dejavu]], [559, [revert_timeinfo, revert_namenoextinfo]], diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py index 31b5cebc5c..a1313354dc 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 = 68 +currentFormat = 69 # Incremented to format 4, 6 April 2007, lasgouttes @@ -230,6 +230,9 @@ currentFormat = 68 # Incremented to format 68, 21 May 2018 by spitz # New Layout tag "AddToCiteEngine" +# Incremented to format 69, 16 August 2018 by spitz +# New argument type "listpreamble" + # Do not forget to document format change in Customization # Manual (section "Declaring a new text class"). @@ -479,7 +482,7 @@ def convert(lines, end_format): i += 1 continue - if format >= 65 and format <= 67: + if format >= 65 and format <= 68: # nothing to do. i += 1 continue diff --git a/src/Layout.cpp b/src/Layout.cpp index 023af6518c..4f3dc14268 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -377,6 +377,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass) latexargs_.clear(); itemargs_.clear(); postcommandargs_.clear(); + listpreamble_.clear(); } break; @@ -1005,6 +1006,7 @@ void Layout::readArgument(Lexer & lex) latexarg arg; // writeArgument() makes use of these default values arg.mandatory = false; + arg.nodelims = false; arg.autoinsert = false; arg.insertcotext = false; bool error = false; @@ -1017,6 +1019,7 @@ void Layout::readArgument(Lexer & lex) lex >> id; bool const itemarg = prefixIs(id, "item:"); bool const postcmd = prefixIs(id, "post:"); + bool const listpreamble = prefixIs(id, "listpreamble:"); while (!finished && lex.isOK() && !error) { lex.next(); @@ -1096,7 +1099,11 @@ void Layout::readArgument(Lexer & lex) itemargs_[id] = arg; else if (postcmd) postcommandargs_[id] = arg; - else + else if (listpreamble) { + // list preamble has no delimiters by default + arg.nodelims = true; + listpreamble_[id] = arg; + } else latexargs_[id] = arg; } @@ -1218,6 +1225,9 @@ void Layout::write(ostream & os) const for (LaTeXArgMap::const_iterator it = postcommandargs_.begin(); it != postcommandargs_.end(); ++it) writeArgument(os, it->first, it->second); + for (LaTeXArgMap::const_iterator it = listpreamble_.begin(); + it != listpreamble_.end(); ++it) + writeArgument(os, it->first, it->second); os << "\tNeedProtect " << needprotect << "\n" "\tNeedCProtect " << needcprotect << "\n" "\tKeepEmpty " << keepempty << '\n'; @@ -1479,7 +1489,7 @@ void Layout::write(ostream & os) const bool Layout::hasArgs() const { return !latexargs_.empty() || !postcommandargs_.empty() || - !itemargs_.empty(); + !itemargs_.empty() || !listpreamble_.empty(); } @@ -1488,6 +1498,8 @@ Layout::LaTeXArgMap Layout::args() const LaTeXArgMap args = latexargs_; if (!postcommandargs_.empty()) args.insert(postcommandargs_.begin(), postcommandargs_.end()); + if (!listpreamble_.empty()) + args.insert(listpreamble_.begin(), listpreamble_.end()); if (!itemargs_.empty()) args.insert(itemargs_.begin(), itemargs_.end()); return args; diff --git a/src/Layout.h b/src/Layout.h index 7991cb193e..4f4f1c7899 100644 --- a/src/Layout.h +++ b/src/Layout.h @@ -94,6 +94,7 @@ public: docstring labelstring; docstring menustring; bool mandatory; + bool nodelims; docstring ldelim; docstring rdelim; docstring defaultarg; @@ -116,6 +117,8 @@ public: /// LaTeXArgMap const & postcommandargs() const { return postcommandargs_; } /// + LaTeXArgMap const & listpreamble() const { return listpreamble_; } + /// LaTeXArgMap const & itemargs() const { return itemargs_; } /// Returns true is the layout has arguments. If false, then an /// InsetArgument in this layout stands for the parent InsetText. @@ -484,6 +487,8 @@ private: /// LaTeXArgMap postcommandargs_; /// + LaTeXArgMap listpreamble_; + /// LaTeXArgMap itemargs_; /// bool add_to_toc_; diff --git a/src/TextClass.cpp b/src/TextClass.cpp index df8aebeef9..f012595687 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 = 68; //spitz: New layout tag AddToCiteEngine +int const LAYOUT_FORMAT = 69; //spitz: New argument type listpreamble // Layout format for the current lyx file format. Controls which format is diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp index df1344e626..ba7031dab3 100644 --- a/src/insets/InsetArgument.cpp +++ b/src/insets/InsetArgument.cpp @@ -314,7 +314,8 @@ void InsetArgument::latexArgument(otexstream & os, runparams.pass_thru = isPassThru(); InsetText::latex(ots, runparams); TexString ts = ots.release(); - bool const add_braces = ldelim != "{" && support::contains(ts.str, rdelim); + bool const add_braces = !ldelim.empty() && ldelim != "{" + && support::contains(ts.str, rdelim); os << ldelim; if (add_braces) os << '{'; diff --git a/src/output_latex.cpp b/src/output_latex.cpp index d66279459a..0fd9d01e69 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -290,6 +290,14 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, << "}\n"; } else os << from_ascii(style.latexparam()) << '\n'; + if (style.latextype == LATEX_BIB_ENVIRONMENT + || style.latextype == LATEX_ITEM_ENVIRONMENT + || style.latextype == LATEX_LIST_ENVIRONMENT) { + OutputParams rp = runparams; + rp.local_font = &pit->getFirstFontSettings(bparams); + latexArgInsets(paragraphs, pit, os, rp, style.listpreamble(), + "listpreamble:"); + } } data.style = &style; @@ -459,15 +467,21 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX latexargs.find(ins->name()); if (lait != latexargs.end()) { Layout::latexarg arg = (*lait).second; - docstring ldelim = arg.mandatory ? + docstring ldelim; + docstring rdelim; + if (!arg.nodelims) { + ldelim = arg.mandatory ? from_ascii("{") : from_ascii("["); - docstring rdelim = arg.mandatory ? + rdelim = arg.mandatory ? from_ascii("}") : from_ascii("]"); + } if (!arg.ldelim.empty()) ldelim = arg.ldelim; if (!arg.rdelim.empty()) rdelim = arg.rdelim; ins->latexArgument(os, runparams, ldelim, rdelim, arg.presetarg); + if (prefix == "listpreamble:") + os << breakln; inserted = true; } } diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index 0dd0861ad1..52f52b84d1 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -49,6 +49,7 @@ Format LaTeX feature LyX feature 556 Bib files encoding \begin_inset CommandInset bibtex Biblatex: bibencoding= [latex name] encoding= [lyx name] BibTeX: \bgroup\inputencoding{}...\egroup +563 InsetArgument listpreamble: All content between \begin{env} and first \item of a list diff --git a/src/version.h b/src/version.h index b6e6d398e5..452cec3203 100644 --- a/src/version.h +++ b/src/version.h @@ -32,8 +32,8 @@ extern char const * const lyx_version_info; // Do not remove the comment below, so we get merge conflict in // independent branches. Instead add your own. -#define LYX_FORMAT_LYX 562 // spitz: l7n info inset -#define LYX_FORMAT_TEX2LYX 562 +#define LYX_FORMAT_LYX 563 // spitz: listpreamble arguments +#define LYX_FORMAT_TEX2LYX 563 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX #ifndef _MSC_VER