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
This commit is contained in:
Jean-Marc Lasgouttes 2002-03-27 12:27:17 +00:00
parent 04d8b7b72b
commit 78f2a7a19e
15 changed files with 380 additions and 17 deletions

View File

@ -1,5 +1,7 @@
2002-03-27 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-03-27 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* NEWS: small update
* MAINTAINERS: removed * MAINTAINERS: removed
2002-03-26 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-03-26 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>

4
NEWS
View File

@ -103,13 +103,15 @@ Other changes include:
- Updated documentation - Updated documentation
- a few more document classes for journals: dtk, ltugboat and svprobth.
- Support for setting bookmarks and jumping to them - Support for setting bookmarks and jumping to them
- It is possible to cycle between a label and its references. - It is possible to cycle between a label and its references.
- Preliminary support for multiple bibliographies - Preliminary support for multiple bibliographies
- Babel can be disabled when using the default language - Babel can be disabled
- A thesaurus facility (English only) - A thesaurus facility (English only)

View File

@ -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> 2002-03-19 Kayvan A. Sylvan <kayvan@sylvan.com>
* examples/listerrors.lyx: Fixed to run with python-1.5 as well * examples/listerrors.lyx: Fixed to run with python-1.5 as well

View File

@ -504,7 +504,7 @@ cat >$outfile <<EOF
\\converter html latex "$html_to_latex_command" "" \\converter html latex "$html_to_latex_command" ""
\\converter word latex "$word_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 bmp eps "$bmp_to_eps" ""
\\converter fits eps "$fits_to_eps" "" \\converter fits eps "$fits_to_eps" ""
\\converter gif eps "$gif_to_eps" "" \\converter gif eps "$gif_to_eps" ""

View File

@ -583,6 +583,41 @@ jadetex
You need the sgmltools v2.0 package installed to use this. You need the sgmltools v2.0 package installed to use this.
\layout Subsection \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 entcs
\layout Description \layout Description
@ -1184,11 +1219,45 @@ Svprothe
is a format suitable for publication in the journal Probability Theory is a format suitable for publication in the journal Probability Theory
and Related Fields. and Related Fields.
For more information, see section For more information, see section
\begin_inset LatexCommand \ref{svjog} \begin_inset LatexCommand
\ref{svjog}
\end_inset \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 \layout Section
Required packages Required packages

54
lib/layouts/dtk.layout Normal file
View File

@ -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!

213
lib/layouts/ltugboat.layout Normal file
View File

@ -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

View File

@ -10,6 +10,7 @@ src/CutAndPaste.C
src/debug.C src/debug.C
src/exporter.C src/exporter.C
src/ext_l10n.h src/ext_l10n.h
src/FloatList.C
src/FontLoader.C src/FontLoader.C
src/frontends/controllers/biblio.C src/frontends/controllers/biblio.C
src/frontends/controllers/ButtonController.h src/frontends/controllers/ButtonController.h
@ -28,11 +29,6 @@ src/frontends/controllers/ControlTexinfo.C
src/frontends/controllers/ControlThesaurus.C src/frontends/controllers/ControlThesaurus.C
src/frontends/controllers/ControlVCLog.C src/frontends/controllers/ControlVCLog.C
src/frontends/controllers/helper_funcs.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/Alert_pimpl.C
src/frontends/qt2/FileDialog.C src/frontends/qt2/FileDialog.C
src/frontends/qt2/lengthcombo.C src/frontends/qt2/lengthcombo.C

View File

@ -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> 2002-03-27 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* bufferview_funcs.C (currentState): only show paragraph number * bufferview_funcs.C (currentState): only show paragraph number

View File

@ -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> 2002-03-27 Angus Leeming <a.leeming@ic.ac.uk>
* MathsSymbols.[Ch]: remove #include "bmtable.h" & "FormMathsPanel.h". * MathsSymbols.[Ch]: remove #include "bmtable.h" & "FormMathsPanel.h".

View File

@ -522,7 +522,7 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
} else if (ob == lyxview_->button_latex_values) { } else if (ob == lyxview_->button_latex_values) {
if (contains(fl_get_choice_text(size_->choice_width),'%')) if (contains(fl_get_choice_text(size_->choice_width),'%'))
Alert::alert(_("Warning!"), 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!")); _("Cannot use the values from LaTeX size!"));
else { else {
LyXLength dummy = LyXLength dummy =

View File

@ -25,7 +25,7 @@ class LyXLength;
// what we always need for lengths // what we always need for lengths
string const choice_Length_All = 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 = string const choice_Length_WithUnit =
"cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu"; // all with a Unit "cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu"; // all with a Unit

View File

@ -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> 2002-03-27 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insetspecialchar.C (isLineSeparator): disable the nice code to * insetspecialchar.C (isLineSeparator): disable the nice code to

View File

@ -53,9 +53,9 @@ LyXLength convertResizeValue(string const token, LyXLex & lex) {
else if (token == "inch") else if (token == "inch")
return (LyXLength(value+"in")); return (LyXLength(value+"in"));
else if (token == "percentOfColumn") else if (token == "percentOfColumn")
return (LyXLength(value+"c%")); return (LyXLength(value+"col%"));
else if (token == "percentOfPage") else if (token == "percentOfPage")
return (LyXLength(value+"p%")); return (LyXLength(value+"page%"));
else return LyXLength("0pt"); // nothing with figinset else return LyXLength("0pt"); // nothing with figinset
} }

View File

@ -5,10 +5,10 @@
int const num_units = LyXLength::UNIT_NONE; int const num_units = LyXLength::UNIT_NONE;
// I am not sure if "mu" should be possible to select (Lgb) // I am not sure if "mu" should be possible to select (Lgb)
char const * unit_name[num_units] = { "sp", "pt", "bp", "dd", char const * unit_name[num_units] = {
"mm", "pc", "cc", "cm", "sp", "pt", "bp", "dd", "mm", "pc", "cc", "cm",
"in", "ex", "em", "mu", "in", "ex", "em", "mu",
"t%", "c%", "p%", "l%" }; "text%", "col%", "page%", "line%" };
LyXLength::UNIT unitFromString(string const & data) LyXLength::UNIT unitFromString(string const & data)