Dekel's depth bars and assorted fixlets

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

diff --git a/ChangeLog b/ChangeLog
index d6e67d980a0eb095a062c7d8fde77efeb9b8990e..9f93435b60954961bfab05c6bb994611d92273a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2000-04-26  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/insets/insettabular.[Ch]: fix the Clone() declaration.
+
+       * src/menus.C: revert the change of naming (Figure->Graphic...)
+       from 2000-04-11. It was incomplete and bad.
+       
+       * src/LColor.[Ch]: add LColor::depthbar.
+       * src/text.C (GetVisibleRow): use it.
+
+       * README: update the languages list.
+
+2000-04-25  Dekel Tsur  <dekel@math.tau.ac.il>
+
+       * src/text.C (GetVisibleRow): show the depth of paragraphs using
+       vertical bars.
+
 2000-04-26  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * README: remove sections that were just wrong.

diff --git a/NEWS b/NEWS
index 38e926216f0c3b080be14f8e2d4847472e7b4739..e708f0b3c1c2d949b6977a2e3fa304a293f656ea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,8 @@ User-visible changes:
 
 - More accurate error reporting from LaTeX runs.
 
+- Much faster spellchecking (50x faster!).
+
 - Better definition for LyXList style.
 
 - A couple of changes to the LyX format, so that files written with

diff --git a/README b/README
index c1ce8a2e66bbac97de5e170887c9fc40f49b14ec..c8095c4f145d7de6121598c72364439c517c0f71 100644 (file)
--- a/README
+++ b/README
@@ -107,12 +107,14 @@ Does LyX have support for non-English speakers/writers/readers?
        Spanish     (es)
        Finnish     (fi)
        French      (fr)    *
+       Hebrew      (he)
        Hungarian   (hu)    *
        Italian     (it)
        Dutch       (nl)
        Norwegian   (no)
        Polish      (pl)
        Portuguese  (pt)    *
+       Romanian    (ro)
        Russian     (ru)
        Slovenian   (sl)
        Swedish     (sv)    *

diff --git a/src/LColor.C b/src/LColor.C
index f6d5bda5b36d37d66ed369b7a77540d52824c8b8..0ac92f520de3420ddf8e77e658ec804129da8977 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -56,6 +56,7 @@ LColor::LColor()
        fill(note, _("note"), "note", "black", "note");
        fill(notebg, _("note background"), "notebg", "yellow", "notebg");
        fill(noteframe, _("note frame"), "noteframe", "black", "noteframe");
+       fill(depthbar, _("depth bar"), "depthbar", "IndianRed", "depthbar");
        fill(command, _("command-inset"), "command", "black", "command");
        fill(commandbg, _("command-inset background"), "commandbg", "grey80", "commandbg");
        fill(commandframe, _("inset frame"), "commandframe", "black", "commandframe");

diff --git a/src/LColor.h b/src/LColor.h
index ec8c4d66c59de34023f47874c9693607e5de24e0..57e29fc8e418b82e3d787b29a3c037dea8924c40 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -76,6 +76,9 @@ public:
                noteframe,
 
 
+               /// Color for the depth bars in the margin
+               depthbar,
+
                /// Text color for command insets
                command,
                /// Background color for command insets

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index faa3f38552e7e59263073a0b0a72530c1983cde6..c958ec13ef9502e63238375d44e8a2a3e0307502 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -76,7 +76,7 @@ InsetTabular::~InsetTabular()
 }
 
 
-InsetTabular * InsetTabular::Clone() const
+Inset * InsetTabular::Clone() const
 {
     InsetTabular * t = new InsetTabular(*this, buffer);
     return t;

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index bf91314f64b3ee6096f61174a6da11e8196eddc7..f47b2fee595519be0cf35e4bcc5cb48fa7a32bd1 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -68,7 +68,7 @@ public:
     ///
     ~InsetTabular();
     ///
-    InsetTabular * InsetTabular::Clone() const;
+    Inset * Clone() const;
     ///
     void Read(LyXLex &);
     ///

diff --git a/src/menus.C b/src/menus.C
index 951627bdfb22d2c80375e7df502ae192e8957ab2..268cd647b7121d0fa4f7142d34b4f3a2df4e9b22 100644 (file)
--- a/src/menus.C
+++ b/src/menus.C
@@ -1277,11 +1277,11 @@ void Menus::ShowInsertMenu(FL_OBJECT * ob, long)
 
        int SubInsertFloatList = fl_defpup(FL_ObjWin(ob),
                                           _("Floats%t"
-                                            "|Figure%x71"
-                                            "|Table%x72"
-                                            "|Wide Figure%x73"
-                                            "|Wide Table%l%x74"
-                                            "|Algorithm%x75"));
+                                            "|Figure Float%x71"
+                                            "|Table Float%x72"
+                                            "|Wide Figure Float%x73"
+                                            "|Wide Table Float%l%x74"
+                                            "|Algorithm Float%x75"));
        
        fl_setpup_shortcut(SubInsertFloatList, 71, scex(_("IMF|gG#g#G")));
        fl_setpup_shortcut(SubInsertFloatList, 72, scex(_("IMF|Tt#t#T")));
@@ -1310,14 +1310,14 @@ void Menus::ShowInsertMenu(FL_OBJECT * ob, long)
        fl_setpup_shortcut(SubInsertSpecial, 38, scex(_("IMS|Mm#m#M")));
        
        int InsertMenu = fl_defpup(FL_ObjWin(ob),
-                                  _("Graphic..."
-                                    "|Table Box...%l"
+                                  _("Figure..."
+                                    "|Table...%l"
                                     "|Include File..." 
                                     "|Import ASCII File%m"
                                     "|Insert LyX File...%l"
                                     "|Footnote"
                                     "|Margin Note"
-                                    "|Floating Material%m%l"      
+                                    "|Floats%m%l"      
                                     "|Lists & TOC%m%l"
                                     "|Special Character%m%l"
                                     "|Note..."

diff --git a/src/text.C b/src/text.C
index ec1fea62c184d19e06251e0a9ff0b821f26bdebd..56817185053e034f3ed63de679c36606978aed49 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -3735,6 +3735,29 @@ void LyXText::GetVisibleRow(int offset, Row * row_ptr, long y)
                          paperwidth - 2, offset + row_ptr->height,
                          LColor::appendixline);
        }
+
+       int depth = row_ptr->par->GetDepth();
+       if (depth > 0) {
+               int next_depth = (row_ptr->next)
+                       ? next_depth = row_ptr->next->par->GetDepth() : 0; 
+               int prev_depth = (row_ptr->previous)
+                       ? row_ptr->previous->par->GetDepth() : 0;
+
+               for (int i = 1; i <= depth; ++i)
+                       pain.line(4*i, offset,
+                                 4*i, offset + row_ptr->height - 1 - (i-next_depth-1)*3,
+                                 LColor::depthbar);
+
+               for (int i = prev_depth + 1; i <= depth; ++i)
+                       pain.fillRectangle(4*i, offset,
+                                          4, 2,
+                                          LColor::depthbar);
+
+               for (int i = next_depth + 1; i <= depth; ++i)
+                       pain.fillRectangle(4*i, offset + row_ptr->height - 2 - (i-next_depth-1)*3,
+                                          4, 2,
+                                          LColor::depthbar);
+       }
        
        if (row_ptr->par->pextra_type == LyXParagraph::PEXTRA_MINIPAGE) {
                /* draw a marker at the left margin! */