anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-30 05:00:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,134 Commits 31 Branches 172 Tags
Commit Graph

17651 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
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
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
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
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
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
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
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
Vincent van Ravesteijn
d9ab7302a6 Fix bug #6193: Crash when navigating away from an empty super/subscript. 
I still don't know why it is that bad that this call is made below, but this seems to fix the problem.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31758 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 00:11:56 +00:00
Vincent van Ravesteijn
6e8312d1a4 Move (part of) LFUN_DISSOLVE_INSET into InsetText. 
- put the InsetFlex specific part into InsetFlex,
- honor the argument given to the LFUN also for normal Insets as the description already stated,
- fix bug #6285: context menu action goes to the wrong inset.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31756 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 23:49:43 +00:00
Vincent van Ravesteijn
1bcb0d38e6 * InsetTabular.h: Whitespace. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31755 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 22:21:07 +00:00
Richard Heck
8a38179d6d Initial work for the layout2css stuff. Basically, we have a routine 
here, and lots of support, that writes font information to CSS format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31754 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 21:35:35 +00:00
Richard Heck
5faa75408b Try to deal with one of the big problems here, namely, that we 
can't just output Standard as <p>, or anything else, because we
have structures like:
  this is text <branch>and more text</branch> and more
which would then come out as:
  <p>this is text <p>and more text</p> and more</p>
So we use the OutputParam html_in_par to try to signal when we
are already in a paragraph. It is expected that we will need to
do some bug fixing here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31753 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 20:53:46 +00:00
Richard Heck
9a19a312ba Rename one output param and add a new one. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31752 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 20:47:12 +00:00
Richard Heck
331d8060b5 Move the defaults to Layout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31751 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 20:45:29 +00:00
Richard Heck
67b7ca00a0 Some framework stuff for default-generated CSS. 
The actual generation is still to come.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31749 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 16:13:09 +00:00
Jean-Marc Lasgouttes
546f91ac9e fix linking of Compare.o with autotools 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31748 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 15:45:33 +00:00
Jean-Marc Lasgouttes
32f1905660 fix Ui of GuiCompare to work with Qt 4.2 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31747 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 15:45:01 +00:00
Richard Heck
dfe5bd2e40 Allow the suppression of LyX's own labels. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31746 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 02:51:51 +00:00
Richard Heck
02bc0dc3bf Don't wrap empty labels. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31745 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 02:37:31 +00:00