Commit Graph

35427 Commits

Author SHA1 Message Date
Uwe Stöhr
d4c07e107d Win installer: return to IM 6 2016-05-11 00:32:58 +02:00
Georg Baum
8da5d01ff7 Detect ImageMagick 7
Imagemagick 7 does not have a convert command anymore, it is now called magick.
Joint work by Uwe and me.
2016-05-10 21:27:57 +02:00
Georg Baum
a1cc936548 Ensure that TeXFiles.py is run by python2
We ensure that configure.py is called by python2, regardless whether 'python'
is python 2 or 3. Therefore we can simply call TeXFiles.py with the currently
running interpreter. This fixes configuration on systems where 'python' is
python 3.
2016-05-10 07:18:48 +02:00
Georg Baum
38e9752c01 Change line ends back to unix.
They were changed to windows by accident at 41e928b2e5.
2016-05-09 22:03:16 +02:00
Uwe Stöhr
4ac85c61b6 German UserGuide.lyx: unset compression
thanks Guillaume for the hint
2016-05-09 01:42:35 +02:00
Uwe Stöhr
c62cad7a71 Merge branch 'master' of git.lyx.org:lyx 2016-05-09 01:24:14 +02:00
Uwe Stöhr
41e928b2e5 German UserGuide.lyx: tons of typographic fixes sent in by an unknown user 2016-05-09 01:24:02 +02:00
Guillaume Munch
654f213a2f separator-convert.sh
Lyx files converted from 2.1 to 2.2 contain parbeak and latexpar separators that
would not appear if the lyx file was written in 2.2 from scratch. The script
removes latexpar separators and transforms parbreak separators into plain
separators. Then it displays a diff of the resulting pdf files (requires
diffpdf) for manual control. All lyx files shipped with lyx should be updated in
this way. See #10068.

example usage:
cd lib/doc
../development/tools/separator-convert.sh Math.lyx
2016-05-08 22:14:46 +01:00
Guillaume Munch
10cbed2abe Examples: remove parbreak and latexpar separators
The difference has been validated with diffpdf.

The following could not be tested and were left unchanged:

docbook_article.lyx
lilypond.lyx
linguistics.lyx
springer/sv*.lyx
de/linguistics.lyx
es/linguistics.lyx
ja/FeynmanDiagrams.lyx
ja/lilypond.lyx
ja/beamer.lyx
ja/xypic.lyx

The following is the script that I used (in lib/examples):

LYX=../../build/src/lyx
$LYX -E pdf2 $1.old.pdf $1
sed -i "s/^\\\\begin_inset Separator parbreak$/\\\\begin_inset Separator plain/" $1
sed -i "/^\\\\begin_inset Separator latexpar$/ { N; d; }" $1
$LYX -e lyx $1
$LYX -E pdf2 $1.pdf $1
diffpdf $1.old.pdf $1.pdf
2016-05-08 22:14:46 +01:00
Guillaume Munch
edc8e76591 Templates: remove parbreak and latexpar separators
The difference has been validated with diffpdf.

The following could not be tested and were left unchanged:

AEA.lyx
IJMPC.lyx
ja_beamer-conference-ornate-20min.lyx

The following is the script that I used (in lib/templates):

LYX=../../build/src/lyx
$LYX -E pdf2 $1.old.pdf $1
sed -i "s/^\\\\begin_inset Separator parbreak$/\\\\begin_inset Separator plain/" $1
sed -i "/^\\\\begin_inset Separator latexpar$/ { N; d; }" $1
$LYX -e lyx $1
$LYX -E pdf2 $1.pdf $1
diffpdf $1.old.pdf $1.pdf
2016-05-08 22:14:46 +01:00
Uwe Stöhr
2ea95d0c1f Tutorial.lyx: some mote typographic fixes 2016-05-08 22:32:57 +02:00
Uwe Stöhr
75ff35e089 Tutorial.lyx: typographic fixes spotted by a user 2016-05-08 22:19:49 +02:00
Uwe Stöhr
b6b469a4ab Win installer: remove obsolete comment 2016-05-08 03:10:09 +02:00
Uwe Stöhr
fa2805118b Win installer: update to JabRef 3.x
- also another minor correction
2016-05-08 03:05:55 +02:00
Georg Baum
05ef47f47c Update fuzzy translations without -o
This is what the polib version does already. If a translation is marked
fuzzy then it is not used, so if the other file contains a non-fuzzy
translation we do not throw away useful information if we overtake it.
2016-05-07 10:21:24 +02:00
Georg Baum
499ffc3c13 Merge fuzzy translations correctly
If the -o option is given, we may overwrite existing translations with
translations from the other .po file. In this case, we have to delete or set
the fuzzy flag accoring to the updated translation.
2016-05-07 10:21:12 +02:00
Georg Baum
6a4503ac33 Make mergepo.py python3 compatible
This follows the same recipe (by José) as 262ae8264a for po/lyx_pot.py.
2016-05-07 10:21:00 +02:00
Georg Baum
bc53fc53f8 polib has more names than UTF-8 for utf8
In case of id.po it returns utf-8.
2016-05-07 10:20:38 +02:00
Guillaume Munch
1b4728b5e2 amend 660a43ec 2016-05-07 01:53:04 +01:00
Uwe Stöhr
69d000479a Win installer: update MiKTeX repository and ImageMagick version
- http://ftp.fernuni-hagen.de does no longer exist
- ImageMagick released a new major version
2016-05-07 01:12:36 +02:00
Scott Kostyshak
262dfd3826 Move some unsigned validators to signed (#10095)
2.1.x allows some document settings to have negative values where
2.2.0rc1 does not (because of the bug fix at 9e166088). If a user of
2.2.0rc1 opens a document from 2.1.x that contains one such negative
value, it will appear as though no change to the document settings
can be saved because 2.2.0rc1 treats the document settings as
invalid immediately on opening the dialog. Further, unless the user
manually goes through each tab they will not see the red text next
to the input that is now considered invalid. This could lead to
confusion for users. One example of such confusion is [1].

The following settings now allow negative values, which is
consistent with 2.1.x. Negative values in these settings do not lead
to LaTeX errors:

  - Text Layout tab: the two line edits enabled with "Custom"
  - Page Margins tab: all eight line edits

The following settings are not changed by this commit, so they now
(with 2.2.0) do not allow negative values that 2.1.x allowed. This
change makes sense because negative values lead to LaTeX errors in
these cases:

  - Page Layout tab: the "Height" and "Width" line edits, which are
                     enabled when "Custom" is selected

[1] https://www.mail-archive.com/search?l=mid&q=CAGZ2pgXqf27UaAaQ%3De_wFz1fGTa6Yv0iFyS97qu1C7B5R59irg%40mail.gmail.com
2016-05-06 15:43:41 -04:00
Georg Baum
6390e6264e Fix version number 2016-05-05 13:39:45 +02:00
Georg Baum
23f5ae67c7 ja.gmo for cfa8d02029 2016-05-05 10:20:23 +02:00
Guillaume Munch
660a43ecf4 Clipboard: Retry on_dataChanged() after a delay on windows (#10109)
An undocumented behaviour of QClipboard::mimeData() is that it can fail on
windows due to the specificities of the windows API that allow a race condition.
In particular it seems that querying the clipboard as soon as the dataChanged()
signal is received favourises this race condition.

Thanks to Trac user bquistorff for the explanation and a proof of concept patch.
2016-05-04 19:20:56 +01:00
Guillaume Munch
8fd223146b Whitespace 2016-05-04 18:59:36 +01:00
Uwe Stöhr
b289c597ae Japanese doc files: big translation update fro 2.2.0 from Koji 2016-05-04 01:12:04 +02:00
Uwe Stöhr
cfa8d02029 ja.po: Update from Koji for 2.2.0 2016-05-04 01:08:56 +02:00
Jean-Marc Lasgouttes
ff17b366a0 Resources.cpp is a built source, it should not be in SOURCEFILES
We want to avoid that Resources.cpp be distributed in the tar file.
2016-04-27 00:59:30 +02:00
Scott Kostyshak
2ab7c3ac11 RELEASE-NOTES: advise MSVC 2015 update 2 on Win
When compiling with Qt 5.6, MSVC 2015 update 2 is recommended in
order to avoid #9892.
2016-04-25 23:53:29 -04:00
Stephan Witt
21e4e939be Revert part of c053a9394d
This change introduced a regression and is not needed anymore.

(cherry picked from commit 1cbabdf8d51b26dd80677ddfeb64d13df91fefc0)
2016-04-25 20:59:25 +02:00
Enrico Forestieri
9384ed0f08 Update it.po 2016-04-25 17:36:51 +02:00
Georg Baum
04e4d6c4eb Update fuzzy translations from 2.1.x branch
This was done with
python ../lyx-2.3-staging/development/tools/mergepo.py -n -t po ../lyx-2.1/po

It should have been part of a26cdcb4ba, but the mergepo script did not overwrite
fuzzy translations with non-fuzzy ones at that time. Now 2.2 will not be missing
translations that are in 2.1 (but of course it might contain changed translations).
2016-04-24 21:33:38 +02:00
Georg Baum
4016d00c97 Forgot fi.gmo at 7eacd8d316 2016-04-24 20:44:31 +02:00
Georg Baum
dc38ae873a Fix bug 10074 (regression)
This was a regression of 8aa37c43. I did not take into account that end_pos
could be -1, so the code that checked whether a pair of braces needs to be
inserted between two hyphens did not work for that case. Now we check for
the length of text_, which should be done anyway, and only take end_pos into
account when it is not -1.
2016-04-24 20:12:43 +02:00
Georg Baum
7eacd8d316 Merge finnish translations from bug 10084
Jari-Matti provided an updated fi.po in bug 10084, but unfortunately I did not
see that before remerging the strings. Therefore, I did not take the updated
file directly, but downloaded it to /tmp/fi.po and merged the updates with

python ../lyx-2.3-staging/development/tools/mergepo.py -o -l fi -t po /tmp/

The two header changes were done manually. This way, the updated translations
are not hidden in lots of sorting changes. I had to use mergepo.py from 2.3
because the one in master does not treat fuzzy translations correctly.
2016-04-24 20:04:05 +02:00
Georg Baum
44f73d4c73 pt_BR.po: updates from Georger 2016-04-24 17:06:23 +02:00
Guillaume Munch
86227b196d Citation dialog: Fix trouble with openbox, fluxbox
http://thread.gmane.org/gmane.editors.lyx.devel/161725

These wms have trouble with the fix at b5a2f1c7, probably more precisely with
the trick to force the calculation of the actual sizes before the display
(layout->invalidate() and the code around it).

This patch gets rid of the code that forces the calculation. As a consequence,
the minimum sizes are again incorrect the first time the window is shown. They
are only correct the second time the window is shown. Now here is the trick: LyX
remembers the sizes of windows between sessions. Therefore, as soon as the good
minimum size has been set, the good size is remembered for the next
session. Thus, in the following sessions, even though the minimum size is
incorrect the first time, the dialog still opens with the good size. So the user
does not see the problem in practice, apart from the very first time.

This is meant as a temporary workaround.
2016-04-24 14:05:54 +01:00
Georg Baum
cfafffdf25 Remerge strings except for sv and fr
This is a complete remerge of strings (done with cmake) except for fr.po and
sv.po. Those files had already been remerged after the last string changes,
but they use a different sorting, so I did not want to produce an unneeded
diff.
The differences in the comment lines are a well known problem we have: The
last remerge was done on windows, mine was done on linux.
2016-04-24 10:57:36 +02:00
Georg Baum
7e75ebac45 fr.gmo for 79074e6c87 2016-04-23 11:26:28 +02:00
jpc
79074e6c87 Hopefully last update for 2.2.0 2016-04-22 22:55:47 +01:00
Georg Baum
9bd6ed876f Update sv.gmo from sv.po
This has been forgotten in 93f58cb440
2016-04-21 21:52:44 +02:00
Georg Baum
57298bf59d Update pt_BR.gmo from pt_BR.po
This has been forgotten in c46d5ccdf6
2016-04-21 21:51:12 +02:00
Uwe Stöhr
c46d5ccdf6 pt_BR.po: updates from Georger 2016-04-18 19:10:57 +02:00
Scott Kostyshak
287db1239b Fix a \origin unavailable 2016-04-16 15:20:33 -04:00
jpc
3d5cae4edd Minor rephrasing of last commit 2016-04-16 09:15:42 +01:00
Uwe Stöhr
93f58cb440 sv.po: updates for 2.2.0 from Jim 2016-04-16 01:55:40 +02:00
Guillaume Munch
744f6e3cd8 Compute the highlighting color from AlternateBase and Highlight roles (#10073) 2016-04-15 14:13:50 +01:00
Stephan Witt
87c85303c5 Improved fix for #9966
* provide GuiApplication::typewriterSystemFont() to get a fixed font consistently
* enlarge fixed font on Mac because of the too small default Qt system font
* use it in source pane, progress view, log view and document preamble editor
2016-04-15 11:49:04 +02:00
Jean-Marc Lasgouttes
4807338ba9 Remove image spellcheck-continously.svgz
It is not a proper icon and is not used currently.
2016-04-15 09:21:44 +02:00
Kornel Benko
882b7b01d0 Cmake install: Exclude some files from being installed
Files like CMakeLists.txt or *.lyx~ should not be part
of an installation.
2016-04-14 11:15:08 +02:00