Commit Graph

4142 Commits

Author SHA1 Message Date
Richard Heck
53e99dced5 Fix multirow output for XHTML, now for branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38707 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-11 14:26:48 +00:00
Richard Heck
691107bb7a Backport fix for bug #7547.
We need to check whether we are in a multirow here.
Otherwise, we were asking to construct strings of random size at a
certain point, e.g., two 2GB strings, in one case I saw.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38705 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-11 14:14:09 +00:00
Edwin Leuven
f01741433d backport r38655
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38658 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 15:21:36 +00:00
Richard Heck
2bf904ca34 Fix bug #7490.
As the bug report notes, you do NOT get this crash if you move up or
down in the table a bit before you do the rest. The reason is that
moving up and down sets the cursor's x_target_, and it is because that
is not set that we enter the other code at all and eventually crash.
That is, in InsetTabular's dispatch, we have:

(*) cur.pos() = tm.x2pos(cur.pit(), pm.rows().size()-1, cur.targetX());

You can see the potential for trouble here already. cur.pit() is in the
NEW cell, i.e., the one to which we are moving; it was changed a few
lines previously, and cur.idx() points to the new cell, too. But we are
trying to calculate cur.pos(), which means that cur.pos() is currently
the one from the OLD cell. So the cursor is in an inconsistent state.
Calling cur.targetX() leads us to call Cursor::getPos(), and that is
what causes the crash.

We fix the problem by making sure we call targetX() on the original
cursor. The same problem clearly exists in the DOWN stuff, so we fix
that, too.

By the way, should we be setting x_target_ here once we have calculated
it?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38530 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-26 22:41:48 +00:00
Richard Heck
c7cb9fdc43 Fix crash when there are text insets in a table cell with decimal alignment. This is discussed in these threads:
http://marc.info/?t=115869271700002&r=1&w=2&n=5
	http://marc.info/?t=130349942500005&r=1&w=2&n=17
This is the simpler and more conservative of the two solutions proposed. It is possible,
however, that we need the more complicated one, which is in x2a.patch here:
	http://marc.info/?l=lyx-devel&m=130359169107401&q=p4
Both patches contain work by me and Edwin.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38496 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-25 12:56:09 +00:00
Richard Heck
5f1d31bf16 Just whitespace and a comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38485 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-25 01:46:37 +00:00
Richard Heck
d83e002201 Fairly trivial change here: Just protect against inheriting limits to
output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38430 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-18 01:42:01 +00:00
Richard Heck
4b5a58dca9 Forgot to change this in XHTML output, so formatted references weren't
getting output properly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38404 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-15 11:28:56 +00:00
Richard Heck
1b6803bc7b Fix export of new LaTeX formats: xetex and luatex. Prior to this, child
documents and graphics were not copied to the export directory, since
the format passed to addExternalFile() was wrong.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38378 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-14 18:32:42 +00:00
Richard Heck
bfddee97e1 Better TOC output for XHTML, per Rob and Pavel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38354 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-12 17:33:18 +00:00
Richard Heck
08e69e57bf Fix XHTML TOC translation per a suggestion of Georg's.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38333 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-11 18:43:53 +00:00
Richard Heck
f061d66c2f Remove unused headers.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38332 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-11 14:11:07 +00:00
Georg Baum
f5b37d861b Fix wrong translations of float lists spotted by Pavel:
It was taken from .po file, not layoutttranslations


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38297 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-06 21:20:35 +00:00
Richard Heck
8bc43f2ecb Don't output box width if it's 100% (default).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38226 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-03 12:57:33 +00:00
Richard Heck
41463b84e5 Different types of boxes should all have their own layouts. This
involves no change of functionality, due to the fall-back mechanism and
is needed for XHTML CSS output for the boxes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38225 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-03 12:56:58 +00:00
Richard Heck
20487d93a6 Hyperlinks have to be escaped for XHTML output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38215 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-02 23:35:57 +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
2378db75c1 Prettify tabular output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38184 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 18:36:13 +00:00
Julien Rioux
618c1b6eb1 fix inclusion of literate child documents after r38118
(isLatex is unreliable)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38140 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-30 00:23:32 +00:00
Jürgen Spitzmüller
717c4176f5 * InsetInclude.cpp: another follow-up to r38025: do not attempt to convert a child document to LaTeX if it is already LaTeX.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38118 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 08:35:37 +00:00
Pavel Sanda
29fc2f60be InsetInfo - on VCS error we don't want localized output in .tex output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38117 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 01:43:06 +00:00
Richard Heck
aff04ce265 Refine previous commit: Forgot the break.
Also, if we're "undefined", then we should just continue reading.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38116 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 01:01:24 +00:00
Richard Heck
2a39fbb430 Continuing fix of #7080. Since we now demand "Flex:Whatever" as the name
of a flex InsetLayout, let's check for it when we hit a LyXType tag, and
refuse to honor it unless we have the right sort of name.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38115 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 00:57:07 +00:00
Richard Heck
ebe6c9287f Fix bug #7080.
- Have InsetFlex::layoutName() report "Flex:" + the inset name.
- Do some layout2layout work so that user insets that do not have
  the "Flex:" prefix get it.

Note that this will break some CopyStyle stuff, but we do not have any
decent way to do that, so users will have to make that change for
themselves. I guess we should add that to the release notes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38112 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 23:11:54 +00:00
Richard Heck
2777c336cb This "#if 0" code is very old, and obsolete.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38110 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 22:34:41 +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
Jürgen Spitzmüller
68beae862f * correctly handle childs with pdflatex.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38044 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 10:11:02 +00:00
Julien Rioux
474f19876c handle 'literate' lyx child documents (lilypond and sweave)
- don't assume that the exported file extension is .tex
   - use converter tool chain to produce a latex file for input or include

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38025 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 15:47:40 +00:00
Vincent van Ravesteijn
72ad0bdfbf Simplify logic in InsetRef::latex().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37960 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 10:37:24 +00:00
Vincent van Ravesteijn
eec88b7e5e Revert wrong previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37959 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 10:34:59 +00:00
Vincent van Ravesteijn
e52af5f897 Simplify logic in InsetRef::latex().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37958 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 10:31:43 +00:00
Jürgen Spitzmüller
85f486f259 * InsetSpecialChar.cpp:
make NOBREAKDASH isLetter()

* Paragraph.cpp (isWord separator):
	handle composites with hyphens as one word (i.e., "-" is not a word separator).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37946 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 09:17:09 +00:00
Edwin Leuven
571b779b23 fitcursor in r37929 was not enough for side scrolling tables
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37938 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 18:43:09 +00:00
Jürgen Spitzmüller
266399ef83 typos in comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37935 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 13:27:08 +00:00
Jürgen Spitzmüller
ff829bd92b Follow-up to r37932: We do not need a skipOnSearch variable, since we know the conditions anyway.
Thanks, JMarc,

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37934 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 13:19:55 +00:00
Jürgen Spitzmüller
ee6e5b784d * Inset.h: try to clarify isLetter() and isChar() a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37933 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 11:26:14 +00:00
Jürgen Spitzmüller
8fa96ceec8 Do not hardcode specific insets, but use a variable instead.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37932 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 10:46:14 +00:00
Edwin Leuven
9d4678b663 update when cursor leaves screen while navigating large tables using the arrows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37929 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 08:54:46 +00:00
Richard Heck
69ab57ab89 What is output as \eqref under prettyref needs to be handled differently
under refstyle, since (a) the default refstyle.cfg defines \eqref itself
and (b) does NOT define it the way AMS does. So we simply output:
	(\ref{label})
in this case, to match what we say in the UI.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37918 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 20:29:52 +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
Jürgen Spitzmüller
cf6c0c8192 * Inset.h: fix typo in comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37885 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-08 16:12:35 +00:00
Enrico Forestieri
c0437db8e9 Fix bug #7343 (No warning for missing child documents)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37869 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-07 14:36:22 +00:00
Jean-Marc Lasgouttes
d2720fa200 In InsetText::fixParagraphsFont, differentiate the case of pass thru paragraphs for which fonts should be reset, and paragraph that disable paragraph customization. In the later case, only paragraph parameters are reset.
This improves the fix in r37328 and allows centered sweave chunks, for example (although this does not work yet for other reasons)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37831 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 14:43:50 +00:00
Enrico Forestieri
a889fd0438 Fix #7326 (Latex export of child docs silently fails with uncodable characters)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37795 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 01:14:19 +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
Jürgen Spitzmüller
2d7cf03935 * InsetTabular.cpp:
- (getLastCellInRow): fix crash when in first multirow row
	- (TeXRow): do not output row separator in in last row (bug #7294).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37709 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-17 10:42:13 +00:00
Vincent van Ravesteijn
9bebb8945d Fix bug #7308: Table settings dialog broken.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37706 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-16 23:09:29 +00:00
Vincent van Ravesteijn
21992716e5 Revert r37704. It enabled SET_TABULAR_WIDTH for all longtables (new fix coming soon)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37705 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-16 23:06:43 +00:00
Enrico Forestieri
4c44ddad01 Don't disable apply button if one (or more) of vertical alignment, rotation,
or long table settings are changed. Fixes bug #7308.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37704 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-16 22:19:49 +00:00
Jürgen Spitzmüller
1f21f0f2dc * src/InsetTabular.cpp: revert r36415.
This went in without discussion and is IMHO wrong (bug #7055 is invalid).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37676 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-15 11:43:04 +00:00