Commit Graph

24878 Commits

Author SHA1 Message Date
Kornel Benko
8ffb386899 1.) Removed the unconditional set of option LYX_MERGE_FILES if option
LYX_INSTALL set.
    Does not compile on ubuntu.
2.) translations handling depends now from LYX_CPACK option
  if CPACK option not set translations will be done only if
  explicitly specified on the command line for make e.g.
  ==> make translations


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34976 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 15:30:54 +00:00
Stephan Witt
0498aa1dcb correct OR when checking modifiers
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34974 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 12:18:22 +00:00
Richard Heck
7441f370c0 Revert r34969.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34973 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 12:09:06 +00:00
Richard Heck
0903700db3 Update comment a bit further.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34972 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 12:04:36 +00:00
Richard Heck
88329a656c Fix problem reported by Vincent, that absence of python can cause
failure to load the empty class.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34971 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 11:58:38 +00:00
Richard Heck
9034323d59 Renaming and typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34970 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 11:52:12 +00:00
Uwe Stöhr
ab85e493c7 GuiWorkArea.cpp: make it compilable
Stephan, please check if this is correct

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 11:49:34 +00:00
Peter Kümmel
53bddc751e cmake: fix typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 10:32:54 +00:00
Stephan Witt
e99bd868f9 use "alt" instead of "option" for modifier keyword
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 10:04:59 +00:00
Peter Kümmel
99160cd715 cmkae: more cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34966 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 09:46:46 +00:00
Peter Kümmel
23cfb00ef1 cmake: more cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 07:38:00 +00:00
Kornel Benko
0bcf9a01a0 Remove translation target from automatic creation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34963 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 07:11:42 +00:00
Peter Kümmel
9060f01aa8 cmake: split out FindHunspell.cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34961 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 06:47:01 +00:00
Kornel Benko
7053bbf977 Add CPack unconditionally again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34959 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 06:22:20 +00:00
Peter Kümmel
153bc82d63 cmake: linux is case sensitive
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34957 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 23:23:09 +00:00
Peter Kümmel
19c3bff281 cmake: linux fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34956 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 23:12:50 +00:00
Stephan Witt
0d386d7c25 make mouse scroll wheel zoom configurable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34955 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 22:29:42 +00:00
Peter Kümmel
30bae1710a cmake: fix merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34954 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 22:24:30 +00:00
Peter Kümmel
f151f3a30f cmake: sync with branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34953 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 22:24:08 +00:00
Vincent van Ravesteijn
da45f74df2 Compile fix for r34950.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34952 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 21:22:32 +00:00
Vincent van Ravesteijn
d8351db924 * ModuleList.cpp:
- it makes no sense to output the real filename if it is empty.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34951 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 21:19:46 +00:00
Vincent van Ravesteijn
dd08dd8d0a * LayoutFile.cpp:
- it makes no sense to output the real filename if it is empty,
- success is already false.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34950 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 21:12:48 +00:00
Uwe Stöhr
8e4e050a96 SCons: use a standalone Qt installation rather than a special bundle
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34949 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 19:30:12 +00:00
Uwe Stöhr
457466bb18 lyx_2_0.py: fix comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34948 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 19:29:13 +00:00
Richard Heck
9eaefc1eb6 Uwe's use_makebox conversion routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34947 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 18:10:37 +00:00
Enrico Forestieri
161af56f4e By default, overwrite the main file on export, but allow changing default
behavior through the environment variable LYX_FORCE_OVERWRITE.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34946 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 17:55:46 +00:00
Uwe Stöhr
be06af987f update SCons once more
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34945 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 16:27:21 +00:00
Uwe Stöhr
d8523cc229 GuiFontLoader.cpp: forgot this in r34941
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34944 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 16:16:47 +00:00
Peter Kümmel
c09d33120d UNDO: enc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34943 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 16:09:26 +00:00
Uwe Stöhr
72292b98a6 support for formal math script
- fileformat change
- fixes #2340

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34941 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 15:51:11 +00:00
Uwe Stöhr
6f83641b8e LaTeXConfig.lyx: fix sorting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34940 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 15:40:40 +00:00
Uwe Stöhr
f06e7dcedf lyx_2_0.py: whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34939 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 15:23:21 +00:00
Pavel Sanda
45ab02e550 Prepare for Math Formal Script Family.
Add rsfs10.ttf generated from CTAN's rsfs fonts.
This is really beautiful script.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34938 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 15:00:12 +00:00
Richard Heck
fd03b1280e Allow for "Provides babel 1".
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34937 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 14:49:30 +00:00
Pavel Sanda
59598a0d25 Fix tarball creation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34936 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 14:17:44 +00:00
Uwe Stöhr
ef817c12e7 update SCons
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34935 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 13:49:26 +00:00
Kornel Benko
29bb9c9b57 Remove second call tm msgmerge' The diffs in created po-files
were because of the sort-flag in for msgmerge.

Now the outcome is identical to automake.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34934 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 12:58:34 +00:00
Kornel Benko
043ff28a99 Modified FindLyXGettext.cmake as to producing the same output as automake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34932 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 12:37:37 +00:00
Peter Kümmel
56a7a67783 add first version of .lyx file encryption. It's disabled by default and could out-of-the-box only by compiled on Linux with cmake and with openssl-devel packeges.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 12:26:11 +00:00
Kornel Benko
476d7a9df7 Sorry, vorgotten a dependency.
The po-files created with "make update_po_files" differs from their
counterparts in automake. Especially the last part starting with fuzzy
translations.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34930 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 12:04:04 +00:00
Kornel Benko
05dd62a092 Added target 'update_po_files' to remerge po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34929 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 11:09:10 +00:00
Pavel Sanda
2aa233e68f Remerge strings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34927 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 10:52:29 +00:00
Pavel Sanda
3e64ec2c9d comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34925 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 09:53:29 +00:00
Uwe Stöhr
7db47d9069 ja.po: updates for trunk by Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34922 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 01:39:34 +00:00
Richard Heck
facb727c4a Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34921 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 15:20:17 +00:00
Richard Heck
7d4c560f87 Remove Nameref support. Too many issues involving translation, quotes,
etc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34920 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 15:19:04 +00:00
Enrico Forestieri
be3fba333b Remove left over.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34919 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 14:43:12 +00:00
Enrico Forestieri
952a31a43e Fix output to terminal when LyX is launched from a GUI on *nix
aka
Surrender to Windowsisms
aka
Resistance is futile, you will be assimilated


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34918 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 14:30:46 +00:00
Peter Kümmel
2467a88cde no output to stdout when redirecting, cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34915 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 09:57:46 +00:00
Peter Kümmel
146b1083a1 fix stupid renaming error
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34914 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 08:14:00 +00:00