* ====================================================== */
#include <config.h>
+
+#ifdef HAVE_SSTREAM
+#include <sstream>
+using std::istringstream;
+#else
+#include <strstream>
+#endif
+
#include <time.h>
#include <locale.h>
#include "insets/insetindex.h"
#include "insets/insetinclude.h"
#include "insets/insetbib.h"
+#include "insets/insettext.h"
+#include "insets/insetert.h"
+#include "insets/insetgraphics.h"
+#include "insets/insetfoot.h"
+#include "insets/insettabular.h"
#include "mathed/formulamacro.h"
#include "toolbar.h"
#include "spellchecker.h" // RVDK_PATCH_5
#include "support/syscall.h"
#include "support/lstrings.h"
#include "support/path.h"
-#include "lyxscreen.h"
#include "debug.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "ImportNoweb.h"
#include "layout.h"
#include "WorkArea.h"
+#include "lyxfr1.h"
+#include "menus.h"
+#include "bufferview_funcs.h"
+
+using std::pair;
+using std::endl;
extern bool cursor_follows_scrollbar;
-extern void InsertAsciiFile(string const &, bool);
+extern void InsertAsciiFile(BufferView *, string const &, bool);
extern void math_insert_symbol(char const *);
extern Bool math_insert_greek(char const); // why "Bool"?
extern BufferList bufferlist;
// (alkis)
extern tex_accent_struct get_accent(kb_action action);
-extern void AutoSave();
-extern void MenuSearch();
+extern void AutoSave(BufferView *);
extern void SetUpdateTimer(float timer = 0.3);
extern void FreeUpdateTimer();
extern bool PreviewDVI(Buffer *);
extern void LoadLyXFile(string const &);
extern void Reconfigure(BufferView *);
-extern int current_layout;
+extern LyXTextClass::size_type current_layout;
extern int getISOCodeFromLaTeX(char *);
extern void ShowLatexLog();
-extern void UpdateInset(BufferView *, Inset * inset, bool mark_dirty = true);
-
/* === globals =========================================================== */
bool LyXFunc::show_sc = true;
{
if (selecting || owner->view()->text->mark_set) {
owner->view()->text->SetSelection();
- owner->view()->getScreen()->ToggleToggle();
- owner->view()->update(0);
- } else {
- owner->view()->update(-2); // this IS necessary
+ owner->view()->toggleToggle();
+ //owner->view()->update(0);
+ //} else {
+ //owner->view()->update(-2); // this IS necessary
// (Matthias)
}
-
- owner->view()->getScreen()->ShowCursor();
+ owner->view()->update(0);
+ owner->view()->showCursor();
/* ---> Everytime the cursor is moved, show the current font state. */
// should this too me moved out of this func?
//owner->getMiniBuffer()->Set(CurrentState());
- owner->view()->SetState();
+ owner->view()->setState();
}
}
// this function should be used always [asierra060396]
- if (owner->view()->available() &&
- owner->view()->the_locking_inset &&
- keysym_return == XK_Escape) {
- owner->view()->unlockInset(owner->view()->the_locking_inset);
- owner->view()->text->CursorRight();
- moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ UpdatableInset * tli = owner->view()->the_locking_inset;
+ if (owner->view()->available() && tli && (keysym_return==XK_Escape)) {
+ if (tli == tli->GetLockingInset()) {
+ owner->view()->unlockInset(tli);
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ } else {
+ tli->UnlockInsetInInset(owner->view(),
+ tli->GetLockingInset());
+ }
return 0;
}
// I would really like to avoid having this switch and rather try to
// encode this in the function itself.
- static bool noLaTeX = lyxrc->latex_command == "none";
+ static bool noLaTeX = lyxrc.latex_command == "none";
bool disable = false;
switch (action) {
case LFUN_PREVIEW:
- disable = noLaTeX || lyxrc->view_dvi_command == "none";
+ disable = noLaTeX || lyxrc.view_dvi_command == "none";
break;
case LFUN_PREVIEWPS:
- disable = noLaTeX || lyxrc->view_ps_command == "none";
+ disable = noLaTeX || lyxrc.view_ps_command == "none";
break;
case LFUN_RUNLATEX:
case LFUN_RUNDVIPS:
disable = noLaTeX;
break;
case LFUN_MENUPRINT:
- disable = noLaTeX || lyxrc->print_command == "none";
+ disable = noLaTeX || lyxrc.print_command == "none";
break;
case LFUN_FAX:
- disable = noLaTeX || lyxrc->fax_command == "none";
+ disable = noLaTeX || lyxrc.fax_command == "none";
break;
case LFUN_IMPORT:
if (argument == "latex")
- disable = lyxrc->relyx_command == "none";
+ disable = lyxrc.relyx_command == "none";
+ if (argument == "linuxdoc")
+ disable = lyxrc.linuxdoc_to_lyx_command == "none";
break;
case LFUN_EXPORT:
if (argument == "dvi" || argument == "postscript")
disable = noLaTeX;
if (argument == "html")
- disable = lyxrc->html_command == "none";
+ disable = lyxrc.html_command == "none";
+ if (argument == "html-linuxdoc")
+ disable = lyxrc.linuxdoc_to_html_command == "none";
+ if (argument == "html-docbook")
+ disable = lyxrc.docbook_to_html_command == "none";
break;
case LFUN_UNDO:
disable = buf->undostack.empty();
disable = buf->redostack.empty();
break;
case LFUN_SPELLCHECK:
- disable = lyxrc->isp_command == "none";
+ disable = lyxrc.isp_command == "none";
break;
case LFUN_RUNCHKTEX:
- disable = lyxrc->chktex_command == "none";
+ disable = lyxrc.chktex_command == "none";
break;
case LFUN_LAYOUT_TABLE:
disable = ! owner->view()->text->cursor.par->table;
if (font.latex() == LyXFont::ON)
box = LyXFunc::ToggleOn;
break;
- case LFUN_RTL:
- if (font.direction() == LyXFont::RTL_DIR)
- box = LyXFunc::ToggleOn;
- break;
default:
box = LyXFunc::OK;
break;
// we have not done anything wrong yet.
errorstat = false;
- dispatch_buffer.clear();
+ dispatch_buffer.erase();
// if action is a pseudo-action, we need the real action
if (lyxaction.isPseudoAction(ac)) {
selection_possible = false;
- if (owner->view()->available()
- && owner->view()->getScreen())
- owner->view()->getScreen()->HideCursor();
+ if (owner->view()->available())
+ owner->view()->hideCursor();
// We cannot use this function here
if (getStatus(action) & Disabled)
goto exit_with_message;
- commandshortcut.clear();
+ commandshortcut.erase();
- if (lyxrc->display_shortcuts && show_sc) {
+ if (lyxrc.display_shortcuts && show_sc) {
if (action != LFUN_SELFINSERT) {
// Put name of command and list of shortcuts
// for it in minibuffer
// the math inset [asierra060396]
if (owner->view()->available() &&
owner->view()->the_locking_inset) {
+ UpdatableInset::RESULT result;
if (action > 1
|| (action == LFUN_UNKNOWN_ACTION
&& keyseq.length >= -1)) {
inset->GetCursorPos(slx, sly);
owner->view()->unlockInset(inset);
owner->view()->menuUndo();
- inset = static_cast<UpdatableInset*>(owner->view()->text->cursor.par->GetInset(owner->view()->text->cursor.pos));
- if (inset)
- inset->Edit(slx, sly);
+ if (owner->view()->text->cursor.par->
+ IsInset(owner->view()->text->cursor.pos)) {
+ inset = static_cast<UpdatableInset*>(
+ owner->view()->text->cursor.par->
+ GetInset(owner->view()->text->
+ cursor.pos));
+ } else {
+ inset = 0;
+ }
+ if (inset)
+ inset->Edit(owner->view(),slx,sly,0);
return string();
- } else
- if (action == LFUN_REDO) {
- int slx, sly;
- UpdatableInset * inset = owner->view()->the_locking_inset;
- inset->GetCursorPos(slx, sly);
- owner->view()->unlockInset(inset);
- owner->view()->menuRedo();
- inset = static_cast<UpdatableInset*>(owner->view()->text->cursor.par->GetInset(owner->view()->text->cursor.pos));
- if (inset)
- inset->Edit(slx, sly);
+ } else if (action == LFUN_REDO) {
+ int slx, sly;
+ UpdatableInset * inset = owner->view()->
+ the_locking_inset;
+ inset->GetCursorPos(slx, sly);
+ owner->view()->unlockInset(inset);
+ owner->view()->menuRedo();
+ inset = static_cast<UpdatableInset*>(
+ owner->view()->text->cursor.par->
+ GetInset(owner->view()->text->
+ cursor.pos));
+ if (inset)
+ inset->Edit(owner->view(),slx,sly,0);
+ return string();
+ } else if (((result=owner->view()->the_locking_inset->
+ LocalDispatch(owner->view(), action,
+ argument)) ==
+ UpdatableInset::DISPATCHED) ||
+ (result == UpdatableInset::DISPATCHED_NOUPDATE))
+ return string();
+ else {
+ setMessage(N_("Text mode"));
+ switch(action) {
+ case LFUN_UNKNOWN_ACTION:
+ case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAKLINE:
+ owner->view()->text->CursorRight();
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ break;
+ case LFUN_RIGHT:
+ if (!owner->view()->text->cursor.par->isRightToLeftPar()) {
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->
+ Set(CurrentState(owner->view()));
+ }
return string();
- } else
- if (owner->view()->the_locking_inset->LocalDispatch(action, argument.c_str()))
- return string();
- else {
- setMessage(N_("Text mode"));
- LyXDirection direction = owner->view()->text->cursor.par->getParDirection();
- if ( action == -1 ||
- (action == LFUN_RIGHT
- && direction == LYX_DIR_LEFT_TO_RIGHT)) {
- owner->view()->text->CursorRight();
- moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
- }
- if ( action == LFUN_LEFT
- && direction == LYX_DIR_RIGHT_TO_LEFT) {
- owner->view()->text->CursorRight();
- moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
- }
- if (action == LFUN_LEFT || action == LFUN_RIGHT)
- return string();
+ case LFUN_LEFT:
+ if (owner->view()->text->cursor.par->isRightToLeftPar()) {
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->
+ Set(CurrentState(owner->view()));
}
+ return string();
+ case LFUN_DOWN:
+ owner->view()->text->CursorDown();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->
+ Set(CurrentState(owner->view()));
+ return string();
+ default:
+ break;
+ }
+ }
}
}
// ??? Needed ???
// clear the selection (if there is any)
- owner->view()->getScreen()->ToggleSelection();
+ owner->view()->toggleSelection();
owner->view()->text->ClearSelection();
// Move cursor so that successive C-s 's will not stand in place.
// ??? Needed ???
// set the new selection
// SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected);
- owner->view()->getScreen()->ToggleSelection(false);
+ owner->view()->toggleSelection(false);
} else
LyXBell();
// REMOVED : if (owner->view()->getWorkArea()->focus)
- owner->view()->getScreen()->ShowCursor();
+ owner->view()->showCursor();
}
break;
case LFUN_PREFIX:
{
- if (owner->view()->available()
- && owner->view()->getScreen()) {
+ if (owner->view()->available()) {
owner->view()->update(-2);
}
string buf;
break;
case LFUN_CENTER: // this is center and redraw.
- owner->view()->beforeChange();
- if (owner->view()->text->cursor.y >
-#ifdef NEW_WA
- owner->view()->getWorkArea()->height() / 2)
-#else
- owner->view()->getWorkArea()->h / 2)
-#endif
- {
- owner->view()->getScreen()->
- Draw(owner->view()->text->cursor.y -
-#ifdef NEW_WA
- owner->view()->getWorkArea()->height() / 2
-#else
- owner->view()->getWorkArea()->h / 2
-#endif
- );
- } else { // <=
- owner->view()->getScreen()->
- Draw(0);
- }
- owner->view()->update(0);
- owner->view()->redraw();
+ owner->view()->center();
break;
case LFUN_APPENDIX:
break;
case LFUN_MENUWRITE:
+ owner->getMiniBuffer()->Set(_("Saving document"),
+ MakeDisplayPath(owner->buffer()->fileName()),
+ "...");
MenuWrite(owner->buffer());
+ //owner->getMiniBuffer()-> {
+ // Set(_("Document saved as"),
+ // MakeDisplayPath(owner->buffer()->fileName()));
+ //} else {
+ //owner->getMiniBuffer()->Set(_("Save failed!"));
+ //}
break;
case LFUN_MENUWRITEAS:
break;
case LFUN_IMPORT:
- {
- //needs argument as string
- string imtyp = argument;
-
- // latex
- if (imtyp == "latex") {
- doImportLaTeX(false);
- }
- // ascii
- else if (imtyp == "ascii") {
- doImportASCII(false);
- } else if (imtyp == "asciiparagraph") {
- doImportASCII(true);
- // noweb
- } else if (imtyp == "noweb") {
- doImportLaTeX(true);
- } else {
- setErrorMessage(string(N_("Unknown import type: "))
- + imtyp);
- }
+ doImport(argument);
break;
- }
case LFUN_QUIT:
QuitLyX();
case LFUN_FIGURE:
Figure();
break;
-
+
+ case LFUN_INSERT_GRAPHICS:
+ {
+ Inset * new_inset = new InsetGraphics;
+ owner->view()->insertInset(new_inset);
+ break;
+ }
+
case LFUN_AUTOSAVE:
- AutoSave();
+ AutoSave(owner->view());
break;
case LFUN_UNDO:
break;
case LFUN_MENUSEARCH:
- MenuSearch();
+ {
+ // Ok this is one _very_ bad solution, but I think that some
+ // of this will be rewritten as part of GUI indep anyway.
+ // Lgb
+ static LyXFindReplace FR_;
+ FR_.StartSearch(owner->view());
+ }
+
break;
case LFUN_PASTE:
owner->view()->paste();
+ owner->view()->setState();
break;
case LFUN_PASTESELECTION:
case LFUN_LAYOUT_PASTE:
owner->view()->pasteEnvironment();
+ owner->view()->setState();
break;
case LFUN_GOTOERROR:
if (owner->view()->removeAutoInsets()) {
owner->view()->redraw();
owner->view()->fitCursor();
- owner->view()->updateScrollbar();
+ //owner->view()->updateScrollbar();
}
break;
break;
case LFUN_FREE:
- Free();
+ Free(owner->view());
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_TEX:
- Tex();
- owner->view()->SetState();
- owner->getMiniBuffer()->Set(CurrentState());
+ Tex(owner->view());
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_MELT:
}
else
Foot(owner->view());
- owner->view()->SetState();
+ owner->view()->setState();
break;
case LFUN_MARGINMELT:
Melt(owner->view());
} else
Margin(owner->view());
- owner->view()->SetState();
+ owner->view()->setState();
break;
// --- version control -------------------------------
case LFUN_FILE_INSERT_ASCII:
{
bool asPara = (argument == "paragraph");
- InsertAsciiFile(string(), asPara);
+ InsertAsciiFile(owner->view(), string(), asPara);
}
break;
// Pretend we got the name instead.
Dispatch(int(LFUN_LAYOUT),
- textclasslist.NameOfLayout(owner->view()->
- text->parameters->
- textclass,
+ textclasslist.NameOfLayout(owner->view()
+ ->buffer()->params.textclass,
sel).c_str());
return string();
}
// Derive layout number from given argument (string)
// and current buffer's textclass (number). */
LyXTextClassList::ClassList::size_type tclass =
- owner->view()->text->parameters->textclass;
- pair <bool, int> layout =
+ owner->view()->buffer()->params.textclass;
+ pair <bool, LyXTextClass::size_type> layout =
textclasslist.NumberOfLayout(tclass, argument);
// If the entry is obsolete, use the new one instead.
}
if (current_layout != layout.second) {
- owner->view()->getScreen()->HideCursor();
+ owner->view()->hideCursor();
current_layout = layout.second;
owner->view()->update(-2);
owner->view()->text->
text->cursor.par->
GetLayout() + 1);
owner->view()->update(1);
+ owner->view()->setState();
}
}
break;
owner->getToolbar()->combox->Show();
break;
- case LFUN_RTL:
+ case LFUN_LANGUAGE:
{
- RTLCB();
- owner->view()->SetState();
- owner->getMiniBuffer()->Set(CurrentState());
+ Lang(owner->view(), argument);
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
}
break;
case LFUN_EMPH:
- Emph();
+ Emph(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_BOLD:
- Bold();
+ Bold(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_NOUN:
- Noun();
+ Noun(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_CODE:
- Code();
+ Code(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_SANS:
- Sans();
+ Sans(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_ROMAN:
- Roman();
+ Roman(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_DEFAULT:
- StyleReset();
+ StyleReset(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_UNDERLINE:
- Underline();
+ Underline(owner->view());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_FONT_SIZE:
- FontSize(argument);
+ FontSize(owner->view(), argument);
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_FONT_STATE:
- setMessage(CurrentState());
+ setMessage(CurrentState(owner->view()));
break;
case LFUN_UPCASE_WORD:
inset->setFlag(InsetRef::PAGE_REF);
else
inset->setFlag(InsetRef::REF);
- UpdateInset(owner->view(), inset);
+ owner->view()->updateInset(inset, true);
} else {
setErrorMessage(N_("No cross-reference to toggle"));
}
break; // RVDK_PATCH_5
case LFUN_SPELLCHECK:
- if (lyxrc->isp_command != "none")
- ShowSpellChecker();
+ if (lyxrc.isp_command != "none")
+ ShowSpellChecker(owner->view());
break; // RVDK_PATCH_5
// --- Cursor Movements -----------------------------
case LFUN_RIGHT:
{
LyXText * tmptext = owner->view()->text;
- LyXDirection direction =
- tmptext->cursor.par->getParDirection();
+ bool is_rtl = tmptext->cursor.par->isRightToLeftPar();
if(!tmptext->mark_set)
owner->view()->beforeChange();
owner->view()->update(-2);
- if (direction == LYX_DIR_RIGHT_TO_LEFT)
+ if (is_rtl)
tmptext->CursorLeft();
if (tmptext->cursor.pos < tmptext->cursor.par->Last()
&& tmptext->cursor.par->GetChar(tmptext->cursor.pos)
== LyXParagraph::META_INSET
&& tmptext->cursor.par->GetInset(tmptext->cursor.pos)
- && tmptext->cursor.par->GetInset(tmptext->cursor.pos)->Editable() == 2){
+ && tmptext->cursor.par->GetInset(tmptext->cursor.pos)->Editable() == Inset::HIGHLY_EDITABLE){
Inset * tmpinset = tmptext->cursor.par->GetInset(tmptext->cursor.pos);
setMessage(tmpinset->EditMessage());
- tmpinset->Edit(0, 0);
+ tmpinset->Edit(owner->view(), 0, 0, 0);
break;
}
- if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ if (!is_rtl)
tmptext->CursorRight();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
}
break;
case LFUN_LEFT:
{
-#ifdef USE_PAINTER
// This is soooo ugly. Isn`t it possible to make
// it simpler? (Lgb)
LyXText * txt = owner->view()->text;
- LyXDirection direction = txt->cursor.par->getParDirection();
+ bool is_rtl = txt->cursor.par->isRightToLeftPar();
if(!txt->mark_set) owner->view()->beforeChange();
owner->view()->update(-2);
- if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ if (!is_rtl)
txt->CursorLeft();
if (txt->cursor.pos < txt->cursor.par->Last()
&& txt->cursor.par->GetChar(txt->cursor.pos)
== LyXParagraph::META_INSET
&& txt->cursor.par->GetInset(txt->cursor.pos)
- && txt->cursor.par->GetInset(txt->cursor.pos)->Editable() == 2) {
+ && txt->cursor.par->GetInset(txt->cursor.pos)->Editable() == Inset::HIGHLY_EDITABLE) {
Inset * tmpinset = txt->cursor.par->GetInset(txt->cursor.pos);
setMessage(tmpinset->EditMessage());
- tmpinset->Edit(tmpinset->width(owner->view()->painter(),
+ tmpinset->Edit(owner->view(),
+ tmpinset->width(owner->view()->painter(),
txt->GetFont(txt->cursor.par,
- txt->cursor.pos)), 0);
+ txt->cursor.pos)),
+ 0, 0);
break;
}
- if (direction == LYX_DIR_RIGHT_TO_LEFT)
+ if (is_rtl)
txt->CursorRight();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
-#else
- // This is soooo ugly. Isn`t it possible to make
- // it simpler? (Lgb)
- LyXText * txt = owner->view()->text;
- LyXDirection direction = txt->cursor.par->getParDirection();
- if(!txt->mark_set) owner->view()->beforeChange();
- owner->view()->update(-2);
- if (direction == LYX_DIR_LEFT_TO_RIGHT)
- txt->CursorLeft();
- if (txt->cursor.pos < txt->cursor.par->Last()
- && txt->cursor.par->GetChar(txt->cursor.pos)
- == LyXParagraph::META_INSET
- && txt->cursor.par->GetInset(txt->cursor.pos)
- && txt->cursor.par->GetInset(txt->cursor.pos)->Editable() == 2) {
- Inset * tmpinset = txt->cursor.par->GetInset(txt->cursor.pos);
- setMessage(tmpinset->EditMessage());
- tmpinset->Edit(tmpinset->Width(txt->GetFont(txt->cursor.par,
- txt->cursor.pos)), 0);
- break;
- }
- if (direction == LYX_DIR_RIGHT_TO_LEFT)
- txt->CursorRight();
-
- owner->view()->text->FinishUndo();
- moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
-#endif
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
}
break;
owner->view()->text->CursorUp();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_DOWN:
owner->view()->text->CursorDown();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_UP_PARAGRAPH:
owner->view()->text->CursorUpParagraph();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_DOWN_PARAGRAPH:
owner->view()->text->CursorDownParagraph();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_PRIOR:
owner->view()->cursorPrevious();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_NEXT:
owner->view()->cursorNext();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_HOME:
owner->view()->text->CursorHome();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_END:
owner->view()->text->CursorEnd();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_TAB:
owner->view()->text->CursorTab();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_WORDRIGHT:
if(!owner->view()->text->mark_set)
owner->view()->beforeChange();
owner->view()->update(-2);
- if (owner->view()->text->cursor.par->getParDirection()
- == LYX_DIR_LEFT_TO_RIGHT)
- owner->view()->text->CursorRightOneWord();
- else
+ if (owner->view()->text->cursor.par->isRightToLeftPar())
owner->view()->text->CursorLeftOneWord();
+ else
+ owner->view()->text->CursorRightOneWord();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_WORDLEFT:
if(!owner->view()->text->mark_set)
owner->view()->beforeChange();
owner->view()->update(-2);
- if (owner->view()->text->cursor.par->getParDirection()
- == LYX_DIR_LEFT_TO_RIGHT)
- owner->view()->text->CursorLeftOneWord();
- else
+ if (owner->view()->text->cursor.par->isRightToLeftPar())
owner->view()->text->CursorRightOneWord();
+ else
+ owner->view()->text->CursorLeftOneWord();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_BEGINNINGBUF:
owner->view()->text->CursorTop();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_ENDBUF:
owner->view()->text->CursorBottom();
owner->view()->text->FinishUndo();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
/* cursor selection ---------------------------- */
case LFUN_RIGHTSEL:
owner->view()->update(-2);
- if (owner->view()->text->cursor.par->getParDirection()
- == LYX_DIR_LEFT_TO_RIGHT)
- owner->view()->text->CursorRight();
- else
+ if (owner->view()->text->cursor.par->isRightToLeftPar())
owner->view()->text->CursorLeft();
+ else
+ owner->view()->text->CursorRight();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_LEFTSEL:
owner->view()->update(-2);
- if (owner->view()->text->cursor.par->getParDirection()
- == LYX_DIR_LEFT_TO_RIGHT)
- owner->view()->text->CursorLeft();
- else
+ if (owner->view()->text->cursor.par->isRightToLeftPar())
owner->view()->text->CursorRight();
+ else
+ owner->view()->text->CursorLeft();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_UPSEL:
owner->view()->text->CursorUp();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_DOWNSEL:
owner->view()->text->CursorDown();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_UP_PARAGRAPHSEL:
owner->view()->text->CursorUpParagraph();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_DOWN_PARAGRAPHSEL:
owner->view()->text->CursorDownParagraph();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_PRIORSEL:
owner->view()->cursorPrevious();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_NEXTSEL:
owner->view()->cursorNext();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_HOMESEL:
owner->view()->text->CursorHome();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_ENDSEL:
owner->view()->text->CursorEnd();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_WORDRIGHTSEL:
owner->view()->update(-2);
- if (owner->view()->text->cursor.par->getParDirection()
- == LYX_DIR_LEFT_TO_RIGHT)
- owner->view()->text->CursorRightOneWord();
- else
+ if (owner->view()->text->cursor.par->isRightToLeftPar())
owner->view()->text->CursorLeftOneWord();
+ else
+ owner->view()->text->CursorRightOneWord();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_WORDLEFTSEL:
owner->view()->update(-2);
- if (owner->view()->text->cursor.par->getParDirection()
- == LYX_DIR_LEFT_TO_RIGHT)
- owner->view()->text->CursorLeftOneWord();
- else
+ if (owner->view()->text->cursor.par->isRightToLeftPar())
owner->view()->text->CursorRightOneWord();
+ else
+ owner->view()->text->CursorLeftOneWord();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_BEGINNINGBUFSEL:
owner->view()->text->CursorTop();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
case LFUN_ENDBUFSEL:
owner->view()->text->CursorBottom();
owner->view()->text->FinishUndo();
moveCursorUpdate(true);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
// --- text changing commands ------------------------
case LFUN_BREAKLINE:
owner->view()->beforeChange();
owner->view()->text->InsertChar(LyXParagraph::META_NEWLINE);
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
SetUpdateTimer(0.01);
moveCursorUpdate(false);
break;
case LFUN_PROTECTEDSPACE:
- owner->view()->beforeChange();
- owner->view()->text->
- InsertChar(LyXParagraph::META_PROTECTED_SEPARATOR);
- owner->view()->smallUpdate(1);
- SetUpdateTimer();
- moveCursorUpdate(false);
- break;
+ {
+ LyXLayout const & style =
+ textclasslist.Style(owner->view()->buffer()->params.textclass,
+ owner->view()->text->cursor.par->GetLayout());
+
+ if (style.free_spacing) {
+ owner->view()->text->InsertChar(' ');
+ owner->view()->update(-1);
+ } else {
+ owner->view()->protectedBlank();
+ }
+ moveCursorUpdate(false);
+ }
+ break;
case LFUN_SETMARK:
if(owner->view()->text->mark_set) {
owner->view()->text->Delete();
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
// It is possible to make it a lot faster still
// just comment out the lone below...
- owner->view()->getScreen()->ShowCursor();
+ owner->view()->showCursor();
} else {
owner->view()->cut();
}
SetUpdateTimer();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
- owner->view()->SetState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->view()->setState();
break;
case LFUN_DELETE_SKIP:
owner->view()->text->Delete();
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
}
} else {
owner->view()->text->Delete();
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
}
} else {
owner->view()->cut();
owner->view()->update( 1 );
SetUpdateTimer();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
/* -------> Delete word backward. */
owner->view()->update( 1 );
SetUpdateTimer();
moveCursorUpdate(false);
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
/* -------> Kill to end of line. */
owner->view()->text->Backspace();
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
// It is possible to make it a lot faster still
// just comment out the lone below...
- owner->view()->getScreen()->ShowCursor();
+ owner->view()->showCursor();
}
} else {
owner->view()->cut();
}
SetUpdateTimer();
- owner->getMiniBuffer()->Set(CurrentState());
- owner->view()->SetState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ owner->view()->setState();
}
break;
owner->view()->text->Backspace();
owner->view()->text->sel_cursor
= cursor;
- owner->view()->smallUpdate (1);
+ owner->view()->update(1);
}
} else
owner->view()->cut();
{
owner->view()->beforeChange();
owner->view()->text->BreakParagraph(0);
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
SetUpdateTimer(0.01);
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
- owner->view()->SetState();
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
}
{
owner->view()->beforeChange();
owner->view()->text->BreakParagraph(1);
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
SetUpdateTimer(0.01);
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
- owner->view()->SetState();
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
break;
}
}
else {
owner->view()->text->BreakParagraph(0);
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
}
SetUpdateTimer(0.01);
owner->view()->text->sel_cursor = cursor;
- owner->view()->SetState();
- owner->getMiniBuffer()->Set(CurrentState());
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+ }
+ break;
+
+ case LFUN_PARAGRAPH_SPACING:
+ {
+ LyXParagraph * par = owner->view()->text->cursor.par;
+ Spacing::Space cur_spacing = par->spacing.getSpace();
+ float cur_value = 1.0;
+ if (cur_spacing == Spacing::Other) {
+ cur_value = par->spacing.getValue();
+ }
+
+#ifdef HAVE_SSTREAM
+ istringstream istr(argument);
+#else
+ istrstream istr(argument.c_str());
+#endif
+ string tmp;
+ istr >> tmp;
+ Spacing::Space new_spacing = cur_spacing;
+ float new_value = cur_value;
+ if (tmp.empty()) {
+ lyxerr << "Missing argument to `paragraph-spacing'"
+ << endl;
+ } else if (tmp == "single") {
+ new_spacing = Spacing::Single;
+ } else if (tmp == "onehalf") {
+ new_spacing = Spacing::Onehalf;
+ } else if (tmp == "double") {
+ new_spacing = Spacing::Double;
+ } else if (tmp == "other") {
+ new_spacing = Spacing::Other;
+ float tmpval = 0.0;
+ istr >> tmpval;
+ lyxerr << "new_value = " << tmpval << endl;
+ if (tmpval != 0.0)
+ new_value = tmpval;
+ } else if (tmp == "default") {
+ new_spacing = Spacing::Default;
+ } else {
+ lyxerr << _("Unknown spacing argument: ")
+ << argument << endl;
+ }
+ if (cur_spacing != new_spacing || cur_value != new_value) {
+ par->spacing.set(new_spacing, new_value);
+ owner->view()->text->RedoParagraph();
+ owner->view()->update(-1);
+ }
}
break;
case LFUN_QUOTE:
owner->view()->beforeChange();
owner->view()->text->InsertChar('\"'); // This " matches the single quote in the code
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
SetUpdateTimer();
moveCursorUpdate(false);
break;
else
new_inset = new InsetUrl("url", "", "");
owner->view()->insertInset(new_inset);
- new_inset->Edit(0, 0);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+
+ case LFUN_INSET_TEXT:
+ {
+ InsetText * new_inset = new InsetText(owner->buffer());
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+ case LFUN_INSET_ERT:
+ {
+ InsetERT * new_inset = new InsetERT(owner->buffer());
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+
+ case LFUN_INSET_FOOTNOTE:
+ {
+ InsetFoot * new_inset = new InsetFoot(owner->buffer());
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+
+ case LFUN_INSET_TABULAR:
+ {
+ int r = 2, c = 2;
+ if (!argument.empty())
+ sscanf(argument.c_str(),"%d%d",&r,&c);
+ InsetTabular * new_inset = new InsetTabular(owner->buffer(),r,c);
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
break;
LyXParagraph::size_type pos =
owner->view()->text->cursor.pos;
if(pos < owner->view()->text->cursor.par->size())
- dispatch_buffer = owner->view()->text->
- cursor.par->text[pos];
+ //dispatch_buffer = owner->view()->text->
+ // cursor.par->text[pos];
+ dispatch_buffer =
+ owner->view()->text->
+ cursor.par->GetChar(pos);
else
dispatch_buffer = "EOF";
}
case LFUN_GETFONT:
{
- LyXFont * font = &(owner->view()->text->current_font);
- if(font->shape() == LyXFont::ITALIC_SHAPE)
+ LyXFont & font = owner->view()->text->current_font;
+ if(font.shape() == LyXFont::ITALIC_SHAPE)
dispatch_buffer = 'E';
- else if(font->shape() == LyXFont::SMALLCAPS_SHAPE)
+ else if(font.shape() == LyXFont::SMALLCAPS_SHAPE)
dispatch_buffer = 'N';
else
dispatch_buffer = '0';
case LFUN_GETLATEX:
{
- LyXFont * font = &(owner->view()->text->current_font);
- if(font->latex() == LyXFont::ON)
+ LyXFont & font = owner->view()->text->current_font;
+ if(font.latex() == LyXFont::ON)
dispatch_buffer = 'L';
else
dispatch_buffer = '0';
owner->view()->setCursorFromRow(row);
// Recenter screen
- owner->view()->beforeChange();
- if (owner->view()->text->cursor.y >
-#ifdef NEW_WA
- owner->view()->getWorkArea()->height() / 2
-#else
- owner->view()->getWorkArea()->h / 2
-#endif
- ) {
- owner->view()->getScreen()->
- Draw(owner->view()->text->cursor.y -
-#ifdef NEW_WA
- owner->view()->getWorkArea()->height() / 2
-#else
- owner->view()->getWorkArea()->h / 2
-#endif
- );
- } else { // <=
- owner->view()->getScreen()->
- Draw(0);
- }
- owner->view()->update(0);
- owner->view()->redraw();
+ owner->view()->center();
}
break;
case LFUN_CIRCLE:
case LFUN_OGONEK:
{
- char c;
+ char c = 0;
if (keyseq.length == -1 && keyseq.getiso() != 0)
c = keyseq.getiso();
- else
- c = 0;
owner->getIntl()->getTrans()->
deadkey(c, get_accent(action).accent,
keyseq.length = 0;
// copied verbatim from do_accent_char
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
+
SetUpdateTimer();
owner->view()->text->sel_cursor =
owner->view()->text->cursor;
if (owner->view()->available()) {
owner->view()->
open_new_inset(new InsetFormula(false));
- owner->view()->
- the_locking_inset->LocalDispatch(action, argument.c_str());
+ owner->view()
+ ->the_locking_inset
+ ->LocalDispatch(owner->view(),
+ action,
+ argument);
}
}
break;
owner->view()->insertInset(new_inset);
} else {
owner->view()->insertInset(new_inset);
- new_inset->Edit(0, 0);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
}
break;
owner->view()->insertInset(new_inset);
if (lsarg.empty()) {
- new_inset->Edit(0, 0);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
}
break;
//don't edit it if the call was to INSERT_LAST
if(action != LFUN_INDEX_INSERT_LAST) {
- new_inset->Edit(0, 0);
+ new_inset->Edit(owner->view(), 0, 0, 0);
} else {
//it looks blank on the screen unless
//we do something. put it here.
Inset * new_inset = new InsetInclude(argument,
owner->buffer());
owner->view()->insertInset(new_inset, "Standard", true);
- new_inset->Edit(0, 0);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
break;
}
owner->view()->text->InsertFootnoteEnvironment(kind);
owner->view()->update(1);
- owner->view()->SetState();
+ owner->view()->setState();
}
break;
owner->view()->text->InsertChar(argument[i]);
// This needs to be in the loop, or else we
// won't break lines correctly. (Asger)
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
}
SetUpdateTimer();
owner->view()->text->sel_cursor =
if (!argument.empty())
arg = argument;
else if (arg.empty())
- arg = lyxrc->date_insert_format;
+ arg = lyxrc.date_insert_format;
datetmp_len = (int) strftime(datetmp, 32, arg.c_str(), now_tm);
for (int i = 0; i < datetmp_len; i++) {
owner->view()->text->InsertChar(datetmp[i]);
- owner->view()->smallUpdate(1);
+ owner->view()->update(1);
}
SetUpdateTimer();
owner->view()->text->sel_cursor = owner->view()->text->cursor;
case LFUN_SAVEPREFERENCES:
{
Path p(user_lyxdir);
- lyxrc->write("preferences");
+ lyxrc.write("preferences");
}
break;
* "auto_region_delete", which defaults to
* true (on). */
- if ( lyxrc->auto_region_delete ) {
+ if ( lyxrc.auto_region_delete ) {
if (owner->view()->text->selection){
owner->view()->text->CutSelection(false);
owner->view()->update(-1);
}
owner->view()->beforeChange();
+
for (string::size_type i = 0;
i < argument.length(); ++i) {
if (greek_kb_flag) {
} else
owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
}
-
- owner->view()->smallUpdate(1);
+
+ owner->view()->update(1);
SetUpdateTimer();
owner->view()->text->sel_cursor =
void LyXFunc::MenuNew(bool fromTemplate)
{
- string fname, initpath = lyxrc->document_path;
+ string fname, initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
if (owner->view()->available()) {
initpath = trypath;
}
- ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
- fileDlg.SetButton(1, _("Templates"), lyxrc->template_path);
+ ProhibitInput(owner->view());
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
+ fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
fname = fileDlg.Select(_("Enter Filename for new document"),
initpath, "*.lyx", _("newfile"));
- AllowInput();
+ AllowInput(owner->view());
if (fname.empty()) {
owner->getMiniBuffer()->Set(_("Canceled."));
// The template stuff
string templname;
if (fromTemplate) {
- ProhibitInput();
+ ProhibitInput(owner->view());
fname = fileDlg.Select(_("Choose template"),
- lyxrc->template_path,
+ lyxrc.template_path,
"*.lyx");
templname = fname;
- AllowInput();
+ AllowInput(owner->view());
}
// find a free buffer
void LyXFunc::MenuOpen()
{
- string initpath = lyxrc->document_path;
+ string initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
if (owner->view()->available()) {
}
// launches dialog
- ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
+ ProhibitInput(owner->view());
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
fileDlg.SetButton(1, _("Examples"),
AddPath(system_lyxdir, "examples"));
string filename = fileDlg.Select(_("Select Document to Open"),
initpath, "*.lyx");
- AllowInput();
+ AllowInput(owner->view());
// check selected filename
if (filename.empty()) {
}
}
+// returns filename if file must be imported,
+// empty string if either file not found or already loaded
+// checks for running without gui are missing.
-void LyXFunc::doImportASCII(bool linorpar)
+void LyXFunc::doImportHelper(
+ string const & file, // filename (possibly empty)
+ string const & text, // info when asking for filename
+ string const & pattern, // filetype
+ bool func(BufferView *, string const &) // the real import function
+)
{
- string initpath = lyxrc->document_path;
- LyXFileDlg fileDlg;
-
- if (owner->view()->available()) {
- string trypath = owner->buffer()->filepath;
- // If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
- initpath = trypath;
- }
+ string filename = file;
- // launches dialog
- ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
- fileDlg.SetButton(1, _("Examples"),
- AddPath(system_lyxdir, "examples"));
- string filename = fileDlg.Select(_("Select ASCII file to Import"),
- initpath, "*.txt");
- AllowInput();
+ if (filename.empty()) { // need user interaction
+ string initpath = lyxrc.document_path;
+ LyXFileDlg fileDlg;
+
+ if (owner->view()->available()) {
+ string trypath = owner->buffer()->filepath;
+ // If directory is writeable, use this as default.
+ if (IsDirWriteable(trypath) == 1)
+ initpath = trypath;
+ }
+
+ // launches dialog
+ ProhibitInput(owner->view());
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
+ fileDlg.SetButton(1, _("Examples"),
+ AddPath(system_lyxdir, "examples"));
+ filename = fileDlg.Select(text, initpath, pattern);
+ AllowInput(owner->view());
- // check selected filename
- if (filename.empty()) {
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
+ // check selected filename
+ if (filename.empty())
+ owner->getMiniBuffer()->Set(_("Canceled."));
}
+ // still no filename? abort
+ if (filename.empty())
+ return;
+
// get absolute path of file
filename = MakeAbsPath(filename);
- string s = ChangeExtension(filename, ".lyx", false);
+ string lyxfile = ChangeExtension(filename, ".lyx", false);
// Check if the document already is open
- if (bufferlist.exists(s)) {
+ if (bufferlist.exists(lyxfile)) {
switch(AskConfirmation(_("Document is already open:"),
- MakeDisplayPath(s, 50),
+ MakeDisplayPath(lyxfile, 50),
_("Do you want to close that document now?\n"
"('No' will just switch to the open version)")))
{
case 1: // Yes: close the document
- if (!bufferlist.close(bufferlist.getBuffer(s)))
+ if (!bufferlist.close(bufferlist.getBuffer(lyxfile)))
// If close is canceled, we cancel here too.
return;
break;
case 2: // No: switch to the open document
- owner->view()->buffer(bufferlist.getBuffer(s));
+ owner->view()->buffer(bufferlist.getBuffer(lyxfile));
return;
case 3: // Cancel: Do nothing
owner->getMiniBuffer()->Set(_("Canceled."));
}
// Check if a LyX document by the same root exists in filesystem
- FileInfo f(s, true);
+ FileInfo f(lyxfile, true);
if (f.exist() && !AskQuestion(_("A document by the name"),
- MakeDisplayPath(s),
+ MakeDisplayPath(lyxfile),
_("already exists. Overwrite?"))) {
owner->getMiniBuffer()->Set(_("Canceled."));
return;
}
+ // filename should be valid now
- owner->view()->buffer(bufferlist.newFile(s, string()));
- owner->getMiniBuffer()->Set(_("Importing ASCII file"),
- MakeDisplayPath(filename), "...");
- // Insert ASCII file
- InsertAsciiFile(filename, linorpar);
- owner->getMiniBuffer()->Set(_("ASCII file "),
- MakeDisplayPath(filename),
- _("imported."));
+ // notify user of import ahead
+ string displaypath = MakeDisplayPath(filename);
+ owner->view()->buffer(bufferlist.newFile(lyxfile, string()));
+ owner->getMiniBuffer()->Set(_("Importing"), displaypath, "...");
+
+ // call real importer
+ bool result = func(owner->view(), filename);
+
+ // we are done
+ if (result)
+ owner->getMiniBuffer()->Set(displaypath, _("imported."));
+ else
+ owner->getMiniBuffer()->Set(displaypath, _(": import failed."));
}
+static
+bool doImportASCIIasLines(BufferView * view, string const & filename)
+{
+ InsertAsciiFile(view, filename, false);
+ return true;
+}
-void LyXFunc::doImportLaTeX(bool isnoweb)
+static
+bool doImportASCIIasParagraphs(BufferView * view, string const & filename)
{
- string initpath = lyxrc->document_path;
- LyXFileDlg fileDlg;
-
- if (owner->view()->available()) {
- string trypath = owner->buffer()->filepath;
- // If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
- initpath = trypath;
- }
+ InsertAsciiFile(view, filename, true);
+ return true;
+}
- // launches dialog
- ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
- fileDlg.SetButton(1, _("Examples"),
- AddPath(system_lyxdir, "examples"));
- string filename;
- if (isnoweb) {
- filename = fileDlg.Select(_("Select Noweb file to Import"),
- initpath, "*.nw");
- } else {
- filename = fileDlg.Select(_("Select LaTeX file to Import"),
- initpath, "*.tex");
- }
-
- AllowInput();
-
- // check selected filename
- if (filename.empty()) {
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
- }
+static
+bool doImportLaTeX(BufferView *, string const & filename)
+{
+ ImportLaTeX myImport(filename);
+ Buffer * openbuf = myImport.run();
+ return openbuf != NULL;
+}
- // get absolute path of file
- filename = MakeAbsPath(filename);
+static
+bool doImportNoweb(BufferView *, string const & filename)
+{
+ ImportNoweb myImport(filename);
+ Buffer * openbuf = myImport.run();
+ return openbuf != NULL;
+}
- // Check if the document already is open
- string LyXfilename = ChangeExtension(filename, ".lyx", false);
- if (bufferlist.exists(LyXfilename)){
- switch(AskConfirmation(_("Document is already open:"),
- MakeDisplayPath(LyXfilename, 50),
- _("Do you want to close that document now?\n"
- "('No' will just switch to the open version)")))
- {
- case 1: // Yes: close the document
- if (!bufferlist.close(bufferlist.getBuffer(LyXfilename)))
- // If close is canceled, we cancel here too.
- return;
- break;
- case 2: // No: switch to the open document
- owner->view()->buffer(
- bufferlist.getBuffer(LyXfilename));
- return;
- case 3: // Cancel: Do nothing
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
- }
- }
+static
+bool doImportLinuxDoc(BufferView *, string const & filename)
+{
+ // run sgml2lyx
+ string tmp = lyxrc.linuxdoc_to_lyx_command + filename;
+ Systemcalls one;
+ Buffer * buf = 0;
- // Check if a LyX document by the same root exists in filesystem
- FileInfo f(LyXfilename, true);
- if (f.exist() && !AskQuestion(_("A document by the name"),
- MakeDisplayPath(LyXfilename),
- _("already exists. Overwrite?"))) {
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
+ int result = one.startscript(Systemcalls::System, tmp);
+ if (result == 0) {
+ string filename = ChangeExtension(filename, ".lyx", false);
+ // File was generated without problems. Load it.
+ buf = bufferlist.loadLyXFile(filename);
}
- // loads document
- Buffer * openbuf;
- if (!isnoweb) {
- owner->getMiniBuffer()->Set(_("Importing LaTeX file"),
- MakeDisplayPath(filename), "...");
- ImportLaTeX myImport(filename);
- openbuf = myImport.run();
- } else {
- owner->getMiniBuffer()->Set(_("Importing Noweb file"),
- MakeDisplayPath(filename), "...");
- ImportNoweb myImport(filename);
- openbuf = myImport.run();
- }
- if (openbuf) {
- owner->view()->buffer(openbuf);
- owner->getMiniBuffer()->Set(isnoweb ?
- _("Noweb file ") : _("LateX file "),
- MakeDisplayPath(filename),
- _("imported."));
- } else {
- owner->getMiniBuffer()->Set(isnoweb ?
- _("Could not import Noweb file") :
- _("Could not import LaTeX file"),
- MakeDisplayPath(filename));
- }
+ return result == 0;
}
if (filename.empty()) {
// Launch a file browser
- string initpath = lyxrc->document_path;
+ string initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
if (owner->view()->available()) {
}
// launches dialog
- ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
+ ProhibitInput(owner->view());
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
fileDlg.SetButton(1, _("Examples"),
AddPath(system_lyxdir, "examples"));
filename = fileDlg.Select(_("Select Document to Insert"),
initpath, "*.lyx");
- AllowInput();
+ AllowInput(owner->view());
// check selected filename
if (filename.empty()) {
}
}
+void LyXFunc::doImport(string const & argument)
+{
+ string type;
+ string filename = split(argument, type, ' ');
+ lyxerr.debug() << "LyXFunc::doImport: " << type
+ << " file: " << filename << endl;
+
+ if (type == "latex")
+ doImportHelper(filename,
+ _("Select LaTeX file to import"), "*.tex",
+ doImportLaTeX);
+ else if (type == "ascii")
+ doImportHelper(filename,
+ _("Select ASCII file to import"), "*.txt",
+ doImportASCIIasLines);
+ else if (type == "asciiparagraph")
+ doImportHelper(filename,
+ _("Select ASCII file to import"), "*.txt",
+ doImportASCIIasParagraphs);
+ else if (type == "noweb")
+ doImportHelper(filename,
+ _("Select NoWeb file to import"), "*.nw",
+ doImportNoweb);
+ else if (type == "linuxdoc")
+ doImportHelper(filename,
+ _("Select LinuxDoc file to import"), "*.doc",
+ doImportLinuxDoc);
+ else
+ setErrorMessage(string(N_("Unknown import type: ")) + type);
+}
void LyXFunc::reloadBuffer()
{
projects / features.git / blobdiff