small bits

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index eb7f5cbbe7a94351e4f5e6d3d72f296184121709..0fd66ca8fb0ee174dd870caa6a9d799fc7f90b2c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * bind/xemacs.bind: 
+       * bind/emacs.bind: move keypad bindings later so that the binding
+       for "copy" shown in menus is not C-KP_Insert
+
 2003-01-07  José Abílio Oliveira Matos  <jamatos@lyx.org>
 
        * lyx2lyx/lyx2lyx.py: trims whitespace from header if not in preamble.
@@ -13,8 +19,8 @@
 
 2003-01-06  Angus Leeming  <leeming@lyx.org>
 
-       * scripts/lyxpreview2bitmap.sh: don't use 'which' to find an executable.
-       Use 'type'.
+       * scripts/lyxpreview2bitmap.sh: don't use 'which' to find an
+       executable. Use 'type'.
 
 2003-01-05  John Levon  <levon@movementarian.org>
 

diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index df7a812c496e46b0cdce2277bba77b202a085c09..b4da444dbf04d6c2bb18b12af57d9b3b33ac9baa 100644 (file)
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -181,6 +181,23 @@
 \bind "S-C-Home"               "buffer-begin-select"
 \bind "S-C-End"                "buffer-end-select"
 
+#
+# Edit group
+#
+
+\bind "C-Delete"               "word-delete-forward"
+\bind "M-d"                    "word-delete-forward"
+\bind "C-BackSpace"            "word-delete-backward"
+\bind "M-Return"               "break-paragraph-keep-layout"
+\bind "C-Return"               "break-line"
+\bind "C-S-L"                  "ligature-break-insert"
+\bind "C-space"                        "protected-space-insert"
+\bind "C-period"               "end-of-sentence-period-insert"
+\bind "M-period"               "dots-insert"
+\bind "M-w"                    "copy"
+\bind "M-S-W"                  "layout-copy"
+\bind "Escape"                 "meta-prefix"
+
 # Numeric keypad (if Shift+KP_XXX does not switch the NumLock state)
 \bind "S-KP_Right"              "forward-select"
 \bind "S-KP_Left"               "backward-select"
@@ -203,25 +220,6 @@
 \bind "S-KP_Delete"             "cut"
 
 
-#
-# Edit group
-#
-
-\bind "C-Delete"               "word-delete-forward"
-\bind "M-d"                    "word-delete-forward"
-\bind "C-BackSpace"            "word-delete-backward"
-\bind "M-Return"               "break-paragraph-keep-layout"
-\bind "C-Return"               "break-line"
-\bind "C-S-L"                  "ligature-break-insert"
-\bind "C-space"                        "protected-space-insert"
-\bind "C-period"               "end-of-sentence-period-insert"
-\bind "M-period"               "dots-insert"
-\bind "M-w"                    "copy"
-\bind "M-S-W"                  "layout-copy"
-\bind "Escape"                 "meta-prefix"
-
-
-
 # Include menu and math bindings
 
 \bind_file menus.bind

diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index 5d8d4fbabaf85101c07ea3775f18ffbdc129200b..e59e939efb2ce6644e62f60885bc55edd50e20da 100644 (file)
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -188,6 +188,24 @@
 \bind "S-C-Home"               "buffer-begin-select"
 \bind "S-C-End"                "buffer-end-select"
 
+#
+# Edit group
+#
+
+\bind "M-Delete"               "word-delete-backward"
+\bind "C-Delete"               "word-delete-forward"
+\bind "M-d"                     "word-delete-forward"
+\bind "C-BackSpace"            "word-delete-backward"
+\bind "M-Return"               "break-paragraph-keep-layout"
+\bind "C-Return"               "break-line"
+\bind "C-S-L"                  "ligature-break-insert"
+\bind "C-space"                        "protected-space-insert"
+\bind "C-period"               "end-of-sentence-period-insert"
+\bind "M-period"               "dots-insert"
+\bind "M-w"                    "copy"
+\bind "M-S-W"                  "layout-copy"
+\bind "Escape"                 "meta-prefix"
+
 # Numeric keypad (if Shift+KP_XXX does not switch the NumLock state)
 \bind "S-KP_Right"              "forward-select"
 \bind "S-KP_Left"               "backward-select"
@@ -210,24 +228,6 @@
 \bind "S-KP_Delete"             "cut"
 
 
-#
-# Edit group
-#
-
-\bind "M-Delete"               "word-delete-backward"
-\bind "C-Delete"               "word-delete-forward"
-\bind "M-d"                     "word-delete-forward"
-\bind "C-BackSpace"            "word-delete-backward"
-\bind "M-Return"               "break-paragraph-keep-layout"
-\bind "C-Return"               "break-line"
-\bind "C-S-L"                  "ligature-break-insert"
-\bind "C-space"                        "protected-space-insert"
-\bind "C-period"               "end-of-sentence-period-insert"
-\bind "M-period"               "dots-insert"
-\bind "M-w"                    "copy"
-\bind "M-S-W"                  "layout-copy"
-\bind "Escape"                 "meta-prefix"
-
 ## Trying to incorporate the best of AucTeX and HM--HTML modes
 ##
 # "C-z" is used in HM--HTML-mode for paragraph styles so try to support

diff --git a/src/ChangeLog b/src/ChangeLog
index 63f874fa25d9b2ec932aaeb6f1353d03ec76a3e7..63cebf4818b87967e26cd6faa7cc3dbb31650010 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * paragraph_pimpl.C (simpleTeXBlanks): 
+       (simpleTeXSpecialChars): 
+       * paragraph.C (simpleTeXOnePar): make `column' unsigned.
+
+       * tabular.C (latex): add some missing case statements. Reindent.
+
+       * MenuBackend.C (expandToc): remove unused variable.
+
 2003-01-06  Michael Schmitt <Michael.Schmitt@teststep.org>
 
        * LColor.C:

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 5d5604dfd72c22efc90abf73ab9f82ac651cf800..b56262882001e914dc88ef40030f22a4063a929f 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -486,7 +486,6 @@ void expandToc(Menu & tomenu, Buffer const * buf)
                return;
        }
 
-       FloatList const & floats = buf->params.getLyXTextClass().floats();
        toc::TocList toc_list = toc::getTocList(buf);
        toc::TocList::const_iterator cit = toc_list.begin();
        toc::TocList::const_iterator end = toc_list.end();

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index ec08b08adb8590d093ed6d0e335a85f9039c42ba..dc71237a3e7226c89b88ddd0383107f8cbdd47e8 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-07  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * FormTabular.C: typo.
+
 2003-01-06  Michael Schmitt <Michael.Schmitt@teststep.org>
 
        * FormGraphics.C:

diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index c60b7d2850ad69d30b971b585db4a57627439753..7b9eea187476a600f0df6f4d28e5dc3f35bece2d 100644 (file)
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -189,9 +189,9 @@ void FormTabular::update()
                pwidth = tabular->GetMColumnPWidth(cell);
                align = tabular->GetAlignment(cell);
                // set the horiz. alignment, default is left here
-               fl_set_button(column_options_->radio_align_left, 0);
-               fl_set_button(column_options_->radio_align_right, 0);
-               fl_set_button(column_options_->radio_align_center, 0);
+               fl_set_button(cell_options_->radio_align_left, 0);
+               fl_set_button(cell_options_->radio_align_right, 0);
+               fl_set_button(cell_options_->radio_align_center, 0);
                if (align == LYX_ALIGN_RIGHT)
                        fl_set_button(cell_options_->radio_align_right, 1);
                else if (align == LYX_ALIGN_CENTER)

diff --git a/src/paragraph.C b/src/paragraph.C
index 1ca0c04ef1b5575dbd0a4e2e5d4156d77e6602d1..248b349d5310593582690e1df9ed6abcf58bd620 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1342,7 +1342,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        else
                main_body = beginningOfMainBody();
 
-       int column = 0;
+       unsigned int column = 0;
 
        if (main_body > 0) {
                os << '[';

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 4b953cf7c71ea0f3e6e73ec26401b2ce6ba42862..62fd7a49ac9d6985ac7838fb03cbaee75c77f8fa 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -211,7 +211,8 @@ void Paragraph::Pimpl::erase(pos_type pos)
 
 void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                                       pos_type const i,
-                                      int & column, LyXFont const & font,
+                                      unsigned int & column,
+                                      LyXFont const & font,
                                       LyXLayout const & style)
 {
        if (style.pass_thru) return;
@@ -280,7 +281,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             bool & open_font,
                                             LyXLayout const & style,
                                             pos_type & i,
-                                            int & column,
+                                            unsigned int & column,
                                             value_type const c)
 {
        if (style.pass_thru) {

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 35ad384f1a7d5ffff822d1cae8f3f08507e52f4f..7fd48bafadd2c20b774e0f8cb94812e2299ea279 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -121,7 +121,8 @@ struct Paragraph::Pimpl {
        ///
        void simpleTeXBlanks(std::ostream &, TexRow & texrow,
                             lyx::pos_type const i,
-                            int & column, LyXFont const & font,
+                            unsigned int & column,
+                            LyXFont const & font,
                             LyXLayout const & style);
        ///
        void simpleTeXSpecialChars(Buffer const *, BufferParams const &,
@@ -131,7 +132,7 @@ struct Paragraph::Pimpl {
                                   LyXFont & basefont, bool & open_font,
                                   LyXLayout const & style,
                                   lyx::pos_type & i,
-                                  int & column, value_type const c);
+                                  unsigned int & column, value_type const c);
 
        ///
        void validate(LaTeXFeatures & features,

diff --git a/src/tabular.C b/src/tabular.C
index ef80cf2c7a248b391a75e0ea3ea2919b37686dd8..c3255f0cea6e84ae581734dedca58498884fac5e 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -2246,17 +2246,22 @@ int LyXTabular::latex(Buffer const * buf,
                        if (column_info[i].left_line)
                                os << '|';
                        if (!column_info[i].p_width.zero()) {
-                         switch (column_info[i].alignment) {
-                         case LYX_ALIGN_LEFT:
-                           os << ">{\\raggedright}";
-                           break;
-                         case LYX_ALIGN_RIGHT:
-                           os << ">{\\raggedleft}";
-                           break;
-                         case LYX_ALIGN_CENTER:
-                           os << ">{\\centering}";
-                           break;
-                         }
+                               switch (column_info[i].alignment) {
+                               case LYX_ALIGN_LEFT:
+                                       os << ">{\\raggedright}";
+                                       break;
+                               case LYX_ALIGN_RIGHT:
+                                       os << ">{\\raggedleft}";
+                                       break;
+                               case LYX_ALIGN_CENTER:
+                                       os << ">{\\centering}";
+                                       break;
+                               case LYX_ALIGN_NONE:
+                               case LYX_ALIGN_BLOCK:
+                               case LYX_ALIGN_LAYOUT:
+                               case LYX_ALIGN_SPECIAL:
+                                       break;
+                               }
 
                                switch (column_info[i].valignment) {
                                case LYX_VALIGN_TOP: