From: Jürgen Spitzmüller Date: Mon, 29 Dec 2003 13:55:45 +0000 (+0000) Subject: Michael's latest minipage cleanup patch X-Git-Tag: 1.6.10~15624 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=038032fefdd878a5d172b983269f5ffe84c640a9;p=features.git Michael's latest minipage cleanup patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8282 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/ChangeLog b/src/ChangeLog index 54502524ef..941f8fcaa9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2003-12-28 Michael Schmitt + + * LaTeXFeatures.C: + * lyx_sty.[Ch]: remove minipageindent_def + + * LyXAction.C: + * factory.C: + * lfuns.h: + * lyxfunc.C: + * text3.C: remove LFUN_INSET_MINIPAGE + 2003-12-28 Angus Leeming * text3.C (dispatch): output useful info on receipt of LFUN_GETLAYOUT. diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index 85754e12d0..d7c3b4b68f 100644 --- a/src/LaTeXFeatures.C +++ b/src/LaTeXFeatures.C @@ -357,8 +357,6 @@ string const LaTeXFeatures::getMacros() const macros << mathcircumflex_def << '\n'; // other - if (isRequired("NeedLyXMinipageIndent")) - macros << minipageindent_def; if (isRequired("ParagraphLeftIndent")) macros << paragraphleftindent_def; if (isRequired("NeedLyXFootnoteCode")) diff --git a/src/LyXAction.C b/src/LyXAction.C index 5979bea6d2..228c995fd0 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -224,7 +224,6 @@ void LyXAction::init() { LFUN_MENU_OPEN_BY_NAME, "menu-open", NoBuffer }, { LFUN_MENU_SEPARATOR, "menu-separator-insert", Noop }, { LFUN_META_FAKE, "meta-prefix", NoBuffer }, - { LFUN_INSET_MINIPAGE, "minipage-insert", Noop }, { LFUN_INSERT_BRANCH, "branch-insert", Noop }, { LFUN_INSERT_CHARSTYLE, "charstyle-insert", Noop }, { LFUN_INSERT_NOTE, "note-insert", Noop }, diff --git a/src/factory.C b/src/factory.C index e6f75634a4..c5aab75b5b 100644 --- a/src/factory.C +++ b/src/factory.C @@ -84,9 +84,6 @@ InsetOld * createInset(FuncRequest const & cmd) case LFUN_INSERT_PAGEBREAK: return new InsetPagebreak; - case LFUN_INSET_MINIPAGE: - return new InsetBox(params, "Frameless"); - case LFUN_INSERT_CHARSTYLE: { string s = cmd.getArg(0); CharStyles::iterator found_cs = params.getLyXTextClass().charstyle(s); @@ -443,8 +440,6 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf) inset.reset(new InsetMarginal(buf.params())); } else if (tmptok == "OptArg") { inset.reset(new InsetOptArg(buf.params())); - } else if (tmptok == "Minipage") { - inset.reset(new InsetBox(buf.params(), "Frameless")); } else if (tmptok == "Float") { lex.next(); string tmptok = lex.getString(); diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index dddd5f004f..d36974b297 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,4 +1,8 @@ +2003-12-22 Michael Schmitt + + * insetbox.C: Use term "Box" in button label + 2003-12-16 Martin Vermeer * insetcharstyle.C: get getDrawFont working again diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C index 0b224108d1..e4547b6c1c 100644 --- a/src/insets/insetbox.C +++ b/src/insets/insetbox.C @@ -139,11 +139,11 @@ void InsetBox::setButtonLabel() BoxType btype = boxtranslator().find(params_.type); if (btype == Frameless) { if (params_.use_parbox) - setLabel(_("Parbox")); + setLabel(_("Box") + " (" + _("Parbox") + ")"); else - setLabel(_("Minipage")); + setLabel(_("Box") + " (" + _("Minipage") + ")"); } else - setLabel(boxtranslator_loc().find(btype)); + setLabel(_("Box") + " (" + boxtranslator_loc().find(btype) + ")"); font.setColor(LColor::foreground); setBackgroundColor(LColor::background); diff --git a/src/lfuns.h b/src/lfuns.h index edbe3b0f1f..412cbab53a 100644 --- a/src/lfuns.h +++ b/src/lfuns.h @@ -259,81 +259,80 @@ enum kb_action { LFUN_LOAVIEW, // Dekel 20000519 LFUN_SET_COLOR, // SLior 20000611 LFUN_INSET_MARGINAL, // Lgb 20000626 - LFUN_INSET_MINIPAGE, // Lgb 20000627 - // 195 LFUN_INSET_FLOAT, // Lgb 20000627 + // 195 LFUN_INSET_WIDE_FLOAT, // Lgb 20010531 LFUN_INSET_CAPTION, // Lgb 20000718 LFUN_SWITCHBUFFER, LFUN_TABULAR_FEATURE, // Jug 20000728 - // 200 LFUN_LAYOUT_TABULAR, // Jug 20000731 + // 200 LFUN_SCROLL_INSET, // Jug 20000801 LFUN_UPDATE, // Dekel 20000805 LFUN_INDEX_INSERT, // Angus 20000803 LFUN_SCREEN_FONT_UPDATE, // ARRae 20000813 - // 205 LFUN_GOTO_PARAGRAPH, // Dekel 20000826 + // 205 LFUN_REFERENCE_GOTO, // Dekel 20010114 LFUN_BOOKMARK_SAVE, // Dekel 20010127 LFUN_BOOKMARK_GOTO, // Dekel 20010127 LFUN_SELECT_FILE_SYNC, // Levon 20010214 - // 210 LFUN_MESSAGE, // Lgb 20010408 + // 210 LFUN_TRANSPOSE_CHARS, // Lgb 20010425 LFUN_ESCAPE, // Lgb 20010517 LFUN_THESAURUS_ENTRY, // Levon 20010720 LFUN_FORKS_KILL, // Angus 16 Feb 2002 - // 215 LFUN_TOOLTIPS_TOGGLE, // Angus 8 Mar 2002 + // 215 LFUN_INSET_OPTARG, // Martin 12 Aug 2002 LFUN_MOUSE_PRESS, // André 9 Aug 2002 LFUN_MOUSE_MOTION, // André 9 Aug 2002 LFUN_MOUSE_RELEASE, // André 9 Aug 2002 - // 220 LFUN_MOUSE_DOUBLE, // André 9 Aug 2002 + // 220 LFUN_MOUSE_TRIPLE, // André 9 Aug 2002 LFUN_INSET_WRAP, // Dekel 7 Apr 2002 LFUN_TRACK_CHANGES, // Levon 20021001 (cool date !) LFUN_MERGE_CHANGES, // Levon 20021016 - // 225 LFUN_ACCEPT_CHANGE, // Levon 20021016 + // 225 LFUN_REJECT_CHANGE, // Levon 20021016 LFUN_ACCEPT_ALL_CHANGES, // Levon 20021016 LFUN_REJECT_ALL_CHANGES, // Levon 20021016 LFUN_INSERT_BIBITEM, // André 14 Feb 2003 - // 230 LFUN_DIALOG_SHOW, + // 230 LFUN_DIALOG_SHOW_NEW_INSET, LFUN_DIALOG_SHOW_NEXT_INSET, LFUN_DIALOG_UPDATE, LFUN_DIALOG_HIDE, - // 235 LFUN_DIALOG_DISCONNECT_INSET, + // 235 LFUN_INSET_APPLY, LFUN_INSET_INSERT, LFUN_INSET_MODIFY, LFUN_INSET_DIALOG_UPDATE, - // 240 LFUN_INSET_SETTINGS, + // 240 LFUN_PARAGRAPH_APPLY, LFUN_PARAGRAPH_UPDATE, LFUN_EXTERNAL_EDIT, LFUN_INSERT_BRANCH, - // 245 LFUN_INSET_DIALOG_SHOW, + // 245 LFUN_INSERT_BOX, LFUN_INSERT_LINE, LFUN_INSERT_PAGEBREAK, LFUN_REPEAT, - // 250 LFUN_FINISHED_LEFT, + // 250 LFUN_FINISHED_RIGHT, LFUN_FINISHED_UP, LFUN_FINISHED_DOWN, LFUN_INSERT_CHARSTYLE, - // 255 LFUN_LASTACTION // end of the table + // 255 }; std::ostream & operator<<(std::ostream &, kb_action); diff --git a/src/lyx_sty.C b/src/lyx_sty.C index a4a7308aac..4c9f42af7b 100644 --- a/src/lyx_sty.C +++ b/src/lyx_sty.C @@ -107,11 +107,6 @@ string const floatingfootnote_def = " \\expandafter\\noexpand\\csname SF@gobble@opt \\endcsname}\n" "\\def\\SF@gobble@twobracket[#1]#2{}\n"; -string const minipageindent_def = - "%% This length is the backup for minipages of the \\parindent\n" - "\\newlength{\\LyXMinipageIndent}\n" - "\\setlength{\\LyXMinipageIndent}{\\parindent}\n"; - string const boldsymbol_def = "%% Bold symbol macro for standard LaTeX users\n" "\\newcommand{\\boldsymbol}[1]{\\mbox{\\boldmath $#1$}}\n"; diff --git a/src/lyx_sty.h b/src/lyx_sty.h index 89655d86b7..d549735f5e 100644 --- a/src/lyx_sty.h +++ b/src/lyx_sty.h @@ -43,8 +43,6 @@ extern std::string const paragraphleftindent_def; /// extern std::string const floatingfootnote_def; /// -extern std::string const minipageindent_def; -/// extern std::string const boldsymbol_def; /// extern std::string const binom_def; diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 2ceb143dee..ffa8571412 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -609,9 +609,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const case LFUN_INSET_MARGINAL: code = InsetOld::MARGIN_CODE; break; - case LFUN_INSET_MINIPAGE: - code = InsetOld::BOX_CODE; - break; case LFUN_INSET_FLOAT: case LFUN_INSET_WIDE_FLOAT: code = InsetOld::FLOAT_CODE; diff --git a/src/text3.C b/src/text3.C index ec4058a006..0dbbd22913 100644 --- a/src/text3.C +++ b/src/text3.C @@ -1387,7 +1387,6 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd) case LFUN_INSET_FLOAT: case LFUN_INSET_FOOTNOTE: case LFUN_INSET_MARGINAL: - case LFUN_INSET_MINIPAGE: case LFUN_INSET_OPTARG: case LFUN_INSET_WIDE_FLOAT: case LFUN_INSET_WRAP: