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 9b358bb448d2216528c3369c426924f474ec690f..e167179918bc8fc3bb261e6800358d869c9ea129 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-03-27  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
+       * NEWS: small update
+
        * MAINTAINERS: removed
 
 2002-03-26  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>

diff --git a/NEWS b/NEWS
index 6a250bd380677656bd6d5d4b555afea655fe4119..0e24d958a4df54dfeb1c0cdd454975ab71862684 100644 (file)
--- 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 fbbf3553e8a4d5cb4da10044447a9525d989e7d4..d8da981a455f1c5fceb048a5f66d72fc3b99a1db 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,15 @@
+2002-03-27 Herbert Voss <voss@perce.de>
+
+       * layouts/ltugboat.layout:
+       * layouts/dtk.layout: new layouts.
+       
+       * doc/LaTeXConfig.lyx.in: add description for layouts
+       dtk and ltugboat
+
+2002-03-27  Marco Morandini  <morandini@aero.polimi.it>
+
+       * configure.m4: fix grace to eps converter
+
 2002-03-19  Kayvan A. Sylvan  <kayvan@sylvan.com>
 
        * examples/listerrors.lyx: Fixed to run with python-1.5 as well

diff --git a/lib/configure.m4 b/lib/configure.m4
index e03b7e0aad73e0bb651387a339841b78319e8bdf..addc8a8d40678dab47126a380a300f99c52f00fd 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -504,7 +504,7 @@ cat >$outfile <<EOF
 \\converter html latex "$html_to_latex_command" ""
 \\converter word latex "$word_to_latex_command" ""
 
-\\converter agr  eps "xmgrace -hardcopy -hdevice EPS \$\$i" ""
+\\converter agr  eps "xmgrace -hardcopy -printfile \$\$o -hdevice EPS \$\$i" ""
 \\converter bmp  eps "$bmp_to_eps" ""
 \\converter fits  eps "$fits_to_eps" ""
 \\converter gif  eps "$gif_to_eps" ""

diff --git a/lib/doc/LaTeXConfig.lyx.in b/lib/doc/LaTeXConfig.lyx.in
index cc522adfb61834e12e8ce91ae390113d3bfb5ec1..cebecede1cb9ac765f6f78f58e14dcd92220a050 100644 (file)
--- a/lib/doc/LaTeXConfig.lyx.in
+++ b/lib/doc/LaTeXConfig.lyx.in
@@ -583,6 +583,41 @@ jadetex
  You need the sgmltools v2.0 package installed to use this.
 \layout Subsection
 
+dtk
+\layout Description
+
+Found: @chk_dtk@
+\layout Description
+
+CTAN: 
+\family typewriter 
+usergrps/dante/dtk/
+\layout Description
+
+Notes: The document class 
+\family sans 
+dtk
+\family default 
+ can be used to write articles for the Journal of the German TeX User Group
+ 
+\begin_inset Quotes eld
+\end_inset 
+
+Die TeXnische Komödie
+\begin_inset Quotes erd
+\end_inset 
+
+.
+\layout Description
+
+WWW: 
+\begin_inset LatexCommand
+       \url{http://www.dante.de}
+\end_inset 
+
+
+\layout Subsection
+
 entcs
 \layout Description
 
@@ -1184,11 +1219,45 @@ Svprothe
  is a format suitable for publication in the journal Probability Theory
  and Related Fields.
  For more information, see section 
-\begin_inset LatexCommand \ref{svjog}
+\begin_inset LatexCommand
+       \ref{svjog}
+\end_inset 
+
+.
+\layout Subsection
+
+TUGboat
+\layout Description
+
+Found: @chk_ltugboat@
+\layout Description
+
+CTAN: 
+\family typewriter 
+plain/contrib/tugboat.tar
+\layout Description
 
+Notes: The document class 
+\family sans 
+ltugboat
+\family default 
+ can be used to write articles for the Journal of the TeX User Group 
+\begin_inset Quotes eld
+\end_inset 
+
+TUGboat
+\begin_inset Quotes erd
 \end_inset 
 
 .
+\layout Description
+
+WWW: 
+\begin_inset LatexCommand
+       \url{http://www.tug.org}
+\end_inset 
+
+
 \layout Section
 
 Required packages

diff --git a/lib/layouts/dtk.layout b/lib/layouts/dtk.layout
new file mode 100644 (file)
index 0000000..b8e1405
--- /dev/null
+++ b/lib/layouts/dtk.layout
@@ -0,0 +1,54 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareLaTeXClass[dtk]{article (dtk)}
+# This is the definition file for
+# Die TeXnische Komoedie (dtk), 
+# the journal of the German TeX User Group http://www.dante.de.
+# Author : Herbert Voss <voss@lyx.org> 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 (file)
index 0000000..0642a48
--- /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 <voss@perce.de> 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 fd8f31dca7d1d095c885d7c83ab4131a876f01a5..e9dce5852a9c50394901971e7ef2dc757a6e6f44 100644 (file)
--- 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 2cef4f66b61d8fd780de7684af771963dc1a028e..93cff1cac08963e0d000813c915974e806a70b4c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-27  Herbert Voss  <voss@lyx.org>
+
+       * lengthcommon.C: change c%, l%, p% t% to col%, line%, page%
+       and text% 
+
 2002-03-27  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * bufferview_funcs.C (currentState): only show paragraph number

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index bcc825a94a3cfb988f488747d5dc3f19901b32bb..d2fd354ec72d0911ef80fdd4c30f83926fb1c96f 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-27  Herbert Voss  <voss@lyx.org>
+
+       * xforms_helpers.h:
+       * FormGraphics.C:  change c%, l%, p% t% to col%, line%, page%
+       and text% 
+
 2002-03-27  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * MathsSymbols.[Ch]: remove #include "bmtable.h" & "FormMathsPanel.h".

diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index cee1b1ed6355d9cafcfda1ddf317ab628a20b421..abe5add5bccffd7b2313d2ae8dbe7e9d637c4bd4 100644 (file)
--- 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 b2e0e162858c925613a4fb306bb57fe834e80a4f..5dc5cfac03f562f12ffe401d7cbfcd8295b979c0 100644 (file)
--- 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 4c57b1d8ab209aacffcf6f5f9db6b33490d5e67a..c67460b7a2d18e4386e208d1fec04520d96ec9d1 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-27  Herbert Voss  <voss@lyx.org>
+
+       * insetgraphicsparam.C: change c%, p% to col%, page%
+
 2002-03-27  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * insetspecialchar.C (isLineSeparator): disable the nice code to

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index e4e77d960c3795040c5dc539fae71156b0612130..de44375bb533cae6c12b1a4c28141394918506bc 100644 (file)
--- 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 6f56497cbf4ca8b0954dc0b171df3ed9ceb30585..3324a53bf3819ba5b9fb5175d7d2215e11e3ed5e 100644 (file)
--- 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)