anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small tweaks

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@320 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 1999-11-17 15:05:26 +00:00
parent 35df50f78c
commit d41e87f91e
6 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
1999-11-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/lyx_cb.C (RunLinuxDoc): add a cast to please dec cxx.
* src/chset.C: add "using std::ifstream;" to please dec cxx.
* src/lyx_main.C (init), INSTALL.OS2: the environment variable
which is used to point to LyX data is now LYX_DIR_11x.
* lyx.man: convert to a unix text file; small updates.
1999-11-15 Lars Gullik Bjønnes <larsbj@lyx.org> 1999-11-15 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/support/LSubstring.[Ch]: made the second arg of most of the * src/support/LSubstring.[Ch]: made the second arg of most of the

6
INSTALL.OS2
View File

@ -1,5 +1,5 @@
INSTALL.OS2 file for OS/2 version of LyX 1.0.1 INSTALL.OS2 file for OS/2 version of LyX 1.1.3
by Shigeru Miyata <miyata@kusm.kyoto-u.ac.jp> by Shigeru Miyata <miyata@kusm.kyoto-u.ac.jp>
modified by Arnd Hanses <Arnd.H.Hanses@rz.ruhr-uni-bochum.de> modified by Arnd Hanses <Arnd.H.Hanses@rz.ruhr-uni-bochum.de>
############################################################## ##############################################################
@ -411,11 +411,11 @@ Note3: As distributed, LyX expects to find
its system configuration files in the directory its system configuration files in the directory
%X11ROOT%/XFree86/lib/X11/lyx %X11ROOT%/XFree86/lib/X11/lyx
If you unpacked the distribution in directory c:\foo, add If you unpacked the distribution in directory c:\foo, add
the environment variables LYX_LOCALEDIR and LYX_DIR_10x the environment variables LYX_LOCALEDIR and LYX_DIR_11x
to config.sys to point to c:/foo/XFree86/lib/X11/locale and to config.sys to point to c:/foo/XFree86/lib/X11/locale and
c:/foo/XFree86/lib/X11/lyx as follows: c:/foo/XFree86/lib/X11/lyx as follows:
SET LYX_LOCALEDIR=c:/foo/XFree86/lib/X11/locale SET LYX_LOCALEDIR=c:/foo/XFree86/lib/X11/locale
SET LYX_DIR_10x=c:/foo/XFree86/lib/X11/lyx SET LYX_DIR_11x=c:/foo/XFree86/lib/X11/lyx
Note that, if you do not have any interest in having LyX display Note that, if you do not have any interest in having LyX display
its messages in other languages than english, you can safely its messages in other languages than english, you can safely
skip this step for LYX_LOCALEDIR. skip this step for LYX_LOCALEDIR.

9
lyx.man
View File

@ -3,7 +3,7 @@
.\" .\"
.\" tbl lyx.1 | nroff -man | less .\" tbl lyx.1 | nroff -man | less
.\" .\"
.TH LYX 1 "October 1998" "Version 1.0" "LyX 1.0" .TH LYX 1 "November 1999" "Version 1.1" "LyX 1.1"
.SH NAME .SH NAME
lyx \- A Document Processor lyx \- A Document Processor
.\" .\"
@ -157,7 +157,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_10x .B LYX_DIR_11x
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
@ -165,7 +165,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_10x environment variable 2) LYX_DIR_11x environment variable
.br .br
3) Maybe <path of binary>/TOP_SRCDIR/lib 3) Maybe <path of binary>/TOP_SRCDIR/lib
.br .br
@ -229,7 +229,6 @@ performance on slow systems.
.SH AUTHOR .SH AUTHOR
Copyright Copyright
.Cr .Cr
1995, 1996, 1997, 1998 by Matthias Ettrich (ettrich@informatik.uni-tuebingen.de) 1995, 1996, 1997, 1998, 1999 by Matthias Ettrich (ettrich@informatik.uni-tuebingen.de)
and the rest of the \fBLyX Team\fR (See Credits under the Help menu and the rest of the \fBLyX Team\fR (See Credits under the Help menu
item). item).


1
src/chset.C
View File

@ -5,6 +5,7 @@
#endif #endif
#include <fstream> #include <fstream>
using std::ifstream;
#include "chset.h" #include "chset.h"
#include "support/filetools.h" #include "support/filetools.h"

5
src/lyx_cb.C
View File

@ -1254,7 +1254,10 @@ int RunLinuxDoc(int flag, string const & filename)
if (!current_view->available()) if (!current_view->available())
return 0; return 0;
current_view->buffer()->makeLinuxDocFile(name, 0); current_view->buffer()->makeLinuxDocFile(name, 0);
BufferParams::PAPER_SIZE ps = current_view->buffer()->params.papersize; #ifdef WITH_WARNINGS
#warning remove this once we have a proper geometry class
#endif
BufferParams::PAPER_SIZE ps = static_cast<BufferParams::PAPER_SIZE>(current_view->buffer()->params.papersize);
switch (ps) { switch (ps) {
case BufferParams::PAPER_A4PAPER: add_flags = "-p a4"; break; case BufferParams::PAPER_A4PAPER: add_flags = "-p a4"; break;
case BufferParams::PAPER_USLETTER: add_flags = "-p letter"; break; case BufferParams::PAPER_USLETTER: add_flags = "-p letter"; break;

12
src/lyx_main.C
View File

@ -177,7 +177,7 @@ void LyX::init(int */*argc*/, char **argv)
// 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_10x environment variable // 2) LYX_DIR_11x 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
@ -194,11 +194,11 @@ void LyX::init(int */*argc*/, char **argv)
if (!system_lyxdir.empty()) if (!system_lyxdir.empty())
searchpath= MakeAbsPath(system_lyxdir) + ';'; searchpath= MakeAbsPath(system_lyxdir) + ';';
// LYX_DIR_10x environment variable // LYX_DIR_11x environment variable
string lyxdir = GetEnvPath("LYX_DIR_10x"); string lyxdir = GetEnvPath("LYX_DIR_11x");
if (!lyxdir.empty()) { if (!lyxdir.empty()) {
lyxerr[Debug::INIT] << "LYX_DIR_10x: " << lyxdir << endl; lyxerr[Debug::INIT] << "LYX_DIR_11x: " << lyxdir << endl;
searchpath += lyxdir + ';'; searchpath += lyxdir + ';';
} }
@ -257,7 +257,7 @@ void LyX::init(int */*argc*/, char **argv)
// 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_10x environment variable no good.") lyxerr <<_("LYX_DIR_11x environment variable no good.")
<< '\n' << '\n'
<< _("System directory set to: ") << _("System directory set to: ")
<< system_lyxdir << endl; << system_lyxdir << endl;
@ -269,7 +269,7 @@ void LyX::init(int */*argc*/, char **argv)
if (system_lyxdir.empty()) { if (system_lyxdir.empty()) {
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_10x to the " <<_("set the environment variable LYX_DIR_11x 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)