diff --git a/ChangeLog b/ChangeLog index 5985a2b83c..e855d817a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-03-27 Jean-Marc Lasgouttes + + * lib/layouts/svjog.layout: new file, for Springer-Verlag Journal + of Geodesy (from Martin Vermeer) + + * lib/layouts/svjour.inc: include file for the Springer svjour + class. It can be used to support journals other than JoG. + + * lib/Makefile.am: use $(DESTDIR) make variable (from Arkadiusz + Miskiewicz ) + * lib/reLyX/Makefile.am: ditto. + 2000-03-27 Juergen Vigna * src/insets/insettext.C: added Cut/Copy/Paste inside insets, diff --git a/lib/Makefile.am b/lib/Makefile.am index 335a5d7313..793cd02e0b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -32,13 +32,13 @@ EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \ libinstalldirs: for dir in $(LYXLIBDIRS) ; do \ - $(mkinstalldirs) $(pkgdatadir)/$$dir ; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ; \ done install-data-local: libinstalldirs files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \ for i in $${files} ; do \ - $(INSTALL_DATA) ${srcdir}/$$i $(pkgdatadir)/$$i ; \ + $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \ done dist-hook: diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout new file mode 100644 index 0000000000..47239a5e22 --- /dev/null +++ b/lib/layouts/svjog.layout @@ -0,0 +1,53 @@ +#% Do not delete the line below; configure depends on this +# \DeclareLaTeXClass[svjour,svjog.clo]{article (Springer - svjour/jog)} +# svjour/jog (article) textclass definition file. +# for Springer Verlag Journal of Geodesy. +# -------- +# +# Taken from initial LyX source code +# Author : Matthias Ettrich +# Transposed by Pascal André +# Heavily modified and enhanced by serveral developers. +# +# -------- +# ejour2 made originally by Martin Vermeer based on article.layout. +# Modified for LyX 12 by Jean-Marc Lasgouttes and MV. +# +# Adapted to svjour/jog (new 1999 Springer LaTeX2e classes) by +# MV in 2000. +# +# General textclass parameters +# (jog) ? +# +# see www.springer.de/author/tex/help-journals.html for class files +# +# The standard Springer Journal sections +Input svjour.inc + +ClassOptions + Other jog +End + +# Abstract style definition +Style Abstract + Margin First_Dynamic + LatexType Command + LatexName abstract + Newline 1 + NextNoIndent 0 + ParIndent MM + LabelSep xx + ItemSep 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0 + Align Block + AlignPossible Block, Left + LabelType Top_Environment + LabelString Abstract. + + # label font definition + LabelFont + Series Bold + EndFont +End diff --git a/lib/layouts/svjour.inc b/lib/layouts/svjour.inc new file mode 100644 index 0000000000..496313e660 --- /dev/null +++ b/lib/layouts/svjour.inc @@ -0,0 +1,515 @@ +# svjour (article) textclass definition file for inclusion. +# for Springer Verlag journals +# -------- +# +# Taken from initial LyX source code +# Author : Matthias Ettrich +# Transposed by Pascal André +# Heavily modified and enhanced by serveral developers. +# +# -------- +# ejour2 made originally by Martin Vermeer based on article.layout. +# Modified for LyX 12 by Jean-Marc Lasgouttes and MV. +# +# Adapted for new svjour LaTeX2e classes published by Springer in 1999; +# work done by MV in 2000. +# +# see www.springer.de/author/tex/help-journals.html for class files +# +# General textclass parameters +Columns 2 +Sides 1 +PageStyle Plain +MaxCounter Counter_Section +ProvidesAmsmath 1 + +# Standard style definition +Style Standard + Margin Static + LatexType Paragraph + LatexName dummy + ParIndent MM + ParSkip 0.4 + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label +End + +# The standard sections +Input stdsections.inc + +# Section style definition +Style Section + # standard font definition + Font + Series Medium + Series Bold + Size Normal + EndFont +End + +# Subsection style definition +Style Subsection + Font + Series Medium + Shape Italic + Size Normal + EndFont +End + +# Subsubsection style definition +Style Subsubsection + # standard font definition + Font + Series Medium + Shape Up + Size Normal + EndFont +End + +# Paragraph style definition +Style Paragraph +# standard font definition + Font + Series Medium + Shape Italic + Size Normal + EndFont +End + +# Subparagraph style definition +Style Subparagraph + # standard font definition + Font + Series Medium + Shape Up + Size Normal + EndFont +End + +# Now define the starred versions from the normal ones. +Input stdstarsections.inc + +# Remove the ones that we do not want +NoStyle Part +NoStyle Part* +NoStyle Chapter +NoStyle Chapter* + +# Some standard things +Input stdlayouts.inc +Input stdlists.inc + +# Headnote style definition +Style Headnote + Margin Static + LatexType Command + InTitle 1 + LatexName headnote + NextNoIndent 1 + LeftMargin "HeadNote (optional):xxx" + LabelSep xxx + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + Align Left + AlignPossible Left + LabelType Static + LabelString "Headnote (optional): " + + # standard font definition + LabelFont + Series Bold + Shape Italic + Color Red + EndFont + +End + +# Dedication style definition (optional) +Style Dedication + CopyStyle Headnote + LatexName dedication + LeftMargin Dedication:xxx + LabelString Dedication: +End + +# Title style definition +Style Title + Margin Static + LatexType Command + InTitle 1 + LatexName title + NextNoIndent 1 + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + Align Left + AlignPossible Block, Center, Left, Right, Center + LabelType No_Label + Fill_Top 1 + Fill_Bottom 1 + + # standard font definition + Font + Family Sans + Series Bold + Size Largest + EndFont + +End + +# Subtitle style definition +Style Subtitle + Margin Static + LatexType Command + InTitle 1 + LatexName subtitle + NextNoIndent 1 + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 0 + ParSep 0 + Align Left + AlignPossible Left + LabelType No_Label + + # standard font definition + Font + Family Sans + Series Bold + Size Large + EndFont + +End + +# Title_Running style definition +Style Running_LaTeX_Title + CopyStyle Headnote + LatexName titlerunning + LeftMargin "Running title:xxx" + LabelString "Running title: " +End + +# Author style definition +Style Author + Margin Static + LatexType Command + InTitle 1 + LatexName author + NextNoIndent 1 + ParSkip 0.4 + TopSep 0.7 + BottomSep 0.7 + ItemSep 0 + ParSep 0 + Align Left + AlignPossible Left + LabelType No_Label + + # standard font definition + Font + Series Bold + Shape Italic + EndFont + +End + +# AuthorRunning style definition +Style Author_Running + CopyStyle Headnote + LatexName authorrunning + LeftMargin "Author Running:xxx" + LabelString "Author Running: " +End + +# Institute style definition +Style Institute + Margin Static + LatexType Command + InTitle 1 + LatexName institute + NextNoIndent 1 + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + Align Left + AlignPossible Left + LabelType No_Label + + # Std. font definition + Font + Size Small + EndFont + +End + +Style Date + CopyStyle Institute + LatexName date +End + +# +# Correspondence address style definition +Style Mail + CopyStyle Headnote + LatexName mail + LeftMargin "Corr Author:xx." + LabelString "Corr Author: " +End + +Style Offprints + CopyStyle Headnote + LatexName offprints + LeftMargin "Offprints:xx." + LabelString "Offprints: " +End + +# Abstract style definition +Style Abstract + Margin First_Dynamic + LatexType Environment + LatexName abstract + NextNoIndent 0 + ParIndent MM + LabelSep xx + ItemSep 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0 + Align Block + AlignPossible Block, Left + LabelType Top_Environment + LabelString Abstract. + + # label font definition + LabelFont + Series Bold + EndFont +End + +# Keywords style definition +Style Keywords + Margin First_Dynamic + LatexType Command + LatexName keywords + NextNoIndent 0 + ParIndent MM + LabelSep xx + ItemSep 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString "Key Words: " + + # label font definition + LabelFont + Series Bold + EndFont +End + +# Acknowledgement(s) style definitions +Style Acknowledgements + Margin First_Dynamic + LatexType Environment + LatexName acknowledgements + NextNoIndent 0 + ParIndent MM + LabelSep xx + ItemSep 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString Acknowledgements. + + # font & label font definition + Font + Size Small + EndFont + + LabelFont + Shape Italic + Size Small + EndFont +End + +Style Acknowledgement + CopyStyle Acknowledgements + LatexName acknowledgement + LabelString Acknowledgement. +End + +# +# Bibliography style definition +Style Bibliography + Margin First_Dynamic + LatexType Item_Environment + LatexName thebibliography + NextNoIndent 1 + LeftMargin MM + ParSkip 0.4 + ItemSep 0 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.5 + Align Block + AlignPossible Block, Left + LabelType Bibliography + LabelString References + LabelBottomSep 0.7 + + # label font definition + LabelFont + Series Bold + EndFont + +End + +# Mathematics-like definitions: + +Style Claim + Margin First_Dynamic + LatexType Environment + LatexName claim + NextNoIndent 0 + ParIndent MM + LabelSep xx + ItemSep 0 + TopSep 0.5 + BottomSep 0.5 + ParSep 0 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString Claim. + + # font & label font definition + + LabelFont + Shape Italic + EndFont + +End + +Style Conjecture + CopyStyle Claim + LatexName conjecture + LabelString "Conjecture #. " +End + +Style Corollary + CopyStyle Claim + LatexName corollary + LabelString "Corollary #. " + + # font & label font definition + Font + Shape Italic + EndFont + + LabelFont + Shape Up + Series Bold + EndFont + +End + +Style Definition + CopyStyle Corollary + LatexName definition + LabelString "Definition #. " +End + +Style Example + CopyStyle Claim + LatexName example + LabelString "Example #. " +End + +Style Exercise + CopyStyle Claim + LatexName exercise + LabelString "Exercise #. " + + # font & label font definition + + LabelFont + Shape Up + Series Bold + EndFont + +End + +Style Lemma + CopyStyle Corollary + LatexName lemma + LabelString "Lemma #. " +End + +Style Note + CopyStyle Claim + LatexName note + LabelString "Note #. " +End + +Style Problem + CopyStyle Exercise + LatexName problem + LabelString "Problem #. " +End + +Style Proof + CopyStyle Claim + LatexName proof + LabelString "Proof. " +End + +Style Property + CopyStyle Claim + LatexName property + LabelString "Property #. " +End + +Style Proposition + CopyStyle Claim + LatexName proposition + LabelString "Proposition_#. " +End + +Style Question + CopyStyle Claim + LatexName question + LabelString "Question #. " +End + +Style Remark + CopyStyle Claim + LatexName remark + LabelString "Remark #. " +End + +Style Solution + CopyStyle Exercise + LatexName solution + LabelString "Solution #. " +End + +Style Theorem + CopyStyle Corollary + LatexName theorem + LabelString "Theorem #. " +End + +#Finally a few older definitions for compatibility +Input obsolete.inc + diff --git a/lib/reLyX/Makefile.am b/lib/reLyX/Makefile.am index 3d57256052..1e5e5054ef 100644 --- a/lib/reLyX/Makefile.am +++ b/lib/reLyX/Makefile.am @@ -18,11 +18,11 @@ reLyX.1: libinstalldirs: for dir in $(LYXDATADIRS) ; do \ - $(mkinstalldirs) $(pkgdatadir)/$$dir ; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ; \ done install-data-local: libinstalldirs files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \ for i in $${files} ; do \ - $(INSTALL_DATA) ${srcdir}/$$i $(pkgdatadir)/reLyX/$$i ; \ + $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/reLyX/$$i ; \ done