From dcdbeb3b3475d803c0c66e463dca64db0103c10d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 22 Jan 2003 17:36:35 +0000 Subject: [PATCH] various bits from Michael git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5978 a592a061-630c-0410-9148-cb99ea01b6c8 --- NEWS | 7 ++++--- lib/ChangeLog | 8 ++++++++ lib/layouts/cv.layout | 4 ++-- lib/layouts/egs.layout | 4 ++-- lib/layouts/llncs.layout | 8 ++++---- src/ChangeLog | 11 +++++++++++ src/MenuBackend.C | 2 +- src/buffer.C | 4 ++-- src/lyxfunc.C | 3 +-- 9 files changed, 35 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index a381f8924a..2d856d4afb 100644 --- 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 6dab35984a..add54aaf48 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,11 @@ +2003-01-22 Michael Schmitt + + * 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 * reLyX/reLyXmain.pl: fixes the problem where a directory has diff --git a/lib/layouts/cv.layout b/lib/layouts/cv.layout index 36db70a240..f6da5c3296 100644 --- 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 57ea2b3e2c..3b85cec3d0 100644 --- 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 0f37cb71c0..098a5a7cff 100644 --- 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 b1b65ee281..4543680061 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2003-01-22 Michael Schmitt + + * 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 * text3.C (dispatch): put the lfuns that insert insets in 3 diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 445cde4f28..2488f26df2 100644 --- 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 aaf2b7a037..d7d0a45631 100644 --- 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 f42fa4d492..2f9023a3cd 100644 --- 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();