#include "insets/insetinclude.h"
#include "insets/insetbib.h"
#include "insets/insettext.h"
+//#include "insets/insetnumber.h"
#include "insets/insetert.h"
#include "insets/insetgraphics.h"
#include "insets/insetfoot.h"
#include "layout.h"
#include "WorkArea.h"
#include "lyxfr1.h"
+#include "menus.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;
}
// 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());
+ } else {
+ tli->UnlockInsetInInset(owner->view(),
+ tli->GetLockingInset());
+ }
return 0;
}
case LFUN_IMPORT:
if (argument == "latex")
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";
+ 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();
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;
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 (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();
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)) {
+ switch(action) {
+ case LFUN_UNKNOWN_ACTION:
+ case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAKLINE:
owner->view()->text->CursorRight();
- moveCursorUpdate(false);
- owner->getMiniBuffer()->
- Set(CurrentState());
- }
- if ((action == LFUN_LEFT) ||
- (action == LFUN_RIGHT))
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState());
+ break;
+ case LFUN_RIGHT:
+ if (!owner->view()->text->cursor.par->isRightToLeftPar()) {
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->
+ Set(CurrentState());
+ }
+ return string();
+ case LFUN_LEFT:
+ if (owner->view()->text->cursor.par->isRightToLeftPar()) {
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->
+ Set(CurrentState());
+ }
return string();
+ default:
+ break;
+ }
}
}
}
// noweb
} else if (imtyp == "noweb") {
doImportLaTeX(true);
+ } else if (imtyp == "linuxdoc") {
+ doImportLinuxDoc();
} else {
setErrorMessage(string(N_("Unknown import type: "))
+ imtyp);
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:
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->
+ text->bparams->
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;
+ owner->view()->text->bparams->textclass;
pair <bool, LyXTextClass::size_type> layout =
textclasslist.NumberOfLayout(tclass, argument);
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();
+ LangCB(argument);
owner->view()->setState();
owner->getMiniBuffer()->Set(CurrentState());
}
case LFUN_EMPH:
Emph();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_BOLD:
Bold();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_NOUN:
Noun();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_CODE:
Code();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_SANS:
Sans();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_ROMAN:
Roman();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_DEFAULT:
StyleReset();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_UNDERLINE:
Underline();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_FONT_SIZE:
FontSize(argument);
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_FONT_STATE:
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)
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);
// 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)
0, 0);
break;
}
- if (direction == LYX_DIR_RIGHT_TO_LEFT)
+ if (is_rtl)
txt->CursorRight();
owner->view()->text->FinishUndo();
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());
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());
/* 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());
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());
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());
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());
new_inset->Edit(owner->view(), 0, 0, 0);
}
break;
+#if 0
+ case LFUN_INSET_NUMBER:
+ {
+ InsetNumber * new_inset = new InsetNumber(owner->buffer());
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+#endif
case LFUN_INSET_ERT:
{
InsetERT * new_inset = new InsetERT(owner->buffer());
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";
}
}
owner->view()->beforeChange();
+
+#if 0
+ if (isdigit(argument[0]) &&
+ (lyxrc.number_inset == "true" ||
+ (lyxrc.number_inset == "rtl" &&
+ owner->view()->text->real_current_font.isVisibleRightToLeft()
+ ))) {
+ UpdatableInset * tmpinset = new InsetNumber(owner->buffer());
+ owner->view()->open_new_inset(tmpinset);
+ tmpinset->LocalDispatch(owner->view(), action,
+ argument);
+ return string();
+ }
+#endif
+
for (string::size_type i = 0;
i < argument.length(); ++i) {
if (greek_kb_flag) {
owner->getMiniBuffer()->Set(_("Importing ASCII file"),
MakeDisplayPath(filename), "...");
// Insert ASCII file
- InsertAsciiFile(filename, linorpar);
+ InsertAsciiFile(owner->view(), filename, linorpar);
owner->getMiniBuffer()->Set(_("ASCII file "),
MakeDisplayPath(filename),
_("imported."));
}
+void LyXFunc::doImportLinuxDoc()
+{
+ 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();
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
+ fileDlg.SetButton(1, _("Examples"),
+ AddPath(system_lyxdir, "examples"));
+
+ string filename = fileDlg.Select(_("Select LinuxDoc file to Import"),
+ initpath, "*.sgml");
+
+ AllowInput();
+
+ // check selected filename
+ if (filename.empty()) {
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
+
+ // get absolute path of file
+ filename = MakeAbsPath(filename);
+
+ // 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;
+ }
+ }
+
+ // 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;
+ }
+
+ // loads document
+ owner->getMiniBuffer()->Set(_("Importing LinuxDoc file"),
+ MakeDisplayPath(filename), "...");
+
+ // run sgml2lyx
+ string tmp = lyxrc.linuxdoc_to_lyx_command + filename;
+ Systemcalls one;
+ Buffer * buf = 0;
+
+ 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);
+ owner->view()->buffer(buf);
+ owner->getMiniBuffer()->Set(_("LinuxDoc file "),
+ MakeDisplayPath(filename),
+ _("imported."));
+ } else {
+ owner->getMiniBuffer()->Set(_("Could not import LinuxDoc file"),
+ MakeDisplayPath(filename));
+ }
+}
+
+
void LyXFunc::MenuInsertLyXFile(string const & filen)
{
string filename = filen;