Faster update for char insert in insettext/tabular, fix from Yves, removed

faxcode from configure.cmd.

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

diff --git a/ChangeLog b/ChangeLog
index 4833bcb868a130897aaf093b99a40ece8f1d2512..3408fd271d10e4cbeff0d4c0ea245c93b046b85d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-11-02  Juergen Vigna  <jug@sad.it>
+
+       * src/insets/insettext.C (LocalDispatch): return a DISPATCHED_NOUPDATE
+       on char insertion as it has already be updated by bv->updateInset().
+
+       * src/insets/insettabular.C (UpdateInsetInInset): update the inset
+       if an inset inside was updated.
+
+       * lib/configure.cmd: commented out fax-search code 
+
+2000-11-01  Yves Bastide  <stid@acm.org>
+
+       * src/tabular.C (OldFormatRead): set tabular language to the
+       document's one.
+
 2000-11-02  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * lib/reLyX/MakePreamble.pm (translate_preamble): fix reading of

diff --git a/lib/configure.cmd b/lib/configure.cmd
index 4814427b036a3b3d61fcd9ea8fda3dc7b71108f4..f7864516a03ef63bfa9463dfb746937fd5580b6a 100755 (executable)
--- a/lib/configure.cmd
+++ b/lib/configure.cmd
@@ -213,6 +213,7 @@ rc=lineout(lyxrc_defaults,'\view_pspic_command "'GHOSTVIEW'"')
 rc=lineout(lyxrc_defaults,'\ascii_roff_command "groff -t -ms -Tlatin1"')
 rc=lineout(lyxrc_defaults,'\chktex_command "'CHKTEX'"')
 rc=lineout(lyxrc_defaults,'\spell_command "'SPELL'"')
+/*
 if \(''=SysSearchPath('PATH','fsend.exe')) then
 do
   rc=lineout(X11ROOT'\XFree86\bin\fsend2.cmd','/*A wrapper for fsend.exe*/')
@@ -223,6 +224,7 @@ do
   rc=lineout(X11ROOT'\XFree86\bin\fsend2.cmd')
   rc=lineout(lyxrc_defaults,'\fax_command "fsend2 -p'"'$$Phone' -i'$$FName' -d'$$Name' -m'$$Comment'"'"')
 end
+*/
 if \(''=SysSearchPath('PATH','lp.exe')) then
 do
   rc=lineout(lyxrc_defaults,'\print_spool_command "lp"')

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index aef7875ac230544abcc9a289d61d747ed6a747ba..f4db822cf74a3fb33ab7832e8e12cd977bafe962 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -545,8 +545,10 @@ bool InsetTabular::UpdateInsetInInset(BufferView * bv, Inset * inset)
 {
     if (!the_locking_inset)
        return false;
-    if (the_locking_inset != inset)
-       return the_locking_inset->UpdateInsetInInset(bv, inset);
+    if (the_locking_inset != inset) {
+       if (!the_locking_inset->UpdateInsetInInset(bv, inset))
+           return false;
+    }
     UpdateLocal(bv, CELL, false);
     return true;
 }

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index a3c784e1649f0b71292601c85c6aead6d4dd6bf4..26039d185f21ca8448dd18e8594f090002d928b8 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -596,7 +596,8 @@ void InsetText::InsetButtonPress(BufferView * bv, int x, int y, int button)
 
     int tmp_x = x - drawTextXOffset;
     int tmp_y = y + insetAscent;
-    Inset * inset = bv->checkInsetHit(TEXT(bv), tmp_x, tmp_y, button);
+    Inset * inset = bv->checkInsetHit(TEXT(bv), tmp_x, tmp_y-TEXT(bv)->first,
+                                     button);
 
     HideInsetCursor(bv);
     if (the_locking_inset) {
@@ -628,7 +629,7 @@ void InsetText::InsetButtonPress(BufferView * bv, int x, int y, int button)
            inset_par = cpar(bv);
            uinset->InsetButtonPress(bv, x - inset_x, y - inset_y, button);
            uinset->Edit(bv, x - inset_x, y - inset_y, 0);
-           TEXT(bv)->ClearSelection();
+//         TEXT(bv)->ClearSelection();
            if (the_locking_inset) {
                UpdateLocal(bv, CURSOR_PAR, false);
            }
@@ -806,6 +807,7 @@ InsetText::LocalDispatch(BufferView * bv,
            }
        }
        UpdateLocal(bv, CURSOR_PAR, true);
+       result=DISPATCHED_NOUPDATE;
        break;
         // --- Cursor Movements ---------------------------------------------
     case LFUN_RIGHTSEL:

diff --git a/src/tabular.C b/src/tabular.C
index 4dee6913c4a729c6b7a5dae66cb368ddff70e650..cacf6279912d1b12cbd4ed4935e3190245e8a582 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1392,6 +1392,7 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
     int pos = 0;
     char depth = 0;
     LyXFont font(LyXFont::ALL_SANE);
+    font.setLanguage(owner_->BufferOwner()->GetLanguage());
 
     while (lex.IsOK()) {
         lex.nextToken();