anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

small bits

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5915 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-01-08 09:03:32 +00:00
parent 0efa3f71a0
commit 2868b724d5
11 changed files with 83 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ChangeLog
View File

@ -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>

36
lib/bind/emacs.bind
View File

@ -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

36
lib/bind/xemacs.bind
View File

@ -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

10
src/ChangeLog
View File

@ -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:

1
src/MenuBackend.C
View File

@ -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();

4
src/frontends/xforms/ChangeLog
View File

@ -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:

6
src/frontends/xforms/FormTabular.C
View File

@ -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)

2
src/paragraph.C
View File

@ -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 << '[';

5
src/paragraph_pimpl.C
View File

@ -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) {

5
src/paragraph_pimpl.h
View File

@ -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,

27
src/tabular.C
View File

@ -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: