Commit Graph

715 Commits

Author SHA1 Message Date
Richard Heck
00f0562003 Revert r38746. See http://marc.info/?t=130769382200004&r=1&w=2
for discussion of why. It looks as if something is weird with the
way Qt is handling the environment, at least on some platforms and
with some versions. Here, on F14, with Qt 4.7.x, simply getting and
setting the environment, without changing it, causes scripts such as
epstopdf to fail to start.

The problem is still in trunk.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39039 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-14 13:39:39 +00:00
Richard Heck
50fc0ea9bb Fix problem with static error list.
It's amazing we haven't seen problems with this before. The basic problem is that buf.errorList("whatever") would always return the same global, static error list, if it did not already exist. So, to a significant extent, there was only one global error list!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38982 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-08 00:44:55 +00:00
Enrico Forestieri
b3a983c66f Backport the TEXINPUTS prefix feature. This should also fix bug #1751.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38746 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-13 23:14:46 +00:00
Richard Heck
d7ed0882ea Backport r38743-4. This is cleanup, prior to serious work on Buffer::clone().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38745 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-13 22:39:21 +00:00
Richard Heck
6d6ca1e343 This file failed to go in r38615 due to its still being in conflict.
Why don't you get a warning about this in QtCreator?



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38617 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-07 17:38:02 +00:00
Richard Heck
208ebde5b5 Fix #7525 in branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38591 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-05 15:18:03 +00:00
Richard Heck
bb91e606b3 Forgot this part of r38496. See
http://www.mail-archive.com/lyx-
for the reason it needs to be here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38497 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-25 22:30:22 +00:00
Peter Kümmel
dd64477e3b #7407, home_dir could be a static function and also be called by the
Package constructor


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38370 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-13 19:11:55 +00:00
Richard Heck
a2abadb9f3 Fix crash part of bug #7416. The export status was not being set for
child documents, hence we had no DocIterator for preview.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38204 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-02 12:26:03 +00:00
Richard Heck
4685a3e5a8 Given how we are using this exclusion list, it makes more sense for it
to be a set. Not that speed will really be an issue here, but....


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38178 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-31 13:03:29 +00:00
Julien Rioux
bdc2dc042f exclude latex and pdflatex formats from the converter
graph when using nonTeXFonts

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38167 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-30 22:25:39 +00:00
Enrico Forestieri
c4d1c0943b When an error occurs inside an inset, the content rather than the inset
as a whole gets highlighted. Now, the error list carries information
about the starting id/pos and ending pos, but not about the ending id.
So, when computing the range to be highlighted as range = pos_end - pos_start,
if id_start != id_end, the result 1 means one inset and only the first
character in the inset would be highlighted. Thus, when id_start != id_end,
let pos_end = 0, such that the whole content will be highlighted.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37900 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-10 22:11:34 +00:00
Tommaso Cucinotta
aa431bf8bf Fix bug when retrieving allRelatives() of a buffer (when invoked from a
child, the returned list had no master and twice the child itself).
(was causing misbehavior in Advanced Find & Replace with scope=Document).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37852 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 22:14:52 +00:00
Enrico Forestieri
655a99f8c2 As improbable as it may be, an error could occur in both master and child
at the same line. Given that we know where the error occurred, don't
unnecessarily check the master first.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37846 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 13:52:01 +00:00
Enrico Forestieri
2e18f6a671 Fix bug #7331 (No error highlighting in child documents)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37845 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 13:37:14 +00:00
Enrico Forestieri
a079d95038 Initializing the gui_ member of the cloned buffer has strange side effects
with Qt/X11 (obscure X errors). Better avoiding it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37797 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 03:39:43 +00:00
Enrico Forestieri
2969cb53e2 Fix bug #7324 (Latex export silently fails with uncodable characters)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37796 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 01:50:13 +00:00
Stephan Witt
66d0d61b0c #7299 correct Buffer::saveCheckSum() method for new created files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37737 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-20 10:53:07 +00:00
Richard Heck
6127141d4b Introduce BufferParam to control whether CSS is output in the header of
the XHTML file or to a separate style file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37682 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-15 17:44:17 +00:00
Enrico Forestieri
05491c58cc Also catch the endl manipulator for automatic line counting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37657 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 17:09:39 +00:00
Enrico Forestieri
c6648aaeb9 Complete integration of texrow with otexstream and allow automatic line
counting also when outputting the latex preamble.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37641 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-13 21:41:44 +00:00
Pavel Sanda
ab8645bc3f Few typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37611 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-13 01:34:00 +00:00
Enrico Forestieri
4460f32dfd Fix bug #7186 (Forward Search not working for Child Documents)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37602 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-12 20:24:09 +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
7251551084 Cosmetic change of .lyx headers. We output now only major and minor version,
not release level. File format does not change for a single minor (branch), so
this info has small value.

On the other hand the first line of header is causing unnecessary merge
conflicts for users of LyX VCS.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37579 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-09 22:19:14 +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
Jürgen Spitzmüller
f27d5aa9ae * Allow to set language package on a per-document basis (fixes bug 2909).
File format change. Commit approved by Pavel on trac.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37457 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-03 14:17:31 +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
Pavel Sanda
b01f5549f3 .lyx as symlinks killed when saving because of #6587 workarounds.
At the end escape for fsync would be the least hackish solution
but it needs somebody with ext4 to test with.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37348 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 12:39:50 +00:00
Jean-Marc Lasgouttes
996079334b Fix default buffer output format for literate documents.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37339 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-27 16:33:00 +00:00
Peter Kümmel
654b342e3f make a copy of Converters because this function is used by our export/preview threads
and the converters is also used by the main thread (getStatus).

LyX.exe!lyx::Buffer::doExport
LyX.exe!lyx::Buffer::preview(
LyX.exe!std::tr1::_Pmf_caller3<
LyX.exe!std::tr1::_Pmf_caller3<
LyX.exe!std::tr1::_Callable_pmf<
LyX.exe!std::tr1::_Bind3<
LyX.exe!std::tr1::_Bind_base<
LyX.exe!lyx::frontend::GuiView::GuiViewPrivate::runAndDestroy<
LyX.exe!lyx::frontend::GuiView::GuiViewPrivate::previewAndDestroy(
LyX.exe!QtConcurrent::StoredFunctorCall3<
LyX.exe!QtConcurrent::RunFunctionTask(
QtCored4.dll!QThreadPoolThread::run(
QtCored4.dll!QThreadPrivate::start(
msvcr100d.dll!_callthreadstartex() 
msvcr100d.dll!_threadstartex(void * ptd)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37292 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 09:30:03 +00:00
Enrico Forestieri
ca2ee03ba1 Fix bug #7231 (Math macro arguments miss braces when input into a file)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37205 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-13 21:01:29 +00:00
Abdelrazak Younes
a07d9f2192 Clear undo/redo stack when reloading buffer. This fixes #7208.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37155 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-09 17:55:16 +00:00
Jürgen Spitzmüller
0a34b1e047 fix some typos. Patch by Yuri Chornoivan.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37039 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-29 16:57:04 +00:00
Enrico Forestieri
c203112890 Fix bug #7194 (Crash closing master while child documents are opened)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37021 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-28 15:47:05 +00:00
Pavel Sanda
285a41066b Whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37001 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-26 23:33:28 +00:00
Enrico Forestieri
89c1d25250 Avoid const casts by making mutable the usermacros member.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36984 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-21 14:52:18 +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
Jürgen Spitzmüller
aec686905b * Buffer.cpp (doExport): rebuild the Graph to fix a crash due to an invalid pointer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36837 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 10:56:55 +00:00
Jürgen Spitzmüller
1e98a4f240 Add the option to select the output format in Source View.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36806 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-10 10:34:24 +00:00
Jürgen Spitzmüller
f255f93b9e * Follow Vincent's advice to keep constness. Thanks Vincent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36759 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-07 09:00:50 +00:00
Jürgen Spitzmüller
2653011613 * Use default output flavor for View Source.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36758 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-07 08:36:42 +00:00
Richard Heck
3fffe51506 Revert r36696: We can't collect BibTeX information during the
updateBuffer() traversal. The reason is simple: InsetCitation needs
access to the BibTeX info to calculate its label. But we won't have it
until we get to the bibliography.
I don't think there is any way around that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36710 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-04 03:15:53 +00:00
Richard Heck
0114564eff Mark the cache valid once we have been through updateBuffer().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36702 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 21:22:18 +00:00
Richard Heck
840f2baf91 Simplify some of the bibliography update code. There is really no reason
to be passing the BiblioInfo structure around this way. (That's an old
holdover.) That lets us get rid of the non-const masterBibInfo() again.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36697 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 20:08:04 +00:00
Richard Heck
66be58b074 Proper fix now for bug #6846. The idea, due to JMarc, is to collect
bibliography information in updateBuffer(), rather than doing a wholly
separate traversal. We still do a separate traversal in two cases, as a
full updateBuffer() call just isn't needed there.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36696 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 19:29:46 +00:00
Richard Heck
ab47822680 Towards a proper fix for bug #6846, this just disentangles a couple
things we will ultimately want to do separately.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36694 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 19:00:55 +00:00
Richard Heck
7f5c037df3 Slight re-organization.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36688 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 18:01:37 +00:00
Vincent van Ravesteijn
5eb7add409 Fix bug #6315: counters in insets that don't produce output have ghost values.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36603 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 19:11:38 +00:00