Commit Graph

22706 Commits

Author SHA1 Message Date
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
Pavel Sanda
221bd56fae Fix warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31728 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 09:28:02 +00:00
Jürgen Spitzmüller
d78bea45b4 * PrefDisplayUi.ui: add tooltip.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31725 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 09:15:18 +00:00
Richard Heck
d603b55b52 A couple comments and some very minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31720 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 02:22:36 +00:00
Richard Heck
14bb003b7e Add an HTML output flavor, and do something with it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31719 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 01:48:14 +00:00
Richard Heck
d7d1b39adc More typos.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31718 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 20:25:35 +00:00
Richard Heck
e3cb00d7c7 Fix a couple typos.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31717 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 20:21:54 +00:00
Uwe Stöhr
5b0e04e646 scons_manifest.py: fix SCons
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31716 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 18:21:39 +00:00
Jürgen Spitzmüller
ebfacbe6ce * Makefile.am: add missing file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31714 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 17:06:53 +00:00
Vincent van Ravesteijn
0fafccb7ed Change to camelbumpstyle.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31713 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 17:04:09 +00:00
Abdelrazak Younes
39d3b09150 Remove unused compile script that dates back to my initial Qt4 port...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31712 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 16:49:42 +00:00
Vincent van Ravesteijn
0e4d0ad7e9 Make trunk compile for now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31711 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 16:17:24 +00:00
Vincent van Ravesteijn
36a8745291 set eol-styles.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31709 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 16:15:28 +00:00
Enrico Forestieri
5e26133947 Fix another problem related to bug #6284.
When pasting "# a" within \mbox{} through Ctrl+Shift+V, the space is
correctly retained. However, using Ctrl+Shift+V for pasting "^ a" into
\mbox{}, the space gets swallowed. This is fixed by this patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31708 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 15:54:03 +00:00
Vincent van Ravesteijn
d4be6cf24c Adds the user interface for the new Comparison feature.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31707 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 15:47:05 +00:00
Vincent van Ravesteijn
9722c8f1ea Add a global accessible function loadIfNeeded().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31705 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 14:57:28 +00:00
Vincent van Ravesteijn
316a17f414 Changes in buffer_funcs.cpp::newUnnamedFile():
- the prefix can now be supplied,
- there can be more types of unnamed files,
- the code is made more concise,
- templatefile parameter is made optional,
- "newfile" is made translatable.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31704 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 14:20:00 +00:00
Richard Heck
923dc53431 Fix a typo and clarify the logic around the return value. Note that this
would allow us to do something after copying, if we should later want to
do that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31703 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 12:31:59 +00:00
Uwe Stöhr
adaeffec5a ext_copy.py: fix #6234 for trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31698 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 00:55:28 +00:00
Vincent van Ravesteijn
f09a4ac03c Fix bug #6280: Wrong context menu is opened in an auto-opened inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31697 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 00:02:41 +00:00
Jean-Marc Lasgouttes
42546d3f2c Disable forking on Mac OS X. This should fix crashes on Snow Leopard.
It would be better to
* detect OS X version at run time (how??)
or
* use proper threads for autosave


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31696 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 16:50:40 +00:00
Jean-Marc Lasgouttes
b265203a84 Paragraph::write: buffer normal characters into a docstring, in order to reduce the number of calls to to_qstr().
THis leads to a big speedup of the buffer-write function (>60%). The goal is to make autosave less noticeable.

This patch should be safe as long as transforming a docstring to utf8 is equivalent to transforming the characters one by one.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31695 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 16:48:55 +00:00
Enrico Forestieri
1535e4b825 Fix the rest of bug #6284.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31694 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 15:00:36 +00:00
Jürgen Spitzmüller
537caa8833 * LaTeXFeatures.cpp:
- do not eat space at the beginning of \lyxadded macro (bug 6282).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31692 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-23 09:01:51 +00:00
Uwe Stöhr
212e783052 installer: sync with branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31691 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-21 03:11:14 +00:00
Uwe Stöhr
3856be62b9 Tutorial.lyx: fixes of issues spotted by John Hudson and revision of the document
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31689 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-21 03:08:18 +00:00
Enrico Forestieri
456449bd56 Better fix for bug #6284. There's no need to check for spaces here
as they are already accounted for during the tokenization phase.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31687 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-20 15:26:22 +00:00
Uwe Stöhr
d319b368c7 tex2lyx/preamble.cpp: improve the fix from r31440:
- when languages are given in the documentclass options _and_ the babel options, babel takes the last language option of the \usepackage call
 - there is no quote language "ngerman", it is in both cases "german"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31685 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-20 01:45:33 +00:00
Uwe Stöhr
d98251c379 - gen_lfuns.py: reduce the space between items in LFUNs.lyx to save whitespace
- LFUNs.lyx: rebuilt with changed gen_lfuns.py

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31681 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 23:44:11 +00:00
Enrico Forestieri
5484edda22 Fix bug #6284: missing space between # and text in math mode when using \mbox
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31680 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 23:11:36 +00:00
Enrico Forestieri
ba9d500de4 The current buffer is the master of an included file, not the grandmaster.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31677 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 10:29:15 +00:00
Uwe Stöhr
8355b32381 - LFUNs.lyx: there is no need to use AMS for this file.
- gen_lfuns.py: change the script accordingly and add the missing \spacing tag

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31669 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 00:01:01 +00:00
Enrico Forestieri
ceaf30cc41 Update reverse search documentation for Cygwin.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31667 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-18 23:09:39 +00:00
Enrico Forestieri
e590b77bcc Update it.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31666 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-18 22:35:33 +00:00
Enrico Forestieri
128e349191 Restore the master language at the end of an included child document
instead of the child document language.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31665 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-18 21:48:13 +00:00