From 5c17c617f712d3bae2949d6214471ac8a63a8459 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 23 Jun 2003 13:18:56 +0000 Subject: [PATCH] do not add non-exisitent icons in toolbar (qt); honor the LYX_DIR_14x variable; set LyX version in documents to 1.4 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7204 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ lib/ChangeLog | 8 ++++++++ lib/layouts/elsart.layout | 34 +++++++++++++++++++++++++++++++ lib/reLyX/reLyX.in | 4 ++-- lyx.man | 10 ++++----- po/POTFILES.in | 3 --- src/ChangeLog | 6 ++++++ src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/Toolbar_pimpl.C | 2 ++ src/lyx_main.C | 16 +++++++-------- src/version.C.in | 2 +- 11 files changed, 74 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index be9b5247c7..625fad813a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-06-23 Jean-Marc Lasgouttes + + * lyx.man: change env variable from foo_13x to foo_14x + 2003-05-07 Lars Gullik Bjønnes * Makefile.am: allow boost as system lib diff --git a/lib/ChangeLog b/lib/ChangeLog index 00f58d4560..5ac96e920c 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,11 @@ +2003-04-15 Rod Pinna + + * layouts/elsart.layout: added "Proof" environment + +2003-06-23 Jean-Marc Lasgouttes + + * reLyX/reLyX.in: honor variable LYX_DIR_14x + 2003-06-20 Angus Leeming * scripts/TeXFiles.sh (types): Generalise the sed that tries to diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout index 62b334ddf9..970022c2b2 100644 --- a/lib/layouts/elsart.layout +++ b/lib/layouts/elsart.layout @@ -16,6 +16,7 @@ # modified 2002-04-02 Herbert Voss # for use of BeginTitle/EndTitle # modified 2003-03-11 JMarc for use of TitleLatexType/TitleLatexName +# modified 2003-04-10 Rod Pinna - added proof env. sent to me by Stacy Prowell # General textclass parameters Columns 1 @@ -237,6 +238,7 @@ End # The environments defined are : # - Theorem +# - Proof # - Corollary # - Lemma # - Proposition @@ -286,6 +288,38 @@ Style Theorem End +# Proof style declaration - from email by Stacy Prowell (sprowell@cs.utk.edu) +Style Proof + Margin First_Dynamic + LatexType Environment + # elsart defines the unusual environment pf for proofs. + LatexName pf + NextNoIndent 1 + LabelSep xx + ParIndent MMM + ParSkip 0.4 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Static + # make the label all caps, like it is in the output. + LabelString "PROOF." + + # standard font definition + Font + Shape Up + Size Normal + EndFont + + # label font definition + LabelFont + Series Bold + EndFont +End + # Lemma-numbered style declaration Style Lemma CopyStyle Theorem diff --git a/lib/reLyX/reLyX.in b/lib/reLyX/reLyX.in index 846188a4a2..264b6e176d 100644 --- a/lib/reLyX/reLyX.in +++ b/lib/reLyX/reLyX.in @@ -40,8 +40,8 @@ my $dir = &dirname($name); push @maybe_dir, "$dir"; # case 2: ran make but not make install. push @maybe_dir, "$dir/$srcdir"; -# case 3: environment variable LYX_DIR_13x has been set -if (exists $ENV{LYX_DIR_13x}) { push @maybe_dir, "$ENV{LYX_DIR_13x}/reLyX"}; +# case 3: environment variable LYX_DIR_14x has been set +if (exists $ENV{LYX_DIR_14x}) { push @maybe_dir, "$ENV{LYX_DIR_14x}/reLyX"}; # case 4: e.g., reLyX in /opt/bin, $mainscript in /opt/share/lyx/reLyX push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4 # case 5: configure figured out where $mainscript is diff --git a/lyx.man b/lyx.man index 6311d4a734..f33ec4f755 100644 --- a/lyx.man +++ b/lyx.man @@ -3,7 +3,7 @@ .\" .\" tbl lyx.1 | nroff -man | less .\" -.TH LYX 1 "Jan 2003" "Version 1.3" "LyX 1.3" +.TH LYX 1 "Jan 2003" "Version 1.4" "LyX 1.4" .SH NAME lyx \- A Document Processor .\" @@ -125,7 +125,7 @@ specifies the application name under which resources are to be obtained, rather than the default executable file name. .SH ENVIRONMENT .TP -.B LYX_DIR_13x +.B LYX_DIR_14x can be used to specify which system directory to use. .PP The system directory is determined by searching for the file @@ -133,7 +133,7 @@ The system directory is determined by searching for the file .br 1) -sysdir command line parameter .br -2) LYX_DIR_13x environment variable +2) LYX_DIR_14x environment variable .br 3) Maybe /TOP_SRCDIR/lib .br @@ -141,14 +141,14 @@ The system directory is determined by searching for the file .br 5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree) .TP -.B LYX_USERDIR_13x +.B LYX_USERDIR_14x can be used to specify which user directory to use. .PP The user directory is, in order of precedence: .br 1) -userdir command line parameter .br -2) LYX_USERDIR_13x environment variable +2) LYX_USERDIR_14x environment variable .br 3) $HOME/. if no explicit setting is made diff --git a/po/POTFILES.in b/po/POTFILES.in index 9448d1558d..22ad9bb0eb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -49,7 +49,6 @@ src/frontends/qt2/QDelimiterDialog.C src/frontends/qt2/QDocument.C src/frontends/qt2/QDocumentDialog.C src/frontends/qt2/QERT.C -src/frontends/qt2/QError.C src/frontends/qt2/QExternal.C src/frontends/qt2/QExternalDialog.C src/frontends/qt2/QFloat.C @@ -95,7 +94,6 @@ src/frontends/xforms/FormCitation.C src/frontends/xforms/FormDialogView.C src/frontends/xforms/FormDocument.C src/frontends/xforms/FormERT.C -src/frontends/xforms/FormError.C src/frontends/xforms/FormErrorList.C src/frontends/xforms/FormExternal.C src/frontends/xforms/FormFiledialog.C @@ -138,7 +136,6 @@ src/insets/inset.C src/insets/insetbibtex.C src/insets/insetcaption.C src/insets/insetenv.C -src/insets/inseterror.C src/insets/insetert.C src/insets/insetexternal.C src/insets/insetfloat.C diff --git a/src/ChangeLog b/src/ChangeLog index f76114582f..1de7eee2ad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-06-23 Jean-Marc Lasgouttes + + * lyx_main.C (init): honor LYX_DIR_14x and LYX_USERDIR_14x + + * version.C.in: change docversion to 1.4 + 2003-06-22 Alfredo Braunstein * buffer.C: fix a bug just introduced diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 9f18671b05..7c68d9e7ca 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2003-06-12 Jean-Marc Lasgouttes + + * Toolbar_pimpl.C (add): do not add unknown lfuns + 2003-06-21 Alfredo Braunstein * QError.[Ch]: diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C index e8a3473cd4..76fc851eaa 100644 --- a/src/frontends/qt2/Toolbar_pimpl.C +++ b/src/frontends/qt2/Toolbar_pimpl.C @@ -264,6 +264,8 @@ void Toolbar::Pimpl::add(QToolBar * tb, int action, string const & tooltip) tb->setHorizontalStretchable(true); break; default: { + if (owner_->getLyXFunc().getStatus(action).unknown()) + break; QPixmap p = QPixmap(toolbarbackend.getIcon(action).c_str()); QToolButton * button = new QToolButton(p, toqstr(tooltip), "", diff --git a/src/lyx_main.C b/src/lyx_main.C index dee88dd305..45936db479 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -258,7 +258,7 @@ void LyX::init(bool gui) // Directories are searched in this order: // 1) -sysdir command line parameter - // 2) LYX_DIR_13x environment variable + // 2) LYX_DIR_14x environment variable // 3) Maybe /TOP_SRCDIR/lib // 4) /../share// // 4a) repeat 4 after following the Symlink if // If we had a command line switch, user_lyxdir is already set bool explicit_userdir = true; if (user_lyxdir.empty()) { - // LYX_USERDIR_13x environment variable - user_lyxdir = GetEnvPath("LYX_USERDIR_13x"); + // LYX_USERDIR_14x environment variable + user_lyxdir = GetEnvPath("LYX_USERDIR_14x"); // default behaviour if (user_lyxdir.empty()) diff --git a/src/version.C.in b/src/version.C.in index 244ed001c7..c8e81b0c68 100644 --- a/src/version.C.in +++ b/src/version.C.in @@ -16,7 +16,7 @@ char const * lyx_version = "@VERSION@"; char const * lyx_release_date = "Thu, Jan 30, 2003"; /// This version string is intended to be used in files created by LyX -char const * lyx_docversion = "LyX 1.3"; +char const * lyx_docversion = "LyX 1.4"; /// This is the version information shown by 'lyx -version' char const * lyx_version_info = "@VERSION_INFO@"; -- 2.39.2