From: Jean-Marc Lasgouttes Date: Wed, 27 Mar 2002 12:27:17 +0000 (+0000) Subject: new classes from herbert, units patch from herbert, grace file export fix X-Git-Tag: 1.6.10~19548 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=78f2a7a19ed70fc077f380cf136f9aaaa40ead48;p=lyx.git new classes from herbert, units patch from herbert, grace file export fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3853 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/ChangeLog b/ChangeLog index 9b358bb448..e167179918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-03-27 Jean-Marc Lasgouttes + * NEWS: small update + * MAINTAINERS: removed 2002-03-26 Jean-Marc Lasgouttes diff --git a/NEWS b/NEWS index 6a250bd380..0e24d958a4 100644 --- a/NEWS +++ b/NEWS @@ -103,13 +103,15 @@ Other changes include: - Updated documentation +- a few more document classes for journals: dtk, ltugboat and svprobth. + - Support for setting bookmarks and jumping to them - It is possible to cycle between a label and its references. - Preliminary support for multiple bibliographies -- Babel can be disabled when using the default language +- Babel can be disabled - A thesaurus facility (English only) diff --git a/lib/ChangeLog b/lib/ChangeLog index fbbf3553e8..d8da981a45 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,15 @@ +2002-03-27 Herbert Voss + + * layouts/ltugboat.layout: + * layouts/dtk.layout: new layouts. + + * doc/LaTeXConfig.lyx.in: add description for layouts + dtk and ltugboat + +2002-03-27 Marco Morandini + + * configure.m4: fix grace to eps converter + 2002-03-19 Kayvan A. Sylvan * examples/listerrors.lyx: Fixed to run with python-1.5 as well diff --git a/lib/configure.m4 b/lib/configure.m4 index e03b7e0aad..addc8a8d40 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -504,7 +504,7 @@ cat >$outfile < 2001/08/13 +# +# General textclass parameters +Columns 1 +Sides 2 +SecNumDepth -1 #no counting +TocDepth -1 +MaxCounter Counter_EnumI #no counting of sections +# +ClassOptions + FontSize default #only 10pt in fact of A5 + PageStyle "" # controlled by class +End +# +DefaultFont # only for screen + Family Roman + Series Medium + Shape Up + Size Normal + Color None +EndFont +# +# Standard style definition +# +Style Standard + Margin Static + LatexType Paragraph + LatexName dummy # no special latex env + ParSkip 0.5 # default + ParSep 0.5 # default + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label +End +# +# +Input stdlists.inc +Input stdsections.inc +Input stdstarsections.inc +# +NoStyle Chapter +NoStyle Chapter* +# +Input stdtitle.inc +Input stdstruct.inc +Input stdlayouts.inc +# no lyxmacros! + + diff --git a/lib/layouts/ltugboat.layout b/lib/layouts/ltugboat.layout new file mode 100644 index 0000000000..0642a48502 --- /dev/null +++ b/lib/layouts/ltugboat.layout @@ -0,0 +1,213 @@ +#% Do not delete the line below; configure depends on this +# \DeclareLaTeXClass[ltugboat]{article (tugboat)} +# The tugboat journal (TUGboat) textclass definition file. +# Journal of the TeX User Group http://www.tug.org +# Author : Herbert Voss 2001/08/13 +# +# General textclass parameters +Columns 2 +Sides 2 +#SecNumDepth #no counting +#TocDepth -1 +MaxCounter Counter_Section +# +ClassOptions + FontSize default #only 11pt + PageStyle "" # controlled by class +End +# +DefaultFont # only for screen + Family Roman + Series Medium + Shape Up + Size Normal + Color None +EndFont +# +# +# Standard style definition +# +Style Standard + Margin Static + LatexType Paragraph + LatexName dummy # no special latex env + ParIndent MM + ParSkip 0.5 # default + ParSep 0.5 # default + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label +End +# +# +Input stdlists.inc + +# Section style definition +Style Section + Margin Dynamic + LatexType Command + LatexName section + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + Align Block + AlignPossible Block, Left + LabelType Counter_Section + + # standard font definition + Font + Series Bold + Size Normal + EndFont + +End + +# Subsection style definition +Style Subsection + Margin Dynamic + LatexType Command + LatexName subsection + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 0.9 + BottomSep 0.5 + ParSep 0.5 + Align Block + AlignPossible Block, Left + LabelType Counter_Subsection + # standard font definition + Font + Series Bold + Size Normal + EndFont +End + + +# Subsubsection style definition +Style Subsubsection + Margin Dynamic + LatexType Command + LatexName subsubsection + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 0.7 + BottomSep 0.4 + ParSep 0.4 + Align Block + AlignPossible Block, Left + LabelType Counter_SubSubSection + + # standard font definition + Font + Series Bold + Size Normal + EndFont + +End + +# Paragraph style definition +Style Paragraph + Margin Dynamic + LatexType Command + LatexName paragraph + NeedProtect 1 + NextNoIndent 1 + LabelSep xxx + ParSkip 0.4 + TopSep 0.4 + BottomSep 0 + ParSep 0.4 + Align Block + AlignPossible Block, Left + LabelType Counter_Paragraph + + # standard font definition + Font + Series Bold + Size Normal + EndFont +End + + +#Input stdstarsections.inc +# +Input stdstruct.inc +Input stdlayouts.inc +# +# Create and Overwrite some styles +# +# Title style definition +Style Title + Margin Static + LatexType Command + InTitle 1 + LatexName title + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 1 + ParSep 1 + Align Left + AlignPossible Left + LabelType No_Label + # standard font definition + TextFont + Series Bold + Size Normal + EndFont +End + +# Author style definition +Style Author + Margin Static + LatexType Command + InTitle 1 + LatexName author + LabelSep xxx + ParSkip 0.4 + TopSep 1.3 + BottomSep 0.7 + ParSep 0.7 + LeftMargin MM + Align Left + AlignPossible Left + LabelType No_Label +End +# +# +# Abstract style definition +Style Abstract + Margin Static + LatexType Environment + LatexName abstract + NextNoIndent 1 + LeftMargin "" + RightMargin "" + ParIndent "" + ItemSep 0 + TopSep 1.5 + BottomSep 1.5 + ParSep 0 + Align Block + AlignPossible Block + LabelType Top_Environment + LabelString Abstract + LabelBottomSep 0.5 + # standard font definition + TextFont + Size Normal + EndFont + # label font definition + LabelFont + Size Normal + Series Bold + EndFont +End diff --git a/po/POTFILES.in b/po/POTFILES.in index fd8f31dca7..e9dce5852a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,6 +10,7 @@ src/CutAndPaste.C src/debug.C src/exporter.C src/ext_l10n.h +src/FloatList.C src/FontLoader.C src/frontends/controllers/biblio.C src/frontends/controllers/ButtonController.h @@ -28,11 +29,6 @@ src/frontends/controllers/ControlTexinfo.C src/frontends/controllers/ControlThesaurus.C src/frontends/controllers/ControlVCLog.C src/frontends/controllers/helper_funcs.C -src/frontends/gnome/FormCitation.C -src/frontends/gnome/FormIndex.C -src/frontends/gnome/FormPrint.C -src/frontends/gnome/FormRef.C -src/frontends/gnome/FormToc.C src/frontends/qt2/Alert_pimpl.C src/frontends/qt2/FileDialog.C src/frontends/qt2/lengthcombo.C diff --git a/src/ChangeLog b/src/ChangeLog index 2cef4f66b6..93cff1cac0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-03-27 Herbert Voss + + * lengthcommon.C: change c%, l%, p% t% to col%, line%, page% + and text% + 2002-03-27 Jean-Marc Lasgouttes * bufferview_funcs.C (currentState): only show paragraph number diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index bcc825a94a..d2fd354ec7 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2002-03-27 Herbert Voss + + * xforms_helpers.h: + * FormGraphics.C: change c%, l%, p% t% to col%, line%, page% + and text% + 2002-03-27 Angus Leeming * MathsSymbols.[Ch]: remove #include "bmtable.h" & "FormMathsPanel.h". diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index cee1b1ed63..abe5add5bc 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -522,7 +522,7 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long) } else if (ob == lyxview_->button_latex_values) { if (contains(fl_get_choice_text(size_->choice_width),'%')) Alert::alert(_("Warning!"), - _("The units t%, p%, c% and l% are not allowed here."), + _("The units text%, page%, col% and line% are not allowed here."), _("Cannot use the values from LaTeX size!")); else { LyXLength dummy = diff --git a/src/frontends/xforms/xforms_helpers.h b/src/frontends/xforms/xforms_helpers.h index b2e0e16285..5dc5cfac03 100644 --- a/src/frontends/xforms/xforms_helpers.h +++ b/src/frontends/xforms/xforms_helpers.h @@ -25,7 +25,7 @@ class LyXLength; // what we always need for lengths string const choice_Length_All = - "cm|mm|in|t%%|c%%|p%%|l%%|ex|em|pt|sp|bp|dd|pc|cc|mu"; + "cm|mm|in|text%%|col%%|page%%|line%%|ex|em|pt|sp|bp|dd|pc|cc|mu"; string const choice_Length_WithUnit = "cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu"; // all with a Unit diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 4c57b1d8ab..c67460b7a2 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2002-03-27 Herbert Voss + + * insetgraphicsparam.C: change c%, p% to col%, page% + 2002-03-27 Jean-Marc Lasgouttes * insetspecialchar.C (isLineSeparator): disable the nice code to diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C index e4e77d960c..de44375bb5 100644 --- a/src/insets/insetgraphicsParams.C +++ b/src/insets/insetgraphicsParams.C @@ -53,9 +53,9 @@ LyXLength convertResizeValue(string const token, LyXLex & lex) { else if (token == "inch") return (LyXLength(value+"in")); else if (token == "percentOfColumn") - return (LyXLength(value+"c%")); + return (LyXLength(value+"col%")); else if (token == "percentOfPage") - return (LyXLength(value+"p%")); + return (LyXLength(value+"page%")); else return LyXLength("0pt"); // nothing with figinset } diff --git a/src/lengthcommon.C b/src/lengthcommon.C index 6f56497cbf..3324a53bf3 100644 --- a/src/lengthcommon.C +++ b/src/lengthcommon.C @@ -5,10 +5,10 @@ int const num_units = LyXLength::UNIT_NONE; // I am not sure if "mu" should be possible to select (Lgb) -char const * unit_name[num_units] = { "sp", "pt", "bp", "dd", - "mm", "pc", "cc", "cm", - "in", "ex", "em", "mu", - "t%", "c%", "p%", "l%" }; +char const * unit_name[num_units] = { + "sp", "pt", "bp", "dd", "mm", "pc", "cc", "cm", + "in", "ex", "em", "mu", + "text%", "col%", "page%", "line%" }; LyXLength::UNIT unitFromString(string const & data)