anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not add non-exisitent icons in toolbar (qt); honor the LYX_DIR_14x variable; set LyX version in documents to 1.4

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7204 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-06-23 13:18:56 +00:00
parent ee4ab70bd4
commit 5c17c617f7
11 changed files with 74 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2003-06-23 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyx.man: change env variable from foo_13x to foo_14x
2003-05-07 Lars Gullik Bjønnes <larsbj@gullik.net> 2003-05-07 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am: allow boost as system lib * Makefile.am: allow boost as system lib

8
lib/ChangeLog
View File

@ -1,3 +1,11 @@
2003-04-15 Rod Pinna <rodney.pinna@uwa.edu.au>
* layouts/elsart.layout: added "Proof" environment
2003-06-23 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* reLyX/reLyX.in: honor variable LYX_DIR_14x
2003-06-20 Angus Leeming <leeming@lyx.org> 2003-06-20 Angus Leeming <leeming@lyx.org>
* scripts/TeXFiles.sh (types): Generalise the sed that tries to * scripts/TeXFiles.sh (types): Generalise the sed that tries to

34
lib/layouts/elsart.layout
View File

@ -16,6 +16,7 @@
# modified 2002-04-02 Herbert Voss <voss@perce.de> # modified 2002-04-02 Herbert Voss <voss@perce.de>
# for use of BeginTitle/EndTitle # for use of BeginTitle/EndTitle
# modified 2003-03-11 JMarc for use of TitleLatexType/TitleLatexName # 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 # General textclass parameters
Columns 1 Columns 1
@ -237,6 +238,7 @@ End
# The environments defined are : # The environments defined are :
# - Theorem # - Theorem
# - Proof
# - Corollary # - Corollary
# - Lemma # - Lemma
# - Proposition # - Proposition
@ -286,6 +288,38 @@ Style Theorem
End 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 # Lemma-numbered style declaration
Style Lemma Style Lemma
CopyStyle Theorem CopyStyle Theorem

4
lib/reLyX/reLyX.in
View File

@ -40,8 +40,8 @@ my $dir = &dirname($name);
push @maybe_dir, "$dir"; push @maybe_dir, "$dir";
# case 2: ran make but not make install. # case 2: ran make but not make install.
push @maybe_dir, "$dir/$srcdir"; push @maybe_dir, "$dir/$srcdir";
# case 3: environment variable LYX_DIR_13x has been set # case 3: environment variable LYX_DIR_14x has been set
if (exists $ENV{LYX_DIR_13x}) { push @maybe_dir, "$ENV{LYX_DIR_13x}/reLyX"}; 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 # case 4: e.g., reLyX in /opt/bin, $mainscript in /opt/share/lyx/reLyX
push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4 push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4
# case 5: configure figured out where $mainscript is # case 5: configure figured out where $mainscript is

10
lyx.man
View File

@ -3,7 +3,7 @@
.\" .\"
.\" tbl lyx.1 | nroff -man | less .\" 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 .SH NAME
lyx \- A Document Processor 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. obtained, rather than the default executable file name.
.SH ENVIRONMENT .SH ENVIRONMENT
.TP .TP
.B LYX_DIR_13x .B LYX_DIR_14x
can be used to specify which system directory to use. can be used to specify which system directory to use.
.PP .PP
The system directory is determined by searching for the file 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 .br
1) -sysdir command line parameter 1) -sysdir command line parameter
.br .br
2) LYX_DIR_13x environment variable 2) LYX_DIR_14x environment variable
.br .br
3) Maybe <path of binary>/TOP_SRCDIR/lib 3) Maybe <path of binary>/TOP_SRCDIR/lib
.br .br
@ -141,14 +141,14 @@ The system directory is determined by searching for the file
.br .br
5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree) 5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree)
.TP .TP
.B LYX_USERDIR_13x .B LYX_USERDIR_14x
can be used to specify which user directory to use. can be used to specify which user directory to use.
.PP .PP
The user directory is, in order of precedence: The user directory is, in order of precedence:
.br .br
1) -userdir command line parameter 1) -userdir command line parameter
.br .br
2) LYX_USERDIR_13x environment variable 2) LYX_USERDIR_14x environment variable
.br .br
3) $HOME/.<name of binary> if no explicit setting is made 3) $HOME/.<name of binary> if no explicit setting is made

3
po/POTFILES.in
View File

@ -49,7 +49,6 @@ src/frontends/qt2/QDelimiterDialog.C
src/frontends/qt2/QDocument.C src/frontends/qt2/QDocument.C
src/frontends/qt2/QDocumentDialog.C src/frontends/qt2/QDocumentDialog.C
src/frontends/qt2/QERT.C src/frontends/qt2/QERT.C
src/frontends/qt2/QError.C
src/frontends/qt2/QExternal.C src/frontends/qt2/QExternal.C
src/frontends/qt2/QExternalDialog.C src/frontends/qt2/QExternalDialog.C
src/frontends/qt2/QFloat.C src/frontends/qt2/QFloat.C
@ -95,7 +94,6 @@ src/frontends/xforms/FormCitation.C
src/frontends/xforms/FormDialogView.C src/frontends/xforms/FormDialogView.C
src/frontends/xforms/FormDocument.C src/frontends/xforms/FormDocument.C
src/frontends/xforms/FormERT.C src/frontends/xforms/FormERT.C
src/frontends/xforms/FormError.C
src/frontends/xforms/FormErrorList.C src/frontends/xforms/FormErrorList.C
src/frontends/xforms/FormExternal.C src/frontends/xforms/FormExternal.C
src/frontends/xforms/FormFiledialog.C src/frontends/xforms/FormFiledialog.C
@ -138,7 +136,6 @@ src/insets/inset.C
src/insets/insetbibtex.C src/insets/insetbibtex.C
src/insets/insetcaption.C src/insets/insetcaption.C
src/insets/insetenv.C src/insets/insetenv.C
src/insets/inseterror.C
src/insets/insetert.C src/insets/insetert.C
src/insets/insetexternal.C src/insets/insetexternal.C
src/insets/insetfloat.C src/insets/insetfloat.C

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2003-06-23 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* 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 <abraunst@libero.it> 2003-06-22 Alfredo Braunstein <abraunst@libero.it>
* buffer.C: fix a bug just introduced * buffer.C: fix a bug just introduced

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2003-06-12 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* Toolbar_pimpl.C (add): do not add unknown lfuns
2003-06-21 Alfredo Braunstein <abraunst@libero.it> 2003-06-21 Alfredo Braunstein <abraunst@libero.it>
* QError.[Ch]: * QError.[Ch]:

2
src/frontends/qt2/Toolbar_pimpl.C
View File

@ -264,6 +264,8 @@ void Toolbar::Pimpl::add(QToolBar * tb, int action, string const & tooltip)
tb->setHorizontalStretchable(true); tb->setHorizontalStretchable(true);
break; break;
default: { default: {
if (owner_->getLyXFunc().getStatus(action).unknown())
break;
QPixmap p = QPixmap(toolbarbackend.getIcon(action).c_str()); QPixmap p = QPixmap(toolbarbackend.getIcon(action).c_str());
QToolButton * button = QToolButton * button =
new QToolButton(p, toqstr(tooltip), "", new QToolButton(p, toqstr(tooltip), "",

16
src/lyx_main.C
View File

@ -258,7 +258,7 @@ void LyX::init(bool gui)
// Directories are searched in this order: // Directories are searched in this order:
// 1) -sysdir command line parameter // 1) -sysdir command line parameter
// 2) LYX_DIR_13x environment variable // 2) LYX_DIR_14x environment variable
// 3) Maybe <path of binary>/TOP_SRCDIR/lib // 3) Maybe <path of binary>/TOP_SRCDIR/lib
// 4) <path of binary>/../share/<name of binary>/ // 4) <path of binary>/../share/<name of binary>/
// 4a) repeat 4 after following the Symlink if <path of // 4a) repeat 4 after following the Symlink if <path of
@ -275,10 +275,10 @@ void LyX::init(bool gui)
if (!system_lyxdir.empty()) if (!system_lyxdir.empty())
searchpath = MakeAbsPath(system_lyxdir) + ';'; searchpath = MakeAbsPath(system_lyxdir) + ';';
string const lyxdir = GetEnvPath("LYX_DIR_13x"); string const lyxdir = GetEnvPath("LYX_DIR_14x");
if (!lyxdir.empty()) { if (!lyxdir.empty()) {
lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl; lyxerr[Debug::INIT] << "LYX_DIR_14x: " << lyxdir << endl;
searchpath += lyxdir + ';'; searchpath += lyxdir + ';';
} }
@ -353,7 +353,7 @@ void LyX::init(bool gui)
// Warn if environment variable is set, but unusable // Warn if environment variable is set, but unusable
if (!lyxdir.empty()) { if (!lyxdir.empty()) {
if (system_lyxdir != NormalizePath(lyxdir)) { if (system_lyxdir != NormalizePath(lyxdir)) {
lyxerr <<_("LYX_DIR_13x environment variable no good.") lyxerr <<_("LYX_DIR_14x environment variable no good.")
<< '\n' << '\n'
<< _("System directory set to: ") << _("System directory set to: ")
<< system_lyxdir << endl; << system_lyxdir << endl;
@ -365,7 +365,7 @@ void LyX::init(bool gui)
if (system_lyxdir == "./") { if (system_lyxdir == "./") {
lyxerr <<_("LyX Warning! Couldn't determine system directory. ") lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
<<_("Try the '-sysdir' command line parameter or ") <<_("Try the '-sysdir' command line parameter or ")
<<_("set the environment variable LYX_DIR_13x to the " <<_("set the environment variable LYX_DIR_14x to the "
"LyX system directory ") "LyX system directory ")
<< _("containing the file `chkconfig.ltx'.") << endl; << _("containing the file `chkconfig.ltx'.") << endl;
if (!path_shown) { if (!path_shown) {
@ -394,15 +394,15 @@ void LyX::init(bool gui)
// Directories are searched in this order: // Directories are searched in this order:
// 1) -userdir command line parameter // 1) -userdir command line parameter
// 2) LYX_USERDIR_13x environment variable // 2) LYX_USERDIR_14x environment variable
// 3) $HOME/.<name of binary> // 3) $HOME/.<name of binary>
// If we had a command line switch, user_lyxdir is already set // If we had a command line switch, user_lyxdir is already set
bool explicit_userdir = true; bool explicit_userdir = true;
if (user_lyxdir.empty()) { if (user_lyxdir.empty()) {
// LYX_USERDIR_13x environment variable // LYX_USERDIR_14x environment variable
user_lyxdir = GetEnvPath("LYX_USERDIR_13x"); user_lyxdir = GetEnvPath("LYX_USERDIR_14x");
// default behaviour // default behaviour
if (user_lyxdir.empty()) if (user_lyxdir.empty())

2
src/version.C.in
View File

@ -16,7 +16,7 @@ char const * lyx_version = "@VERSION@";
char const * lyx_release_date = "Thu, Jan 30, 2003"; char const * lyx_release_date = "Thu, Jan 30, 2003";
/// This version string is intended to be used in files created by LyX /// 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' /// This is the version information shown by 'lyx -version'
char const * lyx_version_info = "@VERSION_INFO@"; char const * lyx_version_info = "@VERSION_INFO@";