anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-18 00:43:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,890 Commits 31 Branches 172 Tags 618 MiB
9b93ec0732
Commit Graph

23890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Uwe Stöhr
1762b5cb9d - tufte-handout: new layout 
- tufte-book.layout; synchronize with the tufte-handout.layout
- tufte-book.lyx: add important note and improve the documentation according the example file for the similar tufte-handout class
- biblioExample.bib: new entry used by the tufte example files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31760 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 03:12:18 +00:00
Uwe Stöhr
9874b2e279 new layout: tufte-book 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31759 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 01:46:16 +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
Richard Heck
cb138c6c24 This commit does two things. 
First, it introduces some sensible defaults for the html 
output; these are described in layout.h and implemented in 
the openTag, etc, routines.

Second, it modifies the way standard environments are handled.
The previous version was outputing the label for each paragraph
of e.g. a theorem.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31744 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 02:21:59 +00:00
Richard Heck
c1367ef818 Revert previous commit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31743 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 02:19:07 +00:00
Uwe Stöhr
3c9abe63b4 - UserGuide.lyx: describe the new features 
- preview size
  - option for pilcrows
- English UserGuide.lyx: accept changes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31741 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 01:38:40 +00:00
Richard Heck
52246bacb8 Some initial HTML for theorem environments. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31739 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 01:04:31 +00:00
Vincent van Ravesteijn
ed98a0000d Remove const modifier from the correct function. 
see r31737.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31738 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 14:00:29 +00:00
Vincent van Ravesteijn
bdf69de113 Don't set the read-only flags of the documents. The GuiCompare is modal anyway, so the user shouldn't be able to change something. 
This reverts part of r31736.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31737 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 13:56:44 +00:00
Vincent van Ravesteijn
7227566e86 Call the Compare thread from the GuiCompare dialog. 
Furthermore:
- increase safety, 
- improve error handling,
- minor cleanups,
- set documents to read-only while running the thread.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31736 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 13:41:46 +00:00
Vincent van Ravesteijn
18483e6362 Adds the threaded Compare class, which will eventually do the comparison between two documents. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31734 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 10:43:16 +00:00