From 202b5e3f55e8c3b37d5e54db392c48327cce6163 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 6 Jun 2002 15:14:20 +0000 Subject: [PATCH] fix bugs 416 and 442 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4346 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 5 ++ lib/examples/TableExamples.lyx | 138 +++++++++++++++++++++++++++++++-- src/ChangeLog | 5 ++ src/lyxvc.C | 20 +++-- status.12x | 15 ++-- 5 files changed, 167 insertions(+), 16 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 5e829225fe..c7925f3c66 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2002-06-06 Jean-Marc Lasgouttes + + * examples/TableExamples.lyx: fix footnotes inside tables + (bug 442) + 2002-06-05 Jean-Marc Lasgouttes * external_templates: change the requirements of the xfig and diff --git a/lib/examples/TableExamples.lyx b/lib/examples/TableExamples.lyx index a7a239ba86..74d0d0d2da 100644 --- a/lib/examples/TableExamples.lyx +++ b/lib/examples/TableExamples.lyx @@ -2861,7 +2861,25 @@ d \layout Standard + +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +multirow{4}{14mm}{ +\end_inset + Text in column 1 +\begin_inset ERT +status Collapsed + +\layout Standard +} +\end_inset + + \end_inset @@ -2877,7 +2895,25 @@ C2a \layout Standard + +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +multirow{4}{14mm}{ +\end_inset + Text in column 1 +\begin_inset ERT +status Collapsed + +\layout Standard +} +\end_inset + + \end_inset @@ -3030,7 +3066,7 @@ centering position 0 inner_position 0 height "0pt" -width "25p%" +width "25col%" collapsed false \layout Standard @@ -3091,7 +3127,25 @@ b \layout Standard -1example1 cell(b,1) +1 +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +footnote{ +\end_inset + +example1 cell(b,1) +\begin_inset ERT +status Collapsed + +\layout Standard +} +\end_inset + + \end_inset @@ -3175,7 +3229,25 @@ d \layout Standard -9example1 cell(d,9) +9 +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +footnote{ +\end_inset + +example1 cell(d,9) +\begin_inset ERT +status Collapsed + +\layout Standard +} +\end_inset + + \end_inset @@ -3276,7 +3348,25 @@ b \layout Standard -1example2 cell(b,1) +1 +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +footnote{ +\end_inset + +example2 cell(b,1) +\begin_inset ERT +status Collapsed + +\layout Standard +} +\end_inset + + \end_inset @@ -3360,7 +3450,25 @@ d \layout Standard -9example2 cell(d,9) +9 +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +footnote{ +\end_inset + +example2 cell(d,9) +\begin_inset ERT +status Collapsed + +\layout Standard +} +\end_inset + + \end_inset @@ -3440,6 +3548,16 @@ b \layout Standard 1 +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +footnotemark +\end_inset + + \end_inset @@ -3524,6 +3642,16 @@ d \layout Standard 9 +\begin_inset ERT +status Collapsed + +\layout Standard + +\backslash +footnotemark +\end_inset + + \end_inset diff --git a/src/ChangeLog b/src/ChangeLog index 840e391fd4..2b98d7e67c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-05-31 John Levon + + * lyxvc.C: fix bug 416 (make sure buffer is saved before + attempt to register it with a VCS) + 2002-06-06 Jean-Marc Lasgouttes * buffer.C (sgmlError): enclose #warning in WITH_WARNINGS diff --git a/src/lyxvc.C b/src/lyxvc.C index 4431b6d30f..61fb1e4c5f 100644 --- a/src/lyxvc.C +++ b/src/lyxvc.C @@ -75,6 +75,16 @@ void LyXVC::buffer(Buffer * buf) void LyXVC::registrer() { + string const filename = owner_->fileName(); + + // there must be a file to save + if (!IsFileReadable(filename)) { + Alert::alert(_("File not saved"), + _("You must save the file"), + _("before it can be registered.")); + return; + } + // it is very likely here that the vcs is not created yet... if (!vcs) { string const cvs_entries = "CVS/Entries"; @@ -82,16 +92,16 @@ void LyXVC::registrer() if (IsFileReadable(cvs_entries)) { lyxerr[Debug::LYXVC] << "LyXVC: registering " - << MakeDisplayPath(owner_->fileName()) + << MakeDisplayPath(filename) << " with CVS" << endl; - vcs = new CVS(cvs_entries, owner_->fileName()); + vcs = new CVS(cvs_entries, filename); } else { lyxerr[Debug::LYXVC] << "LyXVC: registering " - << MakeDisplayPath(owner_->fileName()) + << MakeDisplayPath(filename) << " with RCS" << endl; - vcs = new RCS(owner_->fileName()); + vcs = new RCS(filename); } vcs->owner(owner_); @@ -100,7 +110,7 @@ void LyXVC::registrer() // If the document is changed, we might want to save it if (!vcs->owner()->isLyxClean() && Alert::askQuestion(_("Changes in document:"), - MakeDisplayPath(vcs->owner()->fileName(), 50), + MakeDisplayPath(filename, 50), _("Save document and proceed?"))) { vcs->owner()->getUser()->owner() ->getLyXFunc()->dispatch(LFUN_MENUWRITE); diff --git a/status.12x b/status.12x index 2a5e34fc5c..389dd0bcfe 100644 --- a/status.12x +++ b/status.12x @@ -37,23 +37,23 @@ What's new - re-read correctly graphics insets when file name contains a comma +- do not ignore zero-length vertical spacing with 'keep' flag. + - fix drawing problems for collapsed ERT insets +- fix rotation angle of images to be the same as in latex output + - disable 'Load' button of 'include file' dialog for verbatim include +- fix translation of "reset" and "no change" in language combobox + - only use the amsmath package when it is needed - make sure to use the graphicx package with the RasterBitmap and XFig external templates. -- fix rotation angle of images to be the same as in latex output - -- do not ignore zero-length vertical spacing with 'keep' flag. - - fix interaction between sixpack and LyX via lyxserver -- fix translation of "reset" and "no change" in language combobox - - fix command line crash and give useful exit status on some errors - fix latex import when using --with-version-suffix configure flag @@ -61,6 +61,9 @@ What's new - make latex import script (reLyX) honor the LYX_DIR_12x envirnment variable, like the rest of LyX +- rework the configuration script wrt xforms 1.0. This version is now + supported. + - honor --with-extra-XXX when searching for AikSaurus library - fix support for alpha-based systems in boost library