Fix bug 1781 by removing server-get-font.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24448 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-04-22 17:45:22 +00:00
parent 5b6699bfe9
commit 42a5a56e29
3 changed files with 45 additions and 57 deletions

View File

@ -138,277 +138,276 @@ enum FuncCode
LFUN_LINEATCURSOR,
LFUN_SERVER_GET_LAYOUT,
// 90
LFUN_SERVER_GET_FONT,
LFUN_SERVER_GET_NAME,
LFUN_SERVER_NOTIFY,
LFUN_SERVER_GOTO_FILE_ROW,
LFUN_NOTE_INSERT,
// 95
LFUN_ENVIRONMENT_INSERT, // unused as of 20060905
// 95
LFUN_KEYMAP_OFF,
LFUN_KEYMAP_PRIMARY,
LFUN_KEYMAP_SECONDARY,
LFUN_KEYMAP_TOGGLE,
// 100
LFUN_MATH_INSERT,
// 100
LFUN_MATH_MATRIX,
LFUN_MATH_LIMITS,
LFUN_MATH_DELIM, // Alejandro 180696
LFUN_MATH_DISPLAY, // Alejandro 180696
// 105
LFUN_MATH_MODE, // Alejandro 040696
// 105
LFUN_MATH_NUMBER_TOGGLE,
LFUN_MATH_NUMBER_LINE_TOGGLE,
LFUN_MATH_SIZE, // Alejandro 150896
LFUN_MATH_MACRO, // ale970510
// 110
LFUN_MATH_EXTERN, // Andre' 20010424
// 110
LFUN_MATH_MUTATE, // Andre' 20010523
LFUN_MATH_IMPORT_SELECTION, // Andre' 20010704
LFUN_MATH_SPACE, // Andre' 20010725
LFUN_WORD_DELETE_FORWARD,
// 115
LFUN_WORD_DELETE_BACKWARD,
// 115
LFUN_LINE_DELETE,
LFUN_MARK_OFF,
LFUN_MARK_ON,
LFUN_LAYOUT,
// 120
LFUN_LAYOUT_PARAGRAPH,
// 120
LFUN_DROP_LAYOUTS_CHOICE, // used in bindings as of 20071228
LFUN_FONT_TYPEWRITER, // changed from FONT_CODE 20070920
LFUN_FONT_SANS,
LFUN_FONT_DEFAULT,
// 125
LFUN_FONT_UNDERLINE,
// 125
LFUN_FONT_SIZE,
LFUN_FONT_STATE,
LFUN_WORD_UPCASE,
LFUN_WORD_LOWCASE,
// 130
LFUN_WORD_CAPITALIZE,
// 130
LFUN_LABEL_INSERT,
LFUN_DEPTH_DECREMENT,
LFUN_DEPTH_INCREMENT,
LFUN_MENU_OPEN, // used in bindings as of 20060905
// 135
LFUN_CANCEL,
// 135
LFUN_META_PREFIX,
LFUN_COMMAND_EXECUTE,
LFUN_FILE_INSERT,
LFUN_FILE_INSERT_PLAINTEXT, // CFO-G 1997-11-19
// 140
LFUN_FILE_INSERT_PLAINTEXT_PARA,// Levon 2001-02-14
// 140
LFUN_FILE_OPEN,
LFUN_PARAGRAPH_UP, // Asger 1996-10-01
LFUN_PARAGRAPH_UP_SELECT, // Asger 1996-10-01
LFUN_PARAGRAPH_DOWN, // Asger 1996-10-01
// 145
LFUN_PARAGRAPH_DOWN_SELECT, // Asger 1996-10-01
// 145
LFUN_BREAK_PARAGRAPH_SKIP,
LFUN_DELETE_BACKWARD_SKIP,
LFUN_DELETE_FORWARD_SKIP,
LFUN_BUFFER_NEW_TEMPLATE, // Asger 1997-02-02
// 150
LFUN_BUFFER_RELOAD, // Asger 1997-02-02
// 150
LFUN_RECONFIGURE,
LFUN_INDEX_PRINT, // Lgb 97-02-27
LFUN_CELL_SPLIT,
LFUN_BUFFER_CHILD_OPEN, // Ale 970528
// 155
LFUN_TOC_INSERT, // Lgb 97-05-27
// 155
LFUN_FLOAT_LIST, // Lgb 20010503
LFUN_BUFFER_TOGGLE_READ_ONLY, // Lgb 97-05-27
LFUN_VC_REGISTER, // Lgb 97-07-01
LFUN_VC_CHECK_IN, // Lgb 97-07-01
// 160
LFUN_VC_CHECK_OUT, // Lgb 97-07-01
// 160
LFUN_VC_REVERT, // Lgb 97-07-01
LFUN_VC_UNDO_LAST, // Lgb 97-07-01
LFUN_BUFFER_EXPORT, // Lgb 97-07-29
LFUN_LABEL_GOTO, // Ale 970806
// 165
LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE, // ARRae 971202
// 165
LFUN_BUFFER_CHKTEX, // Asger 971030
LFUN_HYPERLINK_INSERT, // CFO-G 971121
LFUN_WORD_FIND_FORWARD, // Etienne 980216
LFUN_WORD_FIND_BACKWARD, // Etienne 980220
// 170
LFUN_APPENDIX, // ettrich 980505
// 170
LFUN_BUFFER_IMPORT, // Asger 980724
LFUN_COMMAND_SEQUENCE, // Andre' 991111
LFUN_PREFERENCES_SAVE,
LFUN_HELP_OPEN, // Jug 990627
// 175
LFUN_DATE_INSERT, // jdblair 20000131
// 175
LFUN_LANGUAGE, // Dekel 20000203
LFUN_ERT_INSERT, // Jug 20000218
LFUN_FOOTNOTE_INSERT, // Jug 20000307
LFUN_PARAGRAPH_SPACING, // Lgb 20000411
// 180
LFUN_TABULAR_INSERT, // Jug 20000412
// 180
LFUN_LOFVIEW, // Dekel 20000519
LFUN_LOTVIEW, // Dekel 20000519
LFUN_LOAVIEW, // Dekel 20000519
LFUN_SET_COLOR, // SLior 20000611
// 185
LFUN_MARGINALNOTE_INSERT, // Lgb 20000626
// 185
LFUN_FLOAT_INSERT, // Lgb 20000627
LFUN_FLOAT_WIDE_INSERT, // Lgb 20010531
LFUN_CAPTION_INSERT, // Lgb 20000718; inactive as of 20060905
LFUN_BUFFER_SWITCH,
// 190
LFUN_TABULAR_FEATURE, // Jug 20000728
// 190
LFUN_LAYOUT_TABULAR, // Jug 20000731
LFUN_BUFFER_UPDATE, // Dekel 20000805
LFUN_INDEX_INSERT, // Angus 20000803
LFUN_SCREEN_FONT_UPDATE, // ARRae 20000813
// 195
LFUN_PARAGRAPH_GOTO, // Dekel 20000826
// 195
LFUN_REFERENCE_NEXT, // Dekel 20010114
LFUN_BOOKMARK_SAVE,
LFUN_BOOKMARK_GOTO,
LFUN_SELECT_FILE_SYNC, // Levon 20010214
// 200
LFUN_MESSAGE, // Lgb 20010408; for scripting purposes, output in minibuffer
// 200
LFUN_CHARS_TRANSPOSE, // Lgb 20010425
LFUN_ESCAPE, // Lgb 20010517
LFUN_THESAURUS_ENTRY, // Levon 20010720
LFUN_OPTIONAL_INSERT, // Martin 12 Aug 2002
// 205
LFUN_MOUSE_PRESS, // André 9 Aug 2002
// 205
LFUN_MOUSE_MOTION, // André 9 Aug 2002
LFUN_MOUSE_RELEASE, // André 9 Aug 2002
LFUN_MOUSE_DOUBLE, // André 9 Aug 2002
LFUN_MOUSE_TRIPLE, // André 9 Aug 2002
// 210
LFUN_WRAP_INSERT, // Dekel 7 Apr 2002
// 210
LFUN_CHANGES_TRACK, // Levon 20021001 (cool date !)
LFUN_CHANGES_MERGE, // Levon 20021016
LFUN_CHANGE_ACCEPT, // Levon 20021016
LFUN_CHANGE_REJECT, // Levon 20021016
// 215
LFUN_ALL_CHANGES_ACCEPT, // Levon 20021016
// 215
LFUN_ALL_CHANGES_REJECT, // Levon 20021016
LFUN_BIBITEM_INSERT, // André 14 Feb 2003
LFUN_DIALOG_SHOW,
LFUN_DIALOG_SHOW_NEW_INSET,
// 220
LFUN_DIALOG_UPDATE,
// 220
LFUN_DIALOG_HIDE,
LFUN_DIALOG_TOGGLE, // JSpitzm 20070430
LFUN_DIALOG_DISCONNECT_INSET,
LFUN_INSET_APPLY,
// 225
LFUN_INSET_INSERT,
// 225
LFUN_INSET_MODIFY,
LFUN_INSET_DIALOG_UPDATE,
LFUN_INSET_SETTINGS,
LFUN_PARAGRAPH_PARAMS_APPLY,
// 230
LFUN_PARAGRAPH_UPDATE,
// 230
LFUN_EXTERNAL_EDIT,
LFUN_BRANCH_INSERT,
LFUN_BOX_INSERT,
LFUN_LINE_INSERT,
// 235
LFUN_NEWPAGE_INSERT, // uwestoehr, 20071124
// 235
LFUN_REPEAT,
LFUN_FINISHED_LEFT,
LFUN_FINISHED_RIGHT,
LFUN_FLEX_INSERT,
// 240
LFUN_WORD_FIND,
// 240
LFUN_WORD_REPLACE,
LFUN_BUFFER_EXPORT_CUSTOM,
LFUN_BUFFER_PRINT,
LFUN_NEXT_INSET_TOGGLE,
// 245
LFUN_ALL_INSETS_TOGGLE,
// 245
LFUN_BUFFER_LANGUAGE,
LFUN_TEXTCLASS_APPLY,
LFUN_TEXTCLASS_LOAD,
LFUN_BUFFER_SAVE_AS_DEFAULT,
// 250
LFUN_BUFFER_PARAMS_APPLY,
// 250
LFUN_LYXRC_APPLY,
LFUN_GRAPHICS_EDIT,
LFUN_BUFFER_NEXT,
LFUN_BUFFER_PREVIOUS,
// 255
LFUN_STATISTICS,
// 255
LFUN_CHANGES_OUTPUT, // jspitzm 20050121
LFUN_BIBTEX_DATABASE_ADD,
LFUN_BIBTEX_DATABASE_DEL,
LFUN_CITATION_INSERT,
// 260
LFUN_OUTLINE_UP,
// 260
LFUN_OUTLINE_DOWN,
LFUN_OUTLINE_IN,
LFUN_OUTLINE_OUT,
LFUN_PARAGRAPH_MOVE_DOWN,
// 265
LFUN_PARAGRAPH_MOVE_UP,
// 265
LFUN_BUFFER_TOGGLE_COMPRESSION, // bpeng 20060427
LFUN_MATH_BIGDELIM,
LFUN_CLIPBOARD_PASTE,
LFUN_INSET_DISSOLVE, // jspitzm 20060807
// 270
LFUN_CHANGE_NEXT,
// 270
LFUN_WINDOW_NEW, // Abdel 20061021
LFUN_WINDOW_CLOSE, // Abdel 20061023
LFUN_UNICODE_INSERT, // Lgb 20061022
LFUN_BOOKMARK_CLEAR, // bpeng 20061031
// 275
LFUN_NOMENCL_INSERT, // Ugras
// 275
LFUN_NOMENCL_PRINT, // Ugras
LFUN_LISTING_INSERT, // Herbert 20011110, bpeng 20070502
LFUN_TOOLBAR_TOGGLE, // Edwin 20070521
LFUN_BUFFER_WRITE_ALL, // rgh, gpothier 200707XX
// 280
LFUN_PARAGRAPH_PARAMS,
// 280
LFUN_LAYOUT_MODULES_CLEAR,
LFUN_LAYOUT_MODULE_ADD,
LFUN_LAYOUT_RELOAD,
LFUN_MASTER_BUFFER_VIEW, // Tommaso, 20070920
// 285
LFUN_MASTER_BUFFER_UPDATE, // Tommaso, 20070920
// 285
LFUN_INFO_INSERT, // bpeng, 20071007
LFUN_CALL, // broider, 20071002
LFUN_CHAR_LEFT, // dov, 20071022
LFUN_CHAR_LEFT_SELECT, // dov, 20071022
// 290
LFUN_CHAR_RIGHT, // dov, 20071022
// 290
LFUN_CHAR_RIGHT_SELECT, // dov, 20071022
LFUN_FINISHED_BACKWARD, // dov, 20071022
LFUN_FINISHED_FORWARD, // dov, 20071022
LFUN_WORD_LEFT, // dov, 20071028
// 295
LFUN_WORD_LEFT_SELECT, // dov, 20071028
// 295
LFUN_WORD_RIGHT, // dov, 20071028
LFUN_WORD_RIGHT_SELECT, // dov, 20071028
LFUN_MATH_MACRO_FOLD,
LFUN_MATH_MACRO_UNFOLD,
// 300
LFUN_MATH_MACRO_ADD_PARAM,
// 300
LFUN_MATH_MACRO_REMOVE_PARAM,
LFUN_MATH_MACRO_APPEND_GREEDY_PARAM,
LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM,
LFUN_MATH_MACRO_MAKE_OPTIONAL,
// 305
LFUN_MATH_MACRO_MAKE_NONOPTIONAL,
// 305
LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM,
LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM,
LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM,
LFUN_IN_MATHMACROTEMPLATE,
// 310
LFUN_SCROLL,
// 310
LFUN_UI_TOGGLE,
LFUN_SPLIT_VIEW,
LFUN_CLOSE_TAB_GROUP,
LFUN_COMPLETION_POPUP,
// 315
LFUN_COMPLETION_INLINE,
// 315
LFUN_COMPLETION_COMPLETE,
LFUN_NEXT_INSET_MODIFY, // JSpitzm 20080323
LFUN_LASTACTION // end of the table

View File

@ -1440,7 +1440,6 @@ void LyXAction::init()
{ LFUN_ESCAPE, "escape", ReadOnly, Edit },
{ LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly, System },
{ LFUN_SERVER_GET_FONT, "server-get-font", ReadOnly, System },
{ LFUN_SERVER_GET_LAYOUT, "server-get-layout", ReadOnly, System },
{ LFUN_SERVER_GET_NAME, "server-get-name", ReadOnly, System },
/*!

View File

@ -981,15 +981,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
break;
}
case LFUN_SERVER_GET_FONT:
if (cur.current_font.fontInfo().shape() == ITALIC_SHAPE)
cur.message(from_ascii("E"));
else if (cur.current_font.fontInfo().shape() == SMALLCAPS_SHAPE)
cur.message(from_ascii("N"));
else
cur.message(from_ascii("0"));
break;
case LFUN_SERVER_GET_LAYOUT:
cur.message(cur.paragraph().layout().name());
break;
@ -2184,7 +2175,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_CHARS_TRANSPOSE:
case LFUN_SERVER_GET_XY:
case LFUN_SERVER_SET_XY:
case LFUN_SERVER_GET_FONT:
case LFUN_SERVER_GET_LAYOUT:
case LFUN_LAYOUT:
case LFUN_DATE_INSERT: