Commit Graph

35661 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
2766857f01 Do not use 'u' flag for ar
The Reproducible Builds effort (https://wiki.debian.org/ReproducibleBuilds) in Debian (at least) means that 'ar' is built in deterministic mode as default: all timestamps are set to 0.

This is not compatible with the use of the 'u' flag, and therefore ARFLAGS has to be changed from 'cru' to 'cr'.

This gets rid of the harmless but annoying warning
  ar: `u' modifier ignored since `D' is the default (see `U')
(cherry picked from commit 987fc1d15d017c192a566fc922e3967d9d280668)
2016-05-11 18:14:29 +02:00
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
Jean-Marc Lasgouttes
67f77a07f0 Disable LFUN_INSET_DISSOLVE in tabulars
When in a tabular cell, "this" is just a lone InsetText, while cur.inset() is the whole tabular. This makes a big difference, especially when one wants to count cells.

Fixes bug #9954.

(cherry picked from commit 4caf167dbd24722421ae8d94a2c103bf41a7667d)
2016-05-10 18:10:47 +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
Jean-Marc Lasgouttes
7444b894f8 Rename InsetMathHull::isTable to allowsTabularFeatures
The old name conflicted with the newly introduced Inset::isTable.

Now the meaning is as follows.
* Inset::isTable() is true when the inset is composed of lines and columns
* InsetMathHull::allowsTabularFeatures is true when the current type of hull allows for tabular-like functions.

(cherry picked from commit db39dc7ccd4c2dd14ef20547e6e3c056ba030d83)
2016-05-09 11:15:17 +02:00
Jean-Marc Lasgouttes
1f2d7bf7e6 Make inset-select-all select all cells only in tables
inset-select-all has 3 levels
1. select current cell
2. select all cells
3. select inset from outside.

The second level makes sense for tables (text and math), but not for things like a math fraction.

Introduce a new method Inset::isTable() that allows to detect this case properly and skip level 2.

(cherry picked from commit 5de28b9ac6736c791146a1a3ebe7f4826c22a9b7)
2016-05-09 11:15:17 +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
Guillaume Munch
1a836459fb Show review toolbar when outputting changes
"Output changes" alters the preamble even in the absence of tracked
changes. Therefore, not being able to notice when it is activated can possibly
yield hard-to-debug compilation failures.
2016-05-06 02:07:34 +01:00
Guillaume Munch
bc40386a6e status.22x 2016-05-06 01:36:27 +01:00
Guillaume Munch
0e8a5be368 Disable certain change tracking commands when there are no changes
Fix TODO
2016-05-06 01:01:42 +01:00
Guillaume Munch
0988675353 GuiChanges: provide feedback when there are no more changes
Remove FIXMEs: date and time localisation
2016-05-06 01:01:42 +01:00
Guillaume Munch
c3acdb9c7c Automatically show the review toolbar if the document has tracked changes
(#8738)

For efficiency, we add a new flag to the buffer indicating when changes are
present. This flag is updated at each buffer update, and also when explicitly
requested via a dispatch result flag.
2016-05-06 01:01:42 +01:00
Guillaume Munch
23edd3a1a2 getInnerText() 2016-05-06 01:01:42 +01: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
Guillaume Munch
5bfdaef980 TocWidget: clean-up the timer logic
The timer logic introduced to solve bug #7138 was not entirely reliable; in
particular it resulted in spurious updates (noticeable by the treeview
collapsing just after one opens a branch, in particular).

This commit cleans up the timer logic. I followed the original design decision
of having an immediate update followed by a delayed update. Now the updates are
appropriately compressed and done after a delay of 2s (as can be noticed with
the treeview still collapsing, unfortunately, but after a more predictable
delay...).
2016-05-03 17:20:58 +01:00
Guillaume Munch
90c8b0697f TocWidget: Fix perf regression
4d1ad336 fixed #9754 but caused perf issues by cancelling the gains of having a
timer (introduced after #7138). This introduces in GuiToc::enableView() a
lightweight check of whether the widget should be updated. The logic is inspired
from GuiViewSource::enableView().
2016-05-03 17:20:58 +01:00
Guillaume Munch
5b976a5ebc Whitespace 2016-05-03 17:20:57 +01:00
Jean-Marc Lasgouttes
79be66bdf1 Let getPosNearX take horizontal scrolling into account
If we do not do that, it is not possible to position the cursor after
a long inset with the mouse.

To do this, it is necessary to add the pit information to the Row
object. This is a good idea in any case, and will allow to simplify
some code later on.

Fixes bug #10094.
(cherry picked from commit 8851645799ef67015e49fd75b9dfeed65d685e85)
2016-05-03 10:53:10 +02:00
Jean-Marc Lasgouttes
390adf75c5 Add missing entry in status.22x
This was forgotten in fe5e1170.
2016-05-01 00:18:10 +02:00
Guillaume Munch
a5e2024fc4 status.22x 2016-04-30 16:07:51 +01:00
Jean-Marc Lasgouttes
fe5e117038 Fix cursor position after redo
When document settings are modified, a command
  inset-forall Branch inset-toggle asign
is run to open as needed all branches. At the end of the said loop,
the cursor is reset to where it was. However, the cur_after undo
element member is not set because it already had a value.

To make this work as expected, it is necessary in LFUN_INSET_FORALL to
reset the cursor before ending the undo group and to insert a dummy
recordUndo call.

Fixes bug #10097.

(cherry picked from commit 0036762f30def16ab8b2216f721f9e552893bc85)
2016-04-29 18:00:53 +02:00
Guillaume Munch
044933b0d9 Improvements to the shortcuts preference dialog (#9174)
Ask the user for removing bindings when using the "restore" button (#9174).

Fix the already-bound-key detection logic.

Don't forget to trigger the search when initializing the search LineEdit with
its former value.
2016-04-29 00:04:10 +01: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