Commit Graph

4937 Commits

Author SHA1 Message Date
Jürgen Spitzmüller
5b8598b48d * languages: add some comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36296 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-14 13:41:38 +00:00
Jürgen Spitzmüller
cc5dd37a2a Introduce a new Language option "AsBabelOptions" that specifies whether a language requires to be passed to babel itself (instead of globally to the class).
This allows us to remove some ugly hardcoding of languages in the source.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36292 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-14 10:35:35 +00:00
Jürgen Spitzmüller
12c7e7dde3 * add PreBabelPreamble to Language definition (fixes #4786).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36291 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-14 09:54:24 +00:00
Pavel Sanda
7f3b80c30c Kill examples/es/beamer-conference-ornate20min.lyx which is already (newer) in templates.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36286 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-13 22:24:28 +00:00
Jürgen Spitzmüller
148f2d648c The languages file rewrite.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36285 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-13 17:25:03 +00:00
Richard Heck
05df2a7cc6 Fix python 3 deprecation warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36267 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 15:42:50 +00:00
Jürgen Spitzmüller
8b24e160b0 * fr_beamer-conference-ornate-20min.lyx: update by Jean-Pierre.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36265 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 15:17:28 +00:00
Jürgen Spitzmüller
2afa7eabd0 * revert r36189, since there is no consensus for this change.
Happy Friday, everybody!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36257 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 09:31:55 +00:00
Uwe Stöhr
1f4b26050e - Serbian splash.lyx: new translation by Zoran
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36252 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 00:29:41 +00:00
Richard Heck
6f76593069 Fix a bug in getFormattedReference().
Also, change from using the "cha" prefix for chapters, a la prettyref,
to the "chap" prefix, a la refstyle. We alias \pr@chap to \pr@cha for
prettyref users.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36238 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 16:45:55 +00:00
Richard Heck
00e6cfee4a Same changes for revert_multirowOffset as for revert_multirow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36233 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 14:00:54 +00:00
Richard Heck
a1589fb091 Thinko.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36232 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 13:46:50 +00:00
Richard Heck
22c7c7b144 Another try at multirow reversion. What makes this so hard is that we
have to account for the possibility of tables within tables.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36230 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 13:41:43 +00:00
Uwe Stöhr
07176c1a45 lyx_2_0.py: correct reversion of multirows with offsets the same ways as for "standard" multirows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36221 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-09 05:35:51 +00:00
Uwe Stöhr
fd25c82378 lyx_2_0.py: correct reversion of multirows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36220 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-09 04:58:46 +00:00
Uwe Stöhr
933bfa77c9 FeynmanDiagrams.lyx:
- new French translation by Jean-Pierre
- fine-tune English version

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36218 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-09 02:15:20 +00:00
Pavel Sanda
52b9a8e8fe * Additional.lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36197 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 18:50:51 +00:00
Uwe Stöhr
6c07cc1820 FeynmanDiagrams.lyx: fix 2 typos spotted by Jean-Pierre
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36192 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 16:45:59 +00:00
Uwe Stöhr
e94a9732b1 stdinsets.inc, InsetERT.cpp: change "ERT" to "TeX" to be consistent - the documentation and all other menus use consequently since LyX 1.6.0 "TeX-code" because it turned out that ERT is a meaningless abbreviation for new users
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36189 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 15:31:05 +00:00
Uwe Stöhr
86b99f8f32 GuiTabular: support for multirow offset; fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36182 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 05:32:28 +00:00
Richard Heck
0a7187b946 Remove one FIXME.
Remove "added by lyx2lyx"-type comment. This is now added automatically
by add_to_preamble (and insert_to_preamble, too).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36166 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 18:42:19 +00:00
Uwe Stöhr
613cad54a4 lyx_2_0.py:
- remove 2 fixmes; we can be sure that there is space between the table entries
- add comment for the preamble that got lost the last days

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36165 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 17:42:26 +00:00
Jean-Marc Lasgouttes
b9b619641b This patch implements proper ERT behaviour for normal layouts.
In particular, it makes paragraph breaks generate single \n in latex output
when ParbreakIsNewline is true

This means that it is not necessary anymore to use newlines to break lines. 
Plain paragraph breaks can be used instead, like is done now in ERT/Listings. 
This is mainly aimed at sweave support.

lyx2lyx support courtesy of Richard Heck



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36163 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 15:06:19 +00:00
Vincent van Ravesteijn
88f3be373a Readd the conversion/reversion for format 405.
This was accidentally removed in r36136.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36151 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:39:06 +00:00
Richard Heck
e3c3c18f27 A couple more comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36144 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:14:49 +00:00
Richard Heck
c0c780d719 Comment out some unused code to save a little load time. It also helps
readers of the class to know what's used and what's not.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36143 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:13:33 +00:00
Richard Heck
284346aa4e Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36142 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:12:44 +00:00
Richard Heck
44279587e5 Make sure we delete this line.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36139 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:13:58 +00:00
Richard Heck
296ae1b3f0 Find the end of this layout, not the first end_layout tag we see!
Math manual now exports right.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36138 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:11:51 +00:00
Richard Heck
bae5fe21bc Make sure we extend with a list.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36137 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:11:19 +00:00
Richard Heck
6ec6e93815 Use find_token_exact so that we do not also find hspace*.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36136 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 19:59:24 +00:00
Richard Heck
c282f4e9db Remove use_makebox option from other boxes, too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36135 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 19:51:06 +00:00
Vincent van Ravesteijn
f226c9d3fc Fix bug #6058: Change tracking and versioning.
Computes a hash value for the authors when using change tracking.

Text.cpp, BufferParams.h, Author.h:
  Change unsigned int to int because the hash values can be negative.

lyx2lyx:
  Allow to convert negative author_ids.

See also: r30756.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36134 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 18:25:29 +00:00
Richard Heck
fb64f0e1af Improve how add_to_preamble and insert_to_preamble work, and audit the
various calls to each.

This should more or less complete the lyx2lyx orgy. Some things probably
will have been broken by accident. Hopefully not too many, and more
things that were broken got fixed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36133 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:54:57 +00:00
Richard Heck
86cff08734 insert_to_preamble likes lists of lines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36132 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:39:21 +00:00
Richard Heck
f3ae1e2641 These commands should just take some lines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36131 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:35:53 +00:00
Richard Heck
68ec955a6d Some documentation for lyx2lyx_tools.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36130 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:27:28 +00:00
Richard Heck
cbbc3d34e3 So I now understand why find_token_exact is called what it is, but it
does not do what it is supposed to do, in general. Still, I guess it is
best left as it is.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36129 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:09:43 +00:00
Richard Heck
1702cc1fa2 At least rename this argument to something that makes sense.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36128 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:02:26 +00:00
Richard Heck
3f47eb1883 More documentation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36127 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:59:27 +00:00
Richard Heck
6cc1d31e38 Just a bit of safety here.
This 0 default for end is wrong. You should be able to do:
  find_token(lines, token, 0, 0)
and have that return -1. As it is, this is equivalent to:
  find_token(lines, token, 0, len(lines))
But I am afraid to change the default, in case something in lyx_1.2.py
relies upon it somehow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36125 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:43:30 +00:00
Richard Heck
f93c44791d Use del_token where it makes sense to do so.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36124 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:33:29 +00:00
Richard Heck
b1c11faf7e This is the del_token that would be helpful.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36123 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:22:26 +00:00
Richard Heck
98c80361f4 Move del_token into the files where it is used. We could use such a
thing, but not one that returns what this does.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36122 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:20:32 +00:00
Richard Heck
fbd0436847 Begin a bunch of comments on the parser tools. You can look through the
file, but it is more helpful to have them summarized here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36121 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:18:20 +00:00
Richard Heck
665c9d78d5 Add two new routines to parser_tools. Somewhere along the way, I wished
I had these. I'm not going to go back and change more code, but these
will be worth having later.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36120 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:04:17 +00:00
Richard Heck
cd544b25d3 Remove FIXME.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36119 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:48:45 +00:00
Richard Heck
d13394a73b Rename and restructure get_containing_inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36117 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:18:47 +00:00
Richard Heck
5fe584cc9c Simplify this complicated routine of mine now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36116 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:13:42 +00:00
Vincent van Ravesteijn
6b81613f9c Fix bug #7016: Cannot read theorems-ams-bytype.inc.
The old format tag was never deleted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36115 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:12:04 +00:00