X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=a6f8f60d18a07e90f0d132621b2723a24f6540e2;hb=a69e7a45780e94f4330a91facfe35126c678e34e;hp=c852c93bfc96c7395d724c2c36377205ae82aff9;hpb=4ed68c1bc2007d6505cc2d82c66494f63d9de107;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index c852c93bfc..a6f8f60d18 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -4,65 +4,60 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich, - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2000 The LyX Team. * * ====================================================== */ #include -#include -#include -#include -#include -#include +#include +#include +#include #include "LString.h" -#include "support/lstrings.h" -#include "lyx_main.h" #include FORMS_H_LOCATION #include "lyx.h" #include "layout_forms.h" #include "bullet_forms.h" -#include "print_form.h" #include "form1.h" -#include "spellchecker.h" -#include "version.h" +#include "lyx_main.h" #include "lyx_cb.h" -#include "credits.h" #include "insets/insetref.h" -#include "insets/insetquotes.h" -#if 0 -#include "insets/insetlatex.h" -#endif #include "insets/insetlabel.h" -#include "insets/insetinfo.h" -#include "insets/insetspecialchar.h" #include "insets/figinset.h" #include "lyxfunc.h" -#include "latexoptions.h" -#include "lyxfont.h" #include "minibuffer.h" #include "combox.h" #include "bufferlist.h" -#include "support/filetools.h" -#include "support/path.h" #include "filedlg.h" #include "lyx_gui_misc.h" -#include "LyXView.h" // only because of form_main +#include "LyXView.h" +#include "BufferView.h" #include "lastfiles.h" +#include "bufferview_funcs.h" #include "support/FileInfo.h" -#include "lyxscreen.h" -#include "debug.h" #include "support/syscall.h" -#include "support/lyxlib.h" +#include "support/filetools.h" +#include "support/path.h" #include "lyxserver.h" -#include "FontLoader.h" #include "lyxrc.h" #include "lyxtext.h" -#include "gettext.h" -#include "layout.h" +#include "CutAndPaste.h" + +using std::ifstream; +using std::copy; +using std::back_inserter; +using std::endl; +using std::cout; +using std::ios; +using std::istream_iterator; +using std::pair; +using std::vector; +using std::sort; +using std::equal; extern Combox * combo_language; +extern Combox * combo_language2; extern BufferList bufferlist; extern void show_symbols_form(); extern FD_form_title * fd_form_title; @@ -72,12 +67,7 @@ extern FD_form_document * fd_form_document; extern FD_form_quotes * fd_form_quotes; extern FD_form_preamble * fd_form_preamble; extern FD_form_table * fd_form_table; -extern FD_form_print * fd_form_print; extern FD_form_figure * fd_form_figure; -extern FD_form_screen * fd_form_screen; -extern FD_form_toc * fd_form_toc; -extern FD_form_ref * fd_form_ref; -extern FD_LaTeXOptions * fd_latex_options; extern FD_form_bullet * fd_form_bullet; extern BufferView * current_view; // called too many times in this file... @@ -88,7 +78,6 @@ extern bool send_fax(string const & fname, string const & sendcmd); extern void MenuSendto(); extern LyXServer * lyxserver; -extern FontLoader fontloader; // this should be static, but I need it in buffer.C bool quitting; // flag, that we are quitting the program @@ -98,22 +87,10 @@ char ascii_type; /* for selection notify callbacks */ bool scrolling = false; -char updatetimer = 0; - -/* whether the work area should get callbacks */ -bool input_prohibited = false; - -/* the selection possible is needed, that only motion events are -* used, where the bottom press event was on the drawing area too */ -bool selection_possible = false; - // This is used to make the dreaded font toggle problem hopefully go // away. Definitely not the best solution, but I think it sorta works. bool toggleall = true; -void InsertCorrectQuote(); - - /* This is the inset locking stuff needed for mathed -------------------- @@ -150,22 +127,23 @@ void InsertCorrectQuote(); Matthias */ -void UpdateInset(Inset * inset, bool mark_dirty = true); +//void UpdateInset(BufferView * bv, Inset * inset, bool mark_dirty = true); + /* these functions return 1 if an error occured, otherwise 0 */ // Now they work only for updatable insets. [Alejandro 080596] -int LockInset(UpdatableInset * inset); +//int LockInset(UpdatableInset * inset); void ToggleLockedInsetCursor(long x, long y, int asc, int desc); -void FitLockedInsetCursor(long x, long y, int asc, int desc); -int UnlockInset(UpdatableInset * inset); -void LockedInsetStoreUndo(Undo::undo_kind kind); +//void FitLockedInsetCursor(long x, long y, int asc, int desc); +//int UnlockInset(UpdatableInset * inset); +//void LockedInsetStoreUndo(Undo::undo_kind kind); /* this is for asyncron updating. UpdateInsetUpdateList will be called automatically from LyX. Just insert the Inset into the Updatelist */ -void UpdateInsetUpdateList(); -void PutInsetIntoInsetUpdateList(Inset * inset); +//void UpdateInsetUpdateList(); +//void PutInsetIntoInsetUpdateList(Inset * inset); -InsetUpdateStruct * InsetUpdateList = 0; +//InsetUpdateStruct * InsetUpdateList = 0; /* @@ -174,157 +152,25 @@ InsetUpdateStruct * InsetUpdateList = 0; /* some function prototypes */ -void GotoNote(); -void OpenStuff(); -void ToggleFloat(); -void MenuUndo(); -void MenuRedo(); -void HyphenationPoint(); -void MenuSeparator(); -void HFill(); -void Newline(); -void ProtectedBlank(); -void CopyCB(); -int RunLinuxDoc(int, string const &); +int RunLinuxDoc(BufferView *, int, string const &); int RunDocBook(int, string const &); -void MenuWrite(Buffer * buf); -void MenuWriteAs(Buffer * buffer); +bool MenuWrite(Buffer * buf); +bool MenuWriteAs(Buffer * buffer); void MenuReload(Buffer * buf); void MenuLayoutSave(); -unsigned char GetCurrentTextClass() - // Who are we asking? - // Shouldn't this question be directed to the buffer? - // Indeed it should. Asger. -{ - return current_view->buffer()->params.textclass; -} - - -// How should this actually work? Should it prohibit input in all BufferViews, -// or just in the current one? If "just the current one", then it should be -// placed in BufferView. If "all BufferViews" then LyXGUI (I think) should -// run "ProhibitInput" on all LyXViews which will run prohibitInput on all -// BufferViews. Or is it perhaps just the (input in) BufferViews in the -// current LyxView that should be prohibited (Lgb) (This applies to -// "AllowInput" as well.) -void ProhibitInput() -{ - input_prohibited = true; - if (current_view->getScreen()) - current_view->getScreen()->HideCursor(); - - static Cursor cursor; - static bool cursor_undefined = true; - - if (cursor_undefined){ - cursor = XCreateFontCursor(fl_display, XC_watch); - XFlush(fl_display); - cursor_undefined = false; - } - - /* set the cursor to the watch for all forms and the canvas */ - XDefineCursor(fl_display, current_view->owner()->getForm()->window, - cursor); - if (fd_form_paragraph->form_paragraph->visible) - XDefineCursor(fl_display, - fd_form_paragraph->form_paragraph->window, - cursor); - if (fd_form_character->form_character->visible) - XDefineCursor(fl_display, - fd_form_character->form_character->window, - cursor); - - XFlush(fl_display); - fl_deactivate_all_forms(); -} - - -// Should find a way to move this into BufferView.C -void SetXtermCursor(Window win) -{ - static Cursor cursor; - static bool cursor_undefined = true; - if (cursor_undefined){ - cursor = XCreateFontCursor(fl_display, XC_xterm); - XFlush(fl_display); - cursor_undefined = false; - } - XDefineCursor(fl_display, win, cursor); - XFlush(fl_display); -} - -void AllowInput() +void ShowMessage(Buffer * buf, + string const & msg1, + string const & msg2 = string(), + string const & msg3 = string(), int delay = 6) { - input_prohibited = false; - - /* reset the cursor from the watch for all forms and the canvas */ - - XUndefineCursor(fl_display, current_view->owner()->getForm()->window); - if (fd_form_paragraph->form_paragraph->visible) - XUndefineCursor(fl_display, - fd_form_paragraph->form_paragraph->window); - if (fd_form_character->form_character->visible) - XUndefineCursor(fl_display, - fd_form_character->form_character->window); - if (current_view->getWorkArea()->belowmouse) - SetXtermCursor(current_view->owner()->getForm()->window); - - XFlush(fl_display); - fl_activate_all_forms(); -} - - -void FreeUpdateTimer() -{ - /* a real free timer would be better but I don't know - * how to do this with xforms */ - updatetimer = 0; -} - - -void SetUpdateTimer(float time) -{ - fl_set_timer(current_view->owner()->getMainForm()->timer_update, time); - updatetimer = 1; -} - - -// candidate for move to BufferView -void BeforeChange() -{ - current_view->getScreen()->ToggleSelection(); - current_view->text->ClearSelection(); - FreeUpdateTimer(); -} - - -// candidate for move to BufferView -void SmallUpdate(signed char f) -{ - current_view->getScreen()->SmallUpdate(); - if (current_view->getScreen()->TopCursorVisible() - != current_view->getScreen()->first) { - current_view->update(f); - return; - } - - current_view->fitCursor(); - current_view->updateScrollbar(); - - if (!current_view->text->selection) - current_view->text->sel_cursor = - current_view->text->cursor; - - if (f == 1 || f == -1) { - if (current_view->buffer()->isLyxClean()) { - current_view->buffer()->markDirty(); - current_view->owner()->getMiniBuffer()->setTimer(4); - } - else { - current_view->buffer()->markDirty(); - } + if (lyxrc.use_gui) { + buf->getUser()->owner()->getMiniBuffer()->Set(msg1, msg2, + msg3, delay); + } else { + // can somebody think of something more clever? cerr? + cout << msg1 << msg2 << msg3 << endl; } } @@ -338,50 +184,60 @@ void SmallUpdate(signed char f) // // should be moved to lyxfunc.C -void MenuWrite(Buffer * buf) +bool MenuWrite(Buffer * buffer) { XFlush(fl_display); - if (!bufferlist.write(buf)) { - string fname = buf->fileName(); + if (!buffer->save()) { + string fname = buffer->fileName(); string s = MakeAbsPath(fname); if (AskQuestion(_("Save failed. Rename and try again?"), MakeDisplayPath(s, 50), _("(If not, document is not saved.)"))) { - MenuWriteAs(buf); + return MenuWriteAs(buffer); } + return false; } else { - lastfiles->newFile(buf->fileName()); + lastfiles->newFile(buffer->fileName()); } + return true; } // should be moved to BufferView.C -void MenuWriteAs(Buffer * buffer) +// Half of this func should be in LyXView, the rest in BufferView. +bool MenuWriteAs(Buffer * buffer) { - if (!current_view->text) return; + // Why do we require BufferView::text to be able to write a + // document? I see no point in that. (Lgb) + //if (!bv->text) return; string fname = buffer->fileName(); string oldname = fname; LyXFileDlg fileDlg; - ProhibitInput(); - fileDlg.SetButton(0, _("Documents"), lyxrc->document_path); - fileDlg.SetButton(1, _("Templates"), lyxrc->template_path); + ProhibitInput(current_view); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); + fileDlg.SetButton(1, _("Templates"), lyxrc.template_path); if (!IsLyXFilename(fname)) fname += ".lyx"; - fname = fileDlg.Select(_("Enter Filename to Save Document as"), - OnlyPath(fname), - "*.lyx", - OnlyFilename(fname)); - AllowInput(); + if (buffer->isUnnamed()) { + fname = fileDlg.Select(_("Enter Filename to Save Document as"), + "", + "*.lyx", + ""); + } else { + fname = fileDlg.Select(_("Enter Filename to Save Document as"), + OnlyPath(fname), + "*.lyx", + OnlyFilename(fname)); + } + AllowInput(current_view); if (fname.empty()) { - current_view->owner()->getMiniBuffer()->Set(_("Canceled.")); - return; + return false; } - // Make sure the absolute filename ends with appropriate suffix string s = MakeAbsPath(fname); if (!IsLyXFilename(s)) @@ -392,7 +248,7 @@ void MenuWriteAs(Buffer * buffer) if (!AskQuestion(_("Same name as document already has:"), MakeDisplayPath(s, 50), _("Save anyway?"))) - return; + return false; // Falls through to name change and save } // No, but do we have another file with this name open? @@ -407,28 +263,39 @@ void MenuWriteAs(Buffer * buffer) buffer->fileName(s); buffer->markDirty(); - current_view->owner()->getMiniBuffer()->Set(_("Document renamed to '"), - MakeDisplayPath(s), - _("', but not saved...")); + ShowMessage(buffer, _("Document renamed to '"), + MakeDisplayPath(s), _("', but not saved...")); } - return; + return false; } // Check whether the file exists else { FileInfo myfile(s); if (myfile.isOK() && !AskQuestion(_("Document already exists:"), MakeDisplayPath(s, 50), _("Replace file?"))) - return; + return false; } // Ok, change the name of the buffer buffer->fileName(s); buffer->markDirty(); + bool unnamed = buffer->isUnnamed(); + buffer->setUnnamed(false); // And save // Small bug: If the save fails, we have irreversible changed the name // of the document. - MenuWrite(buffer); -} + // Hope this is fixed this way! (Jug) + if (!MenuWrite(buffer)) { + buffer->fileName(oldname); + buffer->setUnnamed(unnamed); + ShowMessage(buffer, _("Document could not be saved!"), + _("Holding the old name."), MakeDisplayPath(oldname)); + return false; + } + // now remove the oldname autosave file if existant! + removeAutosaveFile(oldname); + return true; +} int MenuRunLaTeX(Buffer * buffer) @@ -436,7 +303,7 @@ int MenuRunLaTeX(Buffer * buffer) int ret = 0; if (buffer->isLinuxDoc()) - ret = RunLinuxDoc(1, buffer->fileName()); + ret = RunLinuxDoc(buffer->getUser(), 1, buffer->fileName()); else if (buffer->isLiterate()) ret = buffer->runLiterate(); else if (buffer->isDocBook()) @@ -522,22 +389,21 @@ int MenuRunChktex(Buffer * buffer) } -int MakeDVIOutput(Buffer * buffer) +int MakeLaTeXOutput(Buffer * buffer) { - if (!(current_view->text)) - return 1; - + // Who cares? + //if (!bv->text) + // return 1; int ret = 0; - string path = OnlyPath(buffer->fileName()); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) { + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { path = buffer->tmppath; } - if (!buffer->isDviClean()) { - Path p(path); - ret = MenuRunLaTeX(buffer); - } - return ret; + + Path p(path); + ret = MenuRunLaTeX(buffer); + + return ret; } @@ -555,20 +421,29 @@ bool RunScript(Buffer * buffer, bool wait, string name = orgname; int result = 0; - if (MakeDVIOutput(buffer) > 0) + if (MakeLaTeXOutput(buffer) > 0) return false; /* get DVI-Filename */ if (name.empty()) - name = ChangeExtension(buffer->getLatexName(), - ".dvi", true); + name = ChangeExtension(buffer->getLatexName(), ".dvi"); path = OnlyPath(name); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) { + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { path = buffer->tmppath; } Path p(path); - - cmd = command + ' ' + QuoteName(name); + // At this point we check whether the command contains the + // filename parameter $$FName and if that's the case we + // substitute the real file name otherwise the filename is + // simply appended. rokrau 1/12/00 + cmd = command; + string::size_type i; + if ( (i=command.find("$$FName")) != string::npos) + { + cmd.replace(i,7,QuoteName(name)); + } + else + cmd = command + ' ' + QuoteName(name); Systemcalls one; @@ -599,44 +474,42 @@ bool RunScript(Buffer * buffer, bool wait, // the return code of the command. This means that all // the code I added in PrintApplyCB is currently // useless... -#ifdef WITH_WARNINGS -#warning What should we do here? -#endif - current_view->owner()->getMiniBuffer()->Set( - _("Executing command:"), cmd); + // CHECK What should we do here? + ShowMessage(buffer, _("Executing command:"), cmd); result = one.startscript(Systemcalls::System, cmd); } else { - current_view->owner()->getMiniBuffer()->Set( - _("Executing command:"), cmd); + ShowMessage(buffer, _("Executing command:"), cmd); result = one.startscript(wait ? Systemcalls::Wait : Systemcalls::DontWait, cmd); } - return (result == 0); + return result == 0; } // Returns false if we fail -bool MenuRunDvips(Buffer * buffer, bool wait = false) +bool CreatePostscript(Buffer * buffer, bool wait = false) { - if (!current_view->text) - return false; + // Who cares? + //if (!bv->text) + // return false; - ProhibitInput(); + ProhibitInput(current_view); // Generate dvi file - if (MakeDVIOutput(buffer) > 0) { - AllowInput(); + if (MakeLaTeXOutput(buffer) > 0) { + AllowInput(current_view); return false; } // Generate postscript file - string psname = ChangeExtension (buffer->fileName(), - ".ps_tmp", true); + string psname = OnlyFilename(ChangeExtension (buffer->fileName(), + ".ps_tmp")); string paper; - + + // Wrong type char real_papersize = buffer->params.papersize; if (real_papersize == BufferParams::PAPER_DEFAULT) - real_papersize = lyxrc->default_papersize; + real_papersize = lyxrc.default_papersize; switch (real_papersize) { case BufferParams::PAPER_USLETTER: @@ -665,16 +538,16 @@ bool MenuRunDvips(Buffer * buffer, bool wait = false) } // Make postscript file. - string command = "dvips " + lyxrc->print_to_file + ' '; + string command = lyxrc.dvi_to_ps_command + ' ' + lyxrc.print_to_file + ' '; command += QuoteName(psname); if (buffer->params.use_geometry && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM - && !lyxrc->print_paper_dimension_flag.empty() + && !lyxrc.print_paper_dimension_flag.empty() && !buffer->params.paperwidth.empty() && !buffer->params.paperheight.empty()) { // using a custom papersize command += ' '; - command += lyxrc->print_paper_dimension_flag + ' '; + command += lyxrc.print_paper_dimension_flag + ' '; command += buffer->params.paperwidth + ','; command += buffer->params.paperheight; } else if (!paper.empty() @@ -683,174 +556,193 @@ bool MenuRunDvips(Buffer * buffer, bool wait = false) // dvips won't accept -t letter -t landscape. In all other // cases, include the paper size explicitly. command += ' '; - command += lyxrc->print_paper_flag + ' ' + paper; + command += lyxrc.print_paper_flag + ' ' + paper; } if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) { command += ' '; - command += lyxrc->print_landscape_flag; + command += lyxrc.print_landscape_flag; } // push directorypath, if necessary string path = OnlyPath(buffer->fileName()); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)){ + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)){ path = buffer->tmppath; } Path p(path); bool ret = RunScript(buffer, wait, command); - AllowInput(); + AllowInput(current_view); return ret; } // Returns false if we fail -bool MenuPreviewPS(Buffer * buffer) +//bool MenuPreviewPS(Buffer * buffer) +bool PreviewPostscript(Buffer * buffer) { - if (!current_view->text) - return false; + // Who cares? + //if (!bv->text) + // return false; // Generate postscript file - if (!MenuRunDvips(buffer, true)) { + if (!CreatePostscript(buffer, true)) { return false; } // Start postscript viewer - ProhibitInput(); - string ps = ChangeExtension (buffer->fileName(), - ".ps_tmp", true); + ProhibitInput(current_view); + string ps = OnlyFilename(ChangeExtension (buffer->fileName(), + ".ps_tmp")); // push directorypath, if necessary string path = OnlyPath(buffer->fileName()); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)){ + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)){ path = buffer->tmppath; } Path p(path); - bool ret = RunScript(buffer, false, lyxrc->view_ps_command, ps); - AllowInput(); + bool ret = RunScript(buffer, false, lyxrc.view_ps_command, ps); + AllowInput(current_view); return ret; } void MenuFax(Buffer * buffer) { - if (!current_view->text) - return; + // Who cares? + //if (!bv->text) + // return; // Generate postscript file - if (!MenuRunDvips(buffer, true)) { + if (!CreatePostscript(buffer, true)) { return; } // Send fax - string ps = ChangeExtension (buffer->fileName(), ".ps_tmp", true); + string ps = OnlyFilename(ChangeExtension (buffer->fileName(), + ".ps_tmp")); string path = OnlyPath (buffer->fileName()); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) { + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { path = buffer->tmppath; } Path p(path); - if (!lyxrc->fax_program.empty()) { - string help2 = subst(lyxrc->fax_program, "$$FName", ps); + if (!lyxrc.fax_program.empty()) { + string help2 = subst(lyxrc.fax_program, "$$FName", ps); help2 += " &"; Systemcalls one(Systemcalls::System, help2); } else - send_fax(ps, lyxrc->fax_command); + send_fax(ps, lyxrc.fax_command); } // Returns false if we fail -bool MenuPreview(Buffer * buffer) -{ - if (!current_view->text) - return false; - - string paper; - - char real_papersize = buffer->params.papersize; - if (real_papersize == BufferParams::PAPER_DEFAULT) - real_papersize = lyxrc->default_papersize; - - switch (real_papersize) { - case BufferParams::PAPER_USLETTER: - paper = "us"; - break; - case BufferParams::PAPER_A3PAPER: - paper = "a3"; - break; - case BufferParams::PAPER_A4PAPER: - paper = "a4"; - break; - case BufferParams::PAPER_A5PAPER: - paper = "a5"; - break; - case BufferParams::PAPER_B5PAPER: - paper = "b5"; - break; - case BufferParams::PAPER_EXECUTIVEPAPER: - paper = "foolscap"; - break; - case BufferParams::PAPER_LEGALPAPER: - paper = "legal"; - break; - default: /* If nothing else fits, keep the empty value */ - break; - } - - if (paper.empty()) { - if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - // we HAVE to give a size when the page is in - // landscape, so use USletter. - paper = " -paper usr"; - } else { - paper = " -paper " + paper; - if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - paper+= 'r'; - } - - // push directorypath, if necessary - string path = OnlyPath(buffer->fileName()); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)){ - path = buffer->tmppath; +bool PreviewDVI(Buffer * buffer) +{ + // Who cares? + //if (!bv->text) + // return false; + + string paper = lyxrc.view_dvi_paper_option; + if (!paper.empty()) { + // wrong type + char real_papersize = buffer->params.papersize; + if (real_papersize == BufferParams::PAPER_DEFAULT) + real_papersize = lyxrc.default_papersize; + + switch (real_papersize) { + case BufferParams::PAPER_USLETTER: + paper += " us"; + break; + case BufferParams::PAPER_A3PAPER: + paper += " a3"; + break; + case BufferParams::PAPER_A4PAPER: + paper += " a4"; + break; + case BufferParams::PAPER_A5PAPER: + paper += " a5"; + break; + case BufferParams::PAPER_B5PAPER: + paper += " b5"; + break; + case BufferParams::PAPER_EXECUTIVEPAPER: + paper += " foolscap"; + break; + case BufferParams::PAPER_LEGALPAPER: + paper += " legal"; + break; + default: /* If nothing else fits, keep the empty value */ + break; + } + if (real_papersize==' ') { + // if (paper.empty()) { + if (buffer->params.orientation + == BufferParams::ORIENTATION_LANDSCAPE) + // we HAVE to give a size when the page is in + // landscape, so use USletter. + paper = " -paper usr"; + } else { + // paper = " -paper " + paper; + if (buffer->params.orientation + == BufferParams::ORIENTATION_LANDSCAPE) + paper+= 'r'; + } } - Path p(path); - // Run dvi-viewer - string command = lyxrc->view_dvi_command + paper ; + // push directorypath, if necessary + string path = OnlyPath(buffer->fileName()); + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { + path = buffer->tmppath; + } + Path p(path); + // Run dvi-viewer + string command = lyxrc.view_dvi_command + " " + paper; bool ret = RunScript(buffer, false, command); return ret; } +bool AskOverwrite(Buffer * buffer, string const & s) +{ + if (lyxrc.use_gui) { + // be friendly if there is a gui + FileInfo fi(s); + if (fi.readable() && + !AskQuestion(_("File already exists:"), + MakeDisplayPath(s, 50), + _("Do you want to overwrite the file?"))) { + ShowMessage(buffer, _("Canceled")); + return false; + } + } + return true; +} + + void MenuMakeLaTeX(Buffer * buffer) { - if (!current_view->text) - return; + // Why care about this? + //if (!bv->text) + // return; // Get LaTeX-Filename - string s = buffer->getLatexName(); + string s = buffer->getLatexName(false); - FileInfo fi(s); - if (fi.readable() && - !AskQuestion(_("File already exists:"), - MakeDisplayPath(s, 50), - _("Do you want to overwrite the file?"))) { - current_view->owner()->getMiniBuffer()->Set(_("Canceled")); - return; - } + if (!AskOverwrite(buffer, s)) + return; if (buffer->isDocBook()) - current_view->owner()->getMiniBuffer()->Set( - _("DocBook does not have a latex backend")); + ShowMessage(buffer, _("DocBook does not have a latex backend")); else { if (buffer->isLinuxDoc()) - RunLinuxDoc(0, buffer->fileName()); + RunLinuxDoc(buffer->getUser(), 0, buffer->fileName()); else buffer->makeLaTeXFile(s, string(), true); - current_view->owner()->getMiniBuffer()->Set( - _("Nice LaTeX file saved as"), MakeDisplayPath(s)); - buffer->markDviDirty(); + ShowMessage(buffer, _("Nice LaTeX file saved as"), + MakeDisplayPath(s)); } } void MenuMakeLinuxDoc(Buffer * buffer) { - if (!current_view->text) return; + // Who cares? + //if (!bv->text) return; if (!buffer->isLinuxDoc()) { WriteAlert(_("Error!"), _("Document class must be linuxdoc.")); @@ -858,31 +750,25 @@ void MenuMakeLinuxDoc(Buffer * buffer) } // Get LinuxDoc-Filename - string s = ChangeExtension (buffer->fileName(), - ".sgml", false); - - FileInfo fi(s); - if (fi.readable() && - !AskQuestion(_("File already exists:"), - MakeDisplayPath(s, 50), - _("Do you want to overwrite the file?"))) { - current_view->owner()->getMiniBuffer()->Set(_("Canceled")); + string s = ChangeExtension(buffer->fileName(), ".sgml"); + + if (!AskOverwrite(buffer, s)) return; - } - current_view->owner()->getMiniBuffer()->Set( - _("Building LinuxDoc SGML file `"), MakeDisplayPath(s),"'..."); + ShowMessage(buffer, _("Building LinuxDoc SGML file `"), + MakeDisplayPath(s),"'..."); - buffer->makeLinuxDocFile(s, 65); + buffer->makeLinuxDocFile(s, true); buffer->redraw(); - current_view->owner()->getMiniBuffer()->Set( - _("LinuxDoc SGML file save as"), MakeDisplayPath(s)); + ShowMessage(buffer, _("LinuxDoc SGML file save as"), + MakeDisplayPath(s)); } void MenuMakeDocBook(Buffer * buffer) { - if (!current_view->text) return; + // Who cares? + //if (!bv->text) return; if (!buffer->isDocBook()) { WriteAlert(_("Error!"), @@ -891,71 +777,39 @@ void MenuMakeDocBook(Buffer * buffer) } // Get DocBook-Filename - string s = ChangeExtension (buffer->fileName(), - ".sgml", false); - - FileInfo fi(s); - if (fi.readable() && - !AskQuestion(_("File already exists:"), - MakeDisplayPath(s, 50), - _("Do you want to overwrite the file?"))) { - current_view->owner()->getMiniBuffer()->Set(_("Canceled")); + string s = ChangeExtension(buffer->fileName(), ".sgml"); + + if (!AskOverwrite(buffer, s)) return; - } - current_view->owner()->getMiniBuffer()->Set(_("Building DocBook SGML file `"), - MakeDisplayPath(s), "'..."); + ShowMessage(buffer, _("Building DocBook SGML file `"), + MakeDisplayPath(s), "'..."); - buffer->makeDocBookFile(s, 65); + buffer->makeDocBookFile(s, true); buffer->redraw(); - current_view->owner()->getMiniBuffer()->Set(_("DocBook SGML file save as"), - MakeDisplayPath(s)); + ShowMessage(buffer, _("DocBook SGML file save as"), + MakeDisplayPath(s)); } void MenuMakeAscii(Buffer * buffer) { - if (!current_view->text) return; + // Who cares? + //if (!bv->text) return; /* get LaTeX-Filename */ - string s = ChangeExtension (buffer->fileName(), - ".txt", false); + string s = ChangeExtension (buffer->fileName(), ".txt"); - FileInfo fi(s); - if (fi.readable() && - !AskQuestion(_("File already exists:"), - MakeDisplayPath(s, 50), - _("Do you want to overwrite the file?"))) { - current_view->owner()->getMiniBuffer()->Set(_("Canceled")); + + if (!AskOverwrite(buffer, s)) return; - } - buffer->writeFileAscii(s, lyxrc->ascii_linelen); + buffer->writeFileAscii(s, lyxrc.ascii_linelen); - current_view->owner()->getMiniBuffer()->Set(_("Ascii file saved as"), MakeDisplayPath(s)); + ShowMessage(buffer, _("Ascii file saved as"), MakeDisplayPath(s)); } -void MenuPrint(Buffer * buffer) -{ - if (!current_view->text) - return; - - string input_file = ChangeExtension(buffer->fileName(), - lyxrc->print_file_extension, - true); - fl_set_input(fd_form_print->input_file, input_file.c_str()); - - if (fd_form_print->form_print->visible) { - fl_raise_form(fd_form_print->form_print); - } - else { - fl_show_form(fd_form_print->form_print, - FL_PLACE_MOUSE, FL_FULLBORDER, - _("Print")); - } -} - void MenuMakeHTML(Buffer * buffer) { // First, create LaTeX file @@ -967,24 +821,77 @@ void MenuMakeHTML(Buffer * buffer) // the tex file name has to be correct for // latex, but the html file name can be // anything. - string result = ChangeExtension(file, ".html", false); - string infile = buffer->getLatexName(); - string tmp = lyxrc->html_command; + string result = ChangeExtension(file, ".html"); + string infile = buffer->getLatexName(false); + string tmp = lyxrc.html_command; + tmp = subst(tmp, "$$FName", infile); + tmp = subst(tmp, "$$OutName", result); + Systemcalls one; + int res = one.startscript(Systemcalls::System, tmp); + if (res == 0) { + ShowMessage(buffer, _("Document exported as HTML to file `") + + MakeDisplayPath(result) +'\''); + } else { + ShowMessage(buffer, _("Unable to convert to HTML the file `") + + MakeDisplayPath(infile) + + '\''); + } + +} + + +void MenuMakeHTML_LinuxDoc(Buffer * buffer) +{ + // First, create LinuxDoc file + MenuMakeLinuxDoc(buffer); + + // And now, run the converter + string file = buffer->fileName(); + + string result = ChangeExtension(file, ".html"); + string infile = ChangeExtension(file, ".sgml"); + string tmp = lyxrc.linuxdoc_to_html_command; + tmp = subst(tmp, "$$FName", infile); + tmp = subst(tmp, "$$OutName", result); + Systemcalls one; + int res = one.startscript(Systemcalls::System, tmp); + if (res == 0) { + ShowMessage(buffer,_("Document exported as HTML to file `") + + MakeDisplayPath(result) +'\''); + } else { + ShowMessage(buffer,_("Unable to convert to HTML the file `") + + MakeDisplayPath(infile) + + '\''); + } + +} + +void MenuMakeHTML_DocBook(Buffer * buffer) +{ + // First, create LaTeX file + MenuMakeDocBook(buffer); + + // And now, run the converter + string file = buffer->fileName(); + string result = ChangeExtension(file, ".html"); + string infile = ChangeExtension(file, ".sgml"); + string tmp = lyxrc.docbook_to_html_command; tmp = subst(tmp, "$$FName", infile); tmp = subst(tmp, "$$OutName", result); Systemcalls one; int res = one.startscript(Systemcalls::System, tmp); if (res == 0) { - current_view->owner()->getMiniBuffer()->Set(_("Document exported as HTML to file `") - + MakeDisplayPath(result) +'\''); + ShowMessage(buffer,_("Document exported as HTML to file `") + + MakeDisplayPath(result) +'\''); } else { - current_view->owner()->getMiniBuffer()->Set(_("Unable to convert to HTML the file `") - + MakeDisplayPath(infile) - + '\''); + ShowMessage(buffer,_("Unable to convert to HTML the file `") + + MakeDisplayPath(infile) + + '\''); } } + void MenuExport(Buffer * buffer, string const & extyp) { // latex @@ -1009,18 +916,21 @@ void MenuExport(Buffer * buffer, string const & extyp) // is achieved by temporarily disabling use of // temp directory. As a side-effect, we get // *.log and *.aux files also. (Asger) - bool flag = lyxrc->use_tempdir; - lyxrc->use_tempdir = false; + bool flag = lyxrc.use_tempdir; + lyxrc.use_tempdir = false; MenuRunLaTeX(buffer); - lyxrc->use_tempdir = flag; + lyxrc.use_tempdir = flag; } // postscript else if (extyp == "postscript") { // Start Print-dialog. Not as good as dvi... Bernhard. - MenuPrint(buffer); + //should start lyxview->getDialogs()->showPrint(); + // to get same as before + // MenuPrint(buffer); // Since the MenuPrint is a pop-up, we can't use // the same trick as above. (Asger) // MISSING: Move of ps-file :-( + // And MenuPrint should not be used for this at all... } // ascii else if (extyp == "ascii") { @@ -1031,10 +941,15 @@ void MenuExport(Buffer * buffer, string const & extyp) } // HTML else if (extyp == "html") { - MenuMakeHTML(buffer); + if (buffer->isLinuxDoc()) + MenuMakeHTML_LinuxDoc(buffer); + else if (buffer->isDocBook()) + MenuMakeHTML_DocBook(buffer); + else + MenuMakeHTML(buffer); } else { - current_view->owner()->getMiniBuffer()->Set(_("Unknown export type: ")+ extyp); + ShowMessage(buffer, _("Unknown export type: ") + extyp); } } @@ -1046,7 +961,7 @@ void QuitLyX() if (!bufferlist.QwriteAll()) return; - lastfiles->writeFile(lyxrc->lastfiles); + lastfiles->writeFile(lyxrc.lastfiles); // Set a flag that we do quitting from the program, // so no refreshes are necessary. @@ -1065,26 +980,25 @@ void QuitLyX() -void AutoSave() +void AutoSave(BufferView * bv) // should probably be moved into BufferList (Lgb) // Perfect target for a thread... { - if (!current_view->getScreen() || !current_view->available()) + if (!bv->available()) return; - if (current_view->buffer()->isBakClean() - || current_view->buffer()->isReadonly()) { + if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) { // We don't save now, but we'll try again later - current_view->owner()->resetAutosaveTimer(); + bv->owner()->resetAutosaveTimer(); return; } - current_view->owner()->getMiniBuffer()->Set(_("Autosaving current document...")); + bv->owner()->getMiniBuffer()->Set(_("Autosaving current document...")); // create autosave filename - string fname = OnlyPath(current_view->buffer()->fileName()); + string fname = OnlyPath(bv->buffer()->fileName()); fname += "#"; - fname += OnlyFilename(current_view->buffer()->fileName()); + fname += OnlyFilename(bv->buffer()->fileName()); fname += "#"; // tmp_ret will be located (usually) in /tmp @@ -1100,7 +1014,7 @@ void AutoSave() // anyway. bool failed = false; if (!tmp_ret.empty()) { - current_view->buffer()->writeFile(tmp_ret, 1); + bv->buffer()->writeFile(tmp_ret, 1); // assume successful write of tmp_ret if (rename(tmp_ret.c_str(), fname.c_str()) == -1) { failed = true; @@ -1115,11 +1029,11 @@ void AutoSave() if (failed) { // failed to write/rename tmp_ret so try writing direct - if (!current_view->buffer()->writeFile(fname, 1)) { + if (!bv->buffer()->writeFile(fname, 1)) { // It is dangerous to do this in the child, // but safe in the parent, so... if (pid == -1) - current_view->owner()->getMiniBuffer()->Set(_("Autosave Failed!")); + bv->owner()->getMiniBuffer()->Set(_("Autosave Failed!")); } } if (pid == 0) { // we are the child so... @@ -1127,13 +1041,13 @@ void AutoSave() } } - current_view->buffer()->markBakClean(); - current_view->owner()->resetAutosaveTimer(); + bv->buffer()->markBakClean(); + bv->owner()->resetAutosaveTimer(); } // -// (c) CHT Software Service GmbH +// Copyright CHT Software Service GmbH // Uwe C. Schroeder // // create new file with template @@ -1166,19 +1080,19 @@ Buffer * NewLyxFile(string const & filename) // Insert ascii file (if filename is empty, prompt for one) -void InsertAsciiFile(string const & f, bool asParagraph) +void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) { string fname = f; LyXFileDlg fileDlg; - if (!current_view->getScreen()) return; + if (!bv->available()) return; if (fname.empty()) { - ProhibitInput(); + ProhibitInput(bv); fname = fileDlg.Select(_("File to Insert"), - current_view->owner()->buffer()->filepath, + bv->owner()->buffer()->filepath, "*"); - AllowInput(); + AllowInput(bv); if (fname.empty()) return; } @@ -1190,126 +1104,64 @@ void InsertAsciiFile(string const & f, bool asParagraph) return; } - FilePtr myfile(fname, FilePtr::read); - if (!myfile()) { + ifstream ifs(fname.c_str()); + if (!ifs) { WriteFSAlert(_("Error! Cannot open specified file: "), MakeDisplayPath(fname, 50)); return; } - LyXParagraph * tmppar = new LyXParagraph; - tmppar->readSimpleWholeFile(myfile); - - // set the end of the string -#ifdef WITH_WARNINGS -#warning why do we do this? -#endif - // I don't think this is needed. Actually it might be plain wrong. - tmppar->InsertChar(tmppar->text.size() - 1, '\0'); + ifs.unsetf(ios::skipws); + istream_iterator ii(ifs); + istream_iterator end; +#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD) + // We use this until the compilers get better... + vector tmp; + copy(ii, end, back_inserter(tmp)); + string tmpstr(tmp.begin(), tmp.end()); +#else + // This is what we want to use and what we will use once the + // compilers get good enough. + //string tmpstr(ii, end); // yet a reason for using std::string + // alternate approach to get the file into a string: + string tmpstr; + copy(ii, end, back_inserter(tmpstr)); +#endif // insert the string - current_view->getScreen()->HideCursor(); + current_view->hideCursor(); // clear the selection - BeforeChange(); + bv->beforeChange(); if (!asParagraph) - current_view->text->InsertStringA(tmppar->text); + bv->text->InsertStringA(bv, tmpstr); else - current_view->text->InsertStringB(tmppar->text); - delete tmppar; - current_view->update(1); -} - - -void MenuShowTableOfContents() -{ - static int ow = -1, oh; - - TocUpdateCB(0, 0); - if (fd_form_toc->form_toc->visible) { - fl_raise_form(fd_form_toc->form_toc); - } else { - fl_show_form(fd_form_toc->form_toc, - FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER, - _("Table Of Contents")); - if (ow < 0) { - ow = fd_form_toc->form_toc->w; - oh = fd_form_toc->form_toc->h; - } - fl_set_form_minsize(fd_form_toc->form_toc, ow, oh); - } + bv->text->InsertStringB(bv, tmpstr); + bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } void MenuInsertLabel(char const * arg) { string label = arg; - ProhibitInput(); - //string label = fl_show_input(_("Enter new label to insert:"), ""); - if (label.empty()) - label = frontStrip(strip(askForText(_("Enter new label to insert:")))); - if (!label.empty()) { - InsetLabel * new_inset = new InsetLabel; - new_inset->setContents(label); - current_view->buffer()->insertInset(new_inset); - } - AllowInput(); -} - - -void MenuInsertRef() -{ - static int ow = -1, oh; - - RefUpdateCB(0, 0); - if (fd_form_ref->form_ref->visible) { - fl_raise_form(fd_form_ref->form_ref); - } else { - fl_show_form(fd_form_ref->form_ref, - FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER, - _("Insert Reference")); - if (ow < 0) { - ow = fd_form_ref->form_ref->w; - oh = fd_form_ref->form_ref->h; + ProhibitInput(current_view); + if (label.empty()) { + pair + result = askForText(_("Enter new label to insert:")); + if (result.first) { + label = frontStrip(strip(result.second)); } - fl_set_form_minsize(fd_form_ref->form_ref, ow, oh); } -} - - -void MenuPasteSelection(char at) -{ - if (!current_view->getScreen()) - return; - - ascii_type = at; - - Atom data_prop = XInternAtom(fl_display, - "LyX_Primary", - false); - if (data_prop == None) - return; - XConvertSelection(fl_display, - XA_PRIMARY, XA_STRING, data_prop, - current_view->owner()->getForm()->window, 0); - XFlush(fl_display); -} - - -// candidate for move to BufferView -extern "C" void FootCB(FL_OBJECT *, long) -{ - if (!current_view->available()) - return; - - current_view->owner()->getMiniBuffer()->Set(_("Inserting Footnote...")); - current_view->getScreen()->HideCursor(); - current_view->update(-2); - current_view->text->InsertFootnoteEnvironment(LyXParagraph::FOOTNOTE); - current_view->update(1); + if (!label.empty()) { + InsetCommandParams p( "label", label ); + InsetLabel * inset = new InsetLabel( p ); + current_view->insertInset( inset ); + } + AllowInput(current_view); } // candidate for move to LyXView +// This is only used in toolbar.C void LayoutsCB(int sel, void *) { string tmp = tostr(sel); @@ -1320,81 +1172,66 @@ void LayoutsCB(int sel, void *) /* * SGML Linuxdoc support: - * (flag == -1) import SGML file * (flag == 0) make TeX output * (flag == 1) make dvi output */ -int RunLinuxDoc(int flag, string const & filename) +int RunLinuxDoc(BufferView * bv, int flag, string const & filename) { - string name; string s2; - string path; string add_flags; int errorcode = 0; /* generate a path-less extension name */ - name = ChangeExtension (filename, ".sgml", true); - path = OnlyPath (filename); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) { - path = current_view->buffer()->tmppath; + string name = OnlyFilename(ChangeExtension (filename, ".sgml")); + string path = OnlyPath (filename); + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { + path = bv->buffer()->tmppath; } Path p(path); - if (flag != -1) { - if (!current_view->available()) - return 0; - current_view->buffer()->makeLinuxDocFile(name, 0); -#ifdef WITH_WARNINGS -#warning remove this once we have a proper geometry class -#endif - BufferParams::PAPER_SIZE ps = static_cast(current_view->buffer()->params.papersize); - switch (ps) { - case BufferParams::PAPER_A4PAPER: - add_flags = "-p a4"; - break; - case BufferParams::PAPER_USLETTER: - add_flags = "-p letter"; - break; - default: /* nothing to be done yet ;-) */ break; - } + if (!bv->available()) + return 0; + bv->buffer()->makeLinuxDocFile(name, false); + + // CHECK remove this once we have a proper geometry class + + BufferParams::PAPER_SIZE ps = + static_cast(bv->buffer()->params.papersize); + switch (ps) { + case BufferParams::PAPER_A4PAPER: + add_flags = "-p a4"; + break; + case BufferParams::PAPER_USLETTER: + add_flags = "-p letter"; + break; + default: /* nothing to be done yet ;-) */ break; } - ProhibitInput(); + ProhibitInput(bv); Systemcalls one; switch (flag) { - case -1: /* Import file */ - current_view->owner()->getMiniBuffer()->Set(_("Importing LinuxDoc SGML file `"), - MakeDisplayPath(filename), "'..."); - s2 = "sgml2lyx " + lyxrc->sgml_extra_options + ' ' - + name; - if (one.startscript(Systemcalls::System, s2)) - errorcode = 1; - break; case 0: /* TeX output asked */ - current_view->owner()->getMiniBuffer()->Set(_("Converting LinuxDoc SGML to TeX file...")); - s2 = "sgml2latex " + add_flags + " -o tex " - + lyxrc->sgml_extra_options + ' ' + name; + bv->owner()->getMiniBuffer()->Set(_("Converting LinuxDoc SGML to TeX file...")); + s2 = lyxrc.linuxdoc_to_latex_command + ' ' + add_flags + " -o tex " + ' ' + name; if (one.startscript(Systemcalls::System, s2)) errorcode = 1; break; case 1: /* dvi output asked */ - current_view->owner()->getMiniBuffer()->Set(_("Converting LinuxDoc SGML to dvi file...")); - s2 = "sgml2latex " + add_flags + " -o dvi " - + lyxrc->sgml_extra_options + ' ' + name; + bv->owner()->getMiniBuffer()->Set(_("Converting LinuxDoc SGML to dvi file...")); + s2 = lyxrc.linuxdoc_to_latex_command + ' ' + add_flags + " -o dvi " + ' ' + name; if (one.startscript(Systemcalls::System, s2)) { errorcode = 1; - } else - current_view->buffer()->markDviClean(); + } break; default: /* unknown output */ break; } - AllowInput(); + AllowInput(bv); - current_view->buffer()->redraw(); + bv->buffer()->redraw(); return errorcode; } @@ -1406,9 +1243,9 @@ int RunLinuxDoc(int flag, string const & filename) int RunDocBook(int flag, string const & filename) { /* generate a path-less extension name */ - string name = ChangeExtension (filename, ".sgml", true); + string name = OnlyFilename(ChangeExtension (filename, ".sgml")); string path = OnlyPath (filename); - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) { + if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { path = current_view->buffer()->tmppath; } Path p(path); @@ -1416,9 +1253,10 @@ int RunDocBook(int flag, string const & filename) if (!current_view->available()) return 0; - current_view->buffer()->makeDocBookFile(name, 0); + current_view->buffer()->makeDocBookFile(name, false); // Shall this code go or should it stay? (Lgb) + // This code is a placeholder for future implementation. (Jose') // string add_flags; // LYX_PAPER_SIZE ps = (LYX_PAPER_SIZE) current_view->buffer()->params.papersize; // switch (ps) { @@ -1426,7 +1264,7 @@ int RunDocBook(int flag, string const & filename) // case BufferParams::PAPER_USLETTER: add_flags = "-p letter"; break; // default: /* nothing to be done yet ;-) */ break; // } - ProhibitInput(); + ProhibitInput(current_view); int errorcode = 0; Systemcalls one; @@ -1434,115 +1272,23 @@ int RunDocBook(int flag, string const & filename) case 1: /* dvi output asked */ { current_view->owner()->getMiniBuffer()->Set(_("Converting DocBook SGML to dvi file...")); - string s2 = "sgmltools --backend dvi " + name; + string s2 = lyxrc.docbook_to_dvi_command + ' ' + name; if (one.startscript(Systemcalls::System, s2)) { errorcode = 1; - } else - current_view->buffer()->markDviClean(); + } } break; default: /* unknown output */ break; } - AllowInput(); + AllowInput(current_view); current_view->buffer()->redraw(); return errorcode; } -// candidate for move to BufferView -void AllFloats(char flag, char figmar) -{ - if (!current_view->available()) - return; - - LyXCursor cursor = current_view->text->cursor; - - if (!flag && cursor.par->footnoteflag != LyXParagraph::NO_FOOTNOTE - && ((figmar - && cursor.par->footnotekind != LyXParagraph::FOOTNOTE - && cursor.par->footnotekind != LyXParagraph::MARGIN) - || (!figmar - && cursor.par->footnotekind != LyXParagraph::FIG - && cursor.par->footnotekind != LyXParagraph::TAB - && cursor.par->footnotekind != LyXParagraph::WIDE_FIG - && cursor.par->footnotekind != LyXParagraph::WIDE_TAB - && cursor.par->footnotekind != LyXParagraph::ALGORITHM))) - ToggleFloat(); - else - BeforeChange(); - - LyXCursor tmpcursor = cursor; - cursor.par = tmpcursor.par->ParFromPos(tmpcursor.pos); - cursor.pos = tmpcursor.par->PositionInParFromPos(tmpcursor.pos); - - LyXParagraph *par = current_view->buffer()->paragraph; - while (par) { - if (flag) { - if (par->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE - && ((figmar - && par->footnotekind != LyXParagraph::FOOTNOTE - && par->footnotekind != LyXParagraph::MARGIN) - || (!figmar - && par->footnotekind != LyXParagraph::FIG - && par->footnotekind != LyXParagraph::TAB - && par->footnotekind != LyXParagraph::WIDE_FIG - && par->footnotekind != LyXParagraph::WIDE_TAB - && par->footnotekind != LyXParagraph::ALGORITHM - ) - ) - ) { - if (par->previous - && par->previous->footnoteflag != - LyXParagraph::CLOSED_FOOTNOTE){ /* should be */ - current_view->text - ->SetCursorIntern(par - ->previous, - 0); - current_view->text->OpenFootnote(); - } - } - } - else { - if (par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && ( - (figmar - && - par->footnotekind != LyXParagraph::FOOTNOTE - && - par->footnotekind != LyXParagraph::MARGIN - ) - || - (!figmar - && - par->footnotekind != LyXParagraph::FIG - && - par->footnotekind != LyXParagraph::TAB - && - par->footnotekind != LyXParagraph::WIDE_FIG - && - par->footnotekind != LyXParagraph::WIDE_TAB - && - par->footnotekind != LyXParagraph::ALGORITHM - ) - ) - ) { - current_view->text->SetCursorIntern(par, 0); - current_view->text->CloseFootnote(); - } - } - par = par->next; - } - - current_view->text->SetCursorIntern(cursor.par, cursor.pos); - current_view->redraw(); - current_view->fitCursor(); - current_view->updateScrollbar(); -} - - void MenuLayoutCharacter() { static int ow = -1, oh; @@ -1562,7 +1308,8 @@ void MenuLayoutCharacter() } -inline void DeactivateParagraphButtons () +inline +void DeactivateParagraphButtons () { fl_deactivate_object (fd_form_paragraph->button_ok); fl_deactivate_object (fd_form_paragraph->button_apply); @@ -1571,7 +1318,8 @@ inline void DeactivateParagraphButtons () } -inline void ActivateParagraphButtons () +inline +void ActivateParagraphButtons () { fl_activate_object (fd_form_paragraph->button_ok); fl_activate_object (fd_form_paragraph->button_apply); @@ -1580,7 +1328,8 @@ inline void ActivateParagraphButtons () } -inline void DisableParagraphLayout () +inline +void DisableParagraphLayout () { DeactivateParagraphButtons(); fl_deactivate_object (fd_form_paragraph->input_labelwidth); @@ -1603,7 +1352,8 @@ inline void DisableParagraphLayout () } -inline void EnableParagraphLayout () +inline +void EnableParagraphLayout () { ActivateParagraphButtons(); fl_activate_object (fd_form_paragraph->input_labelwidth); @@ -1628,25 +1378,30 @@ inline void EnableParagraphLayout () bool UpdateLayoutParagraph() { - if (!current_view->getScreen() || !current_view->available()) { + if (!current_view->available()) { if (fd_form_paragraph->form_paragraph->visible) fl_hide_form(fd_form_paragraph->form_paragraph); return false; } Buffer * buf = current_view->buffer(); + LyXText * text = 0; + if (current_view->the_locking_inset) + text = current_view->the_locking_inset->getLyXText(current_view); + if (!text) + text = current_view->text; fl_set_input(fd_form_paragraph->input_labelwidth, - current_view->text->cursor.par->GetLabelWidthString().c_str()); + text->cursor.par()->GetLabelWidthString().c_str()); fl_set_button(fd_form_paragraph->radio_align_right, 0); fl_set_button(fd_form_paragraph->radio_align_left, 0); fl_set_button(fd_form_paragraph->radio_align_center, 0); fl_set_button(fd_form_paragraph->radio_align_block, 0); - int align = current_view->text->cursor.par->GetAlign(); + int align = text->cursor.par()->GetAlign(); if (align == LYX_ALIGN_LAYOUT) align = textclasslist.Style(buf->params.textclass, - current_view->text->cursor.par->GetLayout()).align; + text->cursor.par()->GetLayout()).align; switch (align) { case LYX_ALIGN_RIGHT: @@ -1662,20 +1417,41 @@ bool UpdateLayoutParagraph() fl_set_button(fd_form_paragraph->radio_align_block, 1); break; } - + +#ifndef NEW_INSETS + fl_set_button(fd_form_paragraph->check_lines_top, + text->cursor.par()->FirstPhysicalPar()->line_top); + + fl_set_button(fd_form_paragraph->check_lines_bottom, + text->cursor.par()->FirstPhysicalPar()->line_bottom); + + fl_set_button(fd_form_paragraph->check_pagebreaks_top, + text->cursor.par()->FirstPhysicalPar()->pagebreak_top); + + fl_set_button(fd_form_paragraph->check_pagebreaks_bottom, + text->cursor.par()->FirstPhysicalPar()->pagebreak_bottom); + fl_set_button(fd_form_paragraph->check_noindent, + text->cursor.par()->FirstPhysicalPar()->noindent); +#else fl_set_button(fd_form_paragraph->check_lines_top, - current_view->text->cursor.par->FirstPhysicalPar()->line_top); + text->cursor.par()->line_top); fl_set_button(fd_form_paragraph->check_lines_bottom, - current_view->text->cursor.par->FirstPhysicalPar()->line_bottom); + text->cursor.par()->line_bottom); fl_set_button(fd_form_paragraph->check_pagebreaks_top, - current_view->text->cursor.par->FirstPhysicalPar()->pagebreak_top); + text->cursor.par()->pagebreak_top); fl_set_button(fd_form_paragraph->check_pagebreaks_bottom, - current_view->text->cursor.par->FirstPhysicalPar()->pagebreak_bottom); + text->cursor.par()->pagebreak_bottom); fl_set_button(fd_form_paragraph->check_noindent, - current_view->text->cursor.par->FirstPhysicalPar()->noindent); + text->cursor.par()->noindent); +#endif fl_set_input (fd_form_paragraph->input_space_above, ""); - - switch (current_view->text->cursor.par->FirstPhysicalPar()->added_space_top.kind()) { + +#ifndef NEW_INSETS + switch (text->cursor.par()->FirstPhysicalPar()->added_space_top.kind()) { +#else + switch (text->cursor.par()->added_space_top.kind()) { +#endif + case VSpace::NONE: fl_set_choice (fd_form_paragraph->choice_space_above, 1); break; @@ -1695,15 +1471,27 @@ bool UpdateLayoutParagraph() fl_set_choice (fd_form_paragraph->choice_space_above, 6); break; case VSpace::LENGTH: - fl_set_choice (fd_form_paragraph->choice_space_above, 7); + fl_set_choice (fd_form_paragraph->choice_space_above, 7); +#ifndef NEW_INSETS + fl_set_input (fd_form_paragraph->input_space_above, + text->cursor.par()->FirstPhysicalPar()->added_space_top.length().asString().c_str()); +#else fl_set_input (fd_form_paragraph->input_space_above, - current_view->text->cursor.par->FirstPhysicalPar()->added_space_top.length().asString().c_str()); + text->cursor.par()->added_space_top.length().asString().c_str()); +#endif break; } +#ifndef NEW_INSETS + fl_set_button (fd_form_paragraph->check_space_above, + text->cursor.par()->FirstPhysicalPar()->added_space_top.keep()); + fl_set_input (fd_form_paragraph->input_space_below, ""); + switch (text->cursor.par()->FirstPhysicalPar()->added_space_bottom.kind()) { +#else fl_set_button (fd_form_paragraph->check_space_above, - current_view->text->cursor.par->FirstPhysicalPar()->added_space_top.keep()); + text->cursor.par()->added_space_top.keep()); fl_set_input (fd_form_paragraph->input_space_below, ""); - switch (current_view->text->cursor.par->FirstPhysicalPar()->added_space_bottom.kind()) { + switch (text->cursor.par()->added_space_bottom.kind()) { +#endif case VSpace::NONE: fl_set_choice (fd_form_paragraph->choice_space_below, 1); @@ -1730,17 +1518,28 @@ bool UpdateLayoutParagraph() break; case VSpace::LENGTH: fl_set_choice (fd_form_paragraph->choice_space_below, - 7); + 7); +#ifndef NEW_INSETS fl_set_input (fd_form_paragraph->input_space_below, - current_view->text->cursor.par->FirstPhysicalPar()->added_space_bottom.length().asString().c_str()); + text->cursor.par()->FirstPhysicalPar()->added_space_bottom.length().asString().c_str()); break; } fl_set_button (fd_form_paragraph->check_space_below, - current_view->text->cursor.par->FirstPhysicalPar()->added_space_bottom.keep()); + text->cursor.par()->FirstPhysicalPar()->added_space_bottom.keep()); fl_set_button(fd_form_paragraph->check_noindent, - current_view->text->cursor.par->FirstPhysicalPar()->noindent); + text->cursor.par()->FirstPhysicalPar()->noindent); +#else + fl_set_input (fd_form_paragraph->input_space_below, + text->cursor.par()->added_space_bottom.length().asString().c_str()); + break; + } + fl_set_button (fd_form_paragraph->check_space_below, + text->cursor.par()->added_space_bottom.keep()); + fl_set_button(fd_form_paragraph->check_noindent, + text->cursor.par()->noindent); +#endif if (current_view->buffer()->isReadonly()) { DisableParagraphLayout(); } else { @@ -1852,7 +1651,7 @@ void EnableDocumentLayout () bool UpdateLayoutDocument(BufferParams * params) { - if (!current_view->getScreen() || !current_view->available()) { + if (!current_view->available()) { if (fd_form_document->form_document->visible) fl_hide_form(fd_form_document->form_document); return false; @@ -1924,10 +1723,14 @@ bool UpdateLayoutDocument(BufferParams * params) fl_set_button(fd_form_document->radio_sides_one, 0); fl_set_button(fd_form_document->radio_sides_two, 0); - if (params->sides == 2) - fl_set_button(fd_form_document->radio_sides_two, 1); - else + switch (params->sides) { + case LyXTextClass::OneSide: fl_set_button(fd_form_document->radio_sides_one, 1); + break; + case LyXTextClass::TwoSides: + fl_set_button(fd_form_document->radio_sides_two, 1); + break; + } fl_set_button(fd_form_document->radio_columns_one, 0); fl_set_button(fd_form_document->radio_columns_two, 0); @@ -1939,6 +1742,7 @@ bool UpdateLayoutDocument(BufferParams * params) fl_set_input(fd_form_document->input_spacing, ""); switch (params->spacing.getSpace()) { + case Spacing::Default: // nothing bad should happen with this case Spacing::Single: { // \singlespacing @@ -1960,9 +1764,19 @@ bool UpdateLayoutDocument(BufferParams * params) case Spacing::Other: { fl_set_choice(fd_form_document->choice_spacing, 4); - char sval[20]; - sprintf(sval, "%g", params->spacing.getValue()); - fl_set_input(fd_form_document->input_spacing, sval); + //char sval[20]; + //sprintf(sval, "%g", params->spacing.getValue()); +#ifdef HAVE_SSTREAM + std::ostringstream sval; + sval << params->spacing.getValue(); // setw? + fl_set_input(fd_form_document->input_spacing, + sval.str().c_str()); +#else + char tval[20]; + ostrstream sval(tval, 20); + sval << params->spacing.getValue() << '\0'; // setw? + fl_set_input(fd_form_document->input_spacing, sval.str()); +#endif break; } } @@ -2022,8 +1836,7 @@ void MenuLayoutDocument() bool UpdateLayoutQuotes() { bool update = true; - if (!current_view->getScreen() - || !current_view->available() + if (!current_view->available() || current_view->buffer()->isReadonly()) update = false; @@ -2061,7 +1874,7 @@ void MenuLayoutQuotes() bool UpdateLayoutPreamble() { bool update = true; - if (!current_view->getScreen() || ! current_view->available()) + if (!current_view->available()) update = false; if (update) { @@ -2088,6 +1901,7 @@ bool UpdateLayoutPreamble() return update; } + void MenuLayoutPreamble() { static int ow = -1, oh; @@ -2113,7 +1927,7 @@ void MenuLayoutPreamble() void MenuLayoutSave() { - if (!current_view->getScreen() || ! current_view->available()) + if (!current_view->available()) return; if (AskQuestion(_("Do you want to save the current settings"), @@ -2123,632 +1937,178 @@ void MenuLayoutSave() } -// candidate for move to BufferView -void NoteCB() +// This is both GUI and LyXFont dependent. Don't know where to put it. (Asger) +// Well, it's mostly GUI dependent, so I guess it will stay here. (Asger) +LyXFont UserFreeFont(BufferParams const & params) { - InsetInfo * new_inset = new InsetInfo(); - current_view->buffer()->insertInset(new_inset); - new_inset->Edit(0, 0); -} - + LyXFont font(LyXFont::ALL_IGNORE); -// candidate for move to BufferView -void OpenStuff() -{ - if (current_view->available()) { - current_view->owner()->getMiniBuffer()->Set(_("Open/Close...")); - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->update(-2); - current_view->text->OpenStuff(); - current_view->update(0); + int pos = fl_get_choice(fd_form_character->choice_family); + switch(pos) { + case 1: font.setFamily(LyXFont::IGNORE_FAMILY); break; + case 2: font.setFamily(LyXFont::ROMAN_FAMILY); break; + case 3: font.setFamily(LyXFont::SANS_FAMILY); break; + case 4: font.setFamily(LyXFont::TYPEWRITER_FAMILY); break; + case 5: font.setFamily(LyXFont::INHERIT_FAMILY); break; } -} - -// candidate for move to BufferView -void ToggleFloat() -{ - if (current_view->available()) { - current_view->owner()->getMiniBuffer()->Set(_("Open/Close...")); - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->update(-2); - current_view->text->ToggleFootnote(); - current_view->update(0); + pos = fl_get_choice(fd_form_character->choice_series); + switch(pos) { + case 1: font.setSeries(LyXFont::IGNORE_SERIES); break; + case 2: font.setSeries(LyXFont::MEDIUM_SERIES); break; + case 3: font.setSeries(LyXFont::BOLD_SERIES); break; + case 4: font.setSeries(LyXFont::INHERIT_SERIES); break; } -} - -// candidate for move to BufferView -void MenuUndo() -{ -/* if (current_view->buffer()->the_locking_inset) { - current_view->owner()->getMiniBuffer()->Set(_("Undo not yet supported in math mode")); - return; - }*/ - - if (current_view->available()) { - current_view->owner()->getMiniBuffer()->Set(_("Undo")); - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->update(-2); - if (!current_view->text->TextUndo()) - current_view->owner()->getMiniBuffer()->Set(_("No further undo information")); - else - current_view->update(-1); + pos = fl_get_choice(fd_form_character->choice_shape); + switch(pos) { + case 1: font.setShape(LyXFont::IGNORE_SHAPE); break; + case 2: font.setShape(LyXFont::UP_SHAPE); break; + case 3: font.setShape(LyXFont::ITALIC_SHAPE); break; + case 4: font.setShape(LyXFont::SLANTED_SHAPE); break; + case 5: font.setShape(LyXFont::SMALLCAPS_SHAPE); break; + case 6: font.setShape(LyXFont::INHERIT_SHAPE); break; } -} - -// candidate for move to BufferView -void MenuRedo() -{ - if (current_view->buffer()->the_locking_inset) { - current_view->owner()->getMiniBuffer()->Set(_("Redo not yet supported in math mode")); - return; - } - - if (current_view->available()) { - current_view->owner()->getMiniBuffer()->Set(_("Redo")); - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->update(-2); - if (!current_view->text->TextRedo()) - current_view->owner()->getMiniBuffer()->Set(_("No further redo information")); - else - current_view->update(-1); + pos = fl_get_choice(fd_form_character->choice_size); + switch(pos) { + case 1: font.setSize(LyXFont::IGNORE_SIZE); break; + case 2: font.setSize(LyXFont::SIZE_TINY); break; + case 3: font.setSize(LyXFont::SIZE_SCRIPT); break; + case 4: font.setSize(LyXFont::SIZE_FOOTNOTE); break; + case 5: font.setSize(LyXFont::SIZE_SMALL); break; + case 6: font.setSize(LyXFont::SIZE_NORMAL); break; + case 7: font.setSize(LyXFont::SIZE_LARGE); break; + case 8: font.setSize(LyXFont::SIZE_LARGER); break; + case 9: font.setSize(LyXFont::SIZE_LARGEST); break; + case 10: font.setSize(LyXFont::SIZE_HUGE); break; + case 11: font.setSize(LyXFont::SIZE_HUGER); break; + case 12: font.setSize(LyXFont::INCREASE_SIZE); break; + case 13: font.setSize(LyXFont::DECREASE_SIZE); break; + case 14: font.setSize(LyXFont::INHERIT_SIZE); break; } -} - -// candidate for move to BufferView -void HyphenationPoint() -{ - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::HYPHENATION); - current_view->buffer()->insertInset(new_inset); + pos = fl_get_choice(fd_form_character->choice_bar); + switch(pos) { + case 1: font.setEmph(LyXFont::IGNORE); + font.setUnderbar(LyXFont::IGNORE); + font.setNoun(LyXFont::IGNORE); + font.setLatex(LyXFont::IGNORE); + break; + case 2: font.setEmph(LyXFont::TOGGLE); break; + case 3: font.setUnderbar(LyXFont::TOGGLE); break; + case 4: font.setNoun(LyXFont::TOGGLE); break; + case 5: font.setLatex(LyXFont::TOGGLE); break; + case 6: font.setEmph(LyXFont::INHERIT); + font.setUnderbar(LyXFont::INHERIT); + font.setNoun(LyXFont::INHERIT); + font.setLatex(LyXFont::INHERIT); + break; } -} + pos = fl_get_choice(fd_form_character->choice_color); + switch(pos) { + case 1: font.setColor(LColor::ignore); break; + case 2: font.setColor(LColor::none); break; + case 3: font.setColor(LColor::black); break; + case 4: font.setColor(LColor::white); break; + case 5: font.setColor(LColor::red); break; + case 6: font.setColor(LColor::green); break; + case 7: font.setColor(LColor::blue); break; + case 8: font.setColor(LColor::cyan); break; + case 9: font.setColor(LColor::magenta); break; + case 10: font.setColor(LColor::yellow); break; + case 11: font.setColor(LColor::inherit); break; + } + + int choice = combo_language2->get(); + if (choice == 1) + font.setLanguage(ignore_language); + else if (choice == 2) + font.setLanguage(params.language_info); + else + font.setLanguage(&languages[combo_language2->getline()]); -// candidate for move to BufferView -void Ldots() -{ - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::LDOTS); - current_view->buffer()->insertInset(new_inset); - } + return font; } -// candidate for move to BufferView -void EndOfSentenceDot() +/* callbacks for form form_title */ +extern "C" void TimerCB(FL_OBJECT *, long) { - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE); - current_view->buffer()->insertInset(new_inset); + // only if the form still exists + if (lyxrc.show_banner && fd_form_title->form_title != 0) { + if (fd_form_title->form_title->visible) { + fl_hide_form(fd_form_title->form_title); + } + fl_free_form(fd_form_title->form_title); + fd_form_title->form_title = 0; } } -// candidate for move to BufferView -void MenuSeparator() -{ - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR); - current_view->buffer()->insertInset(new_inset); - } -} - +/* callbacks for form form_paragraph */ -// candidate for move to BufferView -void Newline() +extern "C" void ParagraphVSpaceCB(FL_OBJECT * obj, long ) { - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - current_view->text->InsertChar(LyXParagraph::META_NEWLINE); - current_view->update(-1); - } -} + // "Synchronize" the choices and input fields, making it + // impossible to commit senseless data. + FD_form_paragraph const * fp = fd_form_paragraph; -// candidate for move to BufferView -void ProtectedBlank() -{ - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - current_view->text->InsertChar(LyXParagraph::META_PROTECTED_SEPARATOR); - current_view->update(-1); - } -} + if (obj == fp->choice_space_above) { + if (fl_get_choice (fp->choice_space_above) != 7) { + fl_set_input (fp->input_space_above, ""); + ActivateParagraphButtons(); + } + } else if (obj == fp->choice_space_below) { + if (fl_get_choice (fp->choice_space_below) != 7) { + fl_set_input (fp->input_space_below, ""); + ActivateParagraphButtons(); + } + } else if (obj == fp->input_space_above) { + string input = fl_get_input (fp->input_space_above); + if (input.empty()) { + fl_set_choice (fp->choice_space_above, 1); + ActivateParagraphButtons(); + } + else if (isValidGlueLength (input)) { + fl_set_choice (fp->choice_space_above, 7); + ActivateParagraphButtons(); + } + else { + fl_set_choice (fp->choice_space_above, 7); + DeactivateParagraphButtons(); + } + } else if (obj == fp->input_space_below) { + string input = fl_get_input (fp->input_space_below); -// candidate for move to BufferView -void HFill() -{ - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - current_view->text->InsertChar(LyXParagraph::META_HFILL); - current_view->update(-1); + if (input.empty()) { + fl_set_choice (fp->choice_space_below, 1); + ActivateParagraphButtons(); + } + else if (isValidGlueLength (input)) { + fl_set_choice (fp->choice_space_below, 7); + ActivateParagraphButtons(); + } + else { + fl_set_choice (fp->choice_space_below, 7); + DeactivateParagraphButtons(); + } } } -/* -------> These CB's use ToggleFree() as the (one and only?) font-changer. - They also show the current font state. */ - -static -void ToggleAndShow(LyXFont const &); - - -void FontSizeCB(string const & size) -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setGUISize(size); - ToggleAndShow(font); -} - - -void EmphCB() -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setEmph(LyXFont::TOGGLE); - ToggleAndShow(font); -} - - -void NounCB() +extern "C" void ParagraphApplyCB(FL_OBJECT *, long) { - LyXFont font(LyXFont::ALL_IGNORE); - font.setNoun(LyXFont::TOGGLE); - ToggleAndShow(font); -} - - -void BoldCB() -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setSeries(LyXFont::BOLD_SERIES); - ToggleAndShow(font); -} - - -void UnderlineCB() -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setUnderbar(LyXFont::TOGGLE); - ToggleAndShow(font); -} - - -void CodeCB() -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setFamily(LyXFont::TYPEWRITER_FAMILY); // no good - ToggleAndShow(font); -} - - -void SansCB() -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setFamily(LyXFont::SANS_FAMILY); - ToggleAndShow(font); -} - - -void RomanCB() -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setFamily(LyXFont::ROMAN_FAMILY); - ToggleAndShow(font); -} - - -void TexCB() -{ - LyXFont font(LyXFont::ALL_IGNORE); - font.setLatex (LyXFont::TOGGLE); - ToggleAndShow(font); -} - - -void StyleResetCB() -{ - LyXFont font(LyXFont::ALL_INHERIT); - ToggleAndShow(font); -} - - -/* -------> Returns the current font and depth by printing a message. In the - * future perhaps we could try to implement a callback to the button-bar. - * That is, `light' the bold button when the font is currently bold, etc. - */ -string CurrentState() -{ - string state; - if (current_view->available()) { - // I think we should only show changes from the default - // font. (Asger) - Buffer * buffer = current_view->buffer(); - LyXFont font = current_view->text->real_current_font; - LyXFont defaultfont = textclasslist.TextClass(buffer-> - params.textclass).defaultfont(); - font.reduce(defaultfont); - state = _("Font: ") + font.stateText(); - - int depth = current_view->text->GetDepth(); - if (depth > 0) - state += string(_(", Depth: ")) + tostr(depth); - } - return state; -} - - -// candidate for move to BufferView -/* -------> Does the actual toggle job of the XxxCB() calls above. - * Also shows the current font state. - */ -static -void ToggleAndShow(LyXFont const & font) -{ - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - current_view->text->ToggleFree(font, toggleall); - current_view->update(1); - } - // removed since it overrides the ToggleFree Message about the style - // Since Styles are more "High Level" than raw fonts I think the user - // prefers it like this Matthias - // FontStateShowCB( 0, 0 ); -} - - -// candidate for move to BufferView -extern "C" void MarginCB(FL_OBJECT *, long) -{ - if (current_view->available()) { - current_view->owner()->getMiniBuffer()->Set(_("Inserting margin note...")); - current_view->getScreen()->HideCursor(); - current_view->update(-2); - current_view->text->InsertFootnoteEnvironment(LyXParagraph::MARGIN); - current_view->update(1); - } -} - - -extern "C" void FigureCB(FL_OBJECT *, long) -{ - if (fd_form_figure->form_figure->visible) { - fl_raise_form(fd_form_figure->form_figure); - } else { - fl_show_form(fd_form_figure->form_figure, - FL_PLACE_MOUSE, FL_FULLBORDER, - _("Insert Figure")); - } -} - - -extern "C" void TableCB(FL_OBJECT *, long) -{ - if (fd_form_table->form_table->visible) { - fl_raise_form(fd_form_table->form_table); - } else { - fl_show_form(fd_form_table->form_table, - FL_PLACE_MOUSE, FL_FULLBORDER, - _("Insert Table")); - } -} - - -// candidate for move to BufferView -void CopyEnvironmentCB() -{ - if (current_view->available()) { - current_view->text->copyEnvironmentType(); - /* clear the selection, even if mark_set */ - current_view->getScreen()->ToggleSelection(); - current_view->text->ClearSelection(); - current_view->update(-2); - current_view->owner()->getMiniBuffer()->Set(_("Paragraph environment type copied")); - } -} - - -// candidate for move to BufferView -void PasteEnvironmentCB() -{ - if (current_view->available()) { - current_view->text->pasteEnvironmentType(); - current_view->owner()->getMiniBuffer()->Set(_("Paragraph environment type set")); - current_view->update(1); - } -} - - -// candidate for move to BufferView -void CopyCB() -{ - if (current_view->available()) { - current_view->text->CopySelection(); - /* clear the selection, even if mark_set */ - current_view->getScreen()->ToggleSelection(); - current_view->text->ClearSelection(); - current_view->update(-2); - current_view->owner()->getMiniBuffer()->Set(_("Copy")); - } -} - - -// candidate for move to BufferView -void CutCB() -{ - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - current_view->text->CutSelection(); - current_view->update(1); - current_view->owner()->getMiniBuffer()->Set(_("Cut")); - } -} - - -// candidate for move to BufferView -void PasteCB() -{ - if (!current_view->available()) return; - - current_view->owner()->getMiniBuffer()->Set(_("Paste")); - current_view->getScreen()->HideCursor(); - /* clear the selection */ - current_view->getScreen()->ToggleSelection(); - current_view->text->ClearSelection(); - current_view->update(-2); - - /* paste */ - current_view->text->PasteSelection(); - current_view->update(1); - - /* clear the selection */ - current_view->getScreen()->ToggleSelection(); - current_view->text->ClearSelection(); - current_view->update(-2); -} - - -// candidate for move to BufferView -extern "C" void MeltCB(FL_OBJECT *, long) -{ - if (!current_view->available()) return; - - current_view->owner()->getMiniBuffer()->Set(_("Melt")); - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->update(-2); - current_view->text->MeltFootnoteEnvironment(); - current_view->update(1); -} - - -// candidate for move to BufferView -// Change environment depth. -// if decInc == 0, depth change taking mouse button number into account -// if decInc == 1, increment depth -// if decInc == -1, decrement depth -extern "C" void DepthCB(FL_OBJECT * ob, long decInc) -{ - int button = 1; - - /* When decInc != 0, fake a mouse button. This allows us to - implement depth-plus and depth-min commands. RVDK_PATCH_5. */ - /* check out wether ob is defined, too (Matthias) */ - if ( decInc < 0 ) - button = 0; - else if (!decInc && ob) { - button = fl_get_button_numb(ob); - } - - if (current_view->available()) { - current_view->getScreen()->HideCursor(); - current_view->update(-2); - if (button == 1) - current_view->text->IncDepth(); - else - current_view->text->DecDepth(); - current_view->update(1); - current_view->owner()->getMiniBuffer()->Set(_("Changed environment depth" - " (in possible range, maybe not)")); - } -} - - -// This is both GUI and LyXFont dependent. Don't know where to put it. (Asger) -// Well, it's mostly GUI dependent, so I guess it will stay here. (Asger) -LyXFont UserFreeFont() -{ - LyXFont font(LyXFont::ALL_IGNORE); - - int pos = fl_get_choice(fd_form_character->choice_family); - switch(pos) { - case 1: font.setFamily(LyXFont::IGNORE_FAMILY); break; - case 2: font.setFamily(LyXFont::ROMAN_FAMILY); break; - case 3: font.setFamily(LyXFont::SANS_FAMILY); break; - case 4: font.setFamily(LyXFont::TYPEWRITER_FAMILY); break; - case 5: font.setFamily(LyXFont::INHERIT_FAMILY); break; - } - - pos = fl_get_choice(fd_form_character->choice_series); - switch(pos) { - case 1: font.setSeries(LyXFont::IGNORE_SERIES); break; - case 2: font.setSeries(LyXFont::MEDIUM_SERIES); break; - case 3: font.setSeries(LyXFont::BOLD_SERIES); break; - case 4: font.setSeries(LyXFont::INHERIT_SERIES); break; - } - - pos = fl_get_choice(fd_form_character->choice_shape); - switch(pos) { - case 1: font.setShape(LyXFont::IGNORE_SHAPE); break; - case 2: font.setShape(LyXFont::UP_SHAPE); break; - case 3: font.setShape(LyXFont::ITALIC_SHAPE); break; - case 4: font.setShape(LyXFont::SLANTED_SHAPE); break; - case 5: font.setShape(LyXFont::SMALLCAPS_SHAPE); break; - case 6: font.setShape(LyXFont::INHERIT_SHAPE); break; - } - - pos = fl_get_choice(fd_form_character->choice_size); - switch(pos) { - case 1: font.setSize(LyXFont::IGNORE_SIZE); break; - case 2: font.setSize(LyXFont::SIZE_TINY); break; - case 3: font.setSize(LyXFont::SIZE_SCRIPT); break; - case 4: font.setSize(LyXFont::SIZE_FOOTNOTE); break; - case 5: font.setSize(LyXFont::SIZE_SMALL); break; - case 6: font.setSize(LyXFont::SIZE_NORMAL); break; - case 7: font.setSize(LyXFont::SIZE_LARGE); break; - case 8: font.setSize(LyXFont::SIZE_LARGER); break; - case 9: font.setSize(LyXFont::SIZE_LARGEST); break; - case 10: font.setSize(LyXFont::SIZE_HUGE); break; - case 11: font.setSize(LyXFont::SIZE_HUGER); break; - case 12: font.setSize(LyXFont::INCREASE_SIZE); break; - case 13: font.setSize(LyXFont::DECREASE_SIZE); break; - case 14: font.setSize(LyXFont::INHERIT_SIZE); break; - } - - pos = fl_get_choice(fd_form_character->choice_bar); - switch(pos) { - case 1: font.setEmph(LyXFont::IGNORE); - font.setUnderbar(LyXFont::IGNORE); - font.setNoun(LyXFont::IGNORE); - font.setLatex(LyXFont::IGNORE); - break; - case 2: font.setEmph(LyXFont::TOGGLE); break; - case 3: font.setUnderbar(LyXFont::TOGGLE); break; - case 4: font.setNoun(LyXFont::TOGGLE); break; - case 5: font.setLatex(LyXFont::TOGGLE); break; - case 6: font.setEmph(LyXFont::INHERIT); - font.setUnderbar(LyXFont::INHERIT); - font.setNoun(LyXFont::INHERIT); - font.setLatex(LyXFont::INHERIT); - break; - } - - pos = fl_get_choice(fd_form_character->choice_color); - switch(pos) { - case 1: font.setColor(LyXFont::IGNORE_COLOR); break; - case 2: font.setColor(LyXFont::NONE); break; - case 3: font.setColor(LyXFont::BLACK); break; - case 4: font.setColor(LyXFont::WHITE); break; - case 5: font.setColor(LyXFont::RED); break; - case 6: font.setColor(LyXFont::GREEN); break; - case 7: font.setColor(LyXFont::BLUE); break; - case 8: font.setColor(LyXFont::CYAN); break; - case 9: font.setColor(LyXFont::MAGENTA); break; - case 10: font.setColor(LyXFont::YELLOW); break; - case 11: font.setColor(LyXFont::INHERIT_COLOR); break; - } - - return font; -} - - -void FreeCB() -{ - ToggleAndShow(UserFreeFont()); -} - - -/* callbacks for form form_title */ -extern "C" void TimerCB(FL_OBJECT *, long) -{ - // only if the form still exists - if (fd_form_title->form_title != 0) { - if (fd_form_title->form_title->visible) { - fl_hide_form(fd_form_title->form_title); - } - fl_free_form(fd_form_title->form_title); - fd_form_title->form_title = 0; - } -} - - -/* callbacks for form form_paragraph */ - -extern "C" void ParagraphVSpaceCB(FL_OBJECT * obj, long ) -{ - // "Synchronize" the choices and input fields, making it - // impossible to commit senseless data. - - FD_form_paragraph const * fp = fd_form_paragraph; - - if (obj == fp->choice_space_above) { - if (fl_get_choice (fp->choice_space_above) != 7) { - fl_set_input (fp->input_space_above, ""); - ActivateParagraphButtons(); - } - } else if (obj == fp->choice_space_below) { - if (fl_get_choice (fp->choice_space_below) != 7) { - fl_set_input (fp->input_space_below, ""); - ActivateParagraphButtons(); - } - } else if (obj == fp->input_space_above) { - string input = fl_get_input (fp->input_space_above); - - if (input.empty()) { - fl_set_choice (fp->choice_space_above, 1); - ActivateParagraphButtons(); - } - else if (isValidGlueLength (input)) { - fl_set_choice (fp->choice_space_above, 7); - ActivateParagraphButtons(); - } - else { - fl_set_choice (fp->choice_space_above, 7); - DeactivateParagraphButtons(); - } - } else if (obj == fp->input_space_below) { - string input = fl_get_input (fp->input_space_below); - - if (input.empty()) { - fl_set_choice (fp->choice_space_below, 1); - ActivateParagraphButtons(); - } - else if (isValidGlueLength (input)) { - fl_set_choice (fp->choice_space_below, 7); - ActivateParagraphButtons(); - } - else { - fl_set_choice (fp->choice_space_below, 7); - DeactivateParagraphButtons(); - } - } -} - - -extern "C" void ParagraphApplyCB(FL_OBJECT *, long) -{ - if (!current_view->available()) - return; - - VSpace space_top, space_bottom; - LyXAlignment align; - string labelwidthstring; - bool noindent; + if (!current_view->available()) + return; + + VSpace space_top, space_bottom; + LyXAlignment align; + string labelwidthstring; + bool noindent; // If a vspace kind is "Length" but there's no text in // the input field, reset the kind to "None". @@ -2800,16 +2160,22 @@ extern "C" void ParagraphApplyCB(FL_OBJECT *, long) labelwidthstring = fl_get_input(fd_form_paragraph->input_labelwidth); noindent = fl_get_button(fd_form_paragraph->check_noindent); - current_view->text->SetParagraph(line_top, - line_bottom, - pagebreak_top, - pagebreak_bottom, - space_top, - space_bottom, - align, - labelwidthstring, - noindent); - current_view->update(1); + LyXText * text = 0; + if (current_view->the_locking_inset) + text = current_view->the_locking_inset->getLyXText(current_view); + if (!text) + text = current_view->text; + text->SetParagraph(current_view, + line_top, + line_bottom, + pagebreak_top, + pagebreak_bottom, + space_top, + space_bottom, + align, + labelwidthstring, + noindent); + current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); current_view->owner()->getMiniBuffer()->Set(_("Paragraph layout set")); } @@ -2834,7 +2200,8 @@ extern "C" void CharacterApplyCB(FL_OBJECT *, long) // we set toggleall locally here, since it should be true for // all other uses of ToggleAndShow() (JMarc) toggleall = fl_get_button(fd_form_character->check_toggle_all); - ToggleAndShow( UserFreeFont()); + ToggleAndShow(current_view, UserFreeFont(current_view->buffer()->params)); + current_view->setState(); toggleall = true; } @@ -2857,12 +2224,16 @@ extern "C" void CharacterOKCB(FL_OBJECT *ob, long data) void UpdateDocumentButtons(BufferParams const & params) { fl_set_choice(fd_form_document->choice_pagestyle, 1); - - if (params.sides == 2) - fl_set_button(fd_form_document->radio_sides_two, 1); - else + + switch (params.sides) { + case LyXTextClass::OneSide: fl_set_button(fd_form_document->radio_sides_one, 1); - + break; + case LyXTextClass::TwoSides: + fl_set_button(fd_form_document->radio_sides_two, 1); + break; + } + if (params.columns == 2) fl_set_button(fd_form_document->radio_columns_two, 1); else @@ -2878,7 +2249,7 @@ void UpdateDocumentButtons(BufferParams const & params) extern "C" void ChoiceClassCB(FL_OBJECT * ob, long) { - ProhibitInput(); + ProhibitInput(current_view); if (textclasslist.Load(fl_get_choice(ob)-1)) { if (AskQuestion(_("Should I set some parameters to"), fl_get_choice_text(ob), @@ -2895,9 +2266,9 @@ extern "C" void ChoiceClassCB(FL_OBJECT * ob, long) _("Unable to switch to new document class."), _("Reverting to original document class.")); fl_set_choice(fd_form_document->choice_class, - GetCurrentTextClass() + 1); + current_view->buffer()->params.textclass + 1); } - AllowInput(); + AllowInput(current_view); } @@ -2955,9 +2326,30 @@ extern "C" void DocumentSpacingCB(FL_OBJECT * obj, long) extern "C" void DocumentApplyCB(FL_OBJECT *, long) { bool redo = false; - BufferParams *params = &(current_view->buffer()->params); - current_view->buffer()->params.language = - combo_language->getline(); + BufferParams * params = &(current_view->buffer()->params); + + Language const * old_language = params->language_info; + params->language = combo_language->getline(); + Languages::iterator lit = languages.find(params->language); + + Language const * new_language; + if (lit != languages.end()) + new_language = &(*lit).second; + else + new_language = default_language; + + if (current_view->available()) { + if (old_language != new_language + && old_language->RightToLeft() == new_language->RightToLeft() + && !current_view->buffer()->isMultiLingual()) + current_view->buffer()->ChangeLanguage(old_language, + new_language); + if (old_language != new_language) { + //current_view->buffer()->redraw(); + redo = true; + } + } + params->language_info = new_language; // If default skip is a "Length" but there's no text in the // input field, reset the kind to "Medskip", which is the default. @@ -2987,19 +2379,26 @@ extern "C" void DocumentApplyCB(FL_OBJECT *, long) if (!current_view->available()) return; - LyXTextClassList::ClassList::size_type new_class = fl_get_choice(fd_form_document->choice_class) - 1; + current_view->text->SetCursor(current_view, + current_view->text->cursor.par(), + current_view->text->cursor.pos()); + current_view->setState(); + + LyXTextClassList::ClassList::size_type new_class = + fl_get_choice(fd_form_document->choice_class) - 1; + if (params->textclass != new_class) { // try to load new_class if (textclasslist.Load(new_class)) { // successfully loaded redo = true; - current_view->owner()->getMiniBuffer()->Set(_("Converting document to new document class...")); - int ret = current_view->text-> - SwitchLayoutsBetweenClasses(current_view->buffer()-> - params.textclass, - new_class, - current_view->buffer()-> - paragraph); + current_view->owner()->getMiniBuffer()-> + Set(_("Converting document to new document class...")); + CutAndPaste cap; + int ret = cap.SwitchLayoutsBetweenClasses( + current_view->buffer()->params.textclass, + new_class, + current_view->buffer()->paragraph); if (ret) { string s; @@ -3098,10 +2497,9 @@ extern "C" void DocumentApplyCB(FL_OBJECT *, long) current_view->owner()->getMiniBuffer()->Set(_("Document layout set")); current_view->buffer()->markDirty(); - + params->options = fl_get_input(fd_form_document->input_extra); - } @@ -3125,57 +2523,6 @@ extern "C" void DocumentBulletsCB(FL_OBJECT *, long) } -// candidate for move to BufferView -void GotoNote() -{ - if (!current_view->getScreen()) - return; - - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->update(-2); - LyXCursor tmp; - - if (!current_view->text->GotoNextNote()) { - if (current_view->text->cursor.pos - || current_view->text->cursor.par != - current_view->text->FirstParagraph()) - { - tmp = current_view->text->cursor; - current_view->text->cursor.par = - current_view->text->FirstParagraph(); - current_view->text->cursor.pos = 0; - if (!current_view->text->GotoNextNote()) { - current_view->text->cursor = tmp; - current_view->owner()->getMiniBuffer()->Set(_("No more notes")); - LyXBell(); - } - } else { - current_view->owner()->getMiniBuffer()->Set(_("No more notes")); - LyXBell(); - } - } - current_view->update(0); - current_view->text->sel_cursor = - current_view->text->cursor; -} - - -// candidate for move to BufferView -void InsertCorrectQuote() -{ - Buffer * cbuffer = current_view->buffer(); - char c; - - if (current_view->text->cursor.pos ) - c = current_view->text->cursor.par->GetChar(current_view->text->cursor.pos - 1); - else - c = ' '; - - cbuffer->insertInset(new InsetQuotes(c, cbuffer->params)); -} - - /* callbacks for form form_quotes */ extern "C" void QuotesApplyCB(FL_OBJECT *, long) @@ -3184,8 +2531,6 @@ extern "C" void QuotesApplyCB(FL_OBJECT *, long) return; current_view->owner()->getMiniBuffer()->Set(_("Quotes type set")); - //current_view->buffer()->params.quotes_language = - // fl_get_choice(fd_form_quotes->choice_quotes_language) - 1; InsetQuotes::quote_language lga = InsetQuotes::EnglishQ; switch(fl_get_choice(fd_form_quotes->choice_quotes_language) - 1) { case 0: @@ -3260,50 +2605,54 @@ extern "C" void PreambleOKCB(FL_OBJECT * ob, long data) /* callbacks for form form_table */ -extern "C" void TableApplyCB(FL_OBJECT *, long) +extern "C" +void TableApplyCB(FL_OBJECT *, long) { - if (!current_view->getScreen()) + if (!current_view->available()) return; - + +#ifndef NEW_TABULAR // check for tables in tables - if (current_view->text->cursor.par->table){ + if (current_view->text->cursor.par()->table){ WriteAlert(_("Impossible Operation!"), _("Cannot insert table in table."), _("Sorry.")); return; } - +#endif current_view->owner()->getMiniBuffer()->Set(_("Inserting table...")); int ysize = int(fl_get_slider_value(fd_form_table->slider_columns) + 0.5); int xsize = int(fl_get_slider_value(fd_form_table->slider_rows) + 0.5); - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->update(-2); + current_view->hideCursor(); + current_view->beforeChange(); + current_view->update(BufferView::SELECT|BufferView::FITCUR); - current_view->text->SetCursorParUndo(); + current_view->text->SetCursorParUndo(current_view->buffer()); current_view->text->FreezeUndo(); - current_view->text->BreakParagraph(); - current_view->update(-1); + current_view->text->BreakParagraph(current_view); + current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - if (current_view->text->cursor.par->Last()) { - current_view->text->CursorLeft(); + if (current_view->text->cursor.par()->Last()) { + current_view->text->CursorLeft(current_view); - current_view->text->BreakParagraph(); - current_view->update(-1); + current_view->text->BreakParagraph(current_view); + current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } current_view->text->current_font.setLatex(LyXFont::OFF); //if (!fl_get_button(fd_form_table->check_latex)){ // insert the new wysiwy table - current_view->text->SetLayout(0); // standard layout - if (current_view->text->cursor.par->footnoteflag == + current_view->text->SetLayout(current_view, 0); // standard layout +#ifndef NEW_INSETS + if (current_view->text->cursor.par()->footnoteflag == LyXParagraph::NO_FOOTNOTE) { +#endif current_view->text - ->SetParagraph(0, 0, + ->SetParagraph(current_view, 0, 0, 0, 0, VSpace (0.3 * current_view->buffer()-> params.spacing.getValue(), @@ -3314,226 +2663,81 @@ extern "C" void TableApplyCB(FL_OBJECT *, long) LYX_ALIGN_CENTER, string(), 0); - } - else +#ifndef NEW_INSETS + } else { current_view->text - ->SetParagraph(0, 0, + ->SetParagraph(current_view, 0, 0, 0, 0, VSpace(VSpace::NONE), VSpace(VSpace::NONE), LYX_ALIGN_CENTER, string(), 0); - - current_view->text->cursor.par->table = + } +#endif +#ifndef NEW_TABULAR + current_view->text->cursor.par()->table = new LyXTable(xsize, ysize); - - for (int i = 0; i < xsize * ysize - 1; ++i) - current_view->text->cursor.par->InsertChar(0, LyXParagraph::META_NEWLINE); - current_view->text->RedoParagraph(); +#endif + Language const * lang = + current_view->text->cursor.par()->getParLanguage(current_view->buffer()->params); + LyXFont font(LyXFont::ALL_INHERIT, lang); + for (int i = 0; i < xsize * ysize - 1; ++i) { + current_view->text->cursor.par() + ->InsertChar(0, LyXParagraph::META_NEWLINE, font); + } + current_view->text->RedoParagraph(current_view); current_view->text->UnFreezeUndo(); - current_view->update(1); + current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); current_view->owner()->getMiniBuffer()->Set(_("Table inserted")); + current_view->setState(); } -extern "C" void TableCancelCB(FL_OBJECT *, long) -{ - fl_hide_form(fd_form_table->form_table); -} - - -extern "C" void TableOKCB(FL_OBJECT * ob, long data) -{ - TableApplyCB(ob, data); - TableCancelCB(ob, data); -} - - -/* callbacks for form form_print */ - -extern "C" void PrintCancelCB(FL_OBJECT *, long) -{ - fl_hide_form(fd_form_print->form_print); -} - -static bool stringOnlyContains (string const & LStr, char const * cset) -{ - char const * cstr = LStr.c_str() ; - - return strspn(cstr, cset) == strlen(cstr) ; -} - -extern "C" void PrintApplyCB(FL_OBJECT *, long) -{ - if (!current_view->available()) - return; - Buffer * buffer = current_view->buffer(); - string path = OnlyPath(buffer->fileName()); - - string pageflag; - if (fl_get_button(fd_form_print->radio_even_pages)) - pageflag = lyxrc->print_evenpage_flag + ' '; - else if (fl_get_button(fd_form_print->radio_odd_pages)) - pageflag = lyxrc->print_oddpage_flag + ' '; - -// Changes by Stephan Witt (stephan.witt@beusen.de), 19-Jan-99 -// User may give a page (range) list -// User may print multiple (unsorted) copies - string pages = subst(fl_get_input(fd_form_print->input_pages), ';',','); - pages = subst(pages, '+',','); - pages = frontStrip(strip(pages)) ; - while (!pages.empty()) { // a page range was given - string piece ; - pages = split (pages, piece, ',') ; - piece = strip(piece) ; - piece = frontStrip(piece) ; - if ( !stringOnlyContains (piece, "0123456789-") ) { - WriteAlert(_("ERROR! Unable to print!"), - _("Check 'range of pages'!")); - return; - } - if (piece.find('-') == string::npos) { // not found - pageflag += lyxrc->print_pagerange_flag + piece + '-' + piece + ' ' ; - } else if (suffixIs(piece, "-") ) { // missing last page - pageflag += lyxrc->print_pagerange_flag + piece + "1000 "; - } else if (prefixIs(piece, "-") ) { // missing first page - pageflag += lyxrc->print_pagerange_flag + '1' + piece + ' ' ; - } else { - pageflag += lyxrc->print_pagerange_flag + piece + ' ' ; - } - } - - string copies = frontStrip(strip(fl_get_input(fd_form_print->input_copies))); - if (!copies.empty()) { // a number of copies was given - if ( !stringOnlyContains (copies, "0123456789") ) { - WriteAlert(_("ERROR! Unable to print!"), - _("Check 'number of copies'!")); - return; - } - if (fl_get_button(fd_form_print->do_unsorted)) - pageflag += lyxrc->print_copies_flag; - else - pageflag += lyxrc->print_collcopies_flag; - pageflag += " " + copies + ' ' ; - } - - string reverseflag; - if (fl_get_button(fd_form_print->radio_order_reverse)) - reverseflag = lyxrc->print_reverse_flag + ' '; - - string orientationflag; - if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - orientationflag = lyxrc->print_landscape_flag + ' '; - - string ps_file = fl_get_input(fd_form_print->input_file); - string printer = strip(fl_get_input(fd_form_print->input_printer)); - - string printerflag; - if (lyxrc->print_adapt_output // printer name should be passed to dvips - && ! printer.empty()) // a printer name has been given - printerflag = lyxrc->print_to_printer + printer + ' '; - - string extraflags; - if (!lyxrc->print_extra_options.empty()) - extraflags = lyxrc->print_extra_options + ' '; - - string command = lyxrc->print_command + ' ' - + printerflag + pageflag + reverseflag - + orientationflag + extraflags; - - char real_papersize = buffer->params.papersize; - if (real_papersize == BufferParams::PAPER_DEFAULT) - real_papersize = lyxrc->default_papersize; - - string paper; - switch (real_papersize) { - case BufferParams::PAPER_USLETTER: - paper = "letter"; - break; - case BufferParams::PAPER_A3PAPER: - paper = "a3"; - break; - case BufferParams::PAPER_A4PAPER: - paper = "a4"; - break; - case BufferParams::PAPER_A5PAPER: - paper = "a5"; - break; - case BufferParams::PAPER_B5PAPER: - paper = "b5"; - break; - case BufferParams::PAPER_EXECUTIVEPAPER: - paper = "foolscap"; - break; - case BufferParams::PAPER_LEGALPAPER: - paper = "legal"; - break; - default: /* If nothing else fits, keep an empty value... */ - break; - } - - if (buffer->params.use_geometry - && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM - && !lyxrc->print_paper_dimension_flag.empty() - && !buffer->params.paperwidth.empty() - && !buffer->params.paperheight.empty()) { - // using a custom papersize - command += ' '; - command += lyxrc->print_paper_dimension_flag + ' '; - command += buffer->params.paperwidth + ','; - command += buffer->params.paperheight + ' '; - } else if (!lyxrc->print_paper_flag.empty() - && !paper.empty() - && (real_papersize != BufferParams::PAPER_USLETTER || - buffer->params.orientation == BufferParams::ORIENTATION_PORTRAIT)) { - command += " " + lyxrc->print_paper_flag + " " + paper + " "; - } - if (fl_get_button(fd_form_print->radio_file)) - command += lyxrc->print_to_file - + QuoteName(MakeAbsPath(ps_file, path)); - else if (!lyxrc->print_spool_command.empty()) - command += lyxrc->print_to_file - + QuoteName(ps_file); - - // push directorypath, if necessary - if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)){ - path = buffer->tmppath; - } - Path p(path); - - bool result; - if (!lyxrc->print_spool_command.empty() && - !fl_get_button(fd_form_print->radio_file)) { - string command2 = lyxrc->print_spool_command + ' '; - if (!printer.empty()) - command2 += lyxrc->print_spool_printerprefix - + printer; - // First run dvips and, if succesful, then spool command - if ((result = RunScript(buffer, true, command))) { - result = RunScript(buffer, false, command2, ps_file); - } - } else - result = RunScript(buffer, false, command); +extern "C" +void TableCancelCB(FL_OBJECT *, long) +{ + fl_hide_form(fd_form_table->form_table); +} + + +extern "C" +void TableOKCB(FL_OBJECT * ob, long data) +{ + TableApplyCB(ob, data); + TableCancelCB(ob, data); +} - if (!result) - WriteAlert(_("Error:"), - _("Unable to print"), - _("Check that your parameters are correct")); + +void Figure() +{ + if (fd_form_figure->form_figure->visible) { + fl_raise_form(fd_form_figure->form_figure); + } else { + fl_show_form(fd_form_figure->form_figure, + FL_PLACE_MOUSE, FL_FULLBORDER, + _("Insert Figure")); + } } -extern "C" void PrintOKCB(FL_OBJECT * ob, long data) +void Table() { - PrintCancelCB(ob, data); - PrintApplyCB(ob, data); + if (fd_form_table->form_table->visible) { + fl_raise_form(fd_form_table->form_table); + } else { + fl_show_form(fd_form_table->form_table, + FL_PLACE_MOUSE, FL_FULLBORDER, + _("Insert Table")); + } } /* callbacks for form form_figure */ -extern "C" void FigureApplyCB(FL_OBJECT *, long) +extern "C" +void FigureApplyCB(FL_OBJECT *, long) { if (!current_view->available()) return; @@ -3544,38 +2748,43 @@ extern "C" void FigureApplyCB(FL_OBJECT *, long) current_view->owner()->getMiniBuffer()->Set(_("Inserting figure...")); if (fl_get_button(fd_form_figure->radio_inline) - || current_view->text->cursor.par->table) { +#ifndef NEW_TABULAR + || current_view->text->cursor.par()->table +#endif + ) { InsetFig * new_inset = new InsetFig(100, 20, buffer); - buffer->insertInset(new_inset); + current_view->insertInset(new_inset); current_view->owner()->getMiniBuffer()->Set(_("Figure inserted")); - new_inset->Edit(0, 0); + new_inset->Edit(current_view, 0, 0, 0); return; } - current_view->getScreen()->HideCursor(); - current_view->update(-2); - BeforeChange(); + current_view->hideCursor(); + current_view->update(BufferView::SELECT|BufferView::FITCUR); + current_view->beforeChange(); - current_view->text->SetCursorParUndo(); + current_view->text->SetCursorParUndo(current_view->buffer()); current_view->text->FreezeUndo(); - current_view->text->BreakParagraph(); - current_view->update(-1); + current_view->text->BreakParagraph(current_view); + current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - if (current_view->text->cursor.par->Last()) { - current_view->text->CursorLeft(); + if (current_view->text->cursor.par()->Last()) { + current_view->text->CursorLeft(current_view); - current_view->text->BreakParagraph(); - current_view->update(-1); + current_view->text->BreakParagraph(current_view); + current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } // The standard layout should always be numer 0; - current_view->text->SetLayout(0); - - if (current_view->text->cursor.par->footnoteflag == + current_view->text->SetLayout(current_view, 0); + +#ifndef NEW_INSETS + if (current_view->text->cursor.par()->footnoteflag == LyXParagraph::NO_FOOTNOTE) { +#endif current_view->text-> - SetParagraph(0, 0, + SetParagraph(current_view, 0, 0, 0, 0, VSpace (0.3 * buffer->params.spacing.getValue(), LyXLength::CM), @@ -3583,23 +2792,27 @@ extern "C" void FigureApplyCB(FL_OBJECT *, long) buffer->params.spacing.getValue(), LyXLength::CM), LYX_ALIGN_CENTER, string(), 0); - } else - current_view->text->SetParagraph(0, 0, +#ifndef NEW_INSETS + } else { + current_view->text->SetParagraph(current_view, 0, 0, 0, 0, VSpace(VSpace::NONE), VSpace(VSpace::NONE), LYX_ALIGN_CENTER, string(), 0); + } +#endif - current_view->update(-1); + current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); Inset * new_inset = new InsetFig(100, 100, buffer); - buffer->insertInset(new_inset); - new_inset->Edit(0, 0); - current_view->update(0); + current_view->insertInset(new_inset); + new_inset->Edit(current_view, 0, 0, 0); + current_view->update(BufferView::SELECT|BufferView::FITCUR); current_view->owner()->getMiniBuffer()->Set(_("Figure inserted")); current_view->text->UnFreezeUndo(); + current_view->setState(); } @@ -3616,575 +2829,20 @@ extern "C" void FigureOKCB(FL_OBJECT * ob, long data) } -extern "C" void ScreenApplyCB(FL_OBJECT *, long) -{ - lyxrc->roman_font_name = fl_get_input(fd_form_screen->input_roman); - lyxrc->sans_font_name = fl_get_input(fd_form_screen->input_sans); - lyxrc->typewriter_font_name = fl_get_input(fd_form_screen->input_typewriter); - lyxrc->font_norm = fl_get_input(fd_form_screen->input_font_norm); - lyxrc->zoom = atoi(fl_get_input(fd_form_screen->intinput_size)); - fontloader.update(); - - // All buffers will need resize - bufferlist.resize(); - - current_view->owner()->getMiniBuffer()->Set(_("Screen options set")); -} - - -extern "C" void ScreenCancelCB(FL_OBJECT *, long) -{ - fl_hide_form(fd_form_screen->form_screen); -} - - -extern "C" void ScreenOKCB(FL_OBJECT * ob, long data) -{ - ScreenCancelCB(ob, data); - ScreenApplyCB(ob, data); -} - - -void LaTeXOptions() -{ - if (!current_view->available()) - return; - - fl_set_button(fd_latex_options->accents, - int(current_view->buffer()->params.allowAccents)); - - if (fd_latex_options->LaTeXOptions->visible) { - fl_raise_form(fd_latex_options->LaTeXOptions); - } else { - fl_show_form(fd_latex_options->LaTeXOptions, - FL_PLACE_MOUSE, FL_FULLBORDER, - _("LaTeX Options")); - } -} - - // This function runs "configure" and then rereads lyx.defaults to // reconfigure the automatic settings. -void Reconfigure() +void Reconfigure(BufferView * bv) { - current_view->owner()->getMiniBuffer()->Set(_("Running configure...")); + bv->owner()->getMiniBuffer()->Set(_("Running configure...")); // Run configure in user lyx directory Path p(user_lyxdir); Systemcalls one(Systemcalls::System, AddName(system_lyxdir, "configure")); p.pop(); - current_view->owner()->getMiniBuffer()->Set(_("Reloading configuration...")); - lyxrc->read(LibFileSearch(string(), "lyxrc.defaults")); + bv->owner()->getMiniBuffer()->Set(_("Reloading configuration...")); + lyxrc.read(LibFileSearch(string(), "lyxrc.defaults")); WriteAlert(_("The system has been reconfigured."), _("You need to restart LyX to make use of any"), _("updated document class specifications.")); } - - -// candidate for move to BufferView -/* these functions are for the spellchecker */ -char * NextWord(float & value) -{ - if (!current_view->available()){ - value = 1; - return 0; - } - - char * string = current_view->text->SelectNextWord(value); - - return string; -} - - -// candidate for move to BufferView -void SelectLastWord() -{ - if (!current_view->available()) - return; - - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->text->SelectSelectedWord(); - current_view->getScreen()->ToggleSelection(false); - current_view->update(0); -} - - -// candidate for move to BufferView -void EndOfSpellCheck() -{ - if (!current_view->available()) - return; - - current_view->getScreen()->HideCursor(); - BeforeChange(); - current_view->text->SelectSelectedWord(); - current_view->text->ClearSelection(); - current_view->update(0); -} - - -// candidate for move to BufferView -void ReplaceWord(string const & replacestring) -{ - if (!current_view->getScreen()) - return; - - current_view->getScreen()->HideCursor(); - current_view->update(-2); - - /* clear the selection (if there is any) */ - current_view->getScreen()->ToggleSelection(false); - current_view->update(-2); - - /* clear the selection (if there is any) */ - current_view->getScreen()->ToggleSelection(false); - current_view->text-> - ReplaceSelectionWithString(replacestring.c_str()); - - current_view->text->SetSelectionOverString(replacestring.c_str()); - - // Go back so that replacement string is also spellchecked - for (string::size_type i = 0; i < replacestring.length() + 1; ++i) { - current_view->text->CursorLeftIntern(); - } - current_view->update(1); -} -// End of spellchecker stuff - - - -// -// Table of Contents -// - -struct TocList { - int counter[6]; - bool appendix; - TocList * next; -}; - - -static TocList * toclist = 0; - - -extern "C" void TocSelectCB(FL_OBJECT * ob, long) -{ - if (!current_view->available()) - return; - - TocList * tmptoclist = toclist; - int i = fl_get_browser(ob); - for (int a = 1; a < i && tmptoclist->next; ++a) { - tmptoclist = tmptoclist->next; - } - - if (!tmptoclist) - return; - - - LyXParagraph * par = current_view->buffer()->paragraph; - while (par && (par->GetFirstCounter(0) != tmptoclist->counter[0] || - par->GetFirstCounter(1) != tmptoclist->counter[1] || - par->GetFirstCounter(2) != tmptoclist->counter[2] || - par->GetFirstCounter(3) != tmptoclist->counter[3] || - par->GetFirstCounter(4) != tmptoclist->counter[4] || - par->GetFirstCounter(5) != tmptoclist->counter[5] || - par->appendix != tmptoclist->appendix)) { - par = par->LastPhysicalPar()->Next(); - } - - if (par) { - BeforeChange(); - current_view->text->SetCursor(par, 0); - current_view->text->sel_cursor = - current_view->text->cursor; - current_view->update(0); - } - else { - WriteAlert(_("Error"), - _("Couldn't find this label"), - _("in current document.")); - } - -} - - -extern "C" void TocCancelCB(FL_OBJECT *, long) -{ - fl_hide_form(fd_form_toc->form_toc); -} - - -extern "C" void TocUpdateCB(FL_OBJECT *, long) -{ - static LyXParagraph * stapar = 0; - TocList * tmptoclist = 0; - - /* deleted the toclist */ - if (toclist){ - while (toclist){ - tmptoclist = toclist->next; - delete toclist; - toclist = tmptoclist; - } - } - toclist = 0; - tmptoclist = toclist; - - - fl_clear_browser(fd_form_toc->browser_toc); - if (!current_view->available()) { - fl_add_browser_line(fd_form_toc->browser_toc, - _("*** No Document ***")); - return; - } - fl_hide_object(fd_form_toc->browser_toc); - /* get the table of contents */ - LyXParagraph * par = current_view->buffer()->paragraph; - char labeltype; - char * line = new char[200]; - int pos = 0; - unsigned char c; - int topline = 0; - - if (stapar == par) - topline = fl_get_browser_topline(fd_form_toc->browser_toc); - stapar = par; - - while (par) { - labeltype = textclasslist.Style(current_view->buffer()->params.textclass, - par->GetLayout()).labeltype; - - if (labeltype >= LABEL_COUNTER_CHAPTER - && labeltype <= LABEL_COUNTER_CHAPTER + - current_view->buffer()->params.tocdepth) { - /* insert this into the table of contents */ - /* first indent a little bit */ - - for (pos = 0; - pos < (labeltype - - textclasslist.TextClass(current_view->buffer()-> - params.textclass).maxcounter()) * 4 + 2; - pos++) - line[pos] = ' '; - - // Then the labestring - if (!par->labelstring.empty()) { - string::size_type i = 0; - while (pos < 199 && i < par->labelstring.length()) { - line[pos] = par->labelstring[i]; - i++; - pos++; - } - } - - line[pos] = ' '; - ++pos; - - /* now the contents */ - LyXParagraph::size_type i = 0; - while (pos < 199 && i < par->size()) { - c = par->GetChar(i); - if (isprint(c) || c >= 128) { - line[pos] = c; - pos++; - } - ++i; - } - line[pos] = '\0'; - fl_add_browser_line(fd_form_toc->browser_toc, line); - - /* make a toclist entry */ - if (!tmptoclist){ - tmptoclist = new TocList; - toclist = tmptoclist; - } else { - tmptoclist->next = new TocList; - tmptoclist = tmptoclist->next; - } - - tmptoclist->next = 0; - int a = 0; - for (a = 0; a < 6; ++a) { - tmptoclist->counter[a] = par->GetFirstCounter(a); - } - tmptoclist->appendix = par->appendix; - } - par = par->LastPhysicalPar()->Next(); - - } - delete[] line; - fl_set_browser_topline(fd_form_toc->browser_toc, topline); - fl_show_object(fd_form_toc->browser_toc); -} - - -/* callbacks for form form_ref */ -extern "C" void RefSelectCB(FL_OBJECT *, long data) -{ - if (!current_view->available()) - return; - - string s = - fl_get_browser_line(fd_form_ref->browser_ref, - fl_get_browser(fd_form_ref->browser_ref)); - string u = frontStrip(strip(fl_get_input(fd_form_ref->ref_name))); - - if (s.empty()) - return; - - if (data == 2) { - current_view->owner()->getLyXFunc()->Dispatch(LFUN_REFGOTO, s.c_str()); - return; - } - - string t; - if (data == 0) - t += "\\ref"; - else - t += "\\pageref"; - - if(current_view->buffer()->isSGML()) - t += "[" + u + "]" + "{" + s + "}"; - else - t += "{" + s + "}"; - - Inset * new_inset = - new InsetRef(t, current_view->buffer()); - current_view->buffer()->insertInset(new_inset); -} - - -extern "C" void RefUpdateCB(FL_OBJECT *, long) -{ - if (!current_view->available()) { - fl_clear_browser(fd_form_ref->browser_ref); - return; - } - - FL_OBJECT * brow = fd_form_ref->browser_ref; - - // Get the current line, in order to restore it later - char const * const btmp = fl_get_browser_line(brow, - fl_get_browser(brow)); - string currentstr = btmp ? btmp : ""; - - fl_clear_browser(brow); - - string refs = current_view->buffer()->getReferenceList('\n'); - int topline = 1; - -#if FL_REVISION > 85 - fl_addto_browser_chars(brow, refs.c_str()); - int total_lines = fl_get_browser_maxline(brow); - for (int i = 1; i <= total_lines ; i++) { - if (fl_get_browser_line(brow, i) == currentstr) { - topline = i; - break; - } - } - fl_set_browser_topline(brow, topline); -#else - // Keep the old ugly code for xforms 0.81 compatibility - string curr_ref; - int ref_num = 0; - - while(true) { - curr_ref = refs.token('\n', ref_num); - if (curr_ref.empty()) - break; - fl_add_browser_line(brow, curr_ref.c_str()); - ref_num++; - } -#endif - - if (!fl_get_browser_maxline(brow)) { - fl_add_browser_line(brow, - _("*** No labels found in document ***")); - fl_deactivate_object(brow); - } else { - fl_select_browser_line(brow, topline); - fl_activate_object(brow); - } - if (current_view->buffer()->isReadonly()) { - // would be better to de/activate insert buttons - // but that's more work... besides this works. ARRae - fl_hide_form(fd_form_ref->form_ref); - } - if (!current_view->buffer()->isSGML()) { - fl_deactivate_object(fd_form_ref->ref_name); - fl_set_object_lcol(fd_form_ref->ref_name, FL_INACTIVE); - } - else { - fl_activate_object(fd_form_ref->ref_name); - fl_set_object_lcol(fd_form_ref->ref_name, FL_BLACK); - } -} - - -extern "C" void RefHideCB(FL_OBJECT *, long) -{ - fl_hide_form(fd_form_ref->form_ref); -} - - -// candidate for move to BufferView -void UpdateInset(Inset * inset, bool mark_dirty) -{ - if (!inset) - return; - - /* very first check for locking insets*/ - if (current_view->buffer()->the_locking_inset == inset){ - if (current_view->text->UpdateInset(inset)){ - current_view->update(); - if (mark_dirty){ - if (current_view->buffer()->isLyxClean()) - current_view->owner()->getMiniBuffer()->setTimer(4); - current_view->buffer()->markDirty(); - } - current_view->updateScrollbar(); - return; - } - } - - /* first check the current buffer */ - if (current_view->available()){ - current_view->getScreen()->HideCursor(); - current_view->update(-3); - if (current_view->text->UpdateInset(inset)){ - if (mark_dirty) - current_view->update(1); - else - current_view->update(3); - return; - } - } - - // check all buffers - bufferlist.updateInset(inset, mark_dirty); - -} - - -// candidate for move to BufferView -/* these functions return 1 if an error occured, - otherwise 0 */ -int LockInset(UpdatableInset * inset) -{ - if (!current_view->buffer()->the_locking_inset && inset){ - current_view->buffer()->the_locking_inset = inset; - return 0; - } - return 1; -} - - -// candidate for move to BufferView -void ShowLockedInsetCursor(long x, long y, int asc, int desc) -{ - if (current_view->buffer()->the_locking_inset && - current_view->getScreen()){ - y += current_view->text->cursor.y; - current_view->getScreen()->ShowManualCursor(x, y, - asc, desc); - } -} - - -// candidate for move to BufferView -void HideLockedInsetCursor(long x, long y, int asc, int desc) -{ - if (current_view->buffer()->the_locking_inset && - current_view->getScreen()){ - y += current_view->text->cursor.y; - current_view->getScreen()->HideManualCursor(x, y, - asc, desc); - } -} - - -// candidate for move to BufferView -void FitLockedInsetCursor(long x, long y, int asc, int desc) -{ - if (current_view->buffer()->the_locking_inset && - current_view->getScreen()){ - y += current_view->text->cursor.y; - if (current_view->getScreen()->FitManualCursor(x, y, asc, desc)) - current_view->updateScrollbar(); - } -} - - -// candidate for move to BufferView -int UnlockInset(UpdatableInset * inset) -{ - if (inset && - current_view->buffer()->the_locking_inset == inset){ - inset->InsetUnlock(); - current_view->buffer()->the_locking_inset = 0; - current_view->text->FinishUndo(); - return 0; - } - return bufferlist.unlockInset(inset); -} - - -// candidate for move to BufferView -void LockedInsetStoreUndo(Undo::undo_kind kind) -{ - if (!current_view->buffer()->the_locking_inset) - return; // shouldn't happen - if (kind == Undo::EDIT) // in this case insets would not be stored! - kind = Undo::FINISH; - current_view->text->SetUndo(kind, - current_view->text->cursor.par-> - ParFromPos(current_view->text->cursor.pos)->previous, - current_view->text->cursor.par-> - ParFromPos(current_view->text->cursor.pos)->next); -} - - -void PutInsetIntoInsetUpdateList(Inset * inset) -{ - if (inset) { - InsetUpdateStruct * tmp = new InsetUpdateStruct(); - tmp->inset = inset; - tmp->next = InsetUpdateList; - InsetUpdateList = tmp; - } -} - - -void UpdateInsetUpdateList() -{ - InsetUpdateStruct * tmp = InsetUpdateList; - while (tmp) { - UpdateInset(tmp->inset, false); // "false" because no document change - tmp = tmp->next; - } - - // delete the update list - while (InsetUpdateList) { - tmp = InsetUpdateList; - InsetUpdateList = InsetUpdateList->next; - delete tmp; - } - InsetUpdateList = 0; -} - - -#ifdef WITH_WARNINGS -#warning UGLY!! -#endif -// I know we shouldn't put anything in here but this seems the fastest -// way to do this (and the cleanest for now). This function just inserts -// a newline in the string and the inserts 'depth'-spaces so that the -// code is indented in the right way!!! -void addNewlineAndDepth(string & file, int const depth) -{ - file += '\n'; - file.append(depth, ' '); -}