Commit Graph

170 Commits

Author SHA1 Message Date
Richard Heck
f119b8f4de Fix bug 4927 again. The latex2ert routine was geared too much toward IndexInset, where
the initial backslash in a LaTeX command is escaped, which it is not in a subfigure.

Note that we are NOT converting labels here into InsetLabel objects. That would not be 
all that hard to do. I've put a comment in about how we could do that. It would be fairly
easy to do.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25581 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-13 19:24:09 +00:00
Richard Heck
a3cfc7aea3 I suppose a line could begin: status openly. So we'll try harder.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25547 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 22:18:14 +00:00
Richard Heck
d06e468995 Move the lyx2latex conversion into a separate routine, so that it could be used elsewhere, too.
People should welcome to add more conversions, if they seem necessary.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25543 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 22:01:57 +00:00
Richard Heck
2debd7d780 Revert IndexQuotes for Index entries. Note that this is totally basic. Someone
who understands quotes is welcome to fix it up.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25542 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 21:55:06 +00:00
Richard Heck
82152ac435 More work on 5006.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25539 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 16:24:19 +00:00
Jürgen Spitzmüller
55a9aa7149 Back to CJK sanity II: re-introduce Japanese (CJK) [bug 4700]
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25511 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-09 07:27:31 +00:00
Richard Heck
dc6da80146 Try to fix bug 5006. The idea here is to wrap all LaTeX commands that are not in math into ERT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25508 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-08 20:25:53 +00:00
Richard Heck
7c03f1808b Some more cleanup of these conversion routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25498 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 21:20:30 +00:00
Richard Heck
77581b5c0d Do a little more work towards making subcaptions work.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25497 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 21:13:02 +00:00
Richard Heck
bdb72502aa Use the unicodesymbols file for the latex2lyx conversion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25495 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 20:31:06 +00:00
Richard Heck
0b4e475bb9 Move the LaTeX to LyX-text conversion into a separate routine, so it can be used
in other places. This is now latex2lyx().



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25492 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 19:13:01 +00:00
Richard Heck
6033b020f3 Cosmetics, mostly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25490 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 18:50:50 +00:00
Richard Heck
d48038c87d Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25489 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 18:22:59 +00:00
Richard Heck
166e3b8c0f Remove the FIXME.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25488 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 18:22:28 +00:00
Richard Heck
bc6c3d91ae Fix up convert_subfig a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25487 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 18:21:53 +00:00
Richard Heck
28fcaad580 Fix lstparams reversion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25486 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 18:17:16 +00:00
Richard Heck
e07caa5f52 Fix up some of the reversion and conversion routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25485 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 18:09:29 +00:00
Richard Heck
175959580f Fix include reversion routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25484 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 17:41:56 +00:00
Richard Heck
3a2153b287 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25482 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 17:23:51 +00:00
Richard Heck
13f95530be Fix whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25478 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 16:22:55 +00:00
Richard Heck
10f7b8cb35 Fix bug 4984: Revert Flex URL to InsetURL.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25477 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 16:12:32 +00:00
Uwe Stöhr
e2e78fa20a - support for polytonic Greek, fileformat incremented to 338, fixes bug 4969, patch by me and Jürgen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25356 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-22 23:21:46 +00:00
Jürgen Spitzmüller
ae760fa72b * Fix lyx2lyx and thereby make install (bug 4953).
* Whitespace.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25259 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-15 14:06:14 +00:00
Abdelrazak Younes
4a1be58591 - Simplify prefs, graphics and external display options which are now true or false.
- the display combo in the prefs, external and graphics dialogs are gone
- the lyxrc display_graphics option now overrides any local inset display option
- The external template format has a new tag: Preview
- format incremented to 337


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25245 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-13 07:34:55 +00:00
Jürgen Spitzmüller
0f07e83733 Wrap figures can also have subfloats. I simply forgot that when implementing subfloat support.
Well, here it is. Fixes one part of bug 4927. There's a remaining problem on conversion of onld subfigs with LaTeX content (e.g. \label). I'll fix that in a second step.

There's 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25148 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 16:05:52 +00:00
Jürgen Spitzmüller
d7eaaba900 ** support for CJK font argument. File Format change **
* src/BufferParams.{cpp,h}:
	- new param fontsCJK (font_cjk).

* src/output_latex.cpp:
	- use fontsCJK param.

* src/Buffer.cpp:
	- increase file format

* src/frontends/qt4/GuiDocument.cpp:
* src/frontends/qt4/ui/FontUi.ui:
	- GUI for the CJK font param

* lib/lyx2lyx/lyx_1_6.py:
	- remove font_cjk param on reversion.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25135 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 06:18:34 +00:00
Richard Heck
592dbb3284 The UserGuide now exports happily to 1.5.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25131 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 05:00:53 +00:00
Richard Heck
d12eea121c Conversion and reversion routines for Standard --> PlainLayout --> Plain Layout business.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25130 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 03:54:18 +00:00
Richard Heck
a54ede0aff Some comments on future cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25126 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-04 22:37:09 +00:00
Richard Heck
9990563fbb The 1.5.x User's Guide now loads in 1.6.svn.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25089 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-03 00:41:38 +00:00
Richard Heck
66799e41fd Another typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25087 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-03 00:05:03 +00:00
Richard Heck
d866df82ea Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25086 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-02 23:24:04 +00:00
Richard Heck
e41875173f Add some LaTeX <--> LyXText conversions.
A lot more of this needs to be done.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25081 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-02 19:47:18 +00:00
Richard Heck
a97fbaa685 More work fixing lyx2lyx.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25080 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-02 19:42:53 +00:00
Richard Heck
0bc17b0c65 Really get revert_nocite working.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25058 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 19:59:15 +00:00
Richard Heck
44d46835fe Fix the increment of i here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25055 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 15:01:28 +00:00
Richard Heck
f7db6b62aa Revert inadvertent commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25054 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 15:00:23 +00:00
Richard Heck
9ae7fa2f36 Just a comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25053 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 14:57:33 +00:00
Richard Heck
3d4f1ca1bc Make revert_nocite work again. Similar issues with ranges and changing indices.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25052 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 14:55:47 +00:00
Richard Heck
cefb583528 Similar range-->while stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25051 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 14:27:43 +00:00
Richard Heck
843fa219b6 Fix convert_spaceinset again.
The problem here is that
  for i in range(len(document.body)):
sets the range BEFORE we do any of our manipulations. But those manipulations 
can make document.body longer. As a result, we can fail to test some lines.
Instead, use:
  while i < len(document.body):
and increment i in the while loop.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25050 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 14:22:11 +00:00
Jürgen Spitzmüller
16ad4a928d * lib/lyx2lyx/lyx_1_6.py:
- revert wrong commit (rev. 25033)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25048 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 10:24:27 +00:00
Richard Heck
983c002dd5 More lyx2lyx fixes. Same issue.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25041 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 02:26:56 +00:00
Richard Heck
180b205049 More fixes, same issue.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25040 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 02:22:44 +00:00
Richard Heck
b40db6b561 Fix revert btprint lyx2lyx.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25039 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 02:21:29 +00:00
Richard Heck
74141d4f72 Fixes for the fixes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25038 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 02:18:51 +00:00
Richard Heck
3e70c177a9 Fix for revert_nocite lyx2lyx. Warnings as before.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25037 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 02:14:15 +00:00
Richard Heck
f7158c0d29 More lyx2lyx fixes. Same warning as before.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25036 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 02:04:33 +00:00
Richard Heck
72a84b1c09 Fix framed notes lyx2lyx reversion. Again, this was a mechanical fix. It should be checked.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25035 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 01:50:39 +00:00
Richard Heck
d70f3a1f3b Fix framed notes lyx2lyx.
Note that this is a mechanical fix. Someone should check that it works.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25034 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 01:45:19 +00:00