[the same with the patch]
Lars,
Here is a patch doing a few trivial things:
- move around some emacs bindings so that the Edit menu does not show
C-KP_Insert as a binding for "paste"
- fix a few warnings
- a patch from juergen S. fixing a typo in his previous tabular stuff.
Can I apply?
JMarc
? po/lyx-1.3.0cvs.pot
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.338
diff -u -p -r1.338 ChangeLog
--- lib/ChangeLog 6 Jan 2003 17:40:46 -0000 1.338
+++ lib/ChangeLog 7 Jan 2003 16:38:35 -0000
@@ -1,7 +1,13 @@
+2003-01-07 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * 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-06 Angus Leeming <[EMAIL PROTECTED]>
- * 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 <[EMAIL PROTECTED]>
Index: lib/bind/emacs.bind
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/bind/emacs.bind,v
retrieving revision 1.18
diff -u -p -r1.18 emacs.bind
--- lib/bind/emacs.bind 11 Oct 2002 09:21:02 -0000 1.18
+++ lib/bind/emacs.bind 7 Jan 2003 16:38:35 -0000
@@ -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"
@@ -201,25 +218,6 @@
\bind "C-KP_Insert" "copy"
\bind "S-KP_Insert" "paste"
\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
Index: lib/bind/xemacs.bind
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/bind/xemacs.bind,v
retrieving revision 1.19
diff -u -p -r1.19 xemacs.bind
--- lib/bind/xemacs.bind 5 Aug 2002 16:50:03 -0000 1.19
+++ lib/bind/xemacs.bind 7 Jan 2003 16:38:35 -0000
@@ -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"
@@ -209,24 +227,6 @@
\bind "S-KP_Insert" "paste"
\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
##
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.1005
diff -u -p -r1.1005 ChangeLog
--- src/ChangeLog 6 Jan 2003 14:02:19 -0000 1.1005
+++ src/ChangeLog 7 Jan 2003 16:38:39 -0000
@@ -1,3 +1,13 @@
+2003-01-07 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* LColor.C:
Index: src/MenuBackend.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/MenuBackend.C,v
retrieving revision 1.61
diff -u -p -r1.61 MenuBackend.C
--- src/MenuBackend.C 6 Jan 2003 14:02:20 -0000 1.61
+++ src/MenuBackend.C 7 Jan 2003 16:38:39 -0000
@@ -486,7 +486,6 @@ void expandToc(Menu & tomenu, Buffer con
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();
Index: src/paragraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph.C,v
retrieving revision 1.233
diff -u -p -r1.233 paragraph.C
--- src/paragraph.C 27 Nov 2002 10:30:13 -0000 1.233
+++ src/paragraph.C 7 Jan 2003 16:38:39 -0000
@@ -1342,7 +1342,7 @@ bool Paragraph::simpleTeXOnePar(Buffer c
else
main_body = beginningOfMainBody();
- int column = 0;
+ unsigned int column = 0;
if (main_body > 0) {
os << '[';
Index: src/paragraph_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph_pimpl.C,v
retrieving revision 1.45
diff -u -p -r1.45 paragraph_pimpl.C
--- src/paragraph_pimpl.C 27 Nov 2002 10:30:14 -0000 1.45
+++ src/paragraph_pimpl.C 7 Jan 2003 16:38:39 -0000
@@ -211,7 +211,8 @@ void Paragraph::Pimpl::erase(pos_type po
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::simpleTeXSpecialC
bool & open_font,
LyXLayout const & style,
pos_type & i,
- int & column,
+ unsigned int & column,
value_type const c)
{
if (style.pass_thru) {
Index: src/paragraph_pimpl.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph_pimpl.h,v
retrieving revision 1.18
diff -u -p -r1.18 paragraph_pimpl.h
--- src/paragraph_pimpl.h 1 Dec 2002 22:59:17 -0000 1.18
+++ src/paragraph_pimpl.h 7 Jan 2003 16:38:40 -0000
@@ -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,
Index: src/tabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tabular.C,v
retrieving revision 1.141
diff -u -p -r1.141 tabular.C
--- src/tabular.C 27 Nov 2002 10:30:14 -0000 1.141
+++ src/tabular.C 7 Jan 2003 16:38:40 -0000
@@ -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:
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.648
diff -u -p -r1.648 ChangeLog
--- src/frontends/xforms/ChangeLog 6 Jan 2003 14:02:22 -0000 1.648
+++ src/frontends/xforms/ChangeLog 7 Jan 2003 16:38:42 -0000
@@ -1,3 +1,7 @@
+2002-01-07 Jürgen Spitzmüller <[EMAIL PROTECTED]>
+
+ * FormTabular.C: typo.
+
2003-01-06 Michael Schmitt <[EMAIL PROTECTED]>
* FormGraphics.C:
Index: src/frontends/xforms/FormTabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormTabular.C,v
retrieving revision 1.64
diff -u -p -r1.64 FormTabular.C
--- src/frontends/xforms/FormTabular.C 6 Jan 2003 14:02:22 -0000 1.64
+++ src/frontends/xforms/FormTabular.C 7 Jan 2003 16:38:42 -0000
@@ -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)
