Small tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@320 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 1247802360ccb47ff2b19cab26d8df34c1ca4585..3e71c5ea4d575d0909082e798b3904ae116a09d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * src/support/LSubstring.[Ch]: made the second arg of most of the

diff --git a/INSTALL.OS2 b/INSTALL.OS2
index 5f47e9e4086f9bd22de51b932b672e78f7c9bc98..5cc5ce5497f0e4d29bb3c5a3df54b4a05c6ac97a 100644 (file)
--- a/INSTALL.OS2
+++ b/INSTALL.OS2
@@ -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>
 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
  %X11ROOT%/XFree86/lib/X11/lyx
        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 
        c:/foo/XFree86/lib/X11/lyx as follows:
  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
        its messages in other languages than english, you can safely 
        skip this step for LYX_LOCALEDIR.

diff --git a/lyx.man b/lyx.man
index a58b05757a2d5ffa5336394bf27611e5f4c80802..31b6dbe691d0e2e37db26db134a13776095382ad 100644 (file)
--- a/lyx.man
+++ b/lyx.man
@@ -3,7 +3,7 @@
 .\"
 .\"  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
 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. 
 .SH ENVIRONMENT
 .TP
-.B LYX_DIR_10x
+.B LYX_DIR_11x
 can be used to specify which system directory to use.
 .PP
 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
 1) -sysdir command line parameter
 .br
-2) LYX_DIR_10x environment variable
+2) LYX_DIR_11x environment variable
 .br
 3) Maybe <path of binary>/TOP_SRCDIR/lib
 .br
@@ -229,7 +229,6 @@ performance on slow systems.
 .SH AUTHOR
 Copyright
 .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
 item).
-\1a
\ No newline at end of file

diff --git a/src/chset.C b/src/chset.C
index 94ed5a3b68ef7793907b76d278b635949db35a70..d83a7451162d079f40cebb0df99d1b734ca5daed 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -5,6 +5,7 @@
 #endif
 
 #include <fstream>
+using std::ifstream;
 
 #include "chset.h"
 #include "support/filetools.h"

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 062287c4da2804d26956507118a62fc5dba9265e..0ff593741867549d74b5991f36d80c6618ea023e 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -1254,7 +1254,10 @@ int RunLinuxDoc(int flag, string const & filename)
                if (!current_view->available())
                        return 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) {
                case BufferParams::PAPER_A4PAPER:  add_flags = "-p a4";     break;
                case BufferParams::PAPER_USLETTER: add_flags = "-p letter"; break;

diff --git a/src/lyx_main.C b/src/lyx_main.C
index f7c21364546c172bd9527e937e2d1ab57cd6cccd..53e963954d071e6158ad53732298828a5b3aada1 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -177,7 +177,7 @@ void LyX::init(int */*argc*/, char **argv)
 
        // Directories are searched in this order:
        // 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
        // 4) <path of binary>/../share/<name of binary>/
        // 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())
                searchpath= MakeAbsPath(system_lyxdir) + ';';
 
-       // LYX_DIR_10x environment variable
-       string lyxdir = GetEnvPath("LYX_DIR_10x");
+       // LYX_DIR_11x environment variable
+       string lyxdir = GetEnvPath("LYX_DIR_11x");
        
        if (!lyxdir.empty()) {
-               lyxerr[Debug::INIT] << "LYX_DIR_10x: " << lyxdir << endl;
+               lyxerr[Debug::INIT] << "LYX_DIR_11x: " << lyxdir << endl;
                searchpath += lyxdir + ';';
        }
 
@@ -257,7 +257,7 @@ void LyX::init(int */*argc*/, char **argv)
        // Warn if environment variable is set, but unusable
        if (!lyxdir.empty()) {
                if (system_lyxdir != NormalizePath(lyxdir)) {
-                       lyxerr <<_("LYX_DIR_10x environment variable no good.")
+                       lyxerr <<_("LYX_DIR_11x environment variable no good.")
                               << '\n'
                               << _("System directory set to: ") 
                               << system_lyxdir << endl;
@@ -269,7 +269,7 @@ void LyX::init(int */*argc*/, char **argv)
        if (system_lyxdir.empty()) {
                lyxerr <<_("LyX Warning! Couldn't determine system directory.")
                       <<_("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")
                       << _("containing the file `chkconfig.ltx'.") << endl;
                if (!path_shown)