From 541828ebf50876780d90766d84ba01246440c9be Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 18:06:42 +0200 Subject: [PATCH] Another witch hunting case: break-paragraph -> paragraph-break. --- lib/bind/cua.bind | 2 +- lib/bind/emacs.bind | 4 ++-- lib/bind/mac.bind | 4 ++-- lib/bind/site.bind | 4 ++-- lib/bind/xemacs.bind | 4 ++-- lib/doc/Math.lyx | 2 +- lib/doc/UserGuide.lyx | 42 ++++++++++++++++++------------------ lib/doc/de/Math.lyx | 2 +- lib/doc/es/Math.lyx | 2 +- lib/doc/fr/Math.lyx | 2 +- lib/doc/fr/UserGuide.lyx | 42 ++++++++++++++++++------------------ lib/doc/id/UserGuide.lyx | 42 ++++++++++++++++++------------------ lib/doc/ja/Math.lyx | 2 +- lib/doc/ja/UserGuide.lyx | 40 +++++++++++++++++----------------- src/FuncCode.h | 2 +- src/LyXAction.cpp | 6 +++--- src/Text3.cpp | 4 ++-- src/insets/InsetBox.cpp | 2 +- src/insets/InsetCaption.cpp | 2 +- src/insets/InsetScript.cpp | 2 +- src/insets/InsetTabular.cpp | 2 +- src/mathed/InsetMathHull.cpp | 4 ++-- 22 files changed, 109 insertions(+), 109 deletions(-) diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind index 6860bff84c..4d6c286e42 100644 --- a/lib/bind/cua.bind +++ b/lib/bind/cua.bind @@ -222,7 +222,7 @@ Format 1 \bind "C-Delete" "word-delete-forward" \bind "C-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "C-k" "line-delete-forward" diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind index 89e3a81f90..fd7123face 100644 --- a/lib/bind/emacs.bind +++ b/lib/bind/emacs.bind @@ -40,7 +40,7 @@ Format 1 \bind "C-h" "specialchar-insert hyphenation" \bind "C-M-minus" "specialchar-insert nobreakdash" \bind "C-i" "space-insert hfill" -\bind "C-j" "break-paragraph" +\bind "C-j" "paragraph-break" \bind "C-k" "line-delete-forward" \bind "C-l" "screen-recenter" \bind "C-m" "mark-toggle" @@ -216,7 +216,7 @@ Format 1 \bind "C-Delete" "word-delete-forward" \bind "M-d" "word-delete-forward" \bind "C-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "C-S-L" "specialchar-insert ligature-break" diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind index 3049a2f209..c85ec8d972 100644 --- a/lib/bind/mac.bind +++ b/lib/bind/mac.bind @@ -68,7 +68,7 @@ Format 1 # +: "Control-N" # Move down one line \bind "M-n" "down" # +: "Control-O" # Insert a new line after the cursor -\bind "M-o" "break-paragraph" +\bind "M-o" "paragraph-break" # -: "Control-P" # Move up one line # used by menu.bind - layouts # +: "Control-T" # Transpose the character behind the cursor and the character in front of the cursor @@ -347,7 +347,7 @@ Format 1 \bind "A-Delete" "word-delete-forward" \bind "A-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "A-space" "command-alternatives space-insert protected ; math-space" diff --git a/lib/bind/site.bind b/lib/bind/site.bind index 3756a18792..f8f1523e2a 100644 --- a/lib/bind/site.bind +++ b/lib/bind/site.bind @@ -37,11 +37,11 @@ Format 1 \bind "Prior" "screen-up" \bind "Next" "screen-down" -\bind "Return" "break-paragraph" +\bind "Return" "paragraph-break" \bind "Delete" "char-delete-forward" \bind "BackSpace" "char-delete-backward" -\bind "KP_Enter" "break-paragraph" +\bind "KP_Enter" "paragraph-break" \bind "KP_Right" "char-right" \bind "KP_Left" "char-left" \bind "KP_Up" "up" diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind index 47459464c6..90ada4faa7 100644 --- a/lib/bind/xemacs.bind +++ b/lib/bind/xemacs.bind @@ -221,7 +221,7 @@ Format 1 \bind "C-Delete" "word-delete-forward" \bind "M-d" "word-delete-forward" \bind "C-BackSpace" "word-delete-backward" -\bind "M-Return" "break-paragraph inverse" +\bind "M-Return" "paragraph-break inverse" \bind "C-Return" "newline-insert newline" \bind "C-S-Return" "newline-insert linebreak" \bind "C-S-L" "specialchar-insert ligature-break" @@ -332,7 +332,7 @@ Format 1 \bind "C-c percent" "layout Comment" -\bind "C-c Return" "break-paragraph inverse" +\bind "C-c Return" "paragraph-break inverse" # ## End AucTeX # diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index dc31bc48bc..0ce808048a 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -34760,7 +34760,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 08c04aa7c6..b1d80ec398 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -4394,7 +4394,7 @@ Return use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset instead. @@ -5353,7 +5353,7 @@ Standard depth, you can use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to break paragraphs. @@ -7199,7 +7199,7 @@ Return \family default is the \family typewriter -break-paragraph +paragraph-break \family default function, and the individual lines of an address are not paragraphs. Thus, you have to use @@ -8841,7 +8841,7 @@ List We created it by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -8872,7 +8872,7 @@ arg "depth-increment" by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -8903,7 +8903,7 @@ Standard We did this by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -8941,7 +8941,7 @@ Standard paragraph, also at level #4, made with just a \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -8953,7 +8953,7 @@ arg "break-paragraph inverse" We hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset and changed the paragraph environment back to @@ -9003,7 +9003,7 @@ and this is level #6. Just hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9021,7 +9021,7 @@ arg "depth-decrement" #4-b After another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9192,7 +9192,7 @@ This is level #2. We used \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9226,7 +9226,7 @@ Itemize (We got here by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9247,7 +9247,7 @@ Itemize Here's level #4, produced using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9315,7 +9315,7 @@ don't Oh, as if you couldn't guess by now, we're just using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to keep the current environment and depth but create a new item. @@ -9331,7 +9331,7 @@ arg "depth-decrement" to decrease the depth after the next \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9372,7 +9372,7 @@ did Another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9395,7 +9395,7 @@ Enumerate The same thing happens if we do another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9526,7 +9526,7 @@ Bippitey boppitey boo! ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9641,7 +9641,7 @@ blue-fish ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9657,7 +9657,7 @@ arg "depth-increment" 3 times, \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9733,7 +9733,7 @@ Quotation We will use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to preserve the depth. diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx index 1f9a66edb0..be4a8d7428 100644 --- a/lib/doc/de/Math.lyx +++ b/lib/doc/de/Math.lyx @@ -34808,7 +34808,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index 6e5fc0f7cf..a6f1a1ffd7 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -35284,7 +35284,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Section diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index 52f2819164..ec837feb55 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -35049,7 +35049,7 @@ Maxima \begin_layout Standard \series bold -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index d373432e48..ef7df09d2b 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -4579,7 +4579,7 @@ Entrée que la profondeur actuels, utilisez \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -5560,7 +5560,7 @@ Standard la profondeur d'emboîtement courante, vous pouvez utiliser \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset pour séparer les paragraphes. @@ -7486,7 +7486,7 @@ Entrée \family default est la fonction \family typewriter -break-paragraph +paragraph-break \family default , et les lignes d'une adresse, prises isolément, ne sont pas des paragraphes. Ainsi, vous vous servirez de @@ -9368,7 +9368,7 @@ Liste; Nous l'avons obtenu avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9398,7 +9398,7 @@ arg "depth-increment" Nous aurions pu le créer de la même manière que le précédent, avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9429,7 +9429,7 @@ Standard Nous l'avons obtenu avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , puis @@ -9467,7 +9467,7 @@ Standard , également au niveau n°4, obtenu juste avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9479,7 +9479,7 @@ arg "break-paragraph inverse" Nous avons tapé \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset et remis l'environnement de paragraphe à @@ -9527,7 +9527,7 @@ pouvons Tapez \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset puis @@ -9545,7 +9545,7 @@ arg "depth-decrement" 4-b Après un autre \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9736,7 +9736,7 @@ Voici le niveau n°2. Nous avons fait \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9773,7 +9773,7 @@ ListePuces \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , puis @@ -9794,7 +9794,7 @@ ListePuces Voici le niveau n°4, obtenu avec \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , puis @@ -9856,7 +9856,7 @@ pas Au fait, vous aurez deviné que nous utilisons \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset pour conserver le même environnement et la même profondeur mais créer un @@ -9873,7 +9873,7 @@ arg "depth-decrement" pour diminuer la profondeur après le prochain \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9912,7 +9912,7 @@ toujours Après un autre \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset suivi de @@ -9937,7 +9937,7 @@ Gauche Nous obtenons la même chose avec une autre suite \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -10071,7 +10071,7 @@ PooPooPiDoo ! ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset ) @@ -10148,7 +10148,7 @@ poisson bleu ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , @@ -10164,7 +10164,7 @@ arg "depth-increment" 3 fois, \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , @@ -10241,7 +10241,7 @@ Citation Nous utilisons \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset pour préserver la profondeur. diff --git a/lib/doc/id/UserGuide.lyx b/lib/doc/id/UserGuide.lyx index 5ac69be9ac..84d28d013c 100644 --- a/lib/doc/id/UserGuide.lyx +++ b/lib/doc/id/UserGuide.lyx @@ -4537,7 +4537,7 @@ Return use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset instead. @@ -5504,7 +5504,7 @@ Standard depth, you can use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to break paragraphs. @@ -7400,7 +7400,7 @@ Return \family default is the \family typewriter -break-paragraph +paragraph-break \family default function, and the individual lines of an address are not paragraphs. Thus, you have to use @@ -9038,7 +9038,7 @@ List We created it by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9069,7 +9069,7 @@ arg "depth-increment" by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9100,7 +9100,7 @@ Standard We did this by hitting \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9138,7 +9138,7 @@ Standard paragraph, also at level #4, made with just a \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9150,7 +9150,7 @@ arg "break-paragraph inverse" We hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset and changed the paragraph environment back to @@ -9200,7 +9200,7 @@ and this is level #6. Just hit \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9218,7 +9218,7 @@ arg "depth-decrement" #4-b After another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by a @@ -9389,7 +9389,7 @@ This is level #2. We used \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset followed by @@ -9423,7 +9423,7 @@ Itemize (We got here by using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9444,7 +9444,7 @@ Itemize Here's level #4, produced using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset , then @@ -9512,7 +9512,7 @@ don't Oh, as if you couldn't guess by now, we're just using \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to keep the current environment and depth but create a new item. @@ -9528,7 +9528,7 @@ arg "depth-decrement" to decrease the depth after the next \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset . @@ -9569,7 +9569,7 @@ did Another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9592,7 +9592,7 @@ Enumerate The same thing happens if we do another \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9723,7 +9723,7 @@ Bippitey boppitey boo! ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9838,7 +9838,7 @@ blue-fish ( \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9854,7 +9854,7 @@ arg "depth-increment" 3 times, \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -9930,7 +9930,7 @@ Quotation We'll use \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset to preserve the depth. diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx index b95526fd39..44fd4a9a1d 100644 --- a/lib/doc/ja/Math.lyx +++ b/lib/doc/ja/Math.lyx @@ -34050,7 +34050,7 @@ Maxima \series bold \lang english -command-alternatives break-paragraph;math-extern maxima +command-alternatives paragraph-break;math-extern maxima \end_layout \begin_layout Standard diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index c7cb67dd81..2b33d637bc 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -6015,7 +6015,7 @@ Return \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -7895,7 +7895,7 @@ Return \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -11433,7 +11433,7 @@ Return \bar default \noun default \color inherit -break-paragraph +paragraph-break \family roman \series medium \shape up @@ -14106,7 +14106,7 @@ status collapsed \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14211,7 +14211,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14291,7 +14291,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14416,7 +14416,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14454,7 +14454,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14591,7 +14591,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14636,7 +14636,7 @@ arg "depth-decrement" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -14972,7 +14972,7 @@ status collapsed ここは第2階層です。 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset の後に @@ -15052,7 +15052,7 @@ arg "depth-increment" 環境なので、ラベルが黒丸になるのです（ここに来るには、 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset の後に @@ -15096,7 +15096,7 @@ arg "depth-increment" ここは第4階層です。 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset の後に @@ -15260,7 +15260,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -15288,7 +15288,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset と押してから @@ -15394,7 +15394,7 @@ arg "depth-increment" もう一度 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset と @@ -15438,7 +15438,7 @@ arg "depth-decrement" もう一度 \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset と @@ -15698,7 +15698,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -15802,7 +15802,7 @@ arg "break-paragraph inverse" \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset @@ -16023,7 +16023,7 @@ Return 環境を使います。階層を保持するためには \begin_inset Info type "shortcut" -arg "break-paragraph inverse" +arg "paragraph-break inverse" \end_inset を使うことにします。 diff --git a/src/FuncCode.h b/src/FuncCode.h index ec441decf7..9b0de53f5e 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -106,7 +106,7 @@ enum FuncCode LFUN_CHAR_DELETE_FORWARD, LFUN_CHAR_DELETE_BACKWARD, LFUN_NEWLINE_INSERT, // renamed: JSpitzm, 20080325 - LFUN_BREAK_PARAGRAPH, + LFUN_PARAGRAPH_BREAK, // 65 LFUN_QUOTE_INSERT, LFUN_ACCENT_CIRCUMFLEX, diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index d1dfdc3d8d..9aa2ddefb3 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -1996,16 +1996,16 @@ void LyXAction::init() */ { LFUN_PARAGRAPH_GOTO, "paragraph-goto", ReadOnly | NoInternal, Edit }, /*! - * \var lyx::FuncCode lyx::LFUN_BREAK_PARAGRAPH + * \var lyx::FuncCode lyx::LFUN_PARAGRAPH_BREAK * \li Action: Breaks the current paragraph at the current location. * \li Notion: Removes the selection. - * \li Syntax: break-paragraph [] + * \li Syntax: paragraph-break [] * \li Params: : "inverse" - decreases depth by one (or change layout to default layout) when the cursor is at the end of the line. * \endvar */ - { LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop, Edit }, + { LFUN_PARAGRAPH_BREAK, "paragraph-break", Noop, Edit }, /*! * \var lyx::FuncCode lyx::LFUN_PARAGRAPH_PARAMS * \li Action: Change paragraph settings. diff --git a/src/Text3.cpp b/src/Text3.cpp index beebcc5b90..78d74293d0 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -1063,7 +1063,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } break; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: cap::replaceSelection(cur); breakParagraph(cur, cmd.argument() == "inverse"); cur.resetAnchor(); @@ -2747,7 +2747,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, flag.setOnOff(to_utf8(cmd.argument()) == cur.real_current_font.language()->lang()); break; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: enable = cur.inset().getLayout().isMultiPar(); break; diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 68bca75947..2e611ffd30 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -239,7 +239,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, flag.setEnabled(true); return true; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: if ((params_.inner_box && !params_.use_makebox) || params_.type == "Shaded" || params_.type == "Framed") return InsetCollapsable::getStatus(cur, cmd, flag); diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp index e623d9d597..b1c4e08d1a 100644 --- a/src/insets/InsetCaption.cpp +++ b/src/insets/InsetCaption.cpp @@ -197,7 +197,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd, { switch (cmd.action()) { - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: status.setEnabled(false); return true; diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp index 648b910e27..2cb15a2da4 100644 --- a/src/insets/InsetScript.cpp +++ b/src/insets/InsetScript.cpp @@ -261,7 +261,7 @@ bool InsetScript::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { switch (cmd.action()) { - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: case LFUN_LAYOUT: case LFUN_LAYOUT_PARAGRAPH: case LFUN_MATH_DISPLAY: diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 840f3cbddd..6bdf72b046 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -4729,7 +4729,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd, } // disable in non-fixed-width cells - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: // multirow does not allow paragraph breaks if (tabular.isMultiRow(cur.idx())) { status.setEnabled(false); diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index 2055fb2c4b..1f135f54c2 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -1368,7 +1368,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd) cur.undispatched(); break; - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: // just swallow this break; @@ -1570,7 +1570,7 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd, // we never allow this in math, and we want to bind enter // to another actions in command-alternatives - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: status.setEnabled(false); return true; case LFUN_MATH_MUTATE: { -- 2.39.5