Commit Graph

18642 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
b9b619641b This patch implements proper ERT behaviour for normal layouts.
In particular, it makes paragraph breaks generate single \n in latex output
when ParbreakIsNewline is true

This means that it is not necessary anymore to use newlines to break lines. 
Plain paragraph breaks can be used instead, like is done now in ERT/Listings. 
This is mainly aimed at sweave support.

lyx2lyx support courtesy of Richard Heck



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36163 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 15:06:19 +00:00
Pavel Sanda
04e6076ebb Comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36162 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 12:32:47 +00:00
Stephan Witt
2c7a7e72c2 implementation for "Compare with older revision" for CVS, correct return value of SVN::prepareFileRevision for failure to create tmp file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36161 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 12:18:09 +00:00
Stephan Witt
ba00acbd65 check for user cancel or errors on vcs revert before reload of buffer in LFUN_VC_REVERT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36160 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 11:54:08 +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
Pavel Sanda
c9332413e5 Quickfix closing #6396.
sleep sleep


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36154 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 02:38:35 +00:00
Pavel Sanda
69520456e0 Fix RCS part of #6396. Btw revert is slightly broken now...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36153 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 02:21:04 +00:00
Pavel Sanda
0586a14d63 Compil fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36150 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:34:03 +00:00
Vincent van Ravesteijn
4397cef1f8 src/support/debug.h/cpp:
- rename the private member dt to dt_,
- rename second_ and second_used_ to second_stream and second_enabled_ to have the same terminology as the stream_ and enabled_ member,
- remove FIXME because now we have a Qt pane showing the messages,
- adjust some comments.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36149 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:22:47 +00:00
Stephan Witt
69dd56d6c4 CVS implementation for buffer-info vcs-author, cvs-date and cvs-time
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36148 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:20:42 +00:00
Pavel Sanda
badbd3dcc3 Compil fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36147 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:04:21 +00:00
Vincent van Ravesteijn
38e43ce4ca Clarify comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36146 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:23:26 +00:00
Vincent van Ravesteijn
afa873dc5f Remove the FileName parameter of Buffer::loadLyXFile and friends. Now, getAutosaveFileNameFor and getEmergencyFileNamefor can be removed too. Last, the call to lyxvc.file_found_hook can now be centralized and can be given the correct parameter (d->filename instead of the name of the emergency/autosave file).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36145 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:21:01 +00:00
Vincent van Ravesteijn
ab8d87f26a Allow for nested setBusy calls.
Before, LyX could crash when calling setBusy(false) while LyX is still in a busy state due to a surrounding setBusy(true)/setBusy(false) construction.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36140 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:24:58 +00:00
Vincent van Ravesteijn
f226c9d3fc Fix bug #6058: Change tracking and versioning.
Computes a hash value for the authors when using change tracking.

Text.cpp, BufferParams.h, Author.h:
  Change unsigned int to int because the hash values can be negative.

lyx2lyx:
  Allow to convert negative author_ids.

See also: r30756.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36134 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 18:25:29 +00:00
Vincent van Ravesteijn
a4fd294373 Add a static assert to prevent compilation on platforms where int/usigned int are not 32-bits/4-bytes.
This is added to be sure that the to-be-added author hash is always 32-bit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36126 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:51:09 +00:00
Vincent van Ravesteijn
2810b7aef7 typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36062 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:35:12 +00:00
Vincent van Ravesteijn
6f61652605 Fix part of bug #5561: Issues with image pasting
Now the path to the pasted graphics is saved as a relative path if possible.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36058 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 14:28:33 +00:00
Richard Heck
f652f90af9 LyX does \makeat for us.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36030 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:08:01 +00:00
Richard Heck
f7e80e6681 More safety here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36013 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 20:15:04 +00:00
Richard Heck
01af564dc2 Fix bug #7014. The problem here is that we get DEFSKIP if we don't
recognize the argument, but that leads to an infinite loop.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36012 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 20:12:18 +00:00
Uwe Stöhr
bbb8671328 GuiTabular.cpp: add comments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36011 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 01:29:01 +00:00
Enrico Forestieri
31b5ba7e25 Be compatible with Qt 4.2 and 4.3 (Q_EMIT).
Actually, it still fails to link with anything less than Qt 4.4.0
due to the xxxAndDestroy() business in GuiView.cpp ...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36009 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 00:38:35 +00:00
Richard Heck
dc5934737d Improve display of index names under Insert>Lists/TOC.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36006 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 20:38:42 +00:00
Richard Heck
cddf32f152 Use bformat so we get RTL etc correct here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36005 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 20:31:52 +00:00
Pavel Sanda
f5123ccfa8 Add comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36003 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 19:54:08 +00:00
Pavel Sanda
70db6e30c8 Be compatible with Qt 4.2.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg162871.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36002 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 16:37:47 +00:00
Richard Heck
2a0fcda936 Perhaps this is overkill, but it can't hurt....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36001 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 15:42:45 +00:00
Richard Heck
efa0da26c8 Fix the following sort of crash, reported on the list. This is also
#6884.

1. Open LyX. File>New. Document>Outline, to make sure the TOC is open.
That isn't necessary, but it helps you to see what is happening.
2. Create a section heading (alt-P, 2) with an x in it.
3. Split the screen.
4. File>New. You should now still see the TOC for the OLD buffer.
5. Click in the top screen. You now see an empty TOC (the one for the
empty buffer).
6. Click in the empty buffer. Other TOC!
7. Back to the "x" buffer. Empty TOC. Type something. Boom!

The problem is that teh setCurrentWorkArea() call eventually gets us to
structureChanged(), which accesses documentBufferView(). But that
doesn't get reset until later, and hence everything is out of sync.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35999 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 15:33:52 +00:00
Richard Heck
4645e3c56f Make sure that the members of this enum get the same value on every
platform.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35995 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 14:50:07 +00:00
Abdelrazak Younes
3142a62c7a Table dialog: Fix enabling/disabling of first header and last footer
check boxes.
This should fix bug #7008


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35993 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 13:35:16 +00:00
Pavel Sanda
07fc85d3e2 typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35986 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 23:24:24 +00:00
Stephan Witt
2f10f8edd0 first step to cure the VCS load problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35985 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 22:20:54 +00:00
Richard Heck
96dfec471f Partially fix #5108.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35984 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:54:20 +00:00
Uwe Stöhr
f0b79f00fc GuiTabular.cpp: fix #7006: the caption checkbox was simply not connected
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35983 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:52:08 +00:00
Peter Kümmel
8718c455a6 check also if there is a QApplication instance
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35981 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:32:59 +00:00
Uwe Stöhr
3e7d87f489 GuiTabular.cpp: add a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35979 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:20:27 +00:00
Abdelrazak Younes
8b7584846c Fix bug #6997
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35977 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 21:00:03 +00:00
Richard Heck
fa6118e4af Revert unintentional commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35976 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 20:58:24 +00:00
Richard Heck
64e77d6c14 Fix bug #6888.
This is why it was worth doing the updateBuffer() rewrite.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35975 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 20:57:10 +00:00
Pavel Sanda
5075f0f25f typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35973 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 20:24:29 +00:00
Richard Heck
9b105fc6bf Fix bug #7002. I think this is correct, but Peter should check.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35970 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 19:37:59 +00:00
Uwe Stöhr
7c2b2c464b InsetTabular.cpp: multirows are always left-aligned thus allow left alignment and forbid center alignment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:45:02 +00:00
Uwe Stöhr
90291acefb InsetTabular.cpp: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:12:46 +00:00
Uwe Stöhr
98b8e1eb81 InsetTabular.cpp: multirow cells are ALWAYS left aligned and thus cannot inherit the alignment of the column
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:09:38 +00:00
Uwe Stöhr
bc30270b35 InsetTabular.cpp: fix #7003 that I accidentally introduced when fixing #6958
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35966 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 16:16:40 +00:00
Stephan Witt
85b09e9d04 remove the translation context for vcs buffer info message for unimplemented features, the name of vcs info is hardcoded and ascii only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35965 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 15:16:59 +00:00
Jürgen Spitzmüller
9ef7efd85a whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 15:15:38 +00:00
Richard Heck
5c9dde4d3b Had to be a typo, right?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35962 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 11:54:18 +00:00