#include "Lsstream.h"
-#include <time.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
+
#include <utility>
#include <algorithm>
#endif
#include "support/lyxalgo.h"
+#include "support/LAssert.h"
#include "version.h"
#include "kbmap.h"
#include "lyxfunc.h"
#include "insets/insetmarginal.h"
#include "insets/insetminipage.h"
#include "insets/insetfloat.h"
+#if 0
#include "insets/insetlist.h"
-#include "insets/insettabular.h"
#include "insets/insettheorem.h"
+#endif
+#include "insets/insettabular.h"
#include "insets/insetcaption.h"
#include "mathed/formulamacro.h"
#include "mathed/math_cursor.h"
#include "mathed/math_inset.h"
-#include "spellchecker.h"
#include "minibuffer.h"
#include "vspace.h"
#include "LyXView.h"
#include "FontLoader.h"
#include "TextCache.h"
#include "lyxfind.h"
+#include "undo_funcs.h"
+#include "ParagraphParameters.h"
+#include "figureForm.h"
using std::pair;
using std::make_pair;
bool tmp_sc = show_sc;
show_sc = false;
- Dispatch(action, argument);
+ dispatch(action, argument);
show_sc = tmp_sc;
//return 0;
disable = !Exporter::IsExportable(buf, "program");
break;
- case LFUN_INSERTFOOTNOTE:
- // Disable insertion of floats in a tabular.
- disable = false;
- if (owner->view()->theLockingInset()) {
- disable = (owner->view()->theLockingInset()->lyxCode() == Inset::TABULAR_CODE) ||
- owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE);
- }
- break;
-
case LFUN_LAYOUT_TABULAR:
disable = true;
if (owner->view()->theLockingInset()) {
case LFUN_BOOKMARK_GOTO:
disable = !owner->view()->
isSavedPosition(strToUnsignedInt(argument));
+ break;
+
+
+ case LFUN_INSET_TOGGLE:
+ disable = (TEXT(false)->getInset() == 0);
+ break;
case LFUN_MATH_VALIGN: {
// I think this test can be simplified (Andre')
case LFUN_MATH_MUTATE: {
Inset * tli = owner->view()->theLockingInset();
if (tli && (tli->lyxCode() == Inset::MATH_CODE)) {
- MathInsetTypes type = mathcursor->par()->GetType();
+ MathInsetTypes type = mathcursor->formula()->getType();
func_status::value_type box = func_status::ToggleOff;
if (argument == "inline") {
if (type == LM_OT_SIMPLE)
// we just need to be in math mode to enable that
case LFUN_MATH_SIZE:
+ case LFUN_MATH_SPACE:
case LFUN_MATH_LIMITS:
case LFUN_MATH_NONUMBER:
case LFUN_MATH_NUMBER:
default:
break;
- }
- if (disable)
- flag |= func_status::Disabled;
-
- if (buf) {
- func_status::value_type box = func_status::ToggleOff;
- LyXFont const & font =
- TEXT(false)->real_current_font;
- switch (action) {
- case LFUN_EMPH:
- if (font.emph() == LyXFont::ON)
- box = func_status::ToggleOn;
- break;
- case LFUN_NOUN:
- if (font.noun() == LyXFont::ON)
- box = func_status::ToggleOn;
- break;
- case LFUN_BOLD:
- if (font.series() == LyXFont::BOLD_SERIES)
- box = func_status::ToggleOn;
- break;
-#ifndef NO_LATEX
- case LFUN_TEX:
- if (font.latex() == LyXFont::ON)
- box = func_status::ToggleOn;
- break;
+ }
+
+ // the functions which insert insets
+ Inset::Code code = Inset::NO_CODE;
+ switch (action) {
+ case LFUN_INSET_TEXT:
+ code = Inset::TEXT_CODE;
+ break;
+ case LFUN_INSET_ERT:
+ code = Inset::ERT_CODE;
+ break;
+ case LFUN_FIGURE:
+ case LFUN_INSET_GRAPHICS:
+ code = Inset::GRAPHICS_CODE;
+ break;
+ case LFUN_INSET_FOOTNOTE:
+ code = Inset::FOOT_CODE;
+ break;
+ case LFUN_DIALOG_TABULAR_INSERT:
+ case LFUN_INSET_TABULAR:
+ code = Inset::TABULAR_CODE;
+ break;
+ case LFUN_INSET_EXTERNAL:
+ code = Inset::EXTERNAL_CODE;
+ break;
+ case LFUN_INSET_MARGINAL:
+ code = Inset::MARGIN_CODE;
+ break;
+ case LFUN_INSET_MINIPAGE:
+ code = Inset::MINIPAGE_CODE;
+ break;
+ case LFUN_INSET_FLOAT:
+ case LFUN_INSET_WIDE_FLOAT:
+ code = Inset::FLOAT_CODE;
+ break;
+ case LFUN_FLOAT_LIST:
+ code = Inset::FLOAT_LIST_CODE;
+ break;
+#if 0
+ case LFUN_INSET_LIST:
+ code = Inset::LIST_CODE;
+ break;
+ case LFUN_INSET_THEOREM:
+ code = Inset::THEOREM_CODE;
+ break;
#endif
- case LFUN_READ_ONLY_TOGGLE:
- if (buf->isReadonly())
- box = func_status::ToggleOn;
- break;
- default:
- box = func_status::OK;
- break;
- }
- flag |= box;
+ case LFUN_INSET_CAPTION:
+ code = Inset::CAPTION_CODE;
+ break;
+ case LFUN_INSERT_NOTE:
+ code = Inset::IGNORE_CODE;
+ break;
+ case LFUN_INSERT_LABEL:
+ code = Inset::LABEL_CODE;
+ break;
+ case LFUN_REF_INSERT:
+ code = Inset::REF_CODE;
+ break;
+ case LFUN_CITATION_CREATE:
+ case LFUN_CITATION_INSERT:
+ code = Inset::CITE_CODE;
+ break;
+ case LFUN_INSERT_BIBTEX:
+ code = Inset::BIBTEX_CODE;
+ break;
+ case LFUN_INDEX_INSERT:
+ case LFUN_INDEX_INSERT_LAST:
+ case LFUN_INDEX_CREATE:
+ code = Inset::INDEX_CODE;
+ break;
+ case LFUN_INDEX_PRINT:
+ code = Inset::INDEX_PRINT_CODE;
+ break;
+ case LFUN_CHILD_INSERT:
+ code = Inset::INCLUDE_CODE;
+ break;
+ case LFUN_TOC_INSERT:
+ code = Inset::TOC_CODE;
+ break;
+ case LFUN_PARENTINSERT:
+ code = Inset::PARENT_CODE;
+ break;
+ case LFUN_HTMLURL:
+ case LFUN_URL:
+ case LFUN_INSERT_URL:
+ code = Inset::URL_CODE;
+ break;
+ case LFUN_QUOTE:
+ // always allow this, since we will inset a raw quote
+ // if an inset is not allowed.
+ break;
+ case LFUN_HYPHENATION:
+ case LFUN_LIGATURE_BREAK:
+ case LFUN_HFILL:
+ case LFUN_MENU_SEPARATOR:
+ case LFUN_LDOTS:
+ case LFUN_END_OF_SENTENCE:
+ case LFUN_PROTECTEDSPACE:
+ code = Inset::SPECIALCHAR_CODE;
+ break;
+ default:
+ break;
+ }
+ if (code != Inset::NO_CODE
+ && owner->view()->theLockingInset()
+ && !owner->view()->theLockingInset()->insetAllowed(code)) {
+ disable = true;
+ }
+
+ if (disable)
+ flag |= func_status::Disabled;
+
+ // the font related functions (and a few others)
+ func_status::value_type box = func_status::ToggleOff;
+ LyXFont const & font =
+ TEXT(false)->real_current_font;
+ switch (action) {
+ case LFUN_EMPH:
+ if (font.emph() == LyXFont::ON)
+ box = func_status::ToggleOn;
+ break;
+ case LFUN_NOUN:
+ if (font.noun() == LyXFont::ON)
+ box = func_status::ToggleOn;
+ break;
+ case LFUN_BOLD:
+ if (font.series() == LyXFont::BOLD_SERIES)
+ box = func_status::ToggleOn;
+ break;
+ case LFUN_READ_ONLY_TOGGLE:
+ if (buf->isReadonly())
+ box = func_status::ToggleOn;
+ break;
+ case LFUN_APPENDIX:
+ if (TEXT(false)->cursor.par()->params().startOfAppendix())
+ box = func_status::ToggleOn;
+ break;
+ default:
+ box = func_status::OK;
+ break;
}
+ flag |= box;
return flag;
}
void LyXFunc::miniDispatch(string const & s)
{
if (!s.empty()) {
- Dispatch(s);
+ dispatch(s);
}
}
-string const LyXFunc::Dispatch(string const & s)
+string const LyXFunc::dispatch(string const & s)
{
// Split command string into command and argument
string cmd;
string line = frontStrip(s);
string const arg = strip(frontStrip(split(line, cmd, ' ')));
- return Dispatch(lyxaction.LookupFunc(cmd), arg);
+ return dispatch(lyxaction.LookupFunc(cmd), arg);
}
-string const LyXFunc::Dispatch(int ac,
+string const LyXFunc::dispatch(int ac,
string const & do_not_use_this_arg)
{
lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << ac
owner->view()->hideCursor();
// We cannot use this function here
- if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled)
+ if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) {
+ lyxerr << "LyXFunc::Dispatch: "
+ << lyxaction.getActionName(ac)
+ << " [" << ac << "] is disabled at this location"
+ << endl;
goto exit_with_message;
-
+ }
if (owner->view()->available() && owner->view()->theLockingInset()) {
UpdatableInset::RESULT result;
argument = keyseq.getiso();
}
// Undo/Redo is a bit tricky for insets.
- if (action == LFUN_UNDO) {
+ if (action == LFUN_UNDO) {
+#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED
int slx;
int sly;
UpdatableInset * inset =
- owner->view()->theLockingInset();
+ owner->view()->theLockingInset()->getLockingInset();
+ int inset_id = inset->id();
inset->getCursorPos(owner->view(), slx, sly);
owner->view()->unlockInset(inset);
+#else
+ owner->view()->unlockInset(owner->view()->theLockingInset());
+#endif
owner->view()->menuUndo();
+#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED
+#if 0
if (TEXT()->cursor.par()->
isInset(TEXT()->cursor.pos())) {
inset = static_cast<UpdatableInset*>(
} else {
inset = 0;
}
+#else
+ inset = static_cast<UpdatableInset *>(owner->view()->buffer()->getInsetFromID(inset_id));
+#endif
if (inset)
inset->edit(owner->view(),slx,sly,0);
+#endif
return string();
} else if (action == LFUN_REDO) {
int slx;
inset->edit(owner->view(),slx,sly,0);
return string();
} else if (((result=owner->view()->theLockingInset()->
- localDispatch(owner->view(), action,
- argument)) ==
- UpdatableInset::DISPATCHED) ||
- (result == UpdatableInset::DISPATCHED_NOUPDATE))
+ localDispatch(owner->view(), action, argument)) ==
+ UpdatableInset::DISPATCHED) ||
+ (result == UpdatableInset::DISPATCHED_NOUPDATE))
+ return string();
+ else if (result == UpdatableInset::FINISHED) {
+ if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ TEXT()->cursorRight(owner->view());
+ moveCursorUpdate(true, false);
+ owner->showState();
+ }
+ return string();
+ } else if (result == UpdatableInset::FINISHED_RIGHT) {
+ if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ TEXT()->cursorRight(owner->view());
+ moveCursorUpdate(true, false);
+ owner->showState();
+ }
return string();
- else {
+ } else if (result == UpdatableInset::FINISHED_UP) {
+ if (TEXT()->cursor.row()->previous()) {
+ TEXT()->cursorUp(owner->view());
+ moveCursorUpdate(true, false);
+ owner->showState();
+ }
+ return string();
+ } else if (result == UpdatableInset::FINISHED_DOWN) {
+ if (TEXT()->cursor.row()->next())
+ TEXT()->cursorDown(owner->view());
+ else
+ TEXT()->cursorRight(owner->view());
+ moveCursorUpdate(true, false);
+ owner->showState();
+ return string();
+ } else {
//setMessage(N_("Text mode"));
switch (action) {
case LFUN_UNKNOWN_ACTION:
} else {
searched_string = last_search;
}
-
- if (!searched_string.empty() &&
- ((action == LFUN_WORDFINDBACKWARD) ?
- SearchBackward(owner->view(), searched_string) :
- SearchForward(owner->view(), searched_string))) {
-
- // ??? What is that ???
- owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR);
-
- // ??? Needed ???
- // clear the selection (if there is any)
- owner->view()->toggleSelection();
- TEXT()->clearSelection(owner->view());
-
- // Move cursor so that successive C-s 's will not stand in place.
- if (action == LFUN_WORDFINDFORWARD )
- TEXT()->cursorRightOneWord(owner->view());
- TEXT()->finishUndo();
- moveCursorUpdate(true, false);
-
- // ??? Needed ???
- // set the new selection
- // SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected);
- owner->view()->toggleSelection(false);
+ bool fw = (action == LFUN_WORDFINDBACKWARD);
+ if (!searched_string.empty()) {
+ LyXFind(owner->view(), searched_string, fw);
}
-
- // REMOVED : if (owner->view()->getWorkArea()->focus)
- owner->view()->showCursor();
+// owner->view()->showCursor();
}
break;
meta_fake_bit = 0;
if (owner->view()->available())
// cancel any selection
- Dispatch(LFUN_MARK_OFF);
+ dispatch(LFUN_MARK_OFF);
setMessage(N_("Cancel"));
break;
// --- Menus -----------------------------------------------
case LFUN_MENUNEW:
- MenuNew(false);
+ menuNew(false);
break;
case LFUN_MENUNEWTMPLT:
- MenuNew(true);
+ menuNew(true);
break;
case LFUN_CLOSEBUFFER:
- CloseBuffer();
+ closeBuffer();
break;
case LFUN_MENUWRITE:
case LFUN_REMOVEERRORS:
if (owner->view()->removeAutoInsets()) {
owner->view()->redraw();
- owner->view()->fitCursor(TEXT());
+ owner->view()->fitCursor();
}
break;
owner->getDialogs()->setUserFreeFont();
break;
-#ifndef NO_LATEX
- case LFUN_TEX:
- Tex(owner->view());
- owner->view()->setState();
- owner->showState();
- break;
-#endif
-
case LFUN_RECONFIGURE:
Reconfigure(owner->view());
break;
#warning Find another implementation here (or another lyxfunc)!
#endif
#endif
- case LFUN_HELP_COPYRIGHT:
- owner->getDialogs()->showCopyright();
+ case LFUN_HELP_ABOUTLYX:
+ owner->getDialogs()->showAboutlyx();
break;
+ case LFUN_HELP_COPYRIGHT:
case LFUN_HELP_CREDITS:
- owner->getDialogs()->showCredits();
- break;
+
case LFUN_HELP_OPEN:
{
break;
}
- case LFUN_HELP_VERSION: {
- owner->prohibitInput();
- string msg(_("LyX Version "));
- msg += LYX_VERSION;
- msg += " of ";
- msg += LYX_RELEASE;
- fl_show_message(msg.c_str(),
- (_("Library directory: ")
- + MakeDisplayPath(system_lyxdir)).c_str(),
- (_("User directory: ")
- + MakeDisplayPath(user_lyxdir)).c_str());
- owner->allowInput();
- break;
- }
+ case LFUN_HELP_VERSION:
// --- version control -------------------------------
case LFUN_VC_REGISTER:
break;
case LFUN_FILE_OPEN:
- Open(argument);
+ open(argument);
break;
case LFUN_LATEX_LOG:
--sel; // sel 1..., but layout 0...
// Pretend we got the name instead.
- Dispatch(int(LFUN_LAYOUT),
+ dispatch(int(LFUN_LAYOUT),
textclasslist.NameOfLayout(owner->view()
->buffer()->params.textclass,
sel));
case LFUN_SPELLCHECK:
if (lyxrc.isp_command != "none")
- ShowSpellChecker(owner->view());
- break; // RVDK_PATCH_5
+ owner->getDialogs()->showSpellchecker();
+ break;
// --- lyxserver commands ----------------------------
case LFUN_GOTOFILEROW:
{
-#if 0
- char file_name[100];
- int row;
- ::sscanf(argument.c_str(), " %s %d", file_name, &row);
-#else
string file_name;
int row;
istringstream istr(argument.c_str());
istr >> file_name >> row;
-#endif
// Must replace extension of the file to be .lyx and get full path
string const s(ChangeExtension(file_name, ".lyx"));
int id;
istr >> id;
- Paragraph * par = TEXT()->getParFromID(id);
+ Paragraph * par = owner->buffer()->getParFromID(id);
if (par == 0) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
<< id << "]" << std::endl;
break;
+ } else {
+ lyxerr << "Paragraph " << par->id()
+ << " found." << endl;
}
// Set the cursor
- TEXT()->setCursor(owner->view(), par, 0);
+ owner->view()->text->setCursor(owner->view(), par, 0);
owner->view()->setState();
owner->showState();
// --- insert characters ----------------------------------------
// --- Mathed stuff. If we are here, there is no locked inset yet.
-
- // Greek mode
- case LFUN_GREEK:
- {
- if (!greek_kb_flag) {
- greek_kb_flag = 1;
- setMessage(N_("Math greek mode on"));
- } else
- greek_kb_flag = 0;
- }
- break;
-
- // Greek keyboard
- case LFUN_GREEK_TOGGLE:
- {
- greek_kb_flag = greek_kb_flag ? 0 : 2;
- if (greek_kb_flag) {
- setMessage(N_("Math greek keyboard on"));
- } else {
- setMessage(N_("Math greek keyboard off"));
- }
- }
- break;
-
case LFUN_MATH_EXTERN:
case LFUN_MATH_NUMBER:
case LFUN_MATH_NONUMBER:
} else {
p.setContents( argument );
}
- Dispatch(LFUN_CITATION_INSERT, p.getAsString());
+ dispatch(LFUN_CITATION_INSERT, p.getAsString());
} else
owner->getDialogs()->createCitation( p.getAsString() );
}
while (argument.find(';') != string::npos) {
string first;
argument = split(argument, first, ';');
- Dispatch(first);
+ dispatch(first);
}
}
break;
// Then if it was none of the above
if (!owner->view()->Dispatch(action, argument))
lyxerr << "A truly unknown func ["
- << action << "]!" << endl;
+ << lyxaction.getActionName(action) << "]!"
+ << endl;
break;
} // end of switch
}
-void LyXFunc::MenuNew(bool fromTemplate)
+void LyXFunc::menuNew(bool fromTemplate)
{
string initpath = lyxrc.document_path;
if (owner->view()->available()) {
string const trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
+ if (IsDirWriteable(trypath))
initpath = trypath;
}
}
-void LyXFunc::Open(string const & fname)
+void LyXFunc::open(string const & fname)
{
string initpath = lyxrc.document_path;
if (owner->view()->available()) {
string const trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
+ if (IsDirWriteable(trypath))
initpath = trypath;
}
// get absolute path of file and add ".lyx" to the filename if
// necessary
- filename = FileSearch(string(), filename, "lyx");
+ string const fullpath = FileSearch(string(), filename, "lyx");
+ if (fullpath.empty()) {
+ WriteAlert(_("Error"), _("Could not find file"), filename);
+ return;
+ }
+ filename = fullpath;
+
// loads document
string const disp_fn(MakeDisplayPath(filename));
if (owner->view()->available()) {
string const trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
+ if (IsDirWriteable(trypath))
initpath = trypath;
}
- string const text = _("Select ") + formats.PrettyName(format)
+ string const text = _("Select ") + formats.prettyName(format)
+ _(" file to import");
FileDialog fileDlg(owner, text,
make_pair(string(_("Examples")),
string(AddPath(system_lyxdir, "examples"))));
- string const extension = "*." + formats.Extension(format)
- + "| " + formats.PrettyName(format)
- + " (*." + formats.Extension(format) + ")";
+ string const extension = "*." + formats.extension(format)
+ + "| " + formats.prettyName(format)
+ + " (*." + formats.extension(format) + ")";
FileDialog::Result result = fileDlg.Select(initpath,
extension);
}
-void LyXFunc::CloseBuffer()
+void LyXFunc::closeBuffer()
{
if (bufferlist.close(owner->buffer()) && !quitting) {
if (bufferlist.empty()) {
projects / lyx.git / blobdiff