On Fri, Sep 12, 2008 at 04:14:24AM +0200, Pavel Sanda wrote:
> Richard Heck wrote:
> > Enrico Forestieri wrote:
> >> Another option would be the following. When the user enters
> >> \mathbf{x\alpha y}, we could output the following latex code:
> >> \mathbf{x\boldsymbol{\alpha}y}.
> >>
> >>
> > Surely this far and away the best option. The user in this case does not
> > care what LaTeX code is output, only that it looks right.
>
> do you see some easy implementation of such a thing?
I am not really sure that that is the best option. Maybe the two
attached patches make everybody happy. The first one restores the
toggle behavior on \boldsymbol (Ctrl-B), and the second one on
\mathbf (Ctrl-Alt-B).
--
Enrico
Index: src/mathed/InsetMathBoldSymbol.h
===================================================================
--- src/mathed/InsetMathBoldSymbol.h (revisione 26357)
+++ src/mathed/InsetMathBoldSymbol.h (copia locale)
@@ -29,6 +29,8 @@
///
InsetMathBoldSymbol(Kind kind = AMS_BOLD);
///
+ docstring name() const;
+ ///
void metrics(MetricsInfo & mi, Dimension & dim) const;
///
void draw(PainterInfo & pi, int x, int y) const;
Index: src/mathed/InsetMathBoldSymbol.cpp
===================================================================
--- src/mathed/InsetMathBoldSymbol.cpp (revisione 26357)
+++ src/mathed/InsetMathBoldSymbol.cpp (copia locale)
@@ -32,6 +32,21 @@
}
+docstring InsetMathBoldSymbol::name() const
+{
+ switch (kind_) {
+ case AMS_BOLD:
+ return from_ascii("boldsymbol");
+ case BM_BOLD:
+ return from_ascii("bm");
+ case BM_HEAVY:
+ return from_ascii("hm");
+ }
+ // avoid compiler warning
+ return docstring();
+}
+
+
void InsetMathBoldSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
{
//FontSetChanger dummy(mi.base, "mathbf");
Index: src/LyXAction.cpp
===================================================================
--- src/LyXAction.cpp (revisione 26357)
+++ src/LyXAction.cpp (copia locale)
@@ -1092,12 +1092,20 @@
/*!
* \var lyx::FuncCode lyx::LFUN_FONT_BOLD
- * \li Action: Toggles the bold font (selection-wise).
+ * \li Action: Toggles the bold font (selection-wise) using boldsymbol in math.
* \li Syntax: font-bold
* \endvar
*/
{ LFUN_FONT_BOLD, "font-bold", Noop, Layout },
+
/*!
+ * \var lyx::FuncCode lyx::LFUN_FONT_BOLD_MATHBF
+ * \li Action: Toggles the bold font (selection-wise) using mathbf in math.
+ * \li Syntax: font-bold-mathbf
+ * \endvar
+ */
+ { LFUN_FONT_BOLD_MATHBF, "font-bold-mathbf", Noop, Layout },
+/*!
* \var lyx::FuncCode lyx::LFUN_FONT_TYPEWRITER
* \li Action: Toggles the typewriter family font (selection-wise).
* \li Syntax: font-typewriter
Index: src/insets/InsetTabular.cpp
===================================================================
--- src/insets/InsetTabular.cpp (revisione 26357)
+++ src/insets/InsetTabular.cpp (copia locale)
@@ -3516,6 +3516,7 @@
case LFUN_FONT_EMPH:
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLD_MATHBF:
case LFUN_FONT_ROMAN:
case LFUN_FONT_NOUN:
case LFUN_FONT_ITAL:
Index: src/insets/InsetCollapsable.cpp
===================================================================
--- src/insets/InsetCollapsable.cpp (revisione 26357)
+++ src/insets/InsetCollapsable.cpp (copia locale)
@@ -649,6 +649,7 @@
case LFUN_FLOAT_LIST_INSERT:
case LFUN_FLOAT_WIDE_INSERT:
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLD_MATHBF:
case LFUN_FONT_TYPEWRITER:
case LFUN_FONT_DEFAULT:
case LFUN_FONT_EMPH:
Index: src/mathed/InsetMathNest.cpp
===================================================================
--- src/mathed/InsetMathNest.cpp (revisione 26357)
+++ src/mathed/InsetMathNest.cpp (copia locale)
@@ -880,6 +880,12 @@
else
handleFont(cur, cmd.argument(), "boldsymbol");
break;
+ case LFUN_FONT_BOLD_MATHBF:
+ if (currentMode() == TEXT_MODE)
+ handleFont(cur, cmd.argument(), "textbf");
+ else
+ handleFont(cur, cmd.argument(), "mathbf");
+ break;
case LFUN_FONT_SANS:
if (currentMode() == TEXT_MODE)
handleFont(cur, cmd.argument(), "textsf");
@@ -1192,6 +1198,7 @@
/// We have to handle them since 1.4 blocks all unhandled actions
case LFUN_FONT_ITAL:
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLD_MATHBF:
case LFUN_FONT_SANS:
case LFUN_FONT_EMPH:
case LFUN_FONT_TYPEWRITER:
Index: src/Text3.cpp
===================================================================
--- src/Text3.cpp (revisione 26357)
+++ src/Text3.cpp (copia locale)
@@ -1522,7 +1522,8 @@
break;
}
- case LFUN_FONT_BOLD: {
+ case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLD_MATHBF: {
Font font(ignore_font, ignore_language);
font.fontInfo().setSeries(BOLD_SERIES);
toggleAndShow(cur, this, font);
@@ -2038,6 +2039,7 @@
break;
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLD_MATHBF:
flag.setOnOff(fontinfo.series() == BOLD_SERIES);
break;
Index: src/FuncCode.h
===================================================================
--- src/FuncCode.h (revisione 26357)
+++ src/FuncCode.h (copia locale)
@@ -60,352 +60,354 @@
LFUN_FONT_EMPH,
LFUN_FONT_BOLD,
// 25
+ LFUN_FONT_BOLD_MATHBF,
LFUN_FONT_ROMAN,
LFUN_FONT_NOUN,
LFUN_FONT_ITAL,
LFUN_FONT_FRAK,
+ // 30
LFUN_CHAR_FORWARD,
- // 30
LFUN_CHAR_BACKWARD,
LFUN_UP,
LFUN_DOWN,
LFUN_SCREEN_UP,
+ // 35
LFUN_SCREEN_DOWN,
- // 35
LFUN_LINE_BEGIN,
LFUN_LINE_END,
LFUN_CELL_FORWARD,
LFUN_CELL_BACKWARD,
+ // 40
LFUN_WORD_FORWARD,
- // 40
LFUN_WORD_BACKWARD,
LFUN_BUFFER_BEGIN,
LFUN_BUFFER_END,
LFUN_CHAR_FORWARD_SELECT,
+ // 45
LFUN_CHAR_BACKWARD_SELECT,
- // 45
LFUN_UP_SELECT,
LFUN_DOWN_SELECT,
LFUN_SCREEN_UP_SELECT,
LFUN_SCREEN_DOWN_SELECT,
+ // 50
LFUN_LINE_BEGIN_SELECT,
- // 50
LFUN_LINE_END_SELECT,
LFUN_WORD_FORWARD_SELECT,
LFUN_WORD_BACKWARD_SELECT,
LFUN_WORD_SELECT,
+ // 55
LFUN_BUFFER_BEGIN_SELECT,
- // 55
LFUN_BUFFER_END_SELECT,
LFUN_SPACE_INSERT, // JSpitzm 20030520
LFUN_SPECIALCHAR_INSERT, // JSpitzm, 20071206
LFUN_MARK_TOGGLE,
+ // 60
LFUN_CHAR_DELETE_FORWARD,
- // 60
LFUN_CHAR_DELETE_BACKWARD,
LFUN_NEWLINE_INSERT, // renamed: JSpitzm, 20080325
LFUN_BREAK_PARAGRAPH,
LFUN_QUOTE_INSERT,
+ // 65
LFUN_ACCENT_CIRCUMFLEX,
- // 65
LFUN_MATH_SUBSCRIPT,
LFUN_MATH_SUPERSCRIPT,
LFUN_ACCENT_GRAVE,
LFUN_ACCENT_ACUTE,
+ // 70
LFUN_ACCENT_TILDE,
- // 70
LFUN_ACCENT_CEDILLA,
LFUN_ACCENT_MACRON,
LFUN_ACCENT_UNDERBAR,
LFUN_ACCENT_UNDERDOT,
+ // 75
LFUN_ACCENT_CIRCLE,
- // 75
LFUN_ACCENT_TIE,
LFUN_ACCENT_BREVE,
LFUN_ACCENT_CARON,
LFUN_ACCENT_HUNGARIAN_UMLAUT,
+ // 80
LFUN_ACCENT_UMLAUT,
- // 80
LFUN_ACCENT_DOT,
LFUN_ACCENT_OGONEK,
LFUN_SELF_INSERT,
LFUN_GETBUFNAME,
+ // 85
LFUN_SERVER_GET_XY,
- // 85
LFUN_SERVER_SET_XY,
LFUN_SPLIT_VIEW,
LFUN_LINEATCURSOR,
LFUN_SERVER_GET_LAYOUT,
+ // 90
LFUN_SERVER_GET_FILENAME,
- // 90
LFUN_SERVER_NOTIFY,
LFUN_SERVER_GOTO_FILE_ROW,
LFUN_NOTE_INSERT,
LFUN_UI_TOGGLE,
+ // 95
LFUN_KEYMAP_OFF,
- // 95
LFUN_KEYMAP_PRIMARY,
LFUN_KEYMAP_SECONDARY,
LFUN_KEYMAP_TOGGLE,
LFUN_MATH_INSERT,
+ // 100
LFUN_MATH_MATRIX,
- // 100
LFUN_MATH_LIMITS,
LFUN_MATH_DELIM, // Alejandro 180696
LFUN_MATH_DISPLAY, // Alejandro 180696
LFUN_MATH_MODE, // Alejandro 040696
+ // 105
LFUN_MATH_NUMBER_TOGGLE,
- // 105
LFUN_MATH_NUMBER_LINE_TOGGLE,
LFUN_MATH_SIZE, // Alejandro 150896
LFUN_MATH_MACRO, // ale970510
LFUN_MATH_EXTERN, // Andre' 20010424
+ // 110
LFUN_MATH_MUTATE, // Andre' 20010523
- // 110
LFUN_MATH_SPACE, // Andre' 20010725
LFUN_WORD_DELETE_FORWARD,
LFUN_WORD_DELETE_BACKWARD,
LFUN_LINE_DELETE,
+ // 115
LFUN_NOTES_MUTATE,
- // 115
LFUN_MARK_OFF,
LFUN_MARK_ON,
LFUN_LAYOUT,
LFUN_LAYOUT_PARAGRAPH,
+ // 120
LFUN_DROP_LAYOUTS_CHOICE, // used in bindings as of 20071228
- // 120
LFUN_FONT_TYPEWRITER, // changed from FONT_CODE 20070920
LFUN_FONT_SANS,
LFUN_FONT_DEFAULT,
LFUN_FONT_UNDERLINE,
+ // 125
LFUN_FONT_SIZE,
- // 125
LFUN_FONT_STATE,
LFUN_WORD_UPCASE,
LFUN_WORD_LOWCASE,
LFUN_WORD_CAPITALIZE,
+ // 130
LFUN_LABEL_INSERT,
- // 130
LFUN_DEPTH_DECREMENT,
LFUN_DEPTH_INCREMENT,
LFUN_MENU_OPEN, // used in bindings as of 20060905
LFUN_CANCEL,
+ // 135
LFUN_META_PREFIX,
- // 135
LFUN_COMMAND_EXECUTE,
LFUN_FILE_INSERT,
LFUN_FILE_INSERT_PLAINTEXT, // CFO-G 1997-11-19
LFUN_FILE_INSERT_PLAINTEXT_PARA,// Levon 2001-02-14
+ // 140
LFUN_FILE_OPEN,
- // 140
LFUN_PARAGRAPH_UP, // Asger 1996-10-01
LFUN_PARAGRAPH_UP_SELECT, // Asger 1996-10-01
LFUN_PARAGRAPH_DOWN, // Asger 1996-10-01
LFUN_PARAGRAPH_DOWN_SELECT, // Asger 1996-10-01
+ // 145
LFUN_NEXT_INSET_MODIFY, // JSpitzm 20080323
- // 145
LFUN_BUFFER_NEW_TEMPLATE, // Asger 1997-02-02
LFUN_BUFFER_RELOAD, // Asger 1997-02-02
LFUN_RECONFIGURE,
LFUN_BRANCH_ACTIVATE,
+ // 150
LFUN_BRANCH_DEACTIVATE,
- // 150
LFUN_INDEX_PRINT, // Lgb 97-02-27
LFUN_CELL_SPLIT,
LFUN_BUFFER_CHILD_OPEN, // Ale 970528
LFUN_TOC_INSERT, // Lgb 97-05-27
+ // 155
LFUN_FLOAT_LIST_INSERT, // Lgb 20010503
- // 155
LFUN_BUFFER_TOGGLE_READ_ONLY, // Lgb 97-05-27
LFUN_VC_REGISTER, // Lgb 97-07-01
LFUN_VC_CHECK_IN, // Lgb 97-07-01
LFUN_VC_CHECK_OUT, // Lgb 97-07-01
+ // 160
LFUN_VC_REVERT, // Lgb 97-07-01
- // 160
LFUN_VC_UNDO_LAST, // Lgb 97-07-01
LFUN_BUFFER_EXPORT, // Lgb 97-07-29
LFUN_LABEL_GOTO, // Ale 970806
LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE, // ARRae 971202
+ // 165
LFUN_BUFFER_CHKTEX, // Asger 971030
- // 165
LFUN_HYPERLINK_INSERT, // CFO-G 971121
LFUN_WORD_FIND_FORWARD, // Etienne 980216
LFUN_WORD_FIND_BACKWARD, // Etienne 980220
LFUN_APPENDIX, // ettrich 980505
+ // 170
LFUN_BUFFER_IMPORT, // Asger 980724
- // 170
LFUN_COMMAND_SEQUENCE, // Andre' 991111
LFUN_PREFERENCES_SAVE,
LFUN_HELP_OPEN, // Jug 990627
LFUN_DATE_INSERT, // jdblair 20000131
+ // 175
LFUN_LANGUAGE, // Dekel 20000203
- // 175
LFUN_ERT_INSERT, // Jug 20000218
LFUN_FOOTNOTE_INSERT, // Jug 20000307
LFUN_PARAGRAPH_SPACING, // Lgb 20000411
LFUN_TABULAR_INSERT, // Jug 20000412
+ // 180
LFUN_LOFVIEW, // Dekel 20000519
- // 180
LFUN_LOTVIEW, // Dekel 20000519
LFUN_LOAVIEW, // Dekel 20000519
LFUN_SET_COLOR, // SLior 20000611
LFUN_MARGINALNOTE_INSERT, // Lgb 20000626
+ // 185
LFUN_FLOAT_INSERT, // Lgb 20000627
- // 185
LFUN_FLOAT_WIDE_INSERT, // Lgb 20010531
LFUN_CAPTION_INSERT, // Lgb 20000718; inactive as of 20060905
LFUN_BUFFER_SWITCH,
LFUN_TABULAR_FEATURE, // Jug 20000728
+ // 190
LFUN_LAYOUT_TABULAR, // Jug 20000731
- // 190
LFUN_BUFFER_UPDATE, // Dekel 20000805
LFUN_INDEX_INSERT, // Angus 20000803
LFUN_SCREEN_FONT_UPDATE, // ARRae 20000813
LFUN_PARAGRAPH_GOTO, // Dekel 20000826
+ // 195
LFUN_REFERENCE_NEXT, // Dekel 20010114
- // 195
LFUN_BOOKMARK_SAVE,
LFUN_BOOKMARK_GOTO,
LFUN_SELECT_FILE_SYNC, // Levon 20010214
LFUN_MESSAGE, // Lgb 20010408; for scripting purposes, output in minibuffer
+ // 200
LFUN_CHARS_TRANSPOSE, // Lgb 20010425
- // 200
LFUN_ESCAPE, // Lgb 20010517
LFUN_THESAURUS_ENTRY, // Levon 20010720
LFUN_OPTIONAL_INSERT, // Martin 12 Aug 2002
LFUN_MOUSE_PRESS, // André 9 Aug 2002
+ // 205
LFUN_MOUSE_MOTION, // André 9 Aug 2002
- // 205
LFUN_MOUSE_RELEASE, // André 9 Aug 2002
LFUN_MOUSE_DOUBLE, // André 9 Aug 2002
LFUN_MOUSE_TRIPLE, // André 9 Aug 2002
LFUN_WRAP_INSERT, // Dekel 7 Apr 2002
+ // 210
LFUN_CHANGES_TRACK, // Levon 20021001 (cool date !)
- // 210
LFUN_CHANGES_MERGE, // Levon 20021016
LFUN_CHANGE_ACCEPT, // Levon 20021016
LFUN_CHANGE_REJECT, // Levon 20021016
LFUN_ALL_CHANGES_ACCEPT, // Levon 20021016
+ // 215
LFUN_ALL_CHANGES_REJECT, // Levon 20021016
- // 215
LFUN_SCROLL,
LFUN_DIALOG_SHOW,
LFUN_DIALOG_SHOW_NEW_INSET,
LFUN_DIALOG_UPDATE,
+ // 220
LFUN_DIALOG_HIDE,
- // 220
LFUN_DIALOG_TOGGLE, // JSpitzm 20070430
LFUN_DIALOG_DISCONNECT_INSET,
LFUN_INSET_APPLY,
LFUN_INSET_INSERT,
+ // 225
LFUN_INSET_MODIFY,
- // 225
LFUN_INSET_DIALOG_UPDATE,
LFUN_INSET_SETTINGS,
LFUN_PARAGRAPH_PARAMS_APPLY,
LFUN_PARAGRAPH_UPDATE,
+ // 230
LFUN_INSET_EDIT, // JSpitzm 20080427
- // 230
LFUN_BRANCH_INSERT,
LFUN_BOX_INSERT,
LFUN_LINE_INSERT,
LFUN_NEWPAGE_INSERT, // uwestoehr, 20071124
+ // 235
LFUN_REPEAT,
- // 235
LFUN_FINISHED_LEFT,
LFUN_FINISHED_RIGHT,
LFUN_FLEX_INSERT,
LFUN_WORD_FIND,
+ // 240
LFUN_WORD_REPLACE,
- // 240
LFUN_BUFFER_EXPORT_CUSTOM,
LFUN_BUFFER_PRINT,
LFUN_NEXT_INSET_TOGGLE,
LFUN_ALL_INSETS_TOGGLE,
+ // 245
LFUN_BUFFER_LANGUAGE,
- // 245
LFUN_TEXTCLASS_APPLY,
LFUN_TEXTCLASS_LOAD,
LFUN_BUFFER_SAVE_AS_DEFAULT,
LFUN_BUFFER_PARAMS_APPLY,
+ // 250
LFUN_LYXRC_APPLY,
- // 250
LFUN_BUFFER_NEXT,
LFUN_BUFFER_PREVIOUS,
LFUN_STATISTICS,
LFUN_CHANGES_OUTPUT, // jspitzm 20050121
+ // 255
LFUN_BIBTEX_DATABASE_ADD,
- // 255
LFUN_BIBTEX_DATABASE_DEL,
LFUN_CITATION_INSERT,
LFUN_OUTLINE_UP,
LFUN_OUTLINE_DOWN,
+ // 260
LFUN_OUTLINE_IN,
- // 260
LFUN_OUTLINE_OUT,
LFUN_PARAGRAPH_MOVE_DOWN,
LFUN_PARAGRAPH_MOVE_UP,
LFUN_BUFFER_TOGGLE_COMPRESSION, // bpeng 20060427
+ // 265
LFUN_MATH_BIGDELIM,
- // 265
LFUN_CLIPBOARD_PASTE,
LFUN_INSET_DISSOLVE, // jspitzm 20060807
LFUN_CHANGE_NEXT,
LFUN_WINDOW_NEW, // Abdel 20061021
+ // 270
LFUN_WINDOW_CLOSE, // Abdel 20061023
- // 270
LFUN_UNICODE_INSERT, // Lgb 20061022
LFUN_BOOKMARK_CLEAR, // bpeng 20061031
LFUN_NOMENCL_INSERT, // Ugras
LFUN_NOMENCL_PRINT, // Ugras
+ // 275
LFUN_LISTING_INSERT, // Herbert 20011110, bpeng 20070502
- // 275
LFUN_TOOLBAR_TOGGLE, // Edwin 20070521
LFUN_BUFFER_WRITE_ALL, // rgh, gpothier 200707XX
LFUN_PARAGRAPH_PARAMS,
LFUN_LAYOUT_MODULES_CLEAR,
+ // 280
LFUN_LAYOUT_MODULE_ADD,
- // 280
LFUN_LAYOUT_RELOAD,
LFUN_MASTER_BUFFER_VIEW, // Tommaso, 20070920
LFUN_MASTER_BUFFER_UPDATE, // Tommaso, 20070920
LFUN_INFO_INSERT, // bpeng, 20071007
+ // 285
LFUN_CALL, // broider, 20071002
- // 285
LFUN_CHAR_LEFT, // dov, 20071022
LFUN_CHAR_LEFT_SELECT, // dov, 20071022
LFUN_CHAR_RIGHT, // dov, 20071022
LFUN_CHAR_RIGHT_SELECT, // dov, 20071022
+ // 290
LFUN_FINISHED_BACKWARD, // dov, 20071022
- // 290
LFUN_FINISHED_FORWARD, // dov, 20071022
LFUN_WORD_LEFT, // dov, 20071028
LFUN_WORD_LEFT_SELECT, // dov, 20071028
LFUN_WORD_RIGHT, // dov, 20071028
+ // 295
LFUN_WORD_RIGHT_SELECT, // dov, 20071028
- // 295
LFUN_MATH_MACRO_FOLD,
LFUN_MATH_MACRO_UNFOLD,
LFUN_MATH_MACRO_ADD_PARAM,
LFUN_MATH_MACRO_REMOVE_PARAM,
+ // 300
LFUN_MATH_MACRO_APPEND_GREEDY_PARAM,
- // 300
LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM,
LFUN_MATH_MACRO_MAKE_OPTIONAL,
LFUN_MATH_MACRO_MAKE_NONOPTIONAL,
LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM,
+ // 305
LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM,
- // 305
LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM,
LFUN_IN_MATHMACROTEMPLATE,
LFUN_COMPLETION_POPUP,
LFUN_COMPLETION_INLINE,
+ // 310
LFUN_COMPLETION_COMPLETE,
- // 310
LFUN_GRAPHICS_GROUPS_UNIFY,
LFUN_SET_GRAPHICS_GROUP,
LFUN_COMPLETION_CANCEL,
LFUN_COMPLETION_ACCEPT,
+ // 315
LFUN_LASTACTION // end of the table
};
Index: lib/bind/cua.bind
===================================================================
--- lib/bind/cua.bind (revisione 26357)
+++ lib/bind/cua.bind (copia locale)
@@ -55,7 +55,7 @@
\bind "C-Prior" "buffer-previous"
\bind "C-S-Tab" "buffer-previous"
-\bind "C-M-b" "math-insert \mathbf"
+\bind "C-M-b" "font-bold-mathbf"
\bind "C-b" "font-bold"
\bind "C-e" "font-emph"
# used below for line-delete-forward
Index: lib/bind/mac.bind
===================================================================
--- lib/bind/mac.bind (revisione 26357)
+++ lib/bind/mac.bind (copia locale)
@@ -42,7 +42,7 @@
\bind "M-Tab" "buffer-next"
\bind "M-S-BackTab" "buffer-previous"
-\bind "C-M-b" "math-insert \mathbf"
+\bind "C-M-b" "font-bold-mathbf"
\bind "C-b" "font-bold"
\bind "C-e" "font-emph"
\bind "C-k" "font-noun" # 'k' for capitals
