Juergen Spitzmueller wrote:
I think this can go in. Don't know what Angus' current plans about moving the minipage->box conversion from 225 to 228 are, though. So I'd wait for his vote.
If all this patch does is prevent new Miniboxes being created, then great. Of course I vote for it to go in. However, as I read it, it prevents minipages in existing documents from being read. As no conversion script minipage->box exists, then of course that means it can't go in.
Hmmmmm... I think there _is_ a minipage->box conversion available in lyxconvert_224.py. Loading a LyX 1.3.4 document works as expected, at least. So what exactly is missing?
Enclosed please find a slightly modified patch again the current HEAD that "improves" the button label for boxes (the text "parbox" or "minipage" alone is a bit misleading UI-wise, especially as you may think that minipages are still alive).
If there are no objections, please apply. Otherwise, please let me.
Regards, Michael
Index: src/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/ChangeLog,v
retrieving revision 1.1758
diff -u -r1.1758 ChangeLog
--- src/ChangeLog 2003/12/20 00:24:30 1.1758
+++ src/ChangeLog 2003/12/22 14:24:30
@@ -1,3 +1,13 @@
+2003-12-14 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * LaTeXFeatures.C:
+ * lyx_sty.[Ch]: remove minipageindent_def
+
+ * LyXAction.C:
+ * factory.C:
+ * lfuns.h:
+ * lyxfunc.C:
+ * text3.C: remove LFUN_INSET_MINIPAGE
2003-12-19 Alfredo Braunstein <[EMAIL PROTECTED]>
Index: src/LaTeXFeatures.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/LaTeXFeatures.C,v
retrieving revision 1.101
diff -u -r1.101 LaTeXFeatures.C
--- src/LaTeXFeatures.C 2003/11/12 14:38:24 1.101
+++ src/LaTeXFeatures.C 2003/12/22 14:24:32
@@ -357,8 +357,6 @@
macros << mathcircumflex_def << '\n';
// other
- if (isRequired("NeedLyXMinipageIndent"))
- macros << minipageindent_def;
if (isRequired("ParagraphLeftIndent"))
macros << paragraphleftindent_def;
if (isRequired("NeedLyXFootnoteCode"))
Index: src/LyXAction.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/LyXAction.C,v
retrieving revision 1.189
diff -u -r1.189 LyXAction.C
--- src/LyXAction.C 2003/11/12 14:38:24 1.189
+++ src/LyXAction.C 2003/12/22 14:24:33
@@ -224,7 +224,6 @@
{ 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 },
Index: src/factory.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/factory.C,v
retrieving revision 1.79
diff -u -r1.79 factory.C
--- src/factory.C 2003/12/14 16:33:51 1.79
+++ src/factory.C 2003/12/22 14:24:34
@@ -84,9 +84,6 @@
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 @@
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();
Index: src/lfuns.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lfuns.h,v
retrieving revision 1.25
diff -u -r1.25 lfuns.h
--- src/lfuns.h 2003/11/28 15:53:23 1.25
+++ src/lfuns.h 2003/12/22 14:24:35
@@ -259,81 +259,80 @@
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);
Index: src/lyx_sty.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lyx_sty.C,v
retrieving revision 1.15
diff -u -r1.15 lyx_sty.C
--- src/lyx_sty.C 2003/10/06 15:42:21 1.15
+++ src/lyx_sty.C 2003/12/22 14:24:35
@@ -107,11 +107,6 @@
" \\expandafter\\noexpand\\csname [EMAIL PROTECTED]@opt \\endcsname}\n"
"[EMAIL PROTECTED]@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";
Index: src/lyx_sty.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lyx_sty.h,v
retrieving revision 1.16
diff -u -r1.16 lyx_sty.h
--- src/lyx_sty.h 2003/10/06 15:42:21 1.16
+++ src/lyx_sty.h 2003/12/22 14:24:35
@@ -43,8 +43,6 @@
///
extern std::string const floatingfootnote_def;
///
-extern std::string const minipageindent_def;
-///
extern std::string const boldsymbol_def;
///
extern std::string const binom_def;
Index: src/lyxfunc.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.553
diff -u -r1.553 lyxfunc.C
--- src/lyxfunc.C 2003/12/14 16:33:51 1.553
+++ src/lyxfunc.C 2003/12/22 14:24:39
@@ -609,9 +609,6 @@
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;
Index: src/text3.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/text3.C,v
retrieving revision 1.197
diff -u -r1.197 text3.C
--- src/text3.C 2003/12/18 04:43:08 1.197
+++ src/text3.C 2003/12/22 14:24:42
@@ -1387,7 +1387,6 @@
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:
Index: src/insets/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.952
diff -u -r1.952 ChangeLog
--- src/insets/ChangeLog 2003/12/16 18:49:04 1.952
+++ src/insets/ChangeLog 2003/12/22 14:24:58
@@ -1,4 +1,8 @@
+2003-12-22 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * insetbox.C: Use term "Box" in button label
+
2003-12-16 Martin Vermeer <[EMAIL PROTECTED]>
* insetcharstyle.C: get getDrawFont working again
Index: src/insets/insetbox.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetbox.C,v
retrieving revision 1.14
diff -u -r1.14 insetbox.C
--- src/insets/insetbox.C 2003/12/11 15:23:15 1.14
+++ src/insets/insetbox.C 2003/12/22 14:24:59
@@ -139,11 +139,11 @@
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);
