Commit Graph

22562 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
da8c15d4c3 Fix (partly) bug #5754: Caption inset not dissolved when unsetting longtable caption row.
This removes the caption-inset, which is made possible by the clean-up of the LFUN_INSET_DISSOLVE (see r31822 and r31756). This assumes that there is nothing else in the row than the caption inset. I think that should be the case, but this is not yet guaranteed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31823 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 04:31:06 +00:00
Vincent van Ravesteijn
33dbbc15a9 Fix some remains of handling INSET_DISSOLVE (see r31756):
- change cur.inset().nargs() to nargs() as we might actually be in the inset called nextInset(),
- set the enabling flag of the status struct, don't return this value,
- return whether we handled this request.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31822 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 04:01:45 +00:00
Vincent van Ravesteijn
8245ec900b Fix bug #5063: We don't want the combo boxes to adjust to the contents. Also, make the logic exactly the same for all comboboxes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31821 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 02:21:10 +00:00
Uwe Stöhr
8e3736c7b8 GuiBox.cpp: fix typo is comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31820 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-01 23:23:54 +00:00
Vincent van Ravesteijn
d3c786eed6 Fix bug #6297: Use of Fraktur font in boxed equation does not automatically include amssymb.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31819 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-01 22:16:49 +00:00
Uwe Stöhr
28cb2a46b9 tufte-handout.layout: remove code that is already inherited from tufte-book.layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31816 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-01 02:49:05 +00:00
Vincent van Ravesteijn
86b6bb9d18 Fix r31814: we have to close the tab not hide it. Also rename the closeCurrentTab() function to hideCurrentTab().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31815 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-31 18:14:21 +00:00
Vincent van Ravesteijn
e8ec788924 Close the correct tab when clicking one while the active tab is in another tabworkarea. This was fixed in r31072 for the cornerbutton; now it is fixed for the buttons on the tabs themselves.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31814 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-31 18:10:18 +00:00
Uwe Stöhr
d5f23c9fa1 French UserGuide.lyx: correct a string as proposed by Abdel: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg155387.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31813 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-31 01:00:29 +00:00
Vincent van Ravesteijn
25e5dfe330 Do not issue the warning introduced in r31809 if we are setting the parent for the first time, or we are removing the parent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31810 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 15:33:54 +00:00
Vincent van Ravesteijn
0379518340 Issue a warning if a document has two parents. We should do something smart then, but what?
- Do we want to ask the user which of the parents he would like to be the document's parent ?
- Do we want to disable any functionality related to parents ? Like references, bibliography, document outline etc.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31809 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 15:24:35 +00:00
Vincent van Ravesteijn
10e4c1aa7c * LyXaction.cpp: typo and an improved description for LFUN_COMMAND_EXECUTE.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31807 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 15:14:23 +00:00
Vincent van Ravesteijn
1cf4251488 Fix LyX after r31772 (bug #6294).
The declaration should match the definition.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31806 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 14:57:21 +00:00
Kornel Benko
b143ce0148 Added Spacing.cpp to the list for tex2lyx too
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31805 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 06:06:28 +00:00
Uwe Stöhr
7449a337cf UserGuide.lyx: "Close Tab Group" was renamed to "Close Current View"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31802 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 03:33:52 +00:00
Uwe Stöhr
ee9124218b tufte-handout.lyx:
- part is a valid section heading, (if you don't use it, you even won't see PDF bookmarks in the output)
- use starred section headings since the tufte classes by default omit numbers of section headings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31799 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 02:12:50 +00:00
Vincent van Ravesteijn
d4e864dda2 Standard Layout should be MultiPar. Now, because LFUN_BREAK_PARAGRAPHS really uses the MultiPar property, it is necessary to set it correctly.
see r31793.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31798 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 00:33:56 +00:00
Vincent van Ravesteijn
d156d11738 Fix part of bug #6251: When closing a buffer, only close the direct children. All grandchildren will be closed recursively by the children _and_ before it will be close by the grandparent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31797 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 23:28:08 +00:00
Vincent van Ravesteijn
fb2b817346 Dissect closeWorkArea and closeBuffer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31796 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 23:22:50 +00:00
Vincent van Ravesteijn
8fd507ccf2 Remove parameter from cur.reset(). All calls had buffer().inset() as parameter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31795 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 22:46:04 +00:00
Vincent van Ravesteijn
0152d08232 These shouldn't be there as they have nothing to do with the layout of the Inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31794 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 22:13:48 +00:00
Vincent van Ravesteijn
71d29d14b7 Text3.cpp: fix unintended fall-throughs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31793 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 22:08:05 +00:00
Vincent van Ravesteijn
5d9fdda299 Move the call to LFUN_SET_COLOR from the handling of LFUN_BRANCH_ADD_INSERT to LFUN_BRANCH_ADD. Now, the sequence "branch-add A" + "branch-insert A" doesn't result in an undefined branch Inset in the document.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31792 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 22:06:27 +00:00
Vincent van Ravesteijn
cd15ffd9a9 Another fix for bug #5061: A slight correction of the patch shown described in http://permalink.gmane.org/gmane.editors.lyx.devel/113507.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31791 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 21:02:19 +00:00
Vincent van Ravesteijn
d0859f23d0 Fix bug #6292: Ensure the current language is set correctly after dissolving an Inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31790 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 13:36:22 +00:00
Enrico Forestieri
424e3da04c Better fix for bug #6270. The outer braces are swallowed only for user
defined macros, so better use a brace inset only when strictly needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31789 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 13:24:02 +00:00
Uwe Stöhr
9e7fda9130 tufte-handout.layout: the layout inherits everything from tufte-book, therefore remove unused code and load the tufte-book.layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31787 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 02:59:06 +00:00
Uwe Stöhr
9827269e90 scons/scons_manifest.py: remove unneeded includes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31786 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-28 23:51:42 +00:00
Pavel Sanda
e5098a6f0c CompareUi: set scaledContents, resave in 4.4 designer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31785 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-28 18:35:46 +00:00
Jean-Marc Lasgouttes
0a868fb846 remove special TEX2LYX code in Spacing,h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31783 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-28 10:07:10 +00:00
Kornel Benko
56b1078e78 Added FontInfo.cpp to tex2lyx sources to make it compilable again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31782 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-28 06:18:56 +00:00
Uwe Stöhr
b83f574e13 scons_manifest.py: fix SCons after r31772
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31781 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 23:07:50 +00:00
Richard Heck
bc0c63c8ee What we mean by a label in HTML output and what LyX means by a label
aren't the same thing, so we won't be generating default CSS for those.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31778 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:51:30 +00:00
Richard Heck
df0fdb0d53 We should have a default tag for InsetLayout, too, I think. So here it is.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31777 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:46:47 +00:00
Richard Heck
001b0d529d Put the InsetLayout default CSS stuff to use.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31776 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:17:52 +00:00
Richard Heck
d0d86081ba Shouldn't have removed this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31775 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:17:44 +00:00
Richard Heck
9afbd6d68d Update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31774 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:03:30 +00:00
Richard Heck
6a1bf700b4 A bit more cleanup, after JMarc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31773 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 18:23:53 +00:00
Jean-Marc Lasgouttes
0c1ff6d89e Move some functions that only required a FontInfo parameter from Font.*
to FontInfo.*

This allows tex2lyx to use the plain FontInfo object (via Layout), and to remove
several '#ifdef TEX2LYX' in the code

Reorder a bit the makefile in tex2lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31772 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 16:16:15 +00:00
Richard Heck
e8631bf7ed Default CSS for InsetLayout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31771 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 14:33:01 +00:00
Richard Heck
4c004e0485 Forgot this in a previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31770 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 14:32:45 +00:00
Richard Heck
2e871e1ae3 Renaming.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31769 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 14:14:24 +00:00
Richard Heck
e90add4f15 We need to do some cleanup on the layout name before we can
use it as a class name.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31768 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 13:58:23 +00:00
Richard Heck
858dae36e9 Fix up some of the HTML tags now that we have default CSS.
There's more to be done here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31767 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 13:39:39 +00:00
Richard Heck
80cc7e99f2 Add routine to create default CSS for layouts.
JMarc (or others), please check the #ifdef here. If you'd prefer to 
do this some other way, let me know.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31766 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 13:30:53 +00:00
Richard Heck
c2b8eeaf96 Rename some things to improve clarity.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31765 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 13:29:26 +00:00
Richard Heck
1d9b4956c3 Since LyX uses "INHERIT" as a default, we do not want it for HTML.
Also reformat things.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31764 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 13:27:26 +00:00
Richard Heck
66fb89d976 Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31763 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 13:04:13 +00:00
Richard Heck
e4096caf26 Clearer function names, thanks to Abdel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31762 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 12:13:34 +00:00
Uwe Stöhr
7a9e5d2284 tufte-book.layout: correct date of last change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31761 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 03:14:27 +00:00