various bits from Michael

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

diff --git a/NEWS b/NEWS
index a381f8924aa798851a4159aad7c37cfd38f8986c..2d856d4afb3b2a0512e5050ed5f13f17107f8eb3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -49,9 +49,10 @@ developer's list.
 
 ** Instant preview
 
-preview-latex is an emacs package for LaTeX that allows "instant
-previews" of LaTeX code, so you can immediately see the visual
-rendering of the LaTeX in the document. With the help of David
+preview-latex is an emacs package for LaTeX that allows "instant previews"
+of LaTeX code, so you can immediately see the visual rendering of the 
+LaTeX in the document. Its project home page can be found at 
+http://sourceforge.net/projects/preview-latex. With the help of David
 Kastrup, the author, current CVS LyX can harness this functionality to
 allow instant previews in the LyX window of math equations and
 figures. This feature can be immensely useful for making sure the

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 6dab35984a08f662f4a7b2084cc6b56bb84f406f..add54aaf48f5f5d3385d091413f83544e20f3702 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-22  Michael Schmitt  <Michael.Schmitt@teststep.org>
+
+       * layouts/cv.layout:
+       * layouts/egs.layout: do not use Include but Input
+
+       * layouts/llncs.layout: do not CopyStyle Journal, which does not
+       exist. 
+
 2003-01-20  Michael Schmitt  <Michael.Schmitt@teststep.org>
 
        * reLyX/reLyXmain.pl: fixes the problem where a directory has

diff --git a/lib/layouts/cv.layout b/lib/layouts/cv.layout
index 36db70a2406184f7920997eed2e851c946a769cb..f6da5c32967ee2e82d79d88c315366cbc55a2c6b 100644 (file)
--- a/lib/layouts/cv.layout
+++ b/lib/layouts/cv.layout
@@ -165,5 +165,5 @@ Style Bibliography
   
 End
 
-Include stdfloats.inc
-Include stdcounters.inc
+Input stdfloats.inc
+Input stdcounters.inc

diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout
index 57ea2b3e2c2890a7e6975e307c2172947b0e4a08..3b85cec3d0e38e71a0c049ae19f2eb3ebf19f239 100644 (file)
--- a/lib/layouts/egs.layout
+++ b/lib/layouts/egs.layout
@@ -767,5 +767,5 @@ Style LyX-Code
 
 End
 
-Include stdfloats.inc
-Include stdcounters.inc
+Input stdfloats.inc
+Input stdcounters.inc

diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout
index 0f37cb71c05ca24d9e28292bfaf5582ef6dab9cc..098a5a7cffd02453df34f27f7e61ab0a33b35968 100644 (file)
--- a/lib/layouts/llncs.layout
+++ b/lib/layouts/llncs.layout
@@ -182,7 +182,7 @@ End
 
 # TOC_Title style definition
 Style TOC_Title
-  CopyStyle            Journal
+  CopyStyle            "Running LaTeX Title"
   LatexName            toctitle
   LeftMargin           "TOC title:xxx"
   LabelString          "TOC title: "
@@ -214,7 +214,7 @@ End
 
 # AuthorRunning style definition
 Style Author_Running
-  CopyStyle            Journal
+  CopyStyle            "Running LaTeX Title"
   LatexName            authorrunning
   LeftMargin           "Author Running:xxx"
   LabelString          "Author Running: "
@@ -222,7 +222,7 @@ End
 
 # TOC_Author style definition
 Style TOC_Author
-  CopyStyle            Journal
+  CopyStyle            "Running LaTeX Title"
   LatexName            tocauthor
   LeftMargin           "TOC Author :xxx"
   LabelString          "TOC Author: "
@@ -254,7 +254,7 @@ End
 #
 # Correspondence address style definition
 Style Mail
-  CopyStyle            Journal
+  CopyStyle            "Running LaTeX Title"
   LatexName            mail    
   LeftMargin           "Corr Author:xx."
   LabelString          "Corr Author: "

diff --git a/src/ChangeLog b/src/ChangeLog
index b1b65ee28147248d631cb2422b1552cd6484c334..4543680061fad0bb1fcf778f14a45014ea10ea20 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-22  Michael Schmitt  <Michael.Schmitt@teststep.org>
+
+       * MenuBackend.C (expandFormats): List only viewable export formats
+       in "View" menu
+
+       * buffer.C (parseSingleLyXformat2Token): Fix misleading error
+       message 
+
+       * lyxfunc.C (getStatus): Make sure that formats other than
+       "fax" can be can also be disabled 
+
 2003-01-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * text3.C (dispatch): put the lfuns that insert insets in 3

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 445cde4f2801be9b23c20578516f5ce941db4e7f..2488f26df2faf54190cd61341318c8f9db8bb000 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -352,7 +352,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
                action = LFUN_PREVIEW;
                break;
        case MenuItem::UpdateFormats:
-               formats = Exporter::GetExportableFormats(buf, false);
+               formats = Exporter::GetExportableFormats(buf, true);
                action = LFUN_UPDATE;
                break;
        default:

diff --git a/src/buffer.C b/src/buffer.C
index aaf2b7a037356b9b8c46ec231be297a8636dac4d..d7d0a456311fb4702de884b42daafe2e253ab43d 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -621,13 +621,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 #if USE_BOOST_FORMAT
                        Alert::alert(_("Textclass error"),
                                boost::io::str(boost::format(_("The document uses an unknown textclass \"%1$s\".")) % lex.getString()),
-                               _("LyX will not be able to produce output correctly."));
+                               _("-- substituting default."));
 #else
                        Alert::alert(
                                _("Textclass error"),
                                _("The document uses an unknown textclass ")
                                + lex.getString(),
-                               _("LyX will not be able to produce output correctly."));
+                               _("-- substituting default."));
 #endif
                        params.textclass = 0;
                }

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index f42fa4d4920ce3939488afceab5f3aca23f84f9a..2f9023a3cd6427a143ce63353a4f8802cda84fdc 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -327,8 +327,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                        || lyxrc.print_command == "none";
                break;
        case LFUN_EXPORT:
-               disable = ev.argument == "fax" &&
-                       !Exporter::IsExportable(buf, ev.argument);
+               disable = !Exporter::IsExportable(buf, ev.argument);
                break;
        case LFUN_UNDO:
                disable = buf->undostack.empty();