2002-09-12 14:58:06 +00:00
|
|
|
|
/**
|
|
|
|
|
* \file factory.C
|
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
|
*
|
|
|
|
|
* \author Andr<EFBFBD> P<EFBFBD>nitz
|
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* Full author contact details are available in file CREDITS.
|
2002-09-12 14:58:06 +00:00
|
|
|
|
*/
|
2002-08-27 10:14:56 +00:00
|
|
|
|
|
2002-11-04 00:15:56 +00:00
|
|
|
|
#include <config.h>
|
|
|
|
|
|
2003-09-05 16:31:30 +00:00
|
|
|
|
#include "factory.h"
|
2003-09-09 11:24:33 +00:00
|
|
|
|
|
2002-08-27 10:14:56 +00:00
|
|
|
|
#include "buffer.h"
|
|
|
|
|
#include "BufferView.h"
|
2003-09-09 11:24:33 +00:00
|
|
|
|
#include "bufferparams.h"
|
|
|
|
|
#include "debug.h"
|
|
|
|
|
#include "FloatList.h"
|
|
|
|
|
#include "funcrequest.h"
|
2003-09-16 10:54:23 +00:00
|
|
|
|
#include "LColor.h"
|
2003-03-12 11:52:23 +00:00
|
|
|
|
#include "lyxlex.h"
|
2003-11-03 17:47:28 +00:00
|
|
|
|
#include "paragraph.h"
|
2002-08-28 17:33:42 +00:00
|
|
|
|
|
2003-02-21 09:20:18 +00:00
|
|
|
|
#include "insets/insetbibitem.h"
|
2003-02-26 19:28:38 +00:00
|
|
|
|
#include "insets/insetbibtex.h"
|
2002-08-28 17:33:42 +00:00
|
|
|
|
#include "insets/insetcaption.h"
|
2003-02-26 19:28:38 +00:00
|
|
|
|
#include "insets/insetcite.h"
|
2003-11-12 14:38:26 +00:00
|
|
|
|
#include "insets/insetcharstyle.h"
|
2003-03-13 11:00:31 +00:00
|
|
|
|
#include "insets/insetenv.h"
|
2002-08-27 10:14:56 +00:00
|
|
|
|
#include "insets/insetert.h"
|
|
|
|
|
#include "insets/insetexternal.h"
|
|
|
|
|
#include "insets/insetfloat.h"
|
2003-03-12 11:52:23 +00:00
|
|
|
|
#include "insets/insetfloatlist.h"
|
2002-08-27 10:14:56 +00:00
|
|
|
|
#include "insets/insetfoot.h"
|
2003-03-07 18:44:57 +00:00
|
|
|
|
#include "insets/insetgraphics.h"
|
2003-03-11 11:52:05 +00:00
|
|
|
|
#include "insets/insethfill.h"
|
2003-03-05 14:59:37 +00:00
|
|
|
|
#include "insets/insetinclude.h"
|
2002-08-28 17:33:42 +00:00
|
|
|
|
#include "insets/insetindex.h"
|
2006-11-04 17:55:36 +00:00
|
|
|
|
#include "insets/insetnomencl.h"
|
2003-02-27 16:24:14 +00:00
|
|
|
|
#include "insets/insetlabel.h"
|
2003-10-27 12:41:26 +00:00
|
|
|
|
#include "insets/insetline.h"
|
2002-08-27 10:14:56 +00:00
|
|
|
|
#include "insets/insetmarginal.h"
|
|
|
|
|
#include "insets/insetnote.h"
|
2003-10-07 07:42:15 +00:00
|
|
|
|
#include "insets/insetbox.h"
|
2003-08-17 11:28:23 +00:00
|
|
|
|
#include "insets/insetbranch.h"
|
2002-08-27 10:14:56 +00:00
|
|
|
|
#include "insets/insetoptarg.h"
|
2003-10-27 12:41:26 +00:00
|
|
|
|
#include "insets/insetpagebreak.h"
|
2002-08-27 10:14:56 +00:00
|
|
|
|
#include "insets/insetref.h"
|
2003-05-22 10:40:57 +00:00
|
|
|
|
#include "insets/insetspace.h"
|
2002-08-27 15:56:32 +00:00
|
|
|
|
#include "insets/insettabular.h"
|
2002-08-28 17:33:42 +00:00
|
|
|
|
#include "insets/insettoc.h"
|
2002-08-29 13:05:55 +00:00
|
|
|
|
#include "insets/inseturl.h"
|
2003-11-28 15:53:34 +00:00
|
|
|
|
#include "insets/insetvspace.h"
|
2002-09-10 10:18:58 +00:00
|
|
|
|
#include "insets/insetwrap.h"
|
2004-01-26 10:13:15 +00:00
|
|
|
|
|
2006-09-17 09:14:18 +00:00
|
|
|
|
#include "mathed/MathMacroTemplate.h"
|
|
|
|
|
#include "mathed/InsetMathHull.h"
|
2003-02-27 13:26:07 +00:00
|
|
|
|
|
2003-03-12 11:52:23 +00:00
|
|
|
|
#include "support/lstrings.h"
|
2002-08-27 10:14:56 +00:00
|
|
|
|
|
2003-10-01 16:27:36 +00:00
|
|
|
|
#include <boost/assert.hpp>
|
2005-09-26 09:20:15 +00:00
|
|
|
|
#include <boost/current_function.hpp>
|
2003-10-01 16:27:36 +00:00
|
|
|
|
|
2004-07-24 10:55:30 +00:00
|
|
|
|
#include <sstream>
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
|
|
|
|
|
using support::compare_ascii_no_case;
|
2003-06-30 23:56:22 +00:00
|
|
|
|
|
2003-11-03 17:47:28 +00:00
|
|
|
|
using std::auto_ptr;
|
2002-09-03 12:31:22 +00:00
|
|
|
|
using std::endl;
|
2003-10-06 15:43:21 +00:00
|
|
|
|
using std::string;
|
2002-08-27 10:14:56 +00:00
|
|
|
|
|
2003-09-05 22:17:02 +00:00
|
|
|
|
|
2004-01-26 10:13:15 +00:00
|
|
|
|
InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
|
2002-08-27 10:14:56 +00:00
|
|
|
|
{
|
2003-09-09 09:47:59 +00:00
|
|
|
|
BufferParams const & params = bv->buffer()->params();
|
2002-08-27 10:14:56 +00:00
|
|
|
|
|
|
|
|
|
switch (cmd.action) {
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_HFILL_INSERT:
|
2003-09-21 16:02:54 +00:00
|
|
|
|
return new InsetHFill;
|
2003-03-11 11:52:05 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_LINE_INSERT:
|
2003-10-27 12:41:26 +00:00
|
|
|
|
return new InsetLine;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_PAGEBREAK_INSERT:
|
2003-10-27 12:41:26 +00:00
|
|
|
|
return new InsetPagebreak;
|
|
|
|
|
|
2006-11-25 15:09:01 +00:00
|
|
|
|
case LFUN_CLEARPAGE_INSERT:
|
|
|
|
|
return new InsetClearPage;
|
|
|
|
|
|
|
|
|
|
case LFUN_CLEARDOUBLEPAGE_INSERT:
|
|
|
|
|
return new InsetClearDoublePage;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CHARSTYLE_INSERT: {
|
2003-11-12 14:38:26 +00:00
|
|
|
|
string s = cmd.getArg(0);
|
2005-05-04 11:21:14 +00:00
|
|
|
|
LyXTextClass tclass = params.getLyXTextClass();
|
|
|
|
|
CharStyles::iterator found_cs = tclass.charstyle(s);
|
|
|
|
|
if (found_cs != tclass.charstyles().end())
|
|
|
|
|
return new InsetCharStyle(params, found_cs);
|
|
|
|
|
else
|
|
|
|
|
return new InsetCharStyle(params, s);
|
2003-11-12 14:38:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_NOTE_INSERT: {
|
2003-10-27 12:41:26 +00:00
|
|
|
|
string arg = cmd.getArg(0);
|
|
|
|
|
if (arg.empty())
|
|
|
|
|
arg = "Note";
|
|
|
|
|
return new InsetNote(params, arg);
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BOX_INSERT: {
|
2003-10-27 12:41:26 +00:00
|
|
|
|
string arg = cmd.getArg(0);
|
|
|
|
|
if (arg.empty())
|
|
|
|
|
arg = "Boxed";
|
|
|
|
|
return new InsetBox(params, arg);
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BRANCH_INSERT: {
|
2006-11-03 15:16:45 +00:00
|
|
|
|
docstring arg = cmd.argument();
|
2003-10-27 12:41:26 +00:00
|
|
|
|
if (arg.empty())
|
2006-11-03 15:16:45 +00:00
|
|
|
|
arg = from_ascii("none");
|
2003-12-14 16:33:56 +00:00
|
|
|
|
return new InsetBranch(params, InsetBranchParams(arg));
|
2003-10-27 12:41:26 +00:00
|
|
|
|
}
|
2003-08-17 11:28:23 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_ERT_INSERT:
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return new InsetERT(params);
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FOOTNOTE_INSERT:
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return new InsetFoot(params);
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MARGINALNOTE_INSERT:
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return new InsetMarginal(params);
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_OPTIONAL_INSERT:
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return new InsetOptArg(params);
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BIBITEM_INSERT:
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return new InsetBibitem(InsetCommandParams("bibitem"));
|
|
|
|
|
|
2006-09-01 15:41:38 +00:00
|
|
|
|
case LFUN_FLOAT_INSERT: {
|
2003-02-26 19:28:38 +00:00
|
|
|
|
// check if the float type exists
|
2006-10-21 00:16:43 +00:00
|
|
|
|
string const argument = to_utf8(cmd.argument());
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (params.getLyXTextClass().floats().typeExist(argument))
|
|
|
|
|
return new InsetFloat(params, argument);
|
|
|
|
|
lyxerr << "Non-existent float type: " << argument << endl;
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return 0;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
}
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2006-09-01 15:41:38 +00:00
|
|
|
|
case LFUN_FLOAT_WIDE_INSERT: {
|
2003-02-26 19:28:38 +00:00
|
|
|
|
// check if the float type exists
|
2006-10-21 00:16:43 +00:00
|
|
|
|
string const argument = to_utf8(cmd.argument());
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (params.getLyXTextClass().floats().typeExist(argument)) {
|
|
|
|
|
auto_ptr<InsetFloat> p(new InsetFloat(params, argument));
|
2003-02-26 19:28:38 +00:00
|
|
|
|
p->wide(true, params);
|
2003-11-03 17:47:28 +00:00
|
|
|
|
return p.release();
|
2003-02-26 19:28:38 +00:00
|
|
|
|
}
|
2006-09-01 15:41:38 +00:00
|
|
|
|
lyxerr << "Non-existent float type: " << argument << endl;
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return 0;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
}
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2006-09-01 15:41:38 +00:00
|
|
|
|
case LFUN_WRAP_INSERT: {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
string const argument = to_utf8(cmd.argument());
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (argument == "figure")
|
|
|
|
|
return new InsetWrap(params, argument);
|
|
|
|
|
lyxerr << "Non-existent floatflt type: " << argument << endl;
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return 0;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
}
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
|
|
|
|
case LFUN_INDEX_INSERT: {
|
|
|
|
|
// Try and generate a valid index entry.
|
|
|
|
|
InsetCommandParams icp("index");
|
2006-10-20 16:12:49 +00:00
|
|
|
|
icp["name"] = cmd.argument().empty() ?
|
2006-11-04 14:40:59 +00:00
|
|
|
|
bv->getLyXText()->getStringToIndex(bv->cursor()) :
|
2006-10-20 16:12:49 +00:00
|
|
|
|
cmd.argument();
|
2005-05-30 15:35:11 +00:00
|
|
|
|
return new InsetIndex(icp);
|
2003-02-26 19:28:38 +00:00
|
|
|
|
}
|
2002-08-28 17:33:42 +00:00
|
|
|
|
|
2006-11-04 17:55:36 +00:00
|
|
|
|
case LFUN_NOMENCL_INSERT: {
|
|
|
|
|
InsetCommandParams icp("nomenclature");
|
|
|
|
|
icp["symbol"] = cmd.argument().empty() ?
|
|
|
|
|
bv->getLyXText()->getStringToIndex(bv->cursor()) :
|
|
|
|
|
cmd.argument();
|
|
|
|
|
return new InsetNomencl(icp);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-15 22:10:25 +00:00
|
|
|
|
case LFUN_TABULAR_INSERT: {
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument().empty())
|
2005-07-15 22:10:25 +00:00
|
|
|
|
return 0;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
std::istringstream ss(to_utf8(cmd.argument()));
|
2005-07-15 22:10:25 +00:00
|
|
|
|
int r = 0, c = 0;
|
|
|
|
|
ss >> r >> c;
|
|
|
|
|
if (r <= 0)
|
|
|
|
|
r = 2;
|
|
|
|
|
if (c <= 0)
|
|
|
|
|
c = 2;
|
|
|
|
|
return new InsetTabular(*bv->buffer(), r, c);
|
|
|
|
|
}
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CAPTION_INSERT: {
|
2005-07-15 22:10:25 +00:00
|
|
|
|
auto_ptr<InsetCaption> inset(new InsetCaption(params));
|
|
|
|
|
inset->setAutoBreakRows(true);
|
|
|
|
|
inset->setDrawFrame(true);
|
|
|
|
|
inset->setFrameColor(LColor::captionframe);
|
|
|
|
|
return inset.release();
|
2003-11-10 09:06:48 +00:00
|
|
|
|
}
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
|
|
|
|
case LFUN_INDEX_PRINT:
|
|
|
|
|
return new InsetPrintIndex(InsetCommandParams("printindex"));
|
|
|
|
|
|
2006-11-04 17:55:36 +00:00
|
|
|
|
case LFUN_NOMENCL_PRINT:
|
|
|
|
|
return new InsetPrintNomencl(InsetCommandParams("printnomenclature"));
|
|
|
|
|
|
2003-02-26 19:28:38 +00:00
|
|
|
|
case LFUN_TOC_INSERT:
|
|
|
|
|
return new InsetTOC(InsetCommandParams("tableofcontents"));
|
2002-08-29 13:05:55 +00:00
|
|
|
|
|
2003-03-13 11:00:31 +00:00
|
|
|
|
case LFUN_ENVIRONMENT_INSERT:
|
2006-10-21 00:16:43 +00:00
|
|
|
|
return new InsetEnvironment(params, to_utf8(cmd.argument()));
|
2003-03-13 11:00:31 +00:00
|
|
|
|
|
2003-02-26 19:28:38 +00:00
|
|
|
|
#if 0
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_LIST_INSERT:
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return new InsetList;
|
2002-08-27 10:14:56 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_THEOREM_INSERT:
|
2003-02-26 19:28:38 +00:00
|
|
|
|
return new InsetTheorem;
|
|
|
|
|
#endif
|
|
|
|
|
|
2003-03-25 21:27:07 +00:00
|
|
|
|
case LFUN_INSET_INSERT: {
|
2003-02-27 13:26:07 +00:00
|
|
|
|
string const name = cmd.getArg(0);
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2003-02-27 13:26:07 +00:00
|
|
|
|
if (name == "bibitem") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp(name);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-02-27 13:26:07 +00:00
|
|
|
|
return new InsetBibitem(icp);
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2003-02-27 13:26:07 +00:00
|
|
|
|
} else if (name == "bibtex") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp(name);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-09-03 17:40:58 +00:00
|
|
|
|
return new InsetBibtex(icp);
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2003-02-27 13:26:07 +00:00
|
|
|
|
} else if (name == "citation") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp("cite");
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-10-22 13:15:18 +00:00
|
|
|
|
return new InsetCitation(icp);
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2003-02-27 13:26:07 +00:00
|
|
|
|
} else if (name == "ert") {
|
2003-12-02 07:15:42 +00:00
|
|
|
|
InsetCollapsable::CollapseStatus st;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetERTMailer::string2params(to_utf8(cmd.argument()), st);
|
2003-12-02 07:15:42 +00:00
|
|
|
|
return new InsetERT(params, st);
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
2003-03-05 11:30:35 +00:00
|
|
|
|
} else if (name == "external") {
|
2004-01-15 17:34:44 +00:00
|
|
|
|
Buffer const & buffer = *bv->buffer();
|
2003-10-07 20:25:10 +00:00
|
|
|
|
InsetExternalParams iep;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetExternalMailer::string2params(to_utf8(cmd.argument()),
|
2003-08-28 07:41:31 +00:00
|
|
|
|
buffer, iep);
|
2003-11-03 17:47:28 +00:00
|
|
|
|
auto_ptr<InsetExternal> inset(new InsetExternal);
|
2003-07-23 16:48:04 +00:00
|
|
|
|
inset->setParams(iep, buffer);
|
2003-11-03 17:47:28 +00:00
|
|
|
|
return inset.release();
|
2003-03-05 11:30:35 +00:00
|
|
|
|
|
2003-03-07 18:44:57 +00:00
|
|
|
|
} else if (name == "graphics") {
|
2004-01-15 17:34:44 +00:00
|
|
|
|
Buffer const & buffer = *bv->buffer();
|
2003-03-17 16:25:00 +00:00
|
|
|
|
InsetGraphicsParams igp;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetGraphicsMailer::string2params(to_utf8(cmd.argument()),
|
2003-07-23 09:54:21 +00:00
|
|
|
|
buffer, igp);
|
2003-11-03 17:47:28 +00:00
|
|
|
|
auto_ptr<InsetGraphics> inset(new InsetGraphics);
|
2003-06-03 15:10:14 +00:00
|
|
|
|
inset->setParams(igp);
|
2003-11-03 17:47:28 +00:00
|
|
|
|
return inset.release();
|
2003-03-07 18:44:57 +00:00
|
|
|
|
|
2003-03-05 14:59:37 +00:00
|
|
|
|
} else if (name == "include") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams iip(name);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetIncludeMailer::string2params(to_utf8(cmd.argument()), iip);
|
2003-03-05 14:59:37 +00:00
|
|
|
|
return new InsetInclude(iip);
|
|
|
|
|
|
2003-02-27 13:26:07 +00:00
|
|
|
|
} else if (name == "index") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp(name);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-02-27 13:26:07 +00:00
|
|
|
|
return new InsetIndex(icp);
|
|
|
|
|
|
2006-11-04 17:55:36 +00:00
|
|
|
|
} else if (name == "nomenclature") {
|
|
|
|
|
InsetCommandParams icp(name);
|
|
|
|
|
InsetCommandMailer::string2params(name, lyx::to_utf8(cmd.argument()),
|
|
|
|
|
icp);
|
|
|
|
|
return new InsetNomencl(icp);
|
|
|
|
|
|
2003-02-27 16:24:14 +00:00
|
|
|
|
} else if (name == "label") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp(name);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-02-27 16:24:14 +00:00
|
|
|
|
return new InsetLabel(icp);
|
|
|
|
|
|
2003-02-27 13:26:07 +00:00
|
|
|
|
} else if (name == "ref") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp(name);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-02-27 13:26:07 +00:00
|
|
|
|
return new InsetRef(icp, *bv->buffer());
|
|
|
|
|
|
|
|
|
|
} else if (name == "toc") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp("tableofcontents");
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-02-27 13:26:07 +00:00
|
|
|
|
return new InsetTOC(icp);
|
|
|
|
|
|
|
|
|
|
} else if (name == "url") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams icp(name);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
|
2003-12-11 15:23:15 +00:00
|
|
|
|
icp);
|
2003-02-27 13:26:07 +00:00
|
|
|
|
return new InsetUrl(icp);
|
2003-11-28 15:53:34 +00:00
|
|
|
|
|
|
|
|
|
} else if (name == "vspace") {
|
|
|
|
|
VSpace vspace;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
InsetVSpaceMailer::string2params(to_utf8(cmd.argument()), vspace);
|
2003-11-28 15:53:34 +00:00
|
|
|
|
return new InsetVSpace(vspace);
|
2003-02-27 13:26:07 +00:00
|
|
|
|
}
|
2003-02-26 19:28:38 +00:00
|
|
|
|
}
|
2003-05-22 10:40:57 +00:00
|
|
|
|
|
|
|
|
|
case LFUN_SPACE_INSERT: {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
string const name = to_utf8(cmd.argument());
|
2003-05-22 10:40:57 +00:00
|
|
|
|
if (name == "normal")
|
|
|
|
|
return new InsetSpace(InsetSpace::NORMAL);
|
|
|
|
|
else if (name == "protected")
|
|
|
|
|
return new InsetSpace(InsetSpace::PROTECTED);
|
|
|
|
|
else if (name == "thin")
|
|
|
|
|
return new InsetSpace(InsetSpace::THIN);
|
|
|
|
|
else if (name == "quad")
|
|
|
|
|
return new InsetSpace(InsetSpace::QUAD);
|
|
|
|
|
else if (name == "qquad")
|
|
|
|
|
return new InsetSpace(InsetSpace::QQUAD);
|
|
|
|
|
else if (name == "enspace")
|
|
|
|
|
return new InsetSpace(InsetSpace::ENSPACE);
|
|
|
|
|
else if (name == "enskip")
|
|
|
|
|
return new InsetSpace(InsetSpace::ENSKIP);
|
|
|
|
|
else if (name == "negthinspace")
|
|
|
|
|
return new InsetSpace(InsetSpace::NEGTHIN);
|
|
|
|
|
else if (name.empty())
|
|
|
|
|
lyxerr << "LyX function 'space' needs an argument." << endl;
|
|
|
|
|
else
|
|
|
|
|
lyxerr << "Wrong argument for LyX function 'space'." << endl;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-27 13:26:07 +00:00
|
|
|
|
break;
|
2003-02-26 19:28:38 +00:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-27 10:14:56 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-03-12 11:52:23 +00:00
|
|
|
|
|
|
|
|
|
|
2004-01-26 10:13:15 +00:00
|
|
|
|
InsetBase * readInset(LyXLex & lex, Buffer const & buf)
|
2003-03-12 11:52:23 +00:00
|
|
|
|
{
|
|
|
|
|
// consistency check
|
|
|
|
|
if (lex.getString() != "\\begin_inset") {
|
|
|
|
|
lyxerr << "Buffer::readInset: Consistency check failed."
|
|
|
|
|
<< endl;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-26 10:13:15 +00:00
|
|
|
|
auto_ptr<InsetBase> inset;
|
2003-03-12 11:52:23 +00:00
|
|
|
|
|
2003-11-12 14:38:26 +00:00
|
|
|
|
LyXTextClass tclass = buf.params().getLyXTextClass();
|
2004-04-03 08:37:12 +00:00
|
|
|
|
|
2003-03-12 11:52:23 +00:00
|
|
|
|
lex.next();
|
2003-11-12 14:38:26 +00:00
|
|
|
|
string tmptok = lex.getString();
|
2003-03-12 11:52:23 +00:00
|
|
|
|
|
|
|
|
|
// test the different insets
|
|
|
|
|
if (tmptok == "LatexCommand") {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
lex.next();
|
|
|
|
|
string const cmdName = lex.getString();
|
|
|
|
|
lex.pushToken(cmdName);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams inscmd(cmdName);
|
|
|
|
|
inscmd.read(lex);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
|
|
|
|
|
// This strange command allows LyX to recognize "natbib" style
|
|
|
|
|
// citations: citet, citep, Citet etc.
|
2006-10-15 08:32:37 +00:00
|
|
|
|
// FIXME: We already have partial support for \\fullcite and
|
|
|
|
|
// the various \\footcite commands. We should increase the
|
|
|
|
|
// file format number and read these commands here, too.
|
|
|
|
|
// Then we should use is_possible_cite_command() in
|
|
|
|
|
// src/frontends/controllers/biblio.C to test for valid cite
|
|
|
|
|
// commands.
|
2003-03-12 11:52:23 +00:00
|
|
|
|
if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetCitation(inscmd));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "bibitem") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetBibitem(inscmd));
|
2003-09-03 17:40:58 +00:00
|
|
|
|
} else if (cmdName == "bibtex") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetBibtex(inscmd));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "index") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetIndex(inscmd));
|
2006-11-04 17:55:36 +00:00
|
|
|
|
} else if (cmdName == "nomenclature") {
|
|
|
|
|
inset.reset(new InsetNomencl(inscmd));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "include") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetInclude(inscmd));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "label") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetLabel(inscmd));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "url"
|
|
|
|
|
|| cmdName == "htmlurl") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetUrl(inscmd));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "ref"
|
2003-04-24 12:16:56 +00:00
|
|
|
|
|| cmdName == "eqref"
|
2003-03-12 11:52:23 +00:00
|
|
|
|
|| cmdName == "pageref"
|
|
|
|
|
|| cmdName == "vref"
|
|
|
|
|
|| cmdName == "vpageref"
|
|
|
|
|
|| cmdName == "prettyref") {
|
2006-10-20 16:12:49 +00:00
|
|
|
|
if (!inscmd["name"].empty()
|
|
|
|
|
|| !inscmd["reference"].empty()) {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetRef(inscmd, buf));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
}
|
|
|
|
|
} else if (cmdName == "tableofcontents") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetTOC(inscmd));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "listofalgorithms") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetFloatList("algorithm"));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "listoffigures") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetFloatList("figure"));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "listoftables") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetFloatList("table"));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (cmdName == "printindex") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetPrintIndex(inscmd));
|
2006-11-04 17:55:36 +00:00
|
|
|
|
} else if (cmdName == "printnomenclature") {
|
|
|
|
|
inset.reset(new InsetPrintNomencl(inscmd));
|
2003-10-01 16:27:36 +00:00
|
|
|
|
} else {
|
2003-10-14 12:49:15 +00:00
|
|
|
|
lyxerr << "unknown CommandInset '" << cmdName
|
|
|
|
|
<< "'" << std::endl;
|
|
|
|
|
while (lex.isOK() && lex.getString() != "\\end_inset")
|
|
|
|
|
lex.next();
|
|
|
|
|
return 0;
|
2003-03-12 11:52:23 +00:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (tmptok == "Quotes") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetQuotes);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "External") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetExternal);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "FormulaMacro") {
|
2004-04-13 06:27:29 +00:00
|
|
|
|
inset.reset(new MathMacroTemplate);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Formula") {
|
2006-09-16 18:11:38 +00:00
|
|
|
|
inset.reset(new InsetMathHull);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Graphics") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetGraphics);
|
2003-12-10 17:28:14 +00:00
|
|
|
|
} else if (tmptok == "Note") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetNote(buf.params(), tmptok));
|
2003-12-10 21:48:40 +00:00
|
|
|
|
} else if (tmptok == "Box") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetBox(buf.params(), tmptok));
|
2003-11-12 14:38:26 +00:00
|
|
|
|
} else if (tmptok == "CharStyle") {
|
2003-11-28 10:12:04 +00:00
|
|
|
|
lex.next();
|
|
|
|
|
string s = lex.getString();
|
|
|
|
|
CharStyles::iterator found_cs = tclass.charstyle(s);
|
2005-05-04 11:21:14 +00:00
|
|
|
|
if (found_cs != tclass.charstyles().end())
|
|
|
|
|
inset.reset(new InsetCharStyle(buf.params(), found_cs));
|
|
|
|
|
else {
|
|
|
|
|
// "Undefined" inset
|
|
|
|
|
inset.reset(new InsetCharStyle(buf.params(), s));
|
|
|
|
|
}
|
2003-08-17 11:28:23 +00:00
|
|
|
|
} else if (tmptok == "Branch") {
|
2003-12-14 16:33:56 +00:00
|
|
|
|
inset.reset(new InsetBranch(buf.params(),
|
|
|
|
|
InsetBranchParams()));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Include") {
|
2006-11-09 17:53:10 +00:00
|
|
|
|
InsetCommandParams p("include");
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetInclude(p));
|
2003-03-13 11:42:12 +00:00
|
|
|
|
} else if (tmptok == "Environment") {
|
|
|
|
|
lex.next();
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetEnvironment(buf.params(), lex.getString()));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "ERT") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetERT(buf.params()));
|
2003-05-22 10:40:57 +00:00
|
|
|
|
} else if (tmptok == "InsetSpace") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetSpace);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Tabular") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetTabular(buf));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Text") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetText(buf.params()));
|
2003-11-28 15:53:34 +00:00
|
|
|
|
} else if (tmptok == "VSpace") {
|
|
|
|
|
inset.reset(new InsetVSpace);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Foot") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetFoot(buf.params()));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Marginal") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetMarginal(buf.params()));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "OptArg") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetOptArg(buf.params()));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Float") {
|
|
|
|
|
lex.next();
|
|
|
|
|
string tmptok = lex.getString();
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetFloat(buf.params(), tmptok));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Wrap") {
|
|
|
|
|
lex.next();
|
|
|
|
|
string tmptok = lex.getString();
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetWrap(buf.params(), tmptok));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
#if 0
|
|
|
|
|
} else if (tmptok == "List") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetList);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "Theorem") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetList);
|
2003-03-12 11:52:23 +00:00
|
|
|
|
#endif
|
|
|
|
|
} else if (tmptok == "Caption") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetCaption(buf.params()));
|
2003-03-12 11:52:23 +00:00
|
|
|
|
} else if (tmptok == "FloatList") {
|
2003-11-03 17:47:28 +00:00
|
|
|
|
inset.reset(new InsetFloatList);
|
2003-10-01 16:27:36 +00:00
|
|
|
|
} else {
|
2003-10-14 12:49:15 +00:00
|
|
|
|
lyxerr << "unknown Inset type '" << tmptok
|
|
|
|
|
<< "'" << std::endl;
|
|
|
|
|
while (lex.isOK() && lex.getString() != "\\end_inset")
|
|
|
|
|
lex.next();
|
|
|
|
|
return 0;
|
2003-03-12 11:52:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-01 16:27:36 +00:00
|
|
|
|
inset->read(buf, lex);
|
2004-04-20 08:51:15 +00:00
|
|
|
|
|
2004-04-29 14:49:02 +00:00
|
|
|
|
#ifdef WITH_WARNINGS
|
2004-04-20 08:51:15 +00:00
|
|
|
|
#warning hack..
|
2004-04-29 14:49:02 +00:00
|
|
|
|
#endif
|
2004-04-13 13:54:58 +00:00
|
|
|
|
if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
|
|
|
|
|
MathMacroTemplate const * tmpl =
|
|
|
|
|
static_cast<MathMacroTemplate*>(inset.get());
|
|
|
|
|
MacroTable::globalMacros().insert
|
|
|
|
|
(tmpl->name(), tmpl->asMacroData());
|
2005-07-14 08:20:10 +00:00
|
|
|
|
lyxerr[Debug::DEBUG]
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< BOOST_CURRENT_FUNCTION
|
2006-10-22 10:15:23 +00:00
|
|
|
|
<< ": creating local macro " << to_utf8(tmpl->name())
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< endl;
|
2004-04-13 13:54:58 +00:00
|
|
|
|
}
|
2003-03-12 11:52:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-11-03 17:47:28 +00:00
|
|
|
|
return inset.release();
|
2003-03-12 11:52:23 +00:00
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace lyx
|