> Log message: > Minipage is no more (long live the box inset)
Hello,
concerning the two changes in factory.C: Does it still make sense to check for minipages? I think they should be handled completely by lyx2lyx scripts. LFUN_INSET_MINIPAGE should be removed, too.
I found many other places where the term "minipage" was used ('find' is a wonderful tool, e.g. use
find ./src/ -type f -name "*[Ch]" -exec grep -il minipage {} \;
). Please see the attached patch and apply it if it makes sense.
Michael
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/lyx/lyx-devel/po/POTFILES.in,v
retrieving revision 1.372
diff -u -r1.372 POTFILES.in
--- po/POTFILES.in 2003/12/09 11:52:55 1.372
+++ po/POTFILES.in 2003/12/14 17:33:26
@@ -24,7 +24,6 @@
src/frontends/controllers/ControlGraphics.C
src/frontends/controllers/ControlInclude.C
src/frontends/controllers/ControlLog.C
-src/frontends/controllers/ControlNote.C
src/frontends/controllers/ControlPreamble.C
src/frontends/controllers/ControlPrefs.C
src/frontends/controllers/ControlPrint.C
@@ -68,7 +67,6 @@
src/frontends/qt2/QMath.C
src/frontends/qt2/QMathDialog.C
src/frontends/qt2/QMathMatrixDialog.C
-src/frontends/qt2/QMinipage.C
src/frontends/qt2/QNote.C
src/frontends/qt2/QParagraph.C
src/frontends/qt2/QPrefs.C
@@ -120,7 +118,6 @@
src/frontends/xforms/FormMathsPanel.C
src/frontends/xforms/FormMathsSpace.C
src/frontends/xforms/FormMathsStyle.C
-src/frontends/xforms/FormMinipage.C
src/frontends/xforms/FormNote.C
src/frontends/xforms/FormParagraph.C
src/frontends/xforms/FormPreamble.C
@@ -162,7 +159,6 @@
src/insets/insetindex.C
src/insets/insetlist.C
src/insets/insetmarginal.C
-src/insets/insetminipage.C
src/insets/insetnote.C
src/insets/insetoptarg.C
src/insets/insetpagebreak.C
Index: src/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/ChangeLog,v
retrieving revision 1.1752
diff -u -r1.1752 ChangeLog
--- src/ChangeLog 2003/12/14 16:33:51 1.1752
+++ src/ChangeLog 2003/12/14 17:33:58
@@ -1,6 +1,17 @@
+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-14 Angus Leeming <[EMAIL PROTECTED]>
- BranchList.[Ch]: minimize the API.
+ * BranchList.[Ch]: minimize the API.
(Branch::getBranch, getColor): now return a 'const &'.
(Branch::setSelected) now returns a bool set to true if the
selection status changes.
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/14 17:33:59
@@ -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/14 17:34:01
@@ -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/14 17:34:05
@@ -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/14 17:34:06
@@ -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/14 17:34:06
@@ -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/14 17:34:06
@@ -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/14 17:34:10
@@ -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.195
diff -u -r1.195 text3.C
--- src/text3.C 2003/12/12 15:19:34 1.195
+++ src/text3.C 2003/12/14 17:34:12
@@ -1389,7 +1389,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/frontends/gnome/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/ChangeLog,v
retrieving revision 1.63
diff -u -r1.63 ChangeLog
--- src/frontends/gnome/ChangeLog 2003/10/08 11:31:49 1.63
+++ src/frontends/gnome/ChangeLog 2003/12/14 17:34:14
@@ -1,3 +1,10 @@
+2003-12-14 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * Dialogs.C:
+ * Dialogs2.C:
+ * Dialogs_impl.h:
+ * Makefile.am: remove minipage
+
2003-10-08 Angus Leeming <[EMAIL PROTECTED]>
Fix doxygen warnings.
Index: src/frontends/gnome/Dialogs.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/Dialogs.C,v
retrieving revision 1.35
diff -u -r1.35 Dialogs.C
--- src/frontends/gnome/Dialogs.C 2003/08/23 00:16:37 1.35
+++ src/frontends/gnome/Dialogs.C 2003/12/14 17:34:14
@@ -40,7 +40,6 @@
include(lv, d),
logfile(lv, d),
mathpanel(lv, d),
- minipage(lv, d),
paragraph(lv, d),
preamble(lv, d),
preferences(lv, d),
Index: src/frontends/gnome/Dialogs2.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/Dialogs2.C,v
retrieving revision 1.5
diff -u -r1.5 Dialogs2.C
--- src/frontends/gnome/Dialogs2.C 2003/08/23 00:16:37 1.5
+++ src/frontends/gnome/Dialogs2.C 2003/12/14 17:34:14
@@ -91,17 +91,6 @@
pimpl_->changes.controller().show();
}
-void Dialogs::showMinipage(InsetMinipage * im)
-{
- pimpl_->minipage.controller().showInset(im);
-}
-
-
-void Dialogs::updateMinipage(InsetMinipage * im)
-{
- pimpl_->minipage.controller().showInset(im);
-}
-
void Dialogs::showParagraph()
{
Index: src/frontends/gnome/Dialogs_impl.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/Dialogs_impl.h,v
retrieving revision 1.5
diff -u -r1.5 Dialogs_impl.h
--- src/frontends/gnome/Dialogs_impl.h 2003/08/23 00:16:37 1.5
+++ src/frontends/gnome/Dialogs_impl.h 2003/12/14 17:34:15
@@ -75,10 +75,6 @@
#include "FormMathsPanel.h"
#include "forms/form_maths_panel.h"
-#include "ControlMinipage.h"
-#include "FormMinipage.h"
-#include "forms/form_minipage.h"
-
#include "ControlParagraph.h"
#include "FormParagraph.h"
#include "forms/form_paragraph.h"
@@ -178,9 +174,6 @@
typedef GUI<ControlMath, FormMathsPanel, OkCancelReadOnlyPolicy, xformsBC>
MathPanelDialog;
-typedef GUI<ControlMinipage, FormMinipage, NoRepeatedApplyReadOnlyPolicy, xformsBC>
-MinipageDialog;
-
typedef GUI<ControlParagraph, FormParagraph, OkApplyCancelReadOnlyPolicy, xformsBC>
ParagraphDialog;
@@ -237,7 +230,6 @@
IncludeDialog include;
LogFileDialog logfile;
MathPanelDialog mathpanel;
- MinipageDialog minipage;
ParagraphDialog paragraph;
PreambleDialog preamble;
PreferencesDialog preferences;
Index: src/frontends/gnome/Makefile.am
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gnome/Makefile.am,v
retrieving revision 1.48
diff -u -r1.48 Makefile.am
--- src/frontends/gnome/Makefile.am 2003/09/09 18:27:22 1.48
+++ src/frontends/gnome/Makefile.am 2003/12/14 17:34:15
@@ -41,7 +41,6 @@
../xforms/FormMathsPanel.lo \
../xforms/FormMathsSpace.lo \
../xforms/FormMathsStyle.lo \
- ../xforms/FormMinipage.lo \
../xforms/FormParagraph.lo \
../xforms/FormPreferences.lo \
../xforms/FormPrint.lo \
@@ -98,7 +97,6 @@
../xforms/forms/form_maths_panel.lo \
../xforms/forms/form_maths_space.lo \
../xforms/forms/form_maths_style.lo \
- ../xforms/forms/form_minipage.lo \
../xforms/forms/form_paragraph.lo \
../xforms/forms/form_preamble.lo \
../xforms/forms/form_preferences.lo \
Index: src/frontends/gtk/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gtk/ChangeLog,v
retrieving revision 1.19
diff -u -r1.19 ChangeLog
--- src/frontends/gtk/ChangeLog 2003/10/30 17:58:06 1.19
+++ src/frontends/gtk/ChangeLog 2003/12/14 17:34:16
@@ -1,3 +1,8 @@
+2003-12-14 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * Dialogs.C:
+ * Makefile.am: remove minipage
+
2003-10-30 Huang Ying <[EMAIL PROTECTED]>
* GToolbar.C : change layouts widget update code according xforms
Index: src/frontends/gtk/Dialogs.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gtk/Dialogs.C,v
retrieving revision 1.6
diff -u -r1.6 Dialogs.C
--- src/frontends/gtk/Dialogs.C 2003/10/28 16:45:08 1.6
+++ src/frontends/gtk/Dialogs.C 2003/12/14 17:34:16
@@ -30,7 +30,6 @@
#include "ControlInclude.h"
#include "ControlLog.h"
#include "ControlMath.h"
-#include "ControlMinipage.h"
#include "ControlNote.h"
#include "ControlParagraph.h"
#include "ControlRef.h"
@@ -63,7 +62,6 @@
#include "FormMathsMatrix.h"
#include "FormMathsSpace.h"
#include "FormMathsStyle.h"
-#include "FormMinipage.h"
#include "FormNote.h"
#include "FormParagraph.h"
#include "FormRef.h"
@@ -121,7 +119,7 @@
"mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
"mathamsarrows", "mathamsrelations", "mathamsnegatedrelations", "mathamsoperators",
"mathdelimiter", "mathmatrix", "mathspace", "mathstyle",
-"minipage", "note", "paragraph", "ref", "tabular", "tabularcreate", "texinfo",
+"box", "note", "paragraph", "ref", "tabular", "tabularcreate", "texinfo",
#ifdef HAVE_LIBAIKSAURUS
"thesaurus",
@@ -411,10 +409,6 @@
dialog->setController(new ControlMath(*dialog));
dialog->setView(new FormMathsStyle(*dialog));
dialog->bc().bp(new IgnorantPolicy);
- } else if (name == "minipage") {
- dialog->setController(new ControlMinipage(*dialog));
- dialog->setView(new FormMinipage(*dialog));
- dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "note") {
dialog->setController(new ControlNote(*dialog));
dialog->setView(new FormNote(*dialog));
Index: src/frontends/gtk/Makefile.am
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/gtk/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- src/frontends/gtk/Makefile.am 2003/10/28 16:45:08 1.5
+++ src/frontends/gtk/Makefile.am 2003/12/14 17:34:16
@@ -98,7 +98,6 @@
../xforms/FormMathsMatrix.lo \
../xforms/FormMathsSpace.lo \
../xforms/FormMathsStyle.lo \
- ../xforms/FormMinipage.lo \
../xforms/FormNote.lo \
../xforms/FormParagraph.lo \
../xforms/FormPreamble.lo \
Index: src/insets/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.950
diff -u -r1.950 ChangeLog
--- src/insets/ChangeLog 2003/12/14 16:33:56 1.950
+++ src/insets/ChangeLog 2003/12/14 17:34:32
@@ -1,3 +1,7 @@
+2003-12-14 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * inset.h: remove MINIPAGE_CODE
+
2003-12-12 Angus Leeming <[EMAIL PROTECTED]>
* insetbranch.C (c-tor): takes an InsetBranchParams arg rather than
Index: src/insets/inset.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/inset.h,v
retrieving revision 1.150
diff -u -r1.150 inset.h
--- src/insets/inset.h 2003/12/10 09:45:30 1.150
+++ src/insets/inset.h 2003/12/14 17:34:33
@@ -95,8 +95,6 @@
///
WRAP_CODE,
///
- MINIPAGE_CODE,
- ///
SPACE_CODE, // 25
///
SPECIALCHAR_CODE,
