Commit Graph

4125 Commits

Author SHA1 Message Date
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
Enrico Forestieri
46028a6914 Due to the increased accuracy of line counting and registering, when a
latex error occurs inside a table, the exact faulty table row is spotted.
However, if all cells of a table row are output on the same line, lyx is
not able to tell what cell caused the error and highlights the last cell
of the row. This patch allows to output each cell of a table on its own
line, such that the exact point where the error occurred can be highlighted.
Note that this is only done when exporting for preview, and in normal (nice)
exports everything goes as usual.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37643 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 01:02:12 +00:00
Vincent van Ravesteijn
1f99db08a9 Correct the return and parameter types to match the type of RenderBase::state_.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37623 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-13 09:56:54 +00:00
Vincent van Ravesteijn
bc2dd1c50c Remove unused funcion Inset::scroll().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37617 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-13 09:41:13 +00:00
Pavel Sanda
e5677802b2 Fix gcc 4.6 compilation.
If no initializer is specified for an object, and the object is of (possibly
cv-qualified) non-POD class type (or array thereof), the object shall be
default-initialized; if the object is of const-qualified type, the underlying
class type shall have a user-declared default constructor.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37603 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-12 22:08:32 +00:00
Jürgen Spitzmüller
e9cfa82c9f * InsetTabular.cpp: multirow does not allow paragraph breaks (bug 7051).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37597 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-11 09:42:33 +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
Pavel Sanda
1b3c9e54c5 We have lyx_version, for PACKAGE_VERSION.
(Introduced in r34186.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37577 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-09 17:23:20 +00:00
Richard Heck
2bb01af413 Output width and height parameters for XHTML images. Thanks to Rob Oakes
for the patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37554 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-07 23:47:43 +00:00
Edwin Leuven
119ea9cd24 support for tabular*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37471 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-03 23:11:26 +00:00
Richard Heck
636440b8a8 Finally, disentangle IsPredefined and UsesFloatPkg. Now achemso gives us
the option to insert a List of Schemes, etc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37436 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 22:57:00 +00:00
Richard Heck
57deff6c3d Just some renaming, preparatory to disentangling two jobs the current
NeedsFloatPkg tag does.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37429 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 22:15:52 +00:00
Jürgen Spitzmüller
4b91536197 * InsetFloat.cpp (getCaption):
- Protect content which has a "]" in subfloat captions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37416 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 11:05:56 +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
Richard Heck
782e68aeb6 Fix thinko from r37328.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37329 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-26 14:27:16 +00:00
Jean-Marc Lasgouttes
370044551c Unify handling of pass thru insets and paragraphs by introducing Paragraph::isPassThru. Many lfuns are now disabled in sweave chunks.
Also, fix #7175 (do not output \noindent in passthru pars)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37328 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-26 11:04:42 +00:00
Enrico Forestieri
e0dfcdbdda Fix bug #7254 (LyX may insert a blank line when ending an environment)
The quick solution is to output a % sign before \n. The better one
would be doing as in mathed, but it is not so straightforward.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37320 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-24 23:58:58 +00:00
Jürgen Spitzmüller
172b915518 * InsetBox.cpp: framed boxes can have paragraph breaks and environments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37258 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-19 11:18:52 +00:00