Commit Graph

2690 Commits

Author SHA1 Message Date
Uwe Stöhr
d7e88ea7e0 revert r38758 as discussed in http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg169087.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38767 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 17:14:31 +00:00
Uwe Stöhr
9eb6b3b8ac backport CMake efforts to branch to be able to compile LyX 2.0.x the same way as trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38758 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 21:35:36 +00:00
Richard Heck
8b9cf6dbfe Make sure we do not crash here in release mode.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38721 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 13:32:19 +00:00
Richard Heck
b66cf487ed Fix XHTML output for fractions and fix a crash reported on the list
by Jan Paul Imhoff. The problem was that we were assuming (as we still
do in some places) that there are always at least two cells.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38718 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 13:19:18 +00:00
Tommaso Cucinotta
0d9494ae06 Fixing positioning of cells in multi-row align environments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38715 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-11 19:48:42 +00:00
Tommaso Cucinotta
63ee0ee962 Fix #7549, due to a problem in exporting to plaintext a
multicell inset, where we now export all of the cells
separated by "\t", instead of only the first cell.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38713 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-11 19:07:01 +00:00
Georg Baum
16c6442951 Partial fox for bug #6622: Display \utilde and \undertilde on screen correctly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38675 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 19:21:46 +00:00
Georg Baum
c41f48411a Fix bug #7511 by moving the old label instead of creating a new one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38671 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 18:56:51 +00:00
Richard Heck
8f7c852b0f Backport r38613 for branch, fixing #7532.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38615 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-07 16:45:45 +00:00
Richard Heck
6c24213294 Backport fix for #7531 to branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38598 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-05 20:41:59 +00:00
Enrico Forestieri
b1fbf9c6a8 Some math font changing commands only work in math mode, so let's
assure to switch to math mode if needed. This helps avoiding latex
errors (see http://thread.gmane.org/gmane.editors.lyx.general/69580)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38580 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-04 13:07:32 +00:00
Enrico Forestieri
d4bcdae8d7 Fix deletion of empty last row for \smallmatrix (part of bug #7484).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38475 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-22 15:06:59 +00:00
Vincent van Ravesteijn
b29ef9e1a5 Fix bug #7444. We are only interested in whether the dimension has been stored in the cache. Therefore we have to use hasDim, otherwise we get a negative response just because the x-y is not set.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38403 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-15 10:54:52 +00:00
Richard Heck
815a9bd97e Not sure why this was there: Of course we need to escape < and >.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38363 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-13 13:05:52 +00:00
Richard Heck
855ea23faa Remove debugging code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38242 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-04 12:25:52 +00:00
Pavel Sanda
5168f2879c Typo. Merged manual still doesn't export via xhtml.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38210 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-02 14:42:09 +00:00
Richard Heck
30339c03ad Fix preview of generated math images under XHTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38205 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-02 13:04:11 +00:00
Richard Heck
77185fe83d Substack support for XHTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38197 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 23:41:17 +00:00
Richard Heck
740e89de17 The mode setting stuff wasn't working properly for XHTML, so this patch
simplifies it and hopefully does get it working.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38195 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 22:34:40 +00:00
Richard Heck
844296cd47 Remove debugging code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38194 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 21:30:48 +00:00
Richard Heck
707d369d72 Get math within text working for XHTML export.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38193 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 21:18:37 +00:00
Richard Heck
17f1b1d04a Better preview for images.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38192 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 20:44:23 +00:00
Richard Heck
d7a2ae0bf3 Don't try to create a math preview image if we're just previewing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38191 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 20:32:33 +00:00
Richard Heck
4052facca6 If we encounter a macro we don't recognize, then export this bit of math
as an image.

The math macro now exports as XHTML + MathML and can be viewed in
Firefox.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38190 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 20:15:43 +00:00
Richard Heck
0b1fdca0fa Fix last commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38189 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 20:03:41 +00:00
Richard Heck
75a7a2203d More informative normalization for math macros.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38188 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 20:03:15 +00:00
Richard Heck
f22a3988b3 Revert unintentional commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38187 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 19:28:26 +00:00
Richard Heck
461c973d62 Clean up XHTML output a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38185 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 19:18:25 +00:00
Richard Heck
eceefd3d31 Remove debugging code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38183 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 18:35:06 +00:00
Vincent van Ravesteijn
7e566747fd Fix bug #7351 (oart 2). Missing update.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38131 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 17:09:46 +00:00
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