Commit Graph

3010 Commits

Author SHA1 Message Date
Richard Heck
3f27f951cb This is intended to be a pure renaming of the Inset::name() routine,
preparatory to fixing #7080. Note that mathed uses the same routine, but
for a completely different purpose, so I did not rename it there. I have
seen no difference in behavior after testing, e.g., opening and
exporting Math.lyx, and also re-saving it and looking at the diff.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38109 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 22:33:04 +00:00
Georg Baum
dd23151da9 Fix part 1 of bug #7351
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38017 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 21:05:44 +00:00
Georg Baum
85df237aff fix bug 7351 part 3: Do not count inline formulas for eqn number counter
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37976 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-20 12:12:08 +00:00
Vincent van Ravesteijn
49459f6fc4 Fix bug #7345: Crash when right clicking on displayed math with selection
Two things have been fixed here:
1) the selection should not be cleared when the user right clicks a math inset that is part of the selection,
2) the type of context menu should be determined at mouse-press, because that is the moment when the cursor is set. However, we should do it after setting the cursor, because setting the cursor might change the selection status and this influences the choice for the type of context menu.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37961 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 13:14:13 +00:00
Enrico Forestieri
6d425078a7 When an error occurs, don't highlight more than necessary.
Currently, if an inset outputs a newline, the new latex row is still
associated with a previous id/pos. Now, if a latex error occurs before
this newline, we would still highlight everything associated to that
id/pos, even if it is extraneous to the error.
This is avoided by associating the new latex row with the id/pos in
effect right before entering the inset. If an inset does not output
a newline, it is not excluded from the selection, consistent with the
fact that the text of the inset does appear in the error description.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37903 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-12 01:40:01 +00:00
Georg Baum
f176a18434 Fix bug #6919 by splitting Inset::noFontChange() into inheritFont() and
resetFontEdit(). The former is used for on-screen and export formatting,
and the latter is used for interactive editing.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37761 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-22 19:41:04 +00:00
Vincent van Ravesteijn
5036ca8500 Constify InsetMathNest::setMouseHover and remove the const_cast from BufferView.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37632 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-13 10:07:00 +00:00
Vincent van Ravesteijn
77292f028d Remove unimplemented function declaration.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37630 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-13 10:02:00 +00:00
Pavel Sanda
2f572f7a28 Rest of gcc 4.6 issues from Orion Poplawski.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37604 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-12 22:10:56 +00:00
Peter Kümmel
b9b6c12782 compile.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37591 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 22:57:41 +00:00
Enrico Forestieri
d866717ef7 Integrate texrow with otexstream in order to perform automatic line
counting when exporting to latex. This is done for the code comprised
between \begin{document} and \end{document}, while the preamble code
still needs manual calls to TexRow::newline() for registering new lines.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37584 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 20:02:48 +00:00
Enrico Forestieri
1ef605f625 Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
Georg Baum
3d4f76cf2d Fix bug #7252
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37288 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-21 19:18:27 +00:00
Richard Heck
790f75759b This should be const.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37203 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-13 18:30:24 +00:00
Richard Heck
4b1777d2fa Inset::addToToc() can and should be const. It wasn't, I take it, because
of things like:
  pit.push_back(CursorSlice(*this));
which I've had to change to:
  pit.push_back(CursorSlice(const_cast<InsetCaption &>(*this)));
and similarly in a few other places.

If anyone thinks we should instead have:
  explicit CursorSlice(Inset const &);
then we can also do that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37192 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 22:23:27 +00:00
Richard Heck
645f9fdf6d Fix bug #6894. We save counter information during updateBuffer(), and
then output \setcounter macros during snippet generation, so that we get
the right equation values.

Note: It would be possible to use this same machinery to fix bugs in
instant preview, e.g., that you always get things like (0.3) as equation
numbers, if you use equations numbered by section. I'll perhaps post a
patch for that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37186 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 16:04:59 +00:00
Richard Heck
f1a54ebe18 Complete fix for bug #7225.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37185 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 13:50:46 +00:00
Richard Heck
f3c472e769 Remove obsolete comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37184 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 13:40:47 +00:00
Richard Heck
68c43a2b18 XHTML output was a mess for grids output as LaTeX. This will probably
still be a mess in many cases, but hopefully we won't have to go here
very often.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37181 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 23:55:20 +00:00
Richard Heck
fe9aabf34a Fix equation number output for MathML+HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37180 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 23:34:59 +00:00
Richard Heck
7ef3d12a80 Fix equation number output for XHTML+MathML. HTML to come.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37179 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 23:18:56 +00:00
Richard Heck
47ca44e296 Record and use equation numbers. This is towards getting equation
numbering in XHTML output, but it's just as easy to fix this in the LyX
display.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37177 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 19:35:52 +00:00
Vincent van Ravesteijn
bd3d6369c2 Fix bug #7106: iterator out of range while copying multi-row math.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37108 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-04 19:43:52 +00:00
Enrico Forestieri
9687f9beb6 Correctly show in italic shape the uppercase greek letters inserted in
a \mathit inset.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37060 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-01 19:24:16 +00:00
Stephan Witt
ab9de435b4 fix typo: double semicolon at line end of code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36985 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-21 15:28:55 +00:00
Richard Heck
9e9c96035c Finish disentangling tocString(). We introduce a new method, forToc(),
that also makes sure it doesn't do more work than it needs to do, by
limiting the size to 40 characters. Previously, InsetBranch::addToToc()
would have added a string representing the entire contents of the
branch! It's hard to imagine that having to recalculate that sort of
thing doesn't cause some problems with speed, especially in documents
with lots of notes and branches and such.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36974 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 21:55:09 +00:00
Enrico Forestieri
8b88c3edde Refine fix for bug #7183.
Using updateMacros() entails a performance hit when loading a document
with really a lot of macros. So, revert to the original strategy of
tracking macros at creation time. In order to also account for macros
defined in a child document, the child is now loaded by the include inset
at construction time instead of after the master has finished loading.
This strategy mimics what updateMacros() was accomplishing without
incurring in its drawbacks, such that loading time is practically
unchanged even with a thousand macros.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 18:15:39 +00:00
Enrico Forestieri
280f7a7ced Fix bug #7183 (User math macros defined in child documents are shadowed on loading)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36930 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 02:27:25 +00:00
Stephan Witt
d2c3a5c727 fix compiler warnings in pedantic mode: remove trailing comma after last enum member
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36925 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-17 20:51:44 +00:00
Richard Heck
832d6cd7e1 Begin undoing the tocString() mess by renaming that routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36889 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-15 01:34:04 +00:00
Pavel Sanda
e1636b9f24 Report disabled BREAK_PARAGRAPH in MathHull getStatus so we can use command-alternatives.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36882 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-14 17:33:38 +00:00
Enrico Forestieri
116c20a203 Trying to be too smart by reducing the number of regenerated previews, may
cause to miss some regeneration. So, better too much than less.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36872 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-13 22:20:29 +00:00
Enrico Forestieri
f3e3655091 Really fix bug #7090.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36857 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-13 04:46:39 +00:00
Enrico Forestieri
14cbb6cb3d Fix bug #7090 (Segfault in refreshing instant preview when math macro changes)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36832 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-11 18:15:34 +00:00
Jean-Marc Lasgouttes
838af80834 Try to finally fix #6930. All the paths that did not come from context
menus were (intentionally) missing, and it turns out they were needed.

Normally all invocations of INSET_MODIFY should trigger a recordUndo now.
Of course all cases have not been tested, but it should be working.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36770 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-08 09:24:04 +00:00
Georg Baum
4736356bf9 fix remaining bits of bug #6709
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36718 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-04 16:43:41 +00:00
Vincent van Ravesteijn
328e8b2627 Fix bug #2100: No display equations allowed in a non-fixed width tabular cell.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36673 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 02:44:16 +00:00
Vincent van Ravesteijn
36986009d1 Fix bug #4849: Split cell always enabled in (context) menu.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36622 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-30 09:32:30 +00:00
Vincent van Ravesteijn
e7f2bbe1ee Rename InsetXXX::contextMenu to InsetXXX::contextMenuName. Now this function doesn't need all the parameters and we split the functionality of choosing which context menu to return, from the functionality of supplying the name for the Inset itself. Now, the InsetText context menu is returned for InsetCollapsables when the button is not hit by the mouse. There is no (intended) change in functionality for insets without a button, collapsed insets. This fixes partly bug #6642. A fix for InsetTabular and for insets with no button will follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36604 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 21:27:25 +00:00
Jean-Marc Lasgouttes
574931dcdb Fix bug #6930: no undo for inset type changing
THis is a consequence of the new AtPoint mechanism. In the old
world, recordUndoInset was called before INSET_MODIFY. I reintroduced
manual recordUndoInset calls in all places that matter. I suspect
that this issue should be revisited later.

Note that recordUndoInset can now take an optional parameter that tells
what inset is concerned. This is useful because the cursor can be
either just inside the inset or in front of it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36580 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 09:47:46 +00:00
Uwe Stöhr
5524485856 InsetMathSubstack.cpp: fix #2498
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36567 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 03:18:02 +00:00
Georg Baum
c8ec2c0a03 Fix bug #7088
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36557 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 17:16:11 +00:00
Vincent van Ravesteijn
f27853ad41 Cosmetics, typos and comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36492 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 16:53:56 +00:00
Uwe Stöhr
f69929850d InsetMathGrid.cpp: whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36471 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 05:04:38 +00:00
Richard Heck
a81bf77314 Change the escaping mechanism for XHTML output and so allow a fix for
bug #7061.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36455 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-24 15:27:36 +00:00
Georg Baum
7edd656f21 Fix inserting subscript/superscript with nonempty selection by creating a dedicated lfun:
inset-insert simply swallows the selection, while box-insert, note-insert etc.
put the selection inside the new inset.
As a side effect the toolbar icons get better names, as requested by Uwe.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36451 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-23 20:09:08 +00:00
Enrico Forestieri
d43cdfa5ef Fix bug #7058 (Crash when invoking CAS on a multiline AMS context)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36447 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-23 15:36:58 +00:00
Georg Baum
d89bde0652 Load mhchem if it is requested unconditionally, fix some typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36425 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 18:07:04 +00:00
Georg Baum
dea050cb93 fix bug 3008: Add subscript/superscript inset for text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36424 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 17:00:12 +00:00
Richard Heck
ff79d11bb7 Style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36398 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-19 13:27:51 +00:00
Richard Heck
b9e83e76ca Another warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36387 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 22:02:46 +00:00
Richard Heck
60da156ffd Squash some warnings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36386 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 22:01:54 +00:00
Enrico Forestieri
a1927c00d2 Correctly set the breakline guard.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36381 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 21:15:59 +00:00
Enrico Forestieri
6e41d3006d Output end of math environments at the beginning of a new line,
as now this should be blank line safe.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36372 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 14:20:19 +00:00
Enrico Forestieri
8cd4ef18c8 Make sure that no blank line can (unintentionally) slip in when exporting
math to latex. This also fixes bug #6733.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36371 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 14:05:50 +00:00
Enrico Forestieri
04fb3f0d06 Remove a MathStream and HtmlStream member which is used nowhere.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36368 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-18 09:58:35 +00:00
Richard Heck
da1e7e14ce Squash warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36159 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 03:17:23 +00:00
Enrico Forestieri
79ef98205d Fix bug #7019 (Math labels should not be escaped on saving)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36156 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 02:53:29 +00:00
Vincent van Ravesteijn
dad3c8ce74 Fix compilation for platforms besides Windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35948 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-31 14:39:50 +00:00
Vincent van Ravesteijn
aafe985042 Remove the now unused parameter of createDialogStr();
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35892 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 00:42:40 +00:00
Vincent van Ravesteijn
c5b9664476 Remove the name parameter from string2params and params2string. We can always derive the name with insetName(params.code()).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35891 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 00:25:28 +00:00
Enrico Forestieri
3ebcbf5b32 Fix bug #6965 (Crash editing ERT in math mode)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35879 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-28 11:13:47 +00:00
Vincent van Ravesteijn
49beed7437 Fix bug #6989: Be somewhat more secure with the homebrew dynamic asserts that were changed in r35855.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35863 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-27 07:04:58 +00:00
Vincent van Ravesteijn
07924ac300 Remove some unnecessary static_casts and add two FIXMEs about casts that don't look safe.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35856 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 16:45:21 +00:00
Vincent van Ravesteijn
573500dd04 Remove unneccessary uses of dynamic_cast from the code.
A dynamic_cast is necessary when:

- the object to be casted is from an external library because we can't add Qxxx::asXxxx() to Qt e.g.:
    * QAbstractListModel to GuiIdListModel,
    * QValidator to PathValidator,
    * QWidget to TabWorkArea,
    * QWidget to GuiWorkArea;

- the object is to be casted from an interface to the implementing class, because the Interface does not know by whom it is implemented:
    * ProgressInterface to GuiProgress,
    * Application to GuiApplication.

A dynamic_cast can be replaced by:
  - already existing as***Inset() functions, e.g.:
    * asHullInset(),
    * asInsetMath()->asMacro(),
    * asInsetText();

  - a static_cast when we are sure this can't go wrong, e.g.:
    * we are sure that CellData::inset->clone() is an InsetTableCell,
    * in cases where we explicitly check it->lyxCode().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35855 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 15:03:51 +00:00
Vincent van Ravesteijn
8693ae474b Proper implementatiom of isInToc()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35846 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 01:10:19 +00:00
Enrico Forestieri
f967cd1c45 Proper fix for #6967 that does not reintroduce #6793
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35841 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 21:36:25 +00:00
Vincent van Ravesteijn
8a550ba48a I don't like negated logic. Especially not if it leads to the use of more !-operations.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35801 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-24 17:27:32 +00:00
Vincent van Ravesteijn
70ed1095ec Fix bug #6967: Insert->Display Math should not insert a numbered formula and vice versa.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35799 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-24 16:12:22 +00:00
Vincent van Ravesteijn
152491f916 Some cosmetics (from my local cosmetics branch).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35708 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-18 14:20:03 +00:00
Richard Heck
6a80ce62ca DispatchResult::update() ==> DispatchResult::screenUpdate()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35631 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 17:28:55 +00:00
Pavel Sanda
65962da47b Add support for feyn package and Diagram inset.
Patch from Ronen Abravanel.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg161952.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35455 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-19 22:12:06 +00:00
Enrico Forestieri
0dec044864 If system colors are used, paint selected math in Color_selectiontext
instead of Color_math.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35355 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-13 01:36:00 +00:00
Jean-Marc Lasgouttes
6d4709d46c Sanitize ColorChanger
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35331 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-09 13:02:20 +00:00
Uwe Stöhr
3ee100f47d MathSupport.cpp:
- fix metrics of the dots of \ddddot
- whitespace fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35231 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-29 22:59:24 +00:00
Uwe Stöhr
7d68833dc9 remove unused include of FuncRequest
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35189 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-24 03:07:09 +00:00
Enrico Forestieri
7238d40c99 Move code to more proper place.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35180 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-19 22:50:06 +00:00
Enrico Forestieri
fa0cd9ad60 Fix bug #6793: Changing an existing formula type to displayed formula loses the label
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35178 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-19 13:58:36 +00:00
Enrico Forestieri
66808b0482 Avoid memory leak when the label is on the first row.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35168 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-19 08:17:36 +00:00
Enrico Forestieri
97fb94d90f Fix crash when mutating eqnarray-like environments with labeled lines
to display equations.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35163 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-19 07:28:49 +00:00
Enrico Forestieri
87f155767a Better fix for bug #6851.
The old-style font changing macros really inherit the mode, so we have
to account for this.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35156 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-14 17:57:06 +00:00
Enrico Forestieri
61791114a1 Fix bug #6851: Wrong screen fonts with old style macros such as \bf and \rm.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35136 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-14 00:22:04 +00:00
Jean-Marc Lasgouttes
60445ede53 remove unused headers
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35129 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-12 09:38:22 +00:00
Richard Heck
56c500bae5 Update comments a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35035 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 16:55:02 +00:00
Richard Heck
a7f7530bd2 MathML and HTML definitely can't handle MathUnknown!!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35028 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:48:01 +00:00
Richard Heck
f1d941098c MathML and HTML can't handle XYArrow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35027 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:46:26 +00:00
Richard Heck
b520657039 HTML for xarrows.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35026 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:44:17 +00:00
Richard Heck
c8bc76b333 MathML and HTML definitely can't handle XYMatrix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35025 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:38:01 +00:00
Richard Heck
7a8a1eca21 Framework for math export exceptions. We can throw these if we find
something we don't know how to handle and fall back to images.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35024 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:37:42 +00:00
Richard Heck
e48fb0b661 Allow images to be export even when LyXRC says no previews.
I'll try to figure out how to get rid of the magic booleans.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35022 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:17:58 +00:00
Richard Heck
833ef6352f Comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35021 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 14:29:54 +00:00
Enrico Forestieri
0d78b79311 Refine fix for bug #1337.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35009 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-23 07:34:26 +00:00
Enrico Forestieri
976307231d Fix bug #1337: LyX confused on $ symbol in math equations
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35008 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-22 23:19:52 +00:00
Richard Heck
3d6fb3bd1d Try again with LaTeX output for XHTML math.
The previous attempt messed up the inheritance hierarchy somehow. I
think.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35002 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-22 02:47:12 +00:00
Richard Heck
80aca38970 Partially revert r34995, which broke math output. Not sure why yet....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35001 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-22 02:20:12 +00:00
Richard Heck
9803d7a2a6 Prepare for the use of exceptions to catch occasions when we can't
export as MathML, etc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34996 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 14:02:46 +00:00
Richard Heck
c036ecb649 Tweak the math-as-LaTeX output, including the correct tags for jsMath.
We don't yet write info to load the jsMath files, though.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34995 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 13:43:35 +00:00
Richard Heck
e7bb1e616e Re-organize code from a last commit a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34994 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 13:26:48 +00:00
Richard Heck
b8d43b05bc Support for exporting math as images with XHTML. The next step is to
allow this as a fallback. E.g., if we're unable to export as MathML,
then we try to export as an image.

There are several ways, I am sure, in which this implementation is not
ideal.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34993 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 13:19:52 +00:00
Richard Heck
096cf9f2e8 Whitespace only (two tabs at end of each line?).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34991 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-20 19:45:36 +00:00
Uwe Stöhr
72292b98a6 support for formal math script
- fileformat change
- fixes #2340

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34941 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 15:51:11 +00:00
Pavel Sanda
3e64ec2c9d comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34925 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 09:53:29 +00:00
Richard Heck
5577e877bb Try to move all updateBuffer() calls to a central location. We now use
DispatchResult to store a flag that tells us whether we need a buffer
update or not. 

So: If you find a missing one, go to an appropriate place in the
dispatch and call cur.forceBufferUpdate() or, if you don't have a cursor
but do have a DispatchResult, call dr.forceBufferUpdate().

There is one remaining call I could not move, in
TextMetrics::redoParagraph. But this looks like an emergency call when
the macro context has not been set. There are also a couple calls that
are connected with buffer creation that I commented out, since the same
call is done again almost immediately. But I'm not positive about those.

Now the nice thing would be to do the same for updateMacros().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34826 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 14:37:00 +00:00
Richard Heck
0e14f379f3 Rename a couple routines. This will avoid confusion with a forthcoming
patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34816 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 20:04:35 +00:00
Enrico Forestieri
67f6e68e8d Add last missing inner-hull grid type environments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34766 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 17:30:03 +00:00
Enrico Forestieri
7049447fd7 Correct refinement fix for #6595. The problem was not adding \\ to the last
empty line of substack, tabular and xymatrix, but not calling delEmptyLastRow
for them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34763 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 12:31:18 +00:00
Enrico Forestieri
d546a9b286 Revert r34761 because that was not the right fix that is going to be
committed shortly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34762 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 12:25:48 +00:00
Enrico Forestieri
7eeb664bbb Refine fix for #6595. Don't add \\ to the last empty line of substack,
tabular and xymatrix.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34761 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 10:03:56 +00:00
Enrico Forestieri
d9ddc95ab8 Refine fix for #6595. It turns out that the last empty line is to be
deleted not only for "array" but also for all inner-hull grid types.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34752 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-04 18:08:14 +00:00
Enrico Forestieri
9536afe742 Fix bug #6595: empty last row of matrix or eqnarray vanishes.
This patch essentially reverts r30795 and also provides the correct fix
for #2969.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34751 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-04 16:31:53 +00:00
Enrico Forestieri
0c26995be6 Fix bug #6756: import problem with \ (no space following)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34638 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 20:13:11 +00:00
Richard Heck
81228c90fc Fix bug #6759. Thanks to Vincent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34637 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 17:02:55 +00:00
Stephan Witt
2052c1e7cc correct in LFUN_MATH_NUMBER_TOGGLE the conversion of display state to enabled state
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34634 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 12:04:25 +00:00
Enrico Forestieri
fe7196a545 The delimiters '<' and '>' can also be used as big delimiters. They are
equivalent to \langle and \rangle, which were already taken into account.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34607 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-06 18:11:15 +00:00
Enrico Forestieri
e0a5cda787 Add GUI support for big delimiters variants without 'l', 'm' or 'r' endings.
They differ from their cousins only for the space left around them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34604 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-06 00:42:33 +00:00
Enrico Forestieri
41db28dd45 Fix bug #6739: Loading in a 1.6.5 file causes 1.6.6-1 to crash
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34563 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 23:20:30 +00:00
Enrico Forestieri
a2d888496b Still white space.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34562 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 23:12:07 +00:00
Enrico Forestieri
c4faa16f20 Only white space.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34561 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 23:02:04 +00:00
Uwe Stöhr
106d31cd67 InsetMathHull.h: fix typo in comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34445 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-22 00:46:57 +00:00
Enrico Forestieri
cf1f59dd4d Fix bug #6678: Crash when undoing backspace inside math-macro
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34370 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-04 16:16:20 +00:00
Vincent van Ravesteijn
86eaa6de73 Another base class without a virtual destructor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34362 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-03 22:55:40 +00:00
Enrico Forestieri
7d4ca5033e Implement LFUN_UNICODE_INSERT in mathed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34351 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-30 22:23:19 +00:00
Vincent van Ravesteijn
708b73cab7 Fix bug #3900: Mathed corners displayed without mouse hover.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34348 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-30 14:55:37 +00:00
Vincent van Ravesteijn
4c611e5745 Mouse hover property should be dependent on the specific bufferview. If there are 2 views showing the same buffer, an Inset can be shown as hovered in only one view.
This is also in preparation of a decent fix for bug #3900.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34347 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-30 14:47:46 +00:00
Enrico Forestieri
9b3aadbe22 Don't hardcode Color_math, such that decorations and other math
elements can be drawn in the right color on screen.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34326 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-28 13:19:09 +00:00
Enrico Forestieri
beb3fa70e8 Also account for colors in math macros.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34325 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-28 11:38:01 +00:00
Enrico Forestieri
d9bcbe5de6 Index: src/mathed/InsetMathEnsureMath.cpp
===================================================================
--- src/mathed/InsetMathEnsureMath.cpp	(revisione 34304)
+++ src/mathed/InsetMathEnsureMath.cpp	(copia locale)
@@ -13,8 +13,9 @@
 
 #include "InsetMathEnsureMath.h"
 
-#include "MathStream.h"
 #include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 
 #include <ostream>
 
@@ -34,7 +35,8 @@ Inset * InsetMathEnsureMath::clone() con
 
 void InsetMathEnsureMath::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "mathnormal");
+	bool really_change_font = isTextFont(from_ascii(mi.base.fontname));
+	FontSetChanger dummy(mi.base, "mathnormal", really_change_font);
 	cell(0).metrics(mi, dim);
 	metricsMarkers(dim);
 }
@@ -42,7 +44,8 @@ void InsetMathEnsureMath::metrics(Metric
 
 void InsetMathEnsureMath::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, "mathnormal");
+	bool really_change_font = isTextFont(from_ascii(pi.base.fontname));
+	FontSetChanger dummy(pi.base, "mathnormal", really_change_font);
 	cell(0).draw(pi, x, y);
 	drawMarkers(pi, x, y);
 }


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34321 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-28 01:58:11 +00:00
Enrico Forestieri
6c33aa2e5b Index: src/mathed/InsetMathHull.cpp
===================================================================
--- src/mathed/InsetMathHull.cpp	(revisione 34304)
+++ src/mathed/InsetMathHull.cpp	(copia locale)
@@ -328,6 +328,23 @@ docstring InsetMathHull::standardFont()
 }
 
 
+docstring InsetMathHull::standardColor() const
+{
+	docstring color;
+	switch (type_) {
+	case hullRegexp:
+		color = from_ascii("foreground");
+		break;
+	case hullNone:
+		color = from_ascii("foreground");
+		break;
+	default:
+		color = from_ascii("math");
+	}
+	return color;
+}
+
+
 bool InsetMathHull::previewState(BufferView * bv) const
 {
 	if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
@@ -417,8 +434,11 @@ void InsetMathHull::draw(PainterInfo & p
 		return;
 	}
 
+	bool const really_change_color = pi.base.font.color() == Color_none;
+	ColorChanger dummy0(pi.base.font, standardColor(), really_change_color);
 	FontSetChanger dummy1(pi.base, standardFont());
 	StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+
 	InsetMathGrid::draw(pi, x + 1, y);
 
 	if (numberedType()) {
Index: src/mathed/MathSupport.cpp
===================================================================
--- src/mathed/MathSupport.cpp	(revisione 34311)
+++ src/mathed/MathSupport.cpp	(copia locale)
@@ -653,6 +653,13 @@ bool isMathFont(docstring const & name)
 }
 
 
+bool isTextFont(docstring const & name)
+{
+	fontinfo * f = lookupFont(name);
+	return f && f->color_ == Color_foreground;
+}
+
+
 FontInfo getFont(docstring const & name)
 {
 	FontInfo font;
Index: src/mathed/MathSupport.h
===================================================================
--- src/mathed/MathSupport.h	(revisione 34311)
+++ src/mathed/MathSupport.h	(copia locale)
@@ -51,6 +51,8 @@ bool isFontName(docstring const & name);
 
 bool isMathFont(docstring const & name);
 
+bool isTextFont(docstring const & name);
+
 // converts single cell to string
 docstring asString(MathData const & ar);
 // converts single inset to string
Index: src/mathed/InsetMathHull.h
===================================================================
--- src/mathed/InsetMathHull.h	(revisione 34304)
+++ src/mathed/InsetMathHull.h	(copia locale)
@@ -197,6 +197,8 @@ private:
 	void changeCols(col_type);
 	///
 	docstring standardFont() const;
+	///
+	docstring standardColor() const;
 	/// consistency check
 	void check() const;
 	/// can this change its number of rows?
Index: src/MetricsInfo.cpp
===================================================================
--- src/MetricsInfo.cpp	(revisione 34312)
+++ src/MetricsInfo.cpp	(copia locale)
@@ -235,11 +235,15 @@ FontSetChanger::FontSetChanger(MetricsBa
 		save_ = mb;
 		FontSize oldsize = save_.font.size();
 		ColorCode oldcolor = save_.font.color();
+		docstring const oldname = from_ascii(save_.fontname);
 		mb.fontname = name;
 		mb.font = sane_font;
 		augmentFont(mb.font, from_ascii(name));
 		mb.font.setSize(oldsize);
-		mb.font.setColor(oldcolor);
+		if (string(name) != "lyxtex"
+		    && ((isTextFont(oldname) && oldcolor != Color_foreground)
+			|| (isMathFont(oldname) && oldcolor != Color_math)))
+			mb.font.setColor(oldcolor);
 	}
 }
 
@@ -252,11 +256,15 @@ FontSetChanger::FontSetChanger(MetricsBa
 		save_ = mb;
 		FontSize oldsize = save_.font.size();
 		ColorCode oldcolor = save_.font.color();
+		docstring const oldname = from_ascii(save_.fontname);
 		mb.fontname = to_utf8(name);
 		mb.font = sane_font;
 		augmentFont(mb.font, name);
 		mb.font.setSize(oldsize);
-		mb.font.setColor(oldcolor);
+		if (name != "lyxtex"
+		    && ((isTextFont(oldname) && oldcolor != Color_foreground)
+			|| (isMathFont(oldname) && oldcolor != Color_math)))
+			mb.font.setColor(oldcolor);
 	}
 }
 
@@ -294,17 +302,21 @@ WidthChanger::~WidthChanger()
 //
 /////////////////////////////////////////////////////////////////////////
 
-ColorChanger::ColorChanger(FontInfo & font, string const & color)
-	: Changer<FontInfo, string>(font)
+ColorChanger::ColorChanger(FontInfo & font, docstring const & color,
+			   bool really_change_color)
+	: Changer<FontInfo, ColorCode>(font), change_(really_change_color)
 {
-	save_ = lcolor.getFromLyXName(color);
-	font.setColor(lcolor.getFromLyXName(color));
+	if (change_) {
+		save_ = font.color();
+		font.setColor(lcolor.getFromLyXName(to_utf8(color)));
+	}
 }
 
 
 ColorChanger::~ColorChanger()
 {
-	orig_.setColor(lcolor.getFromLyXName(save_));
+	if (change_)
+		orig_.setColor(save_);
 }
 
 
Index: src/MetricsInfo.h
===================================================================
--- src/MetricsInfo.h	(revisione 34312)
+++ src/MetricsInfo.h	(copia locale)
@@ -222,12 +222,16 @@ public:
 
 
 // temporarily change the used color
-class ColorChanger : public Changer<FontInfo, std::string> {
+class ColorChanger : public Changer<FontInfo, ColorCode> {
 public:
 	///
-	ColorChanger(FontInfo & font, std::string const & color);
+	ColorChanger(FontInfo & font, docstring const & color,
+		     bool really_change_color = true);
 	///
 	~ColorChanger();
+private:
+	///
+	bool change_;
 };
 
 } // namespace lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34320 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-28 01:40:11 +00:00
Enrico Forestieri
c88eaf877e Changing only the shape does not always work. For example,
\mathbb{\underbar{a}} is not correctly rendered on screen.
We really have to change the font set, but not always.
This cannot be done using an "if" statement, as when
the FontSetChanger scope ends, everything is restored,
defeating our change. Thus, this has to be done in the
FontSetChanger class itself. This is easily accomplished
by introducing a boolean with a default value of true
for really changing a font set.
This will also be useful in other cases that I am discovering.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34312 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-27 21:31:28 +00:00
Enrico Forestieri
dbb5ac93ea The check for Color_math would fail if the font color is changed
in mathed, so implement a strategy which is immune to color changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34311 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-27 19:23:31 +00:00
Enrico Forestieri
17af3ea8f4 Change only the shape and not the whole font, otherwise constructs
such as \mathbf{\hat{a}} would not be correctly rendered on screen.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34297 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-26 20:20:49 +00:00
Peter Kümmel
38628558a6 cmake: more merged build fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34274 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-23 09:10:35 +00:00
Peter Kümmel
61b2bd5e7f Using "using namespace std" with msvc10 makes also std::tr1::bind visible and generates conflicts with boost::bind.
Solution: don't use boost::bind for msvc10 (could also be extended  to several GCC versions)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34257 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-22 11:16:58 +00:00
Pavel Sanda
62ca7f3ae5 Proper camel case for FileName.absFilename
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:09 +00:00
Vincent van Ravesteijn
108a67ed43 Make Cursor::anchor_ private and make an access function Cursor::realAnchor() to stress the fact that this is thus not the normalAnchor().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34146 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-15 18:16:07 +00:00
Vincent van Ravesteijn
8156884090 Make Cursor::disp_ private as it should be.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34144 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-15 17:34:34 +00:00
Richard Heck
b79d8e5e2d Make members of FuncRequest private, per the FIXME there. Again, this is
basically a massive renaming, with no real changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34106 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 19:00:42 +00:00
Richard Heck
4c7a5d0024 This is just a giant renaming of member variables in FuncRequest,
preparatory to making them private.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34105 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 18:15:17 +00:00
Vincent van Ravesteijn
333c17f879 Fix bug #6633: Equations that end in \limits or \nolimits are corrupted on load.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34025 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-02 15:22:50 +00:00
Richard Heck
1eb8311aff HTML for binomials.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33995 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 21:33:33 +00:00
Richard Heck
c7cfcf9e2f Make sure to call the parent's validate method.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33992 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 21:24:16 +00:00
Richard Heck
6a702a2f99 HTML for substack. Sort of. There's an odd problem here, that is
actually a general LyX bug, but I'll report that to the list.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33991 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 21:17:30 +00:00
Richard Heck
bf76659e67 Revert r33989. We do need this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33990 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 21:02:10 +00:00
Richard Heck
bab268352b HTML for stackrel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33989 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:54:27 +00:00
Richard Heck
85425d8e6c HTML for InsetMathSplit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33988 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:50:29 +00:00
Richard Heck
ae69c7c63c HTML for special characters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33987 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:49:21 +00:00
Richard Heck
da26079578 HTML for math spaces.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33986 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:47:55 +00:00
Richard Heck
f3711d8a65 HTML for math sizes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33985 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:37:23 +00:00
Richard Heck
ea44f30077 Ignore phantoms for now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33984 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:31:15 +00:00
Richard Heck
32ee4c13cf HTML for roots.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33983 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:31:04 +00:00
Richard Heck
36e2a2c95f HTML for underset.
Neither underset nor overset will work reliably, I'm afraid, but such is
the price of using HTML rather than MathML.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33982 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:12:52 +00:00
Richard Heck
77bd365b39 HTML for overset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33979 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 20:04:39 +00:00
Richard Heck
edff97cb30 Matrix output via HTML. I have to say, this one took some work.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33978 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 19:59:09 +00:00
Richard Heck
db1d81f03a Forgot this piece before.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33977 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 19:58:49 +00:00
Richard Heck
96390e0ff7 Change semantics of two-arg htmlize to make more consistent with other
functions.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33975 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 19:17:06 +00:00
Richard Heck
2f44dc2583 This doesn't seem to be compiled even, but oh well.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33972 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 19:01:15 +00:00
Richard Heck
ed8af8f7fd Ignore kerning in HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33971 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 18:59:04 +00:00
Richard Heck
2a1c6c3541 HTML for math fonts.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33970 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 18:57:47 +00:00
Richard Heck
9ee805185c Fix up the math stream.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 18:57:37 +00:00
Richard Heck
a0043da05f Introduce and use a "math_flavor" flag with OutputParams.
I'm not happy about having what is basically the same enum in
BufferParams.h and OutputParams.h, but I don't see how to unify them
without either (a) including BufferParams.h in OutputParams.h, which is
ugly or (b) creating some new file just containing this enum, which
seems like overkill. Any other ideas?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 18:24:52 +00:00
Enrico Forestieri
4fc5f86137 Fix bug #4565: Using keyboard shortcuts to write Greek letters with an underbar produces LaTeX errors.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33963 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-31 01:09:38 +00:00
Richard Heck
8cf5ff6fbf Simplify.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33961 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 22:51:11 +00:00
Richard Heck
36b1623c5b Integrals via HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33960 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 22:51:02 +00:00
Richard Heck
ab2a59b0a1 I don't think we need to do this for MathML or HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33959 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 22:17:06 +00:00
Richard Heck
caf170d612 HTML for dots.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33958 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 22:14:00 +00:00
Richard Heck
8d51923b8b Do the obvious thing with delimiters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33957 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 22:07:05 +00:00
Richard Heck
ed71c32fcd Treat certain decoration cases differently.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33956 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 22:05:28 +00:00
Richard Heck
69fc590ee3 Decorations via HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33955 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 21:56:52 +00:00
Richard Heck
5aff128354 HTML for comments and colors.
Color doesn't do anything at this point. The colors are given in LaTeX
format. Do we know how to convert these to HTML format?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33954 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 17:24:22 +00:00
Richard Heck
f835e2a6f9 Cases for HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33950 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 02:57:05 +00:00
Richard Heck
3e31491871 HTML for InsetMathBrace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33949 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 02:40:32 +00:00
Richard Heck
27add8d945 HTML for math boxes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33948 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 02:37:05 +00:00
Richard Heck
7be729f028 Bold symbols via HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33947 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 02:05:49 +00:00
Richard Heck
e64be58736 InsetMathBig via HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33946 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 02:04:07 +00:00
Richard Heck
0190b003b0 Fractions via HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33945 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 02:03:45 +00:00
Richard Heck
f5bcb24da2 HTML for scripts.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33944 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 01:31:25 +00:00
Richard Heck
f60dad8aaf HTML for numbers.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33943 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 01:23:10 +00:00
Richard Heck
ad49c45475 Pure HTML for math symbols.
I may have to re-do some of the symbols file to make this work properly.
Some of the entities used may have been MathML only.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33942 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 00:24:54 +00:00
Richard Heck
b8550d11e8 Pure HTML output for math macros.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33941 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 00:18:24 +00:00
Richard Heck
9e34cf8186 Fix math char stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33940 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-30 00:18:08 +00:00
Richard Heck
5ef3c828b2 Simple characters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33937 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 23:03:37 +00:00
Richard Heck
30b18aec37 The beginnings of pure HTML output of math, for our internal XHTML
output routines. The idea is that in some cases people may not want to
use MathML, so we are going to try to give options.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33936 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 22:52:13 +00:00
Richard Heck
93c99335b0 Suppress XHTML output for math macros. (We used to get the default from
Inset.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33795 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-18 22:19:34 +00:00
Richard Heck
8f5d4a3fcb Get rid of label_init_length. There is no way to set it from the GUI any
more. Worse, it was being used inconsistently. And we don't really need
it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33786 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-17 12:50:58 +00:00
Enrico Forestieri
ea4d17acb3 Fix bug #6581: Empty base of a script inset should not be shown as an empty brace inset on screen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33705 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-10 20:10:30 +00:00
Vincent van Ravesteijn
a866d2e1a9 Add missing continue. I guess I found this when running latex with a symbol file with some windows encoding or line-ends.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33698 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-10 16:58:20 +00:00
Vincent van Ravesteijn
5d60104a69 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33697 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-10 16:57:01 +00:00
Vincent van Ravesteijn
cd5d57e504 Do not use const char *.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33696 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-10 16:56:13 +00:00
Richard Heck
8a6b77bfe1 Introduce isBufferValid() method now, that returns true also for cloned
Buffers. Use it, as well.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33679 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-08 19:07:05 +00:00
Richard Heck
a2e06a3c15 Eliminate redundancy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33678 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-08 19:06:28 +00:00
Richard Heck
821cffab63 s/isBufferValid/isBufferLoaded/
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33677 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-08 18:57:42 +00:00
Abdelrazak Younes
321f6031af Fix bug #6564. The cmd status retrieval is quite broken within tables (math or text).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33639 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-06 14:19:21 +00:00
Richard Heck
d65020b293 s/updateLabels/updateBuffer/g, per a suggestion of Abdel's.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33613 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-03 22:13:45 +00:00
Abdelrazak Younes
5d235f5251 Migrate GuiHSPace to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33525 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-21 09:28:33 +00:00
Abdelrazak Younes
b5049e769b * InsetTabular cleanup:
- proper message passing for all tabular features
- properly define which feature needs an argument

* replace LFUN_TABULAR_FEATURE with LFUN_INSET_MODIFY
- The math tables are also affected. In the future a common base class
between math and text table will solve this inconsistency.
- There is a hack in GuiApplication in order to not rename the toolbar
icons. This will have to be cleaned up with a general icon naming for
LFUN_INSET_MODIFY... to be discussed.

* Tabular Dialog:
- big cleanup, lots and lots of bug fixing here
- migrated to InsetParamsWidget


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33495 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-18 08:28:46 +00:00
Jürgen Spitzmüller
1178b30c54 generalize special handling of command inset parameters on LaTeX output (escaping, etc.).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33461 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-13 13:08:32 +00:00
Abdelrazak Younes
377cdd5f6c Transfer LyXfunc code to GuiApplication::dispatch() and getStatus(). Now
a lot of simplification is possible. Except some instability period...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33389 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-09 16:11:13 +00:00
Jürgen Spitzmüller
a70e21a34e Patch by John McCabe-Dansted to fix bug #6502:
Wrong line count with parent math macros:

* TeXRow.{cpp,h}:
	- new helper function to insert multiple newline at once.

* mathed/MacroTable.{cpp,h}:
* mathed/MacroTemplate.{cpp,h}:
	- make write() an int, returning number of newlines

* Buffer.cpp (writeLaTeXSource):
	- update texrow's newline on parent macro output.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33367 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-08 17:39:55 +00:00
Tommaso Cucinotta
c0c1e1fd2b Most common cases with regexps seem to work, at least with ignore-format on.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33355 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-07 21:44:31 +00:00
Tommaso Cucinotta
33dca1df0f Now the coloured box around the regexp is visible also if InsetPreview is enabled.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33336 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-05 18:34:01 +00:00
Tommaso Cucinotta
9e057e7533 Improved appearence of regexp insets (at least I hope so), also suggested in #6498 (Regex looks like math).
- added a frame around regexp insets, with a customizable dedicated color code
- regexp insets font turned to texttt
- recovered back the preamble snippet allowing for latex compilation of regexp insets, something that happens if you have instant preview on.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33329 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-05 09:00:40 +00:00
Enrico Forestieri
d652a84f4b Automate the setting of the ascii only flag.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33328 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-04 23:03:48 +00:00
Enrico Forestieri
271d53fdd0 Fix bug #3325: Labels with special characters in equations do not work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33325 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-04 19:08:17 +00:00
Enrico Forestieri
63cb2b52aa Fix bug #2872: reference in math to label with "underscore"...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33324 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-04 10:32:58 +00:00
Vincent van Ravesteijn
8f09cda025 Please Abdel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33292 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-31 13:38:47 +00:00
Vincent van Ravesteijn
00bbabd00f Fix bug #6489: Assertion triggered when deleting contents of math ERT. (probably a stdlib assertion).
Do not access name_[0] if name_ has size 0.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33290 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-31 13:03:31 +00:00
Vincent van Ravesteijn
489b80aef4 Correct the mess introduced in r33250.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33251 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 20:03:09 +00:00
Vincent van Ravesteijn
61eecb8a44 Expand the string "regexp" to something user will better be able to understand.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33250 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 19:56:12 +00:00
Jürgen Spitzmüller
7bbd67eb26 * Implement updateLabels in mathed and add the MathRef insets to the references cache.
This fixes bug #1560.

The diverse setBuffer / updateLabels calls need auditing. See FIXMEs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33249 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 17:37:22 +00:00
Jürgen Spitzmüller
fd40810a8c * InsetMathHull.h: constness, as suggested by Abdel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33243 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 09:18:15 +00:00
Vincent van Ravesteijn
a4e03846cd Fix doxygen output for grouped items. Without the /name tag doxygen shows the group name as the name of the first item. Moreover, the comment styles are somewhat standardized.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33236 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-27 18:10:33 +00:00
Jürgen Spitzmüller
a484f95910 When pasting a math inset with a label, check for duplicates (as we do outside math)
(bug 6218)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33230 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-27 08:41:19 +00:00
Jean-Marc Lasgouttes
fe9a43f44b Add DispatchResult argument to BufferView::dispatch, and remove explicit updates in there.
Split LyXFunc::dispatch into a wrapper that does the actual screen updates and
a worker method that updates a DispatchResult object.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33226 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-25 15:14:41 +00:00
Richard Heck
1d6923b65b Use the attributes MTag now takes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33149 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-21 21:06:44 +00:00
Richard Heck
7a32a8489a Allow MTag to take attributes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33148 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-21 21:06:29 +00:00
Richard Heck
4a4ec0c96a We do not need to extract exponents, either.
There may be more we do not need to do.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33147 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-21 21:05:53 +00:00
Richard Heck
51a388e745 We do not need to extract limits for MathML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33146 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-21 21:01:51 +00:00
Richard Heck
a36607b800 XHTML for InsetMathSize.
We now have nice output of the User's Guide.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33145 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-21 20:48:12 +00:00
Richard Heck
caa4e94bf0 Get rid of some magic booleans in updateLabels() and related routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33110 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 19:42:12 +00:00
Richard Heck
3e654186d2 Move the StartTag, EndTag, and CompTag classes into the html namespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33099 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-19 22:08:04 +00:00
Enrico Forestieri
19c935ca37 Fix XHTML output on systems where char_type is not typedef'd to wchar_t.
See docstream.h for the explanation.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33027 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-14 13:29:13 +00:00
Richard Heck
50b700938b Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32997 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-12 20:22:07 +00:00
Richard Heck
cb346ae202 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32976 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-11 19:29:33 +00:00
Richard Heck
bae9393d53 Minor re-organization.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32975 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-11 18:25:26 +00:00
Richard Heck
a8dc000901 Include omitted case, and fix underline.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32759 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-03 17:46:02 +00:00
Abdelrazak Younes
930088a07d Fix bug #6388
* Buffer can be retrieved from currently set buffer_.
* detachMacroParameters() doesn't really need a Cursor.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32752 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-03 11:00:21 +00:00
Richard Heck
acc158a846 Add a comment and update notes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32728 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 23:31:30 +00:00
Richard Heck
69fc2f6702 Mostly comments about InsetMathSplit, which more or less works.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32727 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 23:28:19 +00:00
Richard Heck
316af4a90b These are in lib/symbols, so should have been caught by the first test:
# split environments with optional valign argument.
# the others (split and alignedat) are hardcoded.
aligned           split       none
gathered          split       none
# from Morten H\o gholm's mathtools.sty:
lgathered         split       none
rgathered         split       none

Right? Someone tell me if that is wrong.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32725 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 22:31:12 +00:00
Richard Heck
95f07cf181 Fix comments and whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32722 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 22:03:15 +00:00
Richard Heck
ab1f7c3fc5 MathML for XArrow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32721 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 22:02:19 +00:00
Richard Heck
791d28bf0b MathML for Stackrel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32720 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 21:54:00 +00:00
Richard Heck
f29db33e69 MathML for Underset. And fix Overset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32719 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 21:48:56 +00:00
Richard Heck
bee7a4c8d2 MathML for Overset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32718 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 21:44:12 +00:00
Richard Heck
07aca7cccc Fix MathML for binominals.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32717 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 21:22:04 +00:00
Richard Heck
b129d5ebdc We do not need special treatment of differentials for MathML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32716 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 21:09:28 +00:00
Richard Heck
f621c97411 MathML for MathCases.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32715 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 21:01:00 +00:00
Richard Heck
14001c49fe Fix up the InsetMathGrid output: detect better if we have a table, and
use appropriate tags.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32714 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 21:00:49 +00:00
Richard Heck
c95c30184d MBox is currently inactive, but in case it becomes active....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32713 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 20:44:09 +00:00
Richard Heck
eb17e9c362 MathML for MathBox and such.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32712 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 20:36:34 +00:00
Richard Heck
19cd5f0e82 Fix MathML output for MathBox, as suggested in the FIXME.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32711 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 19:49:29 +00:00
Richard Heck
812c3204bd Special handing of space characters during text output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32709 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 19:40:36 +00:00
Richard Heck
3915c2d01a Fix some issues with textmode. We'll let SetMode() handle as much of
this as possible for us.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32708 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 19:35:56 +00:00
Richard Heck
5536d442cd Don't wrap numbers in text in <mn>.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32706 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 18:56:55 +00:00
Richard Heck
88d5bfac6a Wrap text in <mtext>, not <mrow>.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32705 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 18:53:40 +00:00
Richard Heck
25edee2ead A little debugging output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32704 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 18:40:20 +00:00
Richard Heck
0b8c6246ff Use SetMode() to manage text and math mode.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32703 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 18:38:01 +00:00
Richard Heck
4479a7f689 A simple version of ModeSpecifier for MathStream.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32702 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 18:37:09 +00:00
Richard Heck
dfe2d5ae4d FIXME.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32701 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 17:33:22 +00:00
Richard Heck
13b88d6166 Fix MathML output of wide characters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32699 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 17:31:13 +00:00
Richard Heck
a62d46b5e3 MathML for InsetMathFont. Unfortunately, this does not seem to render at
the moment in Firefox, but it is the right way to do it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32697 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 16:59:56 +00:00
Richard Heck
9ab24e95b9 MathML for InsetMathBoldSymbol.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32693 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 16:39:37 +00:00
Richard Heck
98e6886dc4 Provide for the possibility of deferred material, per Andre's excellent
suggestion. Now I wish I'd done XHTMLStream the same way....


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32691 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 15:52:57 +00:00
Richard Heck
c060a85d81 Revert r32684, per Andre's suggestion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32689 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 15:46:39 +00:00
Richard Heck
f37a1b8aea MathML for InsetMathBig.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32685 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 04:16:45 +00:00
Richard Heck
8a0134cc8c Introduce a return value for mathmlize(). We will need this to be able
to defer labels.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32684 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 03:50:12 +00:00
Richard Heck
27d580b5c0 Thanks, Andre.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32649 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-26 20:29:57 +00:00
Richard Heck
27f8da648d Output numbers as numbers.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32644 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-26 15:08:03 +00:00
Richard Heck
a278ff37c3 Ignore this in MathML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32643 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-26 15:05:43 +00:00
Richard Heck
d8053e2683 Ensuring math should just be doing math in MathML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32642 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-26 15:01:03 +00:00
Richard Heck
904129cba6 Get MathML output working for math decorations.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32636 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-25 23:23:42 +00:00
Richard Heck
bae47150c6 Must wrap everything...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32635 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-25 23:18:38 +00:00
Richard Heck
f7c53f3af6 Add a FIXME.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32634 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-25 21:47:42 +00:00
Richard Heck
8fa637a36f Get MathML output for InsetMathDots working.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32633 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-25 21:42:07 +00:00
Richard Heck
e1ed39f8b4 So this changes the way we handle sums and such. We just don't need to
handle them specially for MathML, and we don't need to split scripts
either.

Wouldn't it have been nice if I'd realized that before?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32572 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 17:52:09 +00:00
Richard Heck
64c84ae883 Last commit didn't complete reversion, as I forgot to resolve the
conflicted state of this file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32571 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 17:50:46 +00:00
Richard Heck
812616e100 Revert r32566 and r32568.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32569 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 17:42:21 +00:00
Richard Heck
46e1424678 Make InsetMathExInt handle products as well as sums.
We can do more here, but it's actually not clear to me whether we even
need to give these things special treatment for MathML. I may revert
this.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32568 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 17:28:07 +00:00
Richard Heck
c3fc67ef54 Fix up MathML output of integrals.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32567 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 16:06:00 +00:00
Richard Heck
2ae6331072 Fix MathML output of sums.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32566 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 15:54:49 +00:00
Richard Heck
873c9ad4f8 Fix up math scripts. Everything needs to go into <mrow>. (This acts as a
general grouping mechanism, basically.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32564 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 15:39:18 +00:00
Vincent van Ravesteijn
5a530cca94 Do not hardcode the background color of the preview at two places.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32562 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 15:21:08 +00:00
Vincent van Ravesteijn
6b96abd211 Correctly paint the background of the instant preview of a displayed equation.
For a displayed equation, the height is artificially increased by a displayMargin() in InsetMathHull::metrics if it is a displayed equation and there is a preview. 

This extra height is not covered by the preview image and what one can see is the background as drawn by the MathHull inset. The color of this background should be either Color_mathbg or Color_background depending on whether the preview is shown or not.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32560 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 14:09:37 +00:00
Richard Heck
48b09463dd Add comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32554 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 17:44:40 +00:00
Richard Heck
c271d0d8c1 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32552 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 17:22:56 +00:00
Richard Heck
96012a8859 Fix MathML for fractions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32551 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 17:22:42 +00:00
Richard Heck
1a74f3d103 Add a fixme, in effect, about dots.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32550 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 17:12:58 +00:00
Richard Heck
05f1f323de Detect appropriate delimiter for matrices.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32549 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 17:01:09 +00:00
Richard Heck
05336422a4 Fix matrix output, at least a bit. A little more work needs to be done
here, though.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32548 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 16:43:26 +00:00
Richard Heck
2635724b57 In a normal grid, we can just use <mrow>.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32547 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 15:50:31 +00:00
Richard Heck
ce2e071cdf This should do it for the delimiters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32546 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 15:50:05 +00:00
Richard Heck
d4b3b61593 A bit more for math delim.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32545 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 15:35:25 +00:00
Richard Heck
7aeda251ce More Math ML fixes. Using <mfenced> seems to be a bad idea, and the <mo>
version is claimed to be completely equivalent.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32543 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 15:12:34 +00:00
Richard Heck
9e149b8919 Fix a few MathML things: the default output and the output of limits.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32542 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-16 14:53:23 +00:00
Richard Heck
5f27992e16 Restore the MathML output we had before. Still work to be done here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32540 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-15 13:14:57 +00:00
Vincent van Ravesteijn
c4701b2256 Fix bug #6341: Can't set equal spacing in xymatrix.
Now we also 'support' \xymatrix!C (columns), \xymatrix!R (rows), \xymatrix!0 (all equal and ignore entry sizes) and \xymatrix! (all equal).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32518 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-13 21:32:08 +00:00
Enrico Forestieri
c2befc2b1e Fix bug #6382: Wrong cursor placement when inserting math
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32473 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 01:30:33 +00:00
Vincent van Ravesteijn
e6d1759340 CitationUI and InsetMathChar:
squeeze warnings

output_xhtml:
  fix whitespace

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32380 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-07 01:28:14 +00:00
Vincent van Ravesteijn
80ac638d42 Fix trunk after r32352.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32353 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 01:07:38 +00:00
Vincent van Ravesteijn
b56e4c5697 Do not start loading a preview each time one is added. This caused LyX to generate LaTeX code of the document over and over again for each math inset. As a consequence, the loading of the User's Guide took ages.
Fixes a bug introduced in r32157 while fixing bug #4360.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32352 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 00:43:28 +00:00
Richard Heck
996505c2ae This patch introduces an optional argument to Buffer::updateLabels(), so
as to allow us to call the routine when we are preparing for output and
so to do certain things we might not want to do every time. 

This is an abuse of updateLabels(), in a way, but updateLabels() long
ago became the general recurse-through-the-Buffer routine, and to
implement the sort of thing I want to do here in validate(), say, much
of the code in updateLabels()---in particular, the counter-update
code---would have to be duplicated. So I believe this is the best, and
easiest, way to go.

Actual use of the new argument will follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32318 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-04 03:03:38 +00:00
Jean-Marc Lasgouttes
2f7d14a7e1 fix warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32219 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-27 10:00:12 +00:00
Enrico Forestieri
ae40a33202 Fix bug #6351: Crash when editing the unit on a number
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32211 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-26 01:56:50 +00:00
Vincent van Ravesteijn
92c8561674 Some cosmetics after r32157.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32159 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 21:45:51 +00:00
Vincent van Ravesteijn
f19b6178a9 Fix bug #4360: Instant preview does not render formulas which contain math-macro from input file.
Patch from Stefan.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32157 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 20:50:35 +00:00
Vincent van Ravesteijn
fd25e06129 Revert some unwanted debug info.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32146 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 02:09:10 +00:00
Vincent van Ravesteijn
cd514c458a Fix bug #6310: Incorrect latex for sparse matrices with vertical lines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32145 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 02:03:09 +00:00
Jean-Marc Lasgouttes
1545219dcb squash warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32066 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-17 16:57:35 +00:00
Enrico Forestieri
935d1a3221 Clarify comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32051 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-16 14:11:25 +00:00
Enrico Forestieri
d3378a6b84 Style: insetCur -> inset_cursor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32049 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-16 13:31:01 +00:00
Enrico Forestieri
7365a29fea Fix bug #6208: macro crash.
The fix consists in not updating the macro while it is being edited,
and this is accomplished by the changes in MathData::updateMacros().
However, when clicking away with the mouse I was getting another crash,
which is cured by the changes in MathMacro::notifyCursorLeaves().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32037 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-15 23:54:45 +00:00
Abdelrazak Younes
216f9156dc Fix MathML export for < and > special characters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32033 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-15 21:45:21 +00:00
Richard Heck
ae60474513 Get math macros working for MathML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32004 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-15 12:30:26 +00:00
Richard Heck
8340a17e96 Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31997 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 23:28:50 +00:00
Richard Heck
584bca0fe8 MathML for InsetMathSpace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31994 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 21:38:28 +00:00
Richard Heck
70217ba676 Initial work on InsetMathBox. This doesn't really work yet, for reasons
given in the FIXME.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31993 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 21:11:23 +00:00
Richard Heck
ff7d0d5c6e Fix whitespace, comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31991 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 20:40:09 +00:00
Richard Heck
0229c21be4 Fix single character output for MathML. Kind of.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31990 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 20:38:22 +00:00
Richard Heck
9ba340b218 Fix parsing of functions and arguments for MathML.
The enum is overkill for now, but will be useful if anyone decides
really to return to this stuff. It's apparent that there are some 
powerful tools here---like the ability to pipe expressions through
Mathematica.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31989 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 20:20:17 +00:00
Richard Heck
963c22353a Fix delimiters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31988 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 20:18:32 +00:00
Richard Heck
177ff11cfb Whoops. Forgot to fix this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31987 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 19:52:06 +00:00
Richard Heck
25f429d3e5 Fix external function output for MathML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31986 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 19:41:22 +00:00
Richard Heck
90f392425f FIXME
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31984 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 16:58:32 +00:00
Richard Heck
886304a588 Little bit of fixup for math symbols.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31983 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 16:21:33 +00:00
Richard Heck
83c7a5576f Fix silly bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31981 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 15:55:51 +00:00
Richard Heck
54b4b8e6b4 Get MathML output for XHTML working a bit.
Turns out MathML is already here, for the most part, so this will
not be too bad at all. 

Anyone else think that is very cool?!



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31979 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 15:25:32 +00:00
Uwe Stöhr
d5099c8605 - introduce option to suppress the LaTeX package mhchem, fileformat change
The fileformat change is also needed because of our mistake that we load mhchem since LyX 1.6.4 automatically so that files created with LyX 1.6.4 won't compile under LyX 1.6.3. Now at least all files created or opened with LyX 1.7 can be reverted to the fileformat of LyX 1.6.x and can therefore be read by all LyX 1.6.x versions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31941 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-11 01:48:07 +00:00
Enrico Forestieri
f83a6cc3af Don't use updateMacros() in the math parser, in order to avoid
performance problems when loading documents with lots of macros.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31907 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 18:47:33 +00:00
Enrico Forestieri
c34cff8d11 In order to avoid confusion, always use buf in Parser::parse1(),
instead of mixed usage of buffer_ and buf.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31905 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 18:22:57 +00:00
Abdelrazak Younes
882e2eeb7b InsetCommand ctor: Pass 'Buffer *'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31902 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 16:10:34 +00:00
Abdelrazak Younes
82c7e15e64 Uniformize Inset construction (passing Buffer * everywhere). Lots of cleanup to do still...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31901 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 15:53:21 +00:00
Abdelrazak Younes
ff4460603e Make Buffer argument mandatory in most of the InsetMath based class... boring work...
Math manual loads and save correctly it seems but expect some instability period.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31898 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 11:45:46 +00:00
Pavel Sanda
dac1c003d6 Unneeded headers.
It would be interesting to know how many headers do we actually use in our code.
Nice task for some script.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31893 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-07 12:54:19 +00:00
Pavel Sanda
f57a4615cd Header sort order
../treeview.patch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31892 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-07 12:54:08 +00:00
Enrico Forestieri
a1a34443ef Fix bug #5530: LyX expansion in math-macro overwritten by default one.
This patch initializes the buffer_ member of a MathHull inset in most
(but not all) cases. The problems with buffer_ should be greatly
allievated now, but there still can be some corner case.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31873 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-06 15:18:48 +00:00
Vincent van Ravesteijn
d63403205b Fix bug #5968: Assertion while reading a document with multiple equation labels.
This is another ad-hoc solution for the problem of a zero buffer pointer while reading a document or when using cut&paste.

This simple solution would be suitable for branch.

see also e.g. r29085, r28319, bug #5688.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31861 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-05 00:38:09 +00:00
Vincent van Ravesteijn
d3c786eed6 Fix bug #6297: Use of Fraktur font in boxed equation does not automatically include amssymb.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31819 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-01 22:16:49 +00:00
Enrico Forestieri
5e26133947 Fix another problem related to bug #6284.
When pasting "# a" within \mbox{} through Ctrl+Shift+V, the space is
correctly retained. However, using Ctrl+Shift+V for pasting "^ a" into
\mbox{}, the space gets swallowed. This is fixed by this patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31708 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 15:54:03 +00:00
Enrico Forestieri
1535e4b825 Fix the rest of bug #6284.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31694 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 15:00:36 +00:00
Enrico Forestieri
456449bd56 Better fix for bug #6284. There's no need to check for spaces here
as they are already accounted for during the tokenization phase.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31687 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-20 15:26:22 +00:00
Enrico Forestieri
5484edda22 Fix bug #6284: missing space between # and text in math mode when using \mbox
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31680 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 23:11:36 +00:00
Jean-Marc Lasgouttes
60dca30530 disable the del-suppresses-equation-label-at-end feature (not easy to describe, is it?) when there is a selection
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31600 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-12 15:20:23 +00:00
Enrico Forestieri
a7c944b280 Fix bug #6250: LyX 1.6.4 crashes when copying Japanese text in math to clipboard
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31572 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-09 21:33:08 +00:00
Enrico Forestieri
6fb07e35c5 Fix bug #6264: Broken undo of removed script in mathed when both scripts are present.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31558 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-08 12:32:11 +00:00
Pavel Sanda
5847e05e12 Already done
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31543 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-06 14:26:18 +00:00
Enrico Forestieri
eb065995b1 Fix bug #6246: InsetMathKern is broken
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31474 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-27 17:29:01 +00:00
Enrico Forestieri
21fcdfb479 Fix a crash when the modified uncompleted macro is a font changing command.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31379 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-12 21:20:51 +00:00
Pavel Sanda
ab36804b6c Fix searching bug #6139.
Patch by Tommaso.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31053 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 15:35:14 +00:00
Pavel Sanda
4c338ac22d Fix bug #2045.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg153796.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30997 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 22:09:50 +00:00
Abdelrazak Younes
5425c53fd1 Now that Text knows its owner, use the associated Buffer access.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30941 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 15:29:34 +00:00
Abdelrazak Younes
e8674d6141 General cleanup: Text is (or should be) nothing more than InsetText private implementation. We need access to the owner InsetText property in many cases where we instead take the Paragraph owner inset, which is the same of course. Next step is to avoid this indirection whenever possible.
I also updated InsetMathMBox so that it remains compilable, even if not used.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30940 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 15:05:36 +00:00
Jürgen Spitzmüller
89e7f60e1d Catch encoding exception when performing instant preview on an uncodable char (bug 6116).
* MathStream{.cpp, h}:
	- replace bool dryrun() by enum output that also knows whether the stream is for instant preview
* InsetMathHull.cpp:
	- tell the stream whether we use it for instant preview.
* MathString.cpp (write):
	- gracefully catch encoding exception for instant preview.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30895 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-07 05:25:22 +00:00
Enrico Forestieri
abb1ff4a66 MacroData has a buffer_ member, so use this instead of a dummy one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30871 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-06 10:25:48 +00:00
Enrico Forestieri
d53c2ec215 Fix bug #6014: Assertion when pasting "\def" into 2.0svn
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30870 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-06 09:53:06 +00:00
Vincent van Ravesteijn
11c3f2d1bc Fix the math output mess I caused in r30822.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30860 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-04 20:34:53 +00:00
Jean-Marc Lasgouttes
ca7b18a5db Try to implement properly recursive setBuffer. Normally, implmenting
for InsetMathNest and InsetMathHull is enough.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30847 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-03 10:30:34 +00:00
Vincent van Ravesteijn
13bb684eb0 Improve LaTeX output of arrays in math. Always output a '\n' except in the case that the line is completely empty.
see also:
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg153349.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30822 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-01 22:03:12 +00:00
Vincent van Ravesteijn
93e39157b6 Add const versions of Inset::asInsetMath.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30819 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-01 21:39:14 +00:00
Vincent van Ravesteijn
b62b366a67 Fix bug #2969: Double labels appear on empty lines of multi-line equations.
This reverts part of r10553. There, an extra '//' was added when the last line was empty. However, this really makes an extra line and that is visible when the lines have a line number. The bug #2067 that would have been fixed by this does not seem to 'exist' anymore.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30795 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-26 20:25:11 +00:00
Uwe Stöhr
0b33b9d090 allow to use glue lengths in the HSpace dialog; file format change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30724 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-21 11:51:43 +00:00
Richard Heck
0facb603fe Give inset codes to all the math insets, so we get more information when
we run into assertions.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30634 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 19:00:24 +00:00
Richard Heck
6de1a1a2da Fix another assertion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30629 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 13:34:33 +00:00
Richard Heck
93593f8c15 Fix crash related to empty buffer_ argument.
Restore assertion removed at r30602.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30609 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 19:20:53 +00:00
Jean-Marc Lasgouttes
78c45693ef remove all trace of editMessage
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30585 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 18:56:13 +00:00
Pavel Sanda
34fc56c9bc Hopefully fixes #6082
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg153098.html

Juergen?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30581 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 18:06:19 +00:00
Pavel Sanda
49ea9227cd Fix leftover from r27378. Patch and report from John McCabe-Dansted.
Presumably it fixes
"r30414 unselects insets after a fraction of a second. 1.5.7 doesn't exhibit this bug"
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg152960.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30536 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 09:50:46 +00:00
Uwe Stöhr
802067ecdc support for matrix decoration in the MathMatrix dialog;
introduces a new LFUN and fixes #4620

This can in principle also go to branch when new LFUNs are there allowed, Jürgen?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30523 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 21:39:21 +00:00
Enrico Forestieri
ce7302098c Allow undoing changes to the name of macros that are already finalized.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30434 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-09 18:00:27 +00:00
Enrico Forestieri
0c2902d0c0 Better fix for bug #5923. Now the macro name can be freely edited.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30425 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-09 15:21:21 +00:00
Enrico Forestieri
6852e976b0 Proper fix for bug #5923 that doesn't introduce bug #6015.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30410 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-08 01:48:19 +00:00
Enrico Forestieri
98fb455d3f Revert r30398, r30396, r30395, r30393, r30392, and r29387.
Soon to be replaced with a proper fix.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30409 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-08 01:41:06 +00:00
Vincent van Ravesteijn
1c6eea89b4 Fix previous commit for macros with arguments, again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30398 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:23:31 +00:00
Vincent van Ravesteijn
ebe7913a47 Only allow the cursor to be in lastpos for macros as editing in macro-mode is only possible at lastpos.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30396 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:16:21 +00:00
Vincent van Ravesteijn
ebe9b42279 Fix crash when selecting part of a macro and trying to resume macro-mode editing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30395 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:13:07 +00:00
Vincent van Ravesteijn
abdb069f9e Remove unneeded check for cur.pos() > 0.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30393 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:12:08 +00:00
Vincent van Ravesteijn
fb57c00c0d Fix bug #6015: Macro with arguments is not finished when pressing space
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30392 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:08:14 +00:00
Enrico Forestieri
14c5adf034 Better fix for #6049 and similar cases with other math insets.
In order to fix #6047, I needed a further mode other than MATH_MODE
and TEXT_MODE. In this mode, LyX should have behaved as in TEXT_MODE
but should also have allowed math mode commands. Well, this mode was
already implemented in LyX as UNDECIDED_MODE. Currently, this mode is
used nowhere except in the strange case where a math hull is not
present. It cannot be created by any other mean than editing a .lyx
file and getting rid of the $...$ math delimiters. This kind of
file can be reloaded in LyX and you would see a strange math formula
in text mode outside of mathed. Of course, trying to latex this file
would cause errors. After this commit, this strange mode is still
possible, but now all math insets correctly declare that their mode
is math mode (instead of undecided, and unless they state otherwise)
and bugs such as #6049 are fixed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30385 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-06 00:48:07 +00:00
Enrico Forestieri
e8ecb8b483 Fix bug #6049: Mathed: spacebar misbehavior while typing fractions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30384 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 23:50:16 +00:00
Enrico Forestieri
d178fabe24 Refinements to fix for bug #6041.
- Fix display of centered vertical alignment status.
- Avid else branch and simply return early (conforms to the used style).
- Smash unnecessary debug output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30372 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 13:36:34 +00:00
Enrico Forestieri
0b219d2541 Fix bug #6041: "tabular-feature align-" in a math-matrix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30363 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 00:24:17 +00:00
Enrico Forestieri
0a90c42b86 Fix bugs #6047, #4043, and #5394.
6047: Lyx 1.6.3 unable to typeset the third chemical equation of the
      file mhchem.lyx (package mhchem)
4043: mhchem support
5394: support for the mhchems's \ce command
The \ce and \cf insets are text mode environments that allow entering
spaces and mathmode commands. LyX leaves them alone and doesn't try to
be smart, i.e., the behaviour is exactly the same we had in the old days
with text-in-math mode environments, before the introduction of the
\ensuremath and \lyxmathsym macros. This means that in those environments
one has to know what he is doing, as LyX will not offer any protection.
The hack of enclosing \ce and \cf in a \text{} environment in order to
be able to enter spaces is no longer necessary.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30338 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-03 00:05:58 +00:00
Enrico Forestieri
5415144621 Fix bug #6033: Initial character sometimes eaten by math-insert
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30246 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 18:01:31 +00:00
Georg Baum
9c662bf442 - fix requirements of \dddot
- add support for \ddddot
- add partial support for inverse diagonal dots (i. e. they are recognized and
  displayed correctly, but the needed package is not loaded, because it would
  need an off/auto/on setting as amsmath, and that calls for a general solution)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30162 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 20:04:27 +00:00
Enrico Forestieri
4559c29eeb Reintroduce workaround due to nested math hulls as it is not
guaranteed that LyX is always able to replace $...$ constructs
with \ensuremath{...}.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30145 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-16 21:22:32 +00:00
Uwe Stöhr
39c96ebb75 InsetMathFrac.cpp: fix the regression now completely
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29849 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-25 22:46:51 +00:00
Uwe Stöhr
e83c2032ac InsetMathFrac.cpp: fix regression reported here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151588.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29847 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-25 22:42:22 +00:00
Vincent van Ravesteijn
1458ac6a7c Set flag for LFUN_MATH_MUTATE. Also, remove some 'ghost code' from InsetMathNest (if this had a purpose it should have been documented).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29764 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-21 12:45:31 +00:00
Vincent van Ravesteijn
788b0097a6 Hide "Number this line" for single line equations.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29762 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-21 10:14:07 +00:00
Vincent van Ravesteijn
60b26d1aac Fix the copy label as ref for equations from the context menu.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29754 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-20 23:58:29 +00:00
Enrico Forestieri
1a65f586ee Fix bug #1435. Now Ctrl-m enters math mode when in text-in-math mode,
instead of producing nested text boxes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29746 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-20 14:52:03 +00:00
Vincent van Ravesteijn
193b36e71f Fix bug #5923: Resume macromode.
When the user wants to resume a macro, delete the current one and insert a new one, which is not yet finalized.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29687 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-15 22:04:41 +00:00
Vincent van Ravesteijn
7fc21bf766 Fix bug #2034: Inconsistent behavior of cursor inside mathed.
When closing the macromode, do the same trick as in lines 835--838.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29686 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-15 22:00:43 +00:00
Vincent van Ravesteijn
a1a9c4c4ba Fix bug #5540: Crash in MathAtom on Undo.
No undo steps are recorded for math-macros. Now, it is also not done when we resume to edit a macro.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29685 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-15 21:51:43 +00:00
Vincent van Ravesteijn
8996be1208 Restore Object.Event order for:
- LFUN_LABEL_COPY_AS_REF,
- LFUN_LABEL_INSERT_AS_REF.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29680 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-15 21:05:19 +00:00
Vincent van Ravesteijn
13da98685d * InsetMathHull.cpp : constify.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29679 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-15 20:57:48 +00:00
Vincent van Ravesteijn
3c976db90b Fix bug #5948: Copy as reference for equation labels.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29678 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-15 20:54:15 +00:00
André Pönitz
89e4055189 cosmestics (test...)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29649 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-12 21:03:47 +00:00
Enrico Forestieri
024378db01 Remove workaround due to nested math hulls. See:
http://thread.gmane.org/gmane.editors.lyx.devel/110190/focus=110242


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29600 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-09 21:16:04 +00:00
Enrico Forestieri
318fad58a6 Don't create nested math hulls (fixes bug #5392).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29599 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-09 21:15:36 +00:00
Vincent van Ravesteijn
4c9fe33c83 * Move handling of LFUN_INSET_SETTINGS to Inset,
* Remove the EDITABLE enum,
* add functions hasSettings() for all insets.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29375 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-22 20:55:13 +00:00
Jean-Marc Lasgouttes
37d6ef964c fix compiler warnings in new mathfrac/binom code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29257 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-16 09:15:24 +00:00
Uwe Stöhr
23f833a92b InsetMathFrac.cpp: add some comments and remove an unused code line
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29147 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-08 00:19:57 +00:00
Uwe Stöhr
23f9e34a08 InsetMathFrac.cpp: some code optimization
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29133 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-07 01:02:34 +00:00
Uwe Stöhr
48236d215c InsetMathNest.cpp: forgot this in last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29132 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-07 00:23:38 +00:00
Uwe Stöhr
8225a56dfe InsetMathFrac: reimplement \cfrac with its optional argument the way Enrico proposed (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg149855.html)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29131 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-06 23:58:42 +00:00
Enrico Forestieri
3e341497a8 Introduce a helper function and use it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29130 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-06 22:12:22 +00:00
Enrico Forestieri
56210f5a39 Don't wrap characters marked as mathalpha in the unicodesymbols file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29121 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-06 09:04:00 +00:00
Enrico Forestieri
ed6f569fc8 Don't create nested text-in-math environments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29118 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-05 23:34:22 +00:00
Uwe Stöhr
a97b097768 major code cleanup for fractions:
- InsetMathFrac.cpp/h:
    - InsetCFrac, InsetDFrac, and InsetTFrac are now included as kind of InsetMathFrac
    - InsetDBinom and InsetTBinum are now included as kind of InsetMathBinom
    - support for the optional argument of \cfrac (cursor position still needs to be fixed, see post in mailing list)

- stdtoolbars.inc:
    - add entries for \cfrac
    - remove entry for \atop since atop is outdated and only in LaTeX2e for compatibility reasons (according to the LaTeX companion, you get warnings from amsmath in the LaTeX log when using atop)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29114 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-05 19:52:53 +00:00
Enrico Forestieri
8f52d3b7db The \text macro does not require the full AMS package. Also load amstext
when a text-in-math environment is used, such that super and subscripts
are typeset in the correct size.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29098 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-05 02:11:07 +00:00