Commit Graph

437 Commits

Author SHA1 Message Date
Juergen Spitzmueller
f6c0c1ee35 Enable optional \cite* arguments in biblatex-natbib
(cherry picked from commit 6a4199ed23)
2019-05-13 09:25:31 +02:00
Richard Kimberly Heck
679f136eb6 Update Russian translation. 2019-05-11 16:30:37 -04:00
Juergen Spitzmueller
b50949b472 Only write btUnits if we have a bibliography
Fixes: #11562
(cherry picked from commit b77094a497)
2019-04-24 07:32:07 +02:00
Juergen Spitzmueller
43c31f4e0e Revive Bulgarian localization 2019-04-23 13:33:04 +02:00
Juergen Spitzmueller
4104cd13a5 Fix renaming of citation refs after changing bibitem key
Fixes: #6494
(cherry picked from commit faefee3dc6)
2019-04-22 09:18:29 +02:00
Juergen Spitzmueller
6f8673bcee Pass proper text to TeXOnePar in Paragrapgh::Private::validate
This fixes InPreamble layouts in insets (#11557)

(cherry picked from commit 4f884fc92d)
2019-04-21 08:03:22 +02:00
Juergen Spitzmueller
ccf93fc0d6 Use proper listings font styles with polyglossia and RTL
Fixes: #11554

Also load color with minted and polyglossia/RTL, as minted loads it
too late.

(cherry picked from commit 3e516a6219)
2019-04-20 08:37:45 +02:00
Juergen Spitzmueller
ac1ee5947f Status update 2019-04-16 09:10:38 +02:00
Enrico Forestieri
f929e2aae5 Update status.23x
Add reference to a bug reported after it was fixed.
2019-04-14 10:46:05 +02:00
Jean-Marc Lasgouttes
f03c4a2db4 Fixup ad79ac40: reintroduce markers around delimiters
The reasoning behind this change was not correct.

Fixes bug #11516.

(cherry picked from commit 3b58e38dc6)
2019-04-10 14:39:09 +02:00
Jean-Marc Lasgouttes
595c6d0a05 Fix bold-like characters when selecting bidi text
In painter, restrting paining regions does not really work when region is empty.

Fixes bug #11198.

(cherry picked from commit f9da28428a)
2019-04-10 14:19:18 +02:00
Daniel Ramoeller
e8dc6fad05 Fix for #11476: Icons have spurious squares
(cherry picked from commit 209944796a)
2019-04-06 07:30:46 +02:00
Daniel Ramoeller
5f444ee86f Fix for Mac Command-0 zoom-buffer binding
Amends fix to #10455

(cherry picked from commit 990f1eca4a)
2019-04-06 07:28:47 +02:00
Juergen Spitzmueller
7986ac2f32 Fix left/right border UI when toggling formal
Fixes: #9835
(cherry picked from commit 00de6c4be7)
2019-04-01 18:48:07 +02:00
Juergen Spitzmueller
15dae1244b Fix booktabs bottom line with multirows
Fixes: #11445
(cherry picked from commit 819c9c1645)
2019-04-01 18:45:57 +02:00
Enrico Forestieri
f836783908 Fix bug #11526
Correctly categorize a textmode symbol in mathed.

(cherry picked from commit c2af2cfd94)
2019-03-24 22:19:05 +01:00
Jean-Marc Lasgouttes
e0879b1460 Cache the value of GuiFontMetrics::lbearing().
This seems to be necessary on windows, where math editing can get very
slow. Note that other methods like rbearing already use a cache.

In the future all these caches for single characters shall be unified.

(cherry picked from commit d3979e798c)
2019-03-21 18:43:37 +01:00
Jean-Marc Lasgouttes
f94cdf6e1c Place the depth bar correctly in full screen mode
In full screen mode, it is possible to restrict the text width. In
this case, the paint bar should not be painted outside of this
restricted area.

Fixes bug #11286.

(cherry picked from commit 7485225cc6)
2019-03-21 11:57:59 +01:00
Juergen Spitzmueller
5518ca028e Add tabular-features set-inner-lines and fix set-all-lines behavior
Patch by Daniel Ramöller (racoon)

Fixes: #11382
(cherry picked from commit cb84f752f2)
2019-03-20 12:49:23 +01:00
Enrico Forestieri
98a792c9fd Fix bug #11490
Correctly add the branch name suffix when the stem
of the filename contains a dot.

(cherry picked from commit c3b9504835)
2019-03-19 21:41:04 +01:00
Enrico Forestieri
33023e6811 Fix bug #4269 and avoid crash with gzipped file
Call gunzip with quoted filenames as they may contain spaces or
other special characters.

In computing the length of the extension, the code does not account
for the prefix "unzipped_", which is added when the zipped filename
does not have one of the extensions "gz", "z", "Z", or "svgz", and
thus the used index is out of bounds. See also this thread:
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg207360.html

(cherry picked from commit 69726b832b)
(cherry picked from commit 7296e0e6ba)
2019-03-19 21:27:35 +01:00
Juergen Spitzmueller
4456dede9c Do not force LTR with nameref and non-TeX fonts
Fixes: #11518
(cherry picked from commit f0282ddff4)
2019-03-17 17:29:14 +01:00
Richard Kimberly Heck
3ce4338e75 Fix regression concerning collapsing insets after search.
To reproduce: Do a search for text in a footnote (say) that is
currently closed. Click inside the now open footnote. It will close
by itself.

We need to know whether we can go into the inset, not whether we can
edit once we're there.

(cherry picked from commit 4484cc7751)
2019-03-14 21:34:50 -04:00
Juergen Spitzmueller
d3c47dcb13 More exceptions to percent encoding
See #11511

(cherry picked from commit 3c83f01f1b)
2019-03-10 18:04:03 +01:00
Jean-Marc Lasgouttes
ee8a336cbc Update screen as needed when preferences are changed
This commit removes the adhoc code in GuiPrefs and moves it to LyXRC,
so that it triggers in every preference change.

The code has also been updated to trigger on more variables, e.g.
font_*_foundry.

Note that the actual function that are called have not been changed
(addPreviews and LFUN_SCREEN_FONT_UPDATE), although there are doubts
that they behave as needed (see FIXMEs).

Fixes bug #11498.

(cherry picked from commit 954531f247)
2019-02-27 12:04:09 +01:00
Richard Kimberly Heck
9374d0edd9 Fix bad error message (bug 11486).
(cherry picked from commit 5b959033d2)
2019-02-25 22:04:19 -05:00
Juergen Spitzmueller
43edb36032 Amend 5f45b3ed9c
(cherry picked from commit 806f742263)
2019-02-23 17:23:40 +01:00
Juergen Spitzmueller
130a555796 Fix IPA icons
Convert text to path and fix the most salient drawing issues.
2019-02-11 16:47:36 +01:00
Jean-Marc Lasgouttes
4c18a49c87 Fix algorithm for finding localized files
Now we search in priority with the GUI language, and then the
language(s) specified in the LANGUAGES environment variable.
Preoviously, the GUI language would only be considered when
LANGUAGES was not set (which was a bug).

Take this opportunity to remove old compatibility code from 2007.

(cherry picked from commit e203bf519b)
2019-02-07 10:19:28 +01:00
Enrico Forestieri
841f0fd3dd Fix bug #11484
When splitting parameters at commas, take into account that
commas inside curly braces are not parameter separators.

(cherry picked from commit 6316b9b7ae)
2019-02-05 14:57:18 +01:00
Juergen Spitzmueller
f785d63a0a ? and = must not be percent-encoded in hrefs
Fixes: #11482
(cherry picked from commit c2db448ff5)
2019-01-30 08:17:20 +01:00
Daniel Ramoeller
b8e6527c79 Fix for #11294: Wrong description for Change bars module
(cherry picked from commit f71723c8f3)
2019-01-19 19:04:47 -05:00
Richard Kimberly Heck
8cbf1c7cec Rename emergency file when it is kept.
Otherwise, we will ask about it again next time, when the file
may have changed. Also, if we crash again, we'll over-write that
file, which we may not want to do.

See bug #11464.

(cherry picked from commit b804e8851c)
2019-01-17 23:01:54 -05:00
Enrico Forestieri
a54147d087 Remove PYTHONPATH from the environment on Windows
This make sure to use the the modules distributed with LyX,
avoiding reconfigure failures.

(cherry picked from commit ad0c9a548b)
2019-01-12 18:52:01 +01:00
Enrico Forestieri
3131873a6d Replace environment variables in PATH prefix
The PATH prefix modified through the GUI was set without
replacing embedded environment variables. This might have
caused problems on Windows with external python installations.

(cherry picked from commit 472bdf5910)
2019-01-11 23:01:18 +01:00
Juergen Spitzmueller
bfd86a947a Do not consider deleted labels in ambiguity check
This adds a new (boolean) parameter "active" to the label cache, where
we track whether a label is deleted in ct mode (the same could be done,
if wanted, for labels in notes and inactive branches).

Deleted (inactive) labels are neither considered in the uniqueness check
nor added to the outliner. This also means that undeleted references to
deleted labels are now (correctly) marked as BROKEN.

Cherry-picked from:

    [3ae6bff538/lyxgit]
    [a550a613e8/lyxgit]
    [c457ea90e/lyxgit]
    [5cfd25697/lyxgit]
    [5afacb144/lyxgit]
    [54366c38e/lyxgit]

Fixes: #6563
2019-01-09 09:06:53 +01:00
Juergen Spitzmueller
5f3c0d5aca When using polyglossia (bidi), paragraph directions don't need to be swapped
Bidi does that.

Fixes: #11399
(cherry picked from commit 9d20bc4e98)
2019-01-08 08:30:42 +01:00
Scott Kostyshak
45931f7a60 status.23x: correct typo from 822e0133
Thanks to José.
2019-01-07 12:15:16 -05:00
Scott Kostyshak
822e0133aa ko splash.lyx: specify "mj" as CJK font
Now (thanks to d193cd05), the Korean splash.lyx compiles
out-of-the-box with pdflatex.

Thanks to Jürgen.

(cherry picked from commit 0cfaf406c5)
2019-01-07 11:56:23 -05:00
Juergen Spitzmueller
8918075ed0 Properly implement CJKutf8
If we use that, the document actually needs to be in utf8 encoding, and
the CJK environment needs to account for it.

Candidate for stable.

(cherry picked from commit d193cd05a8)
2019-01-07 17:23:22 +01:00
Jean-Marc Lasgouttes
e8d96cb9b1 Fix display of gather in lefteqn mode
The column is flushed when the display of equations is flushed.

Not sure what to do with RtL languages.

Fixes bug 11324.

(cherry picked from commit 7cb0284a3f)
2019-01-07 11:41:35 +01:00
Stephan Witt
7dd5d6371f Add license info for inkscape start script
(cherry picked from commit a4d409b194)

Add status log for 2.3.x
2019-01-07 00:18:52 +01:00
Richard Kimberly Heck
6ac69a78f8 Fix problem caused by re-ordering of menu at 5f6332bf4.
This broke the activation and de-activation of plural, capitalize,
etc. I guess that tells us how much those get used....

(cherry picked from commit 9b3f9cc687)
2019-01-06 12:57:09 -05:00
Jean-Marc Lasgouttes
85e693806e Allow toggling (no)limits only after mathop symbol
In particular, introduce the new InsetMathScript::allowLimits method
that checks for that and honor it in getStatus/ddoDispatch.

Do the same for (over|under)brace

(cherry picked from commit 7b7ed64a0e)
(cherry picked from commit 6cfd733dea)
2019-01-05 15:18:09 +01:00
Jean-Marc Lasgouttes
ca8f6c09b6 forgot this 2019-01-05 15:04:51 +01:00
Jean-Marc Lasgouttes
7f3407b89a Avoid crash when using inset-select-all in tabular
When changing cell idx, it is important to set the pit to a reasonable
value.

(cherry picked from commit a69e01d0b4)
2019-01-05 14:56:41 +01:00
Jean-Marc Lasgouttes
e73c0d6387 Fix vertical offset of fonts like MinionPro
For some reason, adding a LTR/RTL Override unicode character before a
MinionPro string increases the ascent of the line.

This creates vertical offset issues when painting if the ascent used
as reference is the one of the font. Use the QTextLine ascent instead
for better results.

This is a followup to 1bed76e2a.

Fixes (reopened) ticket #11284.
Fixes ticket #10532.
Fixes ticket #10767.

(cherry picked from commit d8498d4785)
2019-01-05 14:40:56 +01:00
Juergen Spitzmueller
08100f8b02 Always update bibfiles cache with bibliography environment before opening citation dialog
We need to do this unconditionally, since there is no (trivial and non-
awkward) way to update it when the bibliography paragraphs are modified.

Fixes: #4899
(cherry picked from commit 35534231d4)
2019-01-05 10:31:08 +01:00
Richard Kimberly Heck
3c4c5aa994 Fix bug #11432.
Take account of Layout::free_spacing.

(cherry picked from commit 6135824f40)
2019-01-03 19:18:22 -05:00
Jean-Marc Lasgouttes
1e2b503ac9 Remove premature (and bad) optimization
When blinking the caret, it looks like a cool idea to only update the
small rectangle containing the caret. Actually it is an awful idea, since
the paint event will paint some rows, and these rows will not be
properly painted outside of the small rectangle. Unfortunately, the
painter will skip those "painted" rows on next paint events.

This leads to painting errors that depend on the ordering of "real"
and "caret" paint events. This is the reason why they only appeared
with split screens.

Quote of the day: ``The real problem is that programmers have spent far
too much time worrying about efficiency in the wrong places and at the
wrong times; premature optimization is the root of all evil (or at
least most of it) in programming.''
-- Donald Knuth, The Art of Computer Programming.

Fixes bug #11354.

(cherry picked from commit fba9f5b9e8)
2019-01-03 13:52:40 +01:00
Jean-Marc Lasgouttes
b9116e8b81 Add override statements to please clang
Eventually, all overridden virtual methods should be marked properly.
Currently, clang only warns about those in classes that already use
override in at least one place (which was the case dor GuiApplication).

(cherry picked from commit c8f4b68423)
2019-01-03 10:22:11 +01:00
Kornel Benko
00cd6f101c Amend 031d1c86: Add support for aastex62 2018-12-30 09:22:55 +01:00
Juergen Spitzmueller
51db94b350 Fix some parsing glitches in Autonest and IsAutonestedBy
Layouts can have spaces, underlines (that must be read as spaces, and
be enquoted)

Candidate for stable

(cherry picked from commit da273a944f)
2018-12-29 18:36:20 +01:00
Juergen Spitzmueller
d62775553a Beamer: autonest column in columns
Candidate for stable

(cherry picked from commit 012d9b088e)
2018-12-29 18:34:10 +01:00
Juergen Spitzmueller
a9890828bd Do not auto-insert separator for keepempty layouts
Candidate for stable

(cherry picked from commit 59d73f52b8)
2018-12-29 18:32:47 +01:00
Juergen Spitzmueller
7e1ecb653b Handle bibliography irritations in thesis template
Outsource the bibliography to an own child, which is then also included
in the children's "Standalone" branch

Add some clarifying notes.

Fixes: #10748
(cherry picked from commit 12aaeb259f)
2018-12-29 18:07:17 +01:00
Pavel Sanda
78e256163a Backport 33284ee5c. 2018-12-29 17:55:55 +01:00
Richard Kimberly Heck
d06c3d7d9f Fix bug #6096.
We used to need a hack to set the size of the layout combo, but
the code was changed in Qt 4.5 or so. Hence the appearance of this
bug in 2009. We can now just remove this hack, and all seems to
work correctly.

(cherry picked from commit d7f4346a19)
2018-12-29 11:30:47 -05:00
Richard Kimberly Heck
6806ad98df Fix bug #9004.
I'm not entirely happy with this way of doing it. It seems messy.
But there is not another clear option right now.

(cherry picked from commit 4f0ccae399)
2018-12-29 11:28:51 -05:00
Juergen Spitzmueller
35f0117b5f LFUN_TEXTSTYLE_UPDATE: Do not force any unspecified settings.
Fixes: #11111 (yay!)
(cherry picked from commit 2f9876a410)
2018-12-29 09:38:39 +01:00
Richard Kimberly Heck
88034d3d89 Fix bug #11422.
We need to load the master document before applying the params, since
otherwise the TOC reset (and other things) happen before the master
has been loaded (and set as parent).

(cherry picked from commit ac3693c04f)
2018-12-29 00:25:58 -05:00
Richard Kimberly Heck
9cd9712cf0 Fix bug #11378.
(cherry picked from commit f11a51be35)
2018-12-28 23:04:46 -05:00
Juergen Spitzmueller
6145cb798d Allow to restore default UI colors in prefs
Patch by Daniel Ramöller (racoon), with slight modifications of mine.

Fixes: #10062

(cherry picked from commit 81e4f8dfb6
with minor adaptations)
2018-12-24 11:51:38 +01:00
Scott Kostyshak
c249d942d6 status.23x: add entry for fix to changes in sel
This status entry is for #10338, which was backported in the
previous two commits.
2018-12-23 15:19:40 -05:00
Juergen Spitzmueller
4480b72a9d GuiCharacter: Add menu to Restore button
and allow for resetting all widgets to "No Change" besides "Default"

(cherry picked from commit ac8aac5b36)
2018-12-22 08:52:55 +01:00
Jean-Marc Lasgouttes
714b731e39 Make DEPM respect current cursor position.
Spaces are now conserved when they surround current cursor. Examples:
  abc   |   def
becomes
  abc | def
after DEPM and
  abc |
is kept as it is.

Fixes ticket #11412.

(cherry picked from commit dff0c5729e)
2018-12-21 22:18:40 +01:00
Enrico Forestieri
324b828717 Fix bug 11346
Enclose in braces an optional argument of a math macro when it
starts with an incomplete script inset or ends with a delimiter
size-modifier macro.

(cherry picked from commit 2dcb730026)
2018-12-20 11:57:54 +01:00
Pavel Sanda
7b431ff0ba Backport 99bfe20120. 2018-12-19 21:47:06 +01:00
Pavel Sanda
cb848bbcd0 * status.23x 2018-12-18 23:17:54 +01:00
Juergen Spitzmueller
1dc6154708 GuiCharacter: Add "Reset" and "Restore Defaults" buttons
Addresses #11415
2018-12-18 08:32:48 +01:00
Juergen Spitzmueller
aea162cc8d Check for hidden dirty child on close
Fixes: #11405
(cherry picked from commit f87218bbb5)
2018-12-17 18:46:13 +01:00
Juergen Spitzmueller
262b0dcca4 GuiCharacter: INHERIT is OFF for the tristate buttons.
(cherry picked from commit 1b6ce0e827)
2018-12-17 10:44:10 +01:00
Jean-Marc Lasgouttes
47adf27ac3 Fix undo after breaking a nested paragraph
We have to take into account that Buffer::updateBuffer can modify the document.

Fix bug #11292.

(cherry picked from commit 57feb0fed0)
2018-12-16 22:00:36 +01:00
Jean-Marc Lasgouttes
09d742cc7f Update boost to 1.68.
This avoid lots of warnings from gcc 8.
2018-12-16 21:45:02 +01:00
Jean-Marc Lasgouttes
0e6cb4e599 Set buffer correctly when changing math space type.
Fixes bug #7747.

(cherry picked from commit 2ec25c8eef)
2018-12-14 19:39:54 +01:00
Enrico Forestieri
3e9a1c2da7 Fix bug #9622
The backslash is the escape character used in our parser. Hence,
when used as a path separator on Windows, it has to be itself
escaped or the path enclosed in either double or single quotes.
Windows users are maybe trained to quote paths containing spaces
but not paths with backslashes. So, we automatically escape the
backslashes when they are not already enclosed in quotes.

(cherry picked from commit 4c9df62c6c)
2018-12-14 18:57:48 +01:00
Enrico Forestieri
eba2f14fa7 Fix display of single-char macro names
Essentially, all characters are allowed in single-char macro names.

Part of #11158.

(cherry picked from commit 95bc273a59)
2018-12-14 12:05:40 +01:00
Jean-Marc Lasgouttes
7950ace3d9 Fix selection of unmarked RtL text
With Qt 5.11 at least, RtL text will be drawn RtL even when the
(undocumented) flag Qt::TextForceLeftToRight is applied to the
QTextLayout object. This creates selection issues for Hebrew text
marked as English.

The solution is to do the same as in breakAt_helper, that is prepend
the string with a direction override unicode character.

Doing this requires to introduce a TEXTLAYOUT_OFFSET constant that has
to be used wisely to account for this extra character.

Fixes bug #11284.

(cherry picked from commit 1bed76e2a1)
2018-12-13 10:51:59 +01:00
Jean-Marc Lasgouttes
3a123b90af Remove old workaround that is not needed anymore
This causes a compilation error with boost 1.69.

Fixes bug #11349.

(cherry picked from commit 76e99e9a20)
2018-12-13 10:39:58 +01:00
Juergen Spitzmueller
ac351f40f1 Fix encoding problems in \input@path
As of LaTeX2e 2018, characters are made active earlier, which results
in new expansion problems.

Following a suggestion of Markus Kohm (pc) and the TL mailing list [1],
we embrace non-ASCII input paths in \detokenize. This relies on e-tex,
but I think we can assume this is nowadays available everywhere.

[1] http://tug.org/pipermail/tex-live/2018-May/041691.html

Fixes: #11146
(cherry picked from commit 8bd65041f2)
2018-12-12 08:39:20 +01:00
Richard Kimberly Heck
c26c7602e4 Copy modules into the Advanced F&R pane as well.
(cherry picked from commit 5064c09e9f)

Update the Advanced F&R document class when switching buffers.

(cherry picked from commit 944b0ae55d)
2018-12-11 18:05:53 -05:00
Richard Kimberly Heck
7bc7b8f422 Speed up convert_literalparam. Part of #11200.
(cherry picked from commit 4549f46a43)
2018-12-11 18:03:44 -05:00
Guillaume Munch
c1945d27df Make tab movement visible (#10733)
The nice hand-made solution for moving tabs has made its time. Use Qt's feature
instead from now on.

(cherry picked from commit 1979496399)
2018-12-11 17:59:27 -05:00
Richard Heck
e694199837 Fix bug 9798.
Nameref support for math references.

(cherry picked from commit 5f6332bf46)
2018-12-11 17:58:07 -05:00
Enrico Forestieri
535309929b Fix reloading of local layout file (bug #11120)
(cherry picked from commit 7822d11361)
2018-12-11 19:26:17 +01:00
Richard Kimberly Heck
ec464a8b9f Prepare for 2.3.2. 2018-12-08 11:24:40 -05:00
Juergen Spitzmueller
a7ecbba7bc sv.po: update by Jim. 2018-11-25 11:51:11 +01:00
Jean-Marc Lasgouttes
f7ebe1f70f Show cursor correctly when loading file
This is a fixup to 4ecbff00. When a file is loaded and the cursor is
set, it is required to first compute metrics to be able to scroll the
screen correctly.

Fixes bug #11377.

(cherry picked from commit 2dc84b69d5)
2018-11-23 17:05:46 +01:00
Jean-Marc Lasgouttes
c1df5fb6ef Avoid extra space in tooltips
When using QTextDocument to check the natutal size of a text, one has
to remove the text margin, which is not useful here.

Fixes bug #11353.

(cherry picked from commit 7db99672e6)
2018-11-21 14:47:04 +01:00
Juergen Spitzmueller
caa4ee6412 pt_BR.po: update by Georger 2018-11-18 18:22:08 +01:00
Juergen Spitzmueller
37599f29a4 uk.po: update by Yuri 2018-11-14 16:21:35 +01:00
Enrico Forestieri
704eede69b Fix bug #11367
The overset, underset, and stackrel insets behave like the script
rather than the fraction inset.
2018-11-12 21:17:03 +01:00
Juergen Spitzmueller
639aa35444 Dispay pre- and posttext widgets if non-empty also if unapplied
Fixes: #11352
(cherry picked from commit b8932afed5)
2018-10-30 22:18:52 +01:00
Juergen Spitzmueller
e00b11355d Merge paragraphs when pasted into an inset that forbids multipars
Fixes: #8281
(cherry picked from commit 5dde4b1b3e)
2018-10-14 09:06:38 +02:00
Juergen Spitzmueller
53a108e814 Load covington later
This solves a loading order conflict with beamer-article.

(cherry picked from commit 00ee54e694)
2018-10-13 09:49:10 +02:00
Enrico Forestieri
e323f74b78 Fix bug #11332
Add the "hyperref-driver=dvips" option to the extra flags of the
latex->dvi converter so that the breakurl package is automatically
loaded when needed.

(cherry picked from commit f5e6db7171)
2018-10-12 08:27:23 +02:00
Richard Kimberly Heck
7697bf7888 Revert "Fix bug #9348"
The fix changes behavior too much for stable. My bad.

This reverts commit e94ea46be7.
2018-10-08 16:27:47 -04:00
Juergen Spitzmueller
7a0416b374 Rework OK/Apply/Cancel UI of prefs dialog
Instead of "Save" (permanently) and "Apply" (temporarily), OK and Apply
now always save permanently, unless the new checkbox "Apply to current
session only" is checked.

Addresses: #10016
(cherry picked from commit c7bdb3b342)
2018-10-08 11:46:42 +02:00
Juergen Spitzmueller
4a8b508d40 If a master is being created at loading the child, un-hide it.
Fixes: #11162
(cherry picked from commit a368439bcc)
2018-10-08 11:43:20 +02:00
Juergen Spitzmueller
5133026b01 Fix suprious comma in book and thesis bib preview.
Fixes: #11272
(cherry picked from commit 399a4d7e71)
2018-10-08 11:40:24 +02:00
Juergen Spitzmueller
ea43f293c2 GuiCitation: don't reset filter on show
Addresses #11291

(cherry picked from commit 33d6499bbc)
2018-10-08 11:36:47 +02:00
Enrico Forestieri
e94ea46be7 Fix bug #9348
(cherry picked from commit 503f7db224)
2018-10-06 12:43:09 +02:00
Richard Kimberly Heck
00db9c44c8 Minor status updates 2018-10-05 11:46:51 -04:00
Richard Kimberly Heck
1d22d23808 Fix bug #10177.
The left margin given at class level should apply only to the main text.

(cherry picked from commit a007b65202)
2018-10-04 19:44:42 -04:00
Richard Kimberly Heck
768c7e2fa2 Fix bug #11275.
Show module name with description.

(cherry picked from commit 2553b0073f)
2018-10-04 14:12:03 -04:00
Jean-Marc Lasgouttes
ba3ff646db When ignoring an update, request one for later
If we were not ready to paint the screen, this does not mean that we
should give up on repainting, just potpone it.

I thought that it was bad to call update() in the paint event, but I
cannot find reference to this anymore and everything seems to work as
intended.

Fixes part of bug #11323.

(cherry picked from commit 38f09c177b)
(cherry picked from commit 2617a4dd50)
2018-10-04 15:07:12 +02:00
Enrico Forestieri
ea81faa911 Fix bug #11180
When a raster image with an advertised pixel density different
from 72 dpi is included in a latex file, the output image dimensions
are scaled by the ratio 72/pixel_density. Hence, if a clipping
bounding box is specified, it has to be scaled by the same ratio,
otherwise the images will be clipped differently on screen and output.
Here we use the extractbb command (present in any TeX distribution)
to ask about the output dimensions of the image as dictated by the
pixel density and compute the scaling ratio by the knowledge of the
actual dimensions. If, for whatever reason, extractbb is not found,
everything goes as before, because the clipping bounding box will
simply not be corrected.

(cherry picked from commit 380f34a114)
2018-10-04 00:40:19 -04:00
Richard Kimberly Heck
e67c119d80 Do not step equation numbers in deleted equations.
(cherry picked from commit df5805917b)
2018-10-04 00:20:19 -04:00
Richard Heck
a05da2121c Fix bug 11070.
Allows plural, caps, no prefix to be set via context menu.

(cherry picked from commit 35afcfb6dd)
2018-10-04 00:17:47 -04:00
Juergen Spitzmueller
76c15f51ea Do not store empty posttext for qualified citations
Fixes: #11308
(cherry picked from commit 90b1345203)
2018-10-02 08:11:50 +02:00
Juergen Spitzmueller
416b71883b Add bibtex inset to outliner if "add to toc" is checked.
Fixes #11309

(cherry picked from commit a89e3c344b)
2018-10-02 08:09:04 +02:00
Juergen Spitzmueller
068e3d4fe5 Amend cab46ff9d1
(cherry picked from commit f973855bde)
2018-10-02 07:47:06 +02:00
Stephan Witt
9fd0c45fa3 Add missing status entries for Mac build fixes 2018-09-29 13:48:31 +02:00
Juergen Spitzmueller
a754912e88 Use LTR environment for forceLTR content with polyglossia
Fixes: #10548
(cherry picked from commit 10c06f67c9)
2018-09-28 18:32:32 +02:00
Richard Kimberly Heck
1e26864c0a Status for last commit. 2018-09-27 22:14:44 -04:00
Enrico Forestieri
804ed1bffb Fix bug #11210
On Windows, start viewers in detached processes in order to avoid
a crash of the QProcess destructor when their thread terminates.
The opening of a console window is avoided by redirecting to the
null device all standard I/O channels.
2018-09-27 21:32:24 +02:00
Juergen Spitzmueller
ac5c2be8db Amend 2d4ac90fd2 once more
Only use local switch in RTL environment.

(cherry picked from commit e158d661b9)
2018-09-26 17:02:18 +02:00
Jean-Marc Lasgouttes
ebd4e25588 Avoid crash with cursor down in math
This can happen when the inset that contains the cursor is outside of
the screen.

THis is only a workaround. The real solution would be a
processUpdateFlags(FitCursor) call, but the code is not ready for that
yet.

Fixes bug #11296.

(cherry picked from commit 17576fb83b)
2018-09-21 18:43:53 +02:00
Jean-Marc Lasgouttes
bf3b81e46a Ignore horizontal wheel scrolling in workarea
We do not know what to do with horizontal scrolling events, so we ignore them.

Note that the code has to be different between Qt4 and Qt5.

Fixes bug #11257.

(cherry picked from commit 2cfbc5ecf6)
2018-09-21 18:42:32 +02:00
Jean-Marc Lasgouttes
97f3f18007 Avoid space before completion in mathed
This can happen if the current element has space after it (e.g. before
a relation).

Fixes bug #11283.

(cherry picked from commit 1b5ccecd65)
2018-09-21 18:41:08 +02:00
Jean-Marc Lasgouttes
f00a3e9304 Paint underline for insets too.
Fixes bug 11297.

(cherry picked from commit 328ff9df3a)
2018-09-20 17:07:10 +02:00
Juergen Spitzmueller
bebb077955 Avoid infinite loop
Fixes: #11295
(cherry picked from commit 92bfa07a62)
2018-09-20 17:01:38 +02:00
Jean-Marc Lasgouttes
b956265be3 Handle branches with space in their name
1/ Handle space in color name in set-color (with quoting)

2/ read properly branch inset which name has a space

Fixes bug #11108.

(cherry picked from commit 819cf53c22)
2018-09-19 22:39:01 +02:00
Juergen Spitzmueller
b5892e58f0 Fix copy-paste error.
(cherry picked from commit 305d449a47)
2018-09-19 08:54:09 +02:00
Jean-Marc Lasgouttes
c2ea2057fb Forgot this 2018-09-18 23:14:19 +02:00
Jean-Marc Lasgouttes
5c4c8065aa needauth is not needed for Sweave>LyX
Indeed this relies on tex2lyx and does not run R scripts.

The same holds for Knitr>LyX

(cherry picked from commit 23dbacb636)
2018-09-18 08:52:57 +02:00
Juergen Spitzmueller
734176c452 zh_CN.po: update by Winfred 2018-09-15 16:24:25 +02:00
Jean-Marc Lasgouttes
66e23c6334 Use a unicode character for menu separator on screen
Additionally, use a left pointing character in a RtL setting.

(cherry picked from commit 76512a7569)
2018-09-11 10:59:26 +02:00
Juergen Spitzmueller
a6fa2d721e tex2lyx: support for plural and capitalized refstyle
Also fix a glitch in non-refstyle import (getOpt() returns the option
with delimiter, so do not add them in ERT once more)

Candidate for stable

(cherry picked from commit faf40fb408)
2018-09-11 08:07:03 +02:00
Juergen Spitzmueller
4431ae2505 tex2lyx: support decimal alignment in tables
(cherry picked from commit 8ef2558dc2)
2018-09-11 08:03:23 +02:00
Juergen Spitzmueller
87db8ba5b8 Fix RTL tabular output with bidi package (i.e., polyglossia)
Fixes: #9686
(cherry picked from commit 21b347a2f8)
2018-09-10 19:20:24 +02:00
Juergen Spitzmueller
c5fe0751d9 tex2lyx: Fixes to the btUnit import
1. Do not attempt to mix diverging btUnits (e.g., chapters and sections).
2. use parse_text to properly parse the contents.

(cherry picked from commit 68d48b0015)
2018-09-10 17:50:30 +02:00
Juergen Spitzmueller
b1e5663333 tex2lyx: Add support for horizontal longtabular alignment 2018-09-10 16:31:46 +02:00
Enrico Forestieri
bc55ae0220 Update it.po 2018-09-10 14:48:34 +02:00
Jean-Marc Lasgouttes
93f861903d Fix disappearing blue language underline.
Make sure that the blue language underline is not below the bottom of
the row. Otherwise, it can disappear when the next row is painted.

(cherry picked from commit 8e9e050670)
2018-09-10 11:53:36 +02:00
Jean-Marc Lasgouttes
d371a43865 Draw top/bottom rules heavier for booktab
This gives a better idea of the TeX output, even though the thicknesses are
not correct. Like in LaTeX, this happens only for full top/bottom rules.

(cherry picked from commit 8651cd89f6)
(cherry picked from commit 84328c8538)
2018-09-10 11:48:37 +02:00
Juergen Spitzmueller
22e6659780 Don't add localswitch if no language changes
(cherry picked from commit 7018d3641f)
2018-09-10 10:13:29 +02:00
Juergen Spitzmueller
9b03b40731 Fix shortcuts info output on the Mac
QKeySequence returns special characters for keys on the mac rather than
textual key names (as on other OSes).

Since these symbols are not included in many fonts, we re-translate them
to textual names

Fixes: #10641
(cherry picked from commit 5f45b3ed9c)
2018-09-10 10:08:04 +02:00
Juergen Spitzmueller
4d81f210c1 Support key symbols via menukeys package
(cherry picked from commit fd7490762d)
2018-09-10 09:46:25 +02:00
Jean-Marc Lasgouttes
014227cc40 Fixes to input method handling
The goal of this patch is to make "self-insert <string>" act as a
sequence of individual self-insert calls. Once it is done, the
insertion of the commit string in GuiWorkArea can use that, which
fixes the issues described in bug 11183.

1/ in InsetMathNest, SELF_INSERT is rewritten to be a proper loop of
   interpretChar, instead of inserting the string as characters. This
   solves the issue of interpreting ^ properly.

2/ the text version does not need to be changed (the loop is rewritten
   using a range, though).

3/ Then {{{GuiWorkArea::inputMethodEvent}}} is changed to invoke
   directly self-insert. This removes the update issues.

Fixes bug 11183.

(cherry picked from commit ad5548cfe3)
2018-09-09 19:43:18 +02:00
Juergen Spitzmueller
ae8c0b2976 Amend 79cf3f5ec1
Some InfoInsets have to be LTR always.
2018-09-09 19:35:24 +02:00
Juergen Spitzmueller
b8c62838ec Covington now provides subexamples itself
Candidate for stable.

(cherry picked from commit ab16bb7eb9)
2018-09-09 19:17:46 +02:00
Juergen Spitzmueller
0bd7a6384b Allow to change multiple columns' width at once
Fixes: #11205
(cherry picked from commit 91254472e6)
2018-09-09 19:13:46 +02:00
Juergen Spitzmueller
0a89b08f68 tex2lyx: fix import of unknown commands'/environments' options
If we detect options via hasOpt(), output the brackets as ERT.

Fixes: #8685
(cherry picked from commit da62299f37)
2018-09-09 19:09:59 +02:00
Juergen Spitzmueller
93f3727b53 tex2lyx: Fix import of Arabic polyglossia environment
Part of #10111

(cherry picked from commit 920e26916e)
2018-09-09 19:05:53 +02:00
Juergen Spitzmueller
9e387aea07 tex2lyx: Add support for multirow
Fixes: #11164
(cherry picked from commit c33506555f)
2018-09-09 12:35:28 +02:00
Juergen Spitzmueller
3efd64696f Consider required modules when checking for layout definitions in modules
Fixes: #11156.
(cherry picked from commit 8b4c76fb24)
2018-09-09 12:25:57 +02:00
Juergen Spitzmueller
995aed2e6e Par alignment in floats must be swapped for all RTL langs, not only Hebrew
Fixes: #11029
(cherry picked from commit 3bacc3c6e7)
2018-09-09 12:23:16 +02:00
Juergen Spitzmueller
a41d589e85 Proper logos with RTL
Fixes #10423

(cherry picked from commit e5a9244bef)
2018-09-09 12:17:03 +02:00
Juergen Spitzmueller
2e65b8e75e Implement tri-state in GuiSetBorder
A new UNDECIDED state is used if multiple cells with differing border
settings are selected.

This prevents additional borders to be set without being asked.

Fixes: #10010
(cherry picked from commit 99aefa5fd2)
2018-09-09 11:46:37 +02:00
Juergen Spitzmueller
a359a53eb6 Disallow paragraph customization in some single-par charstyle insets
Fixes: #9192
(cherry picked from commit 7a5184fd87)
2018-09-09 11:41:52 +02:00
Juergen Spitzmueller
f6a8810d9d Wrap rotated cells with linebreaks in varwidth
Fixes: #8085
(cherry picked from commit 88e5e5fd34)
2018-09-09 11:38:38 +02:00
Juergen Spitzmueller
c41f9f7ed7 tex2lyx: extend titling support
Rather than checking for hardcoded title commands such as \maketitle,
use the titlename and titletype as defined in the layout.

This now also includes title environments.

Fixes part of #6461

(cherry picked from commit 429edc0a59)
2018-09-09 11:33:25 +02:00
Juergen Spitzmueller
00f344effa Consider EuropeanNumberTerminator property when determining text direction
Also, use EuropeanNumberSeparator information rather than relying on an
own (incomplete) list of number separators.

Fixes: #4057
(cherry picked from commit 611df441b6)
2018-09-09 11:30:43 +02:00
Enrico Forestieri
4862e00c1f Fix bug #11203
Minted does not have a language option but it is possible to enter
this option in the LyX interface for compatibility with the listings
package, and also for letting to enter a language not present in the
gui. So, this option is only used for properly specifying a language
in a listing, unless it is entered in the document settings dialog.
This case was not foreseen and thus the option was being passed to
the package as is, causing havoc. With this commit the option is
still available but is used to set a default language for a new
listing in place of the default "tex" language used so far.

(cherry picked from commit 16ca5290c0)
2018-09-09 11:25:01 +02:00
Juergen Spitzmueller
ae196dd70c Support input of non-ASCII characters in hyperlinks
We transform them to hex representation via
QByteArray::toPercentEncoding()

Fixes: #11165
(cherry picked from commit 01d8f41894)
2018-09-09 11:00:20 +02:00
Juergen Spitzmueller
29355d34d5 Use footnotehyper rather than footnote if hyperref is used
Fixes: #11212
(cherry picked from commit f8e286b823)
2018-09-09 10:55:34 +02:00
Juergen Spitzmueller
5f0c20b67e Capitalization fixes
Fixes: #11237
(cherry picked from commit b75f716b73)
2018-09-09 10:52:32 +02:00
Juergen Spitzmueller
08aef452e7 Disambiguate dialog buttons
Fixes: #11242
(cherry picked from commit 74657a14a7)
2018-09-09 10:50:01 +02:00
Juergen Spitzmueller
a0fb2f05c9 Do not start from a non-relevant parent in Buffer cloning.
(cherry picked from commit e077255aea)
2018-09-09 10:46:20 +02:00
Juergen Spitzmueller
0c05722a60 Redesign character dialog
Fixes: #2752, #3804, #3884, #4836

Backport of [fb393b450d661/lyxgit] and [f888afeb9ef7/lyxgit]
2018-09-09 10:28:25 +02:00
Richard Kimberly Heck
53bf5beae0 Prepare for 2.3.1. 2018-08-27 14:07:29 -04:00
Juergen Spitzmueller
7356f37644 Fix line break in tooltip
Fixes: #11252
(cherry picked from commit 6d71b9b69a)
2018-08-20 08:37:25 +02:00
Enrico Forestieri
103d6c6362 Fix bug #11247
async is a reserved keyword in python 3.7

(cherry picked from commit 061cd7fd9c)
2018-08-19 16:35:20 +02:00
Juergen Spitzmueller
5ef6805961 hu.po: update by Alex 2018-08-18 15:10:48 +02:00
Enrico Forestieri
48cd67ebf8 Fix LyX server on Windows
On some recent Windows versions, GetLastError() may also return
NO_ERROR instead of ERROR_IO_PENDING during an overlapped write
operation to a pipe. This was confusing the state machine in
Server.cpp so that replies to commands were scheduled but were
never actually output.

(cherry picked from commit cf5f2661dc)
2018-08-08 13:15:56 +02:00
Enrico Forestieri
e1fa3cb248 Update the server_monitor example client to Qt5
(cherry picked from commit ab72f94595)
2018-08-08 13:12:33 +02:00
Juergen Spitzmueller
9c3dbfb7ed uk.po: Update by Yuri 2018-08-04 07:12:33 +02:00
Juergen Spitzmueller
7de98f7dbc Change size policy of buffer combo in refs dialog
Fixes: #9316
(cherry picked from commit b286c6d235)
2018-08-03 19:46:27 +02:00
Juergen Spitzmueller
d762d55558 Fix problem of unwanted spaces caused by macro definitions
Patch by Gilbert J. M. Forkel

Fixes: #11216
(cherry picked from commit 372712cfd9)
2018-07-31 08:49:50 +02:00
Enrico Forestieri
9a851be4fa Fix bug #11214
The checkProg() function was separating a command from its parameters
by splitting at the first space. This was a problem if the command
was specified with a full path containing spaces. Now the checkProg()
function separates a command from the parameters by splitting at the
first non-quoted space. So, it suffices quoting a path to solve the
issue.
2018-07-28 23:27:43 +02:00
Juergen Spitzmueller
e0e998b157 Fix austrian language code
(cherry picked from commit b12ea3b731)
2018-07-25 19:44:26 +02:00
Juergen Spitzmueller
898ed85dd7 zh_CN: update from Winfred Huang 2018-07-25 15:43:20 +02:00
Juergen Spitzmueller
1d8ee1c704 (a)mend edb2d14124
(cherry picked from commit 0bf7b3211d)
2018-07-22 10:19:37 +02:00
Juergen Spitzmueller
485f070887 Fix nesting problem with numbers in RTL text
\textcolor must precede any \beginL

Fixes: #6283
(cherry picked from commit 114ebf00c4)
2018-07-22 10:16:32 +02:00
Juergen Spitzmueller
cc845ed2cf Fix bracket output in RTL languages
This is a real mess!

Fixes: #11187
(cherry picked from commit 195f62ac93)
2018-07-21 10:40:59 +02:00
Juergen Spitzmueller
a17dfeee0e Fix quotation marks in RTL script
Fixes: #11188
(cherry picked from commit aa1d9638fe)
2018-07-21 10:27:38 +02:00
Juergen Spitzmueller
bdbdd28756 Fix command line output of convertDefault.py for ImageMagick
Part of #11186

(cherry picked from commit 1e5acc5656)
2018-07-13 17:26:34 +02:00
Juergen Spitzmueller
82cade4877 Use QMessageBox for toggleWarning if possible
Qt 5.2 introduces the possibility to place a checkbox on a QMessageBox,
so we need no longer to use our own crude dialog.

(cherry picked from commit 0148ef7e6c)
2018-07-11 19:11:28 +02:00
Juergen Spitzmueller
12ca81f2ea Fix creationCode() of GuiPrintNomencl
This fixes "New Inset" in that dialog.

Candidate for stable

(cherry picked from commit d2afa67da9)
2018-07-10 17:52:50 +02:00
Jean-Marc Lasgouttes
25e0ca1860 Do not force lfun argument to be pure ascii
Fixes bug #11167.

(cherry picked from commit 8e015f3cb2)
2018-07-04 11:46:03 +02:00
Jean-Marc Lasgouttes
5eb4a15579 Do not allow completion when there is an active selection
We do it in texted only, mathed is more difficult and not so relevant IMO.

(cherry picked from commit 789acb4a95)
2018-07-04 11:22:00 +02:00
Juergen Spitzmueller
ab450346b5 Handle correctly zero table special arguments.
Fixes: #10247
2018-06-27 08:16:59 +02:00
Scott Kostyshak
03fef44b54 status: describe the CMake changes in 889d10cd 2018-06-24 18:04:54 -04:00
Enrico Forestieri
49c0021306 Fix bug #11174
Apparently, a new paragraph is started after a float even if
no blank line is actually present. So, account for this fact.

(cherry picked from commit f6922b8c88)
2018-06-17 23:37:39 +02:00
Enrico Forestieri
87b44bcc1f Fix bug #11151
(cherry picked from commit 17ea71b31c)
2018-05-21 22:01:56 +02:00
Stephan Witt
26d0fb3dd5 #11142 correct list of previous versions to check for user directory contents
LyX on Mac uses a user directory with version suffix. On change of the version suffix
the existence of the directories with previous versions is checked and the latest one
is used for a copy on first configure run.

For 2.3 the candidate list starts with 2.2 now as it should.

(cherry picked from commit 17c3617c49)
2018-05-16 07:18:38 +02:00
Juergen Spitzmueller
d35055de83 Fix InsetBox::contentAlignment()
Some cases where alignment is possible were missing.

Candidate for 2.3.x.

(cherry picked from commit de67b68b1d)
2018-05-11 18:44:17 +02:00
Jean-Marc Lasgouttes
4e981b034e Adapt caret height to context in mathed.
Compute a height from current font and current cell vertical
dimensions in MathData::metrics(), because this is where current font
is known.

Introduce BufferView::setCaretAscentDescent to remember this value.

This mechanism is not used for text because Cursor::current_font is
restored by undo, and the caret height would not be changed then. But
in principle it is doable.

(cherry picked from commit 90cfe4ec3b)
2018-05-10 12:53:30 +02:00
Scott Kostyshak
705302f6de Center longtable explicitly (#10690)
"Center" is the default of longtable, but some situations require it
to be centered explicitly, such as when using floatrow:

https://tex.stackexchange.com/questions/320592/floatrow-package-conflicting-with-centering-longtable

(cherry picked from commit bde1834f7e)
2018-05-08 17:42:43 -04:00
Scott Kostyshak
532d3600f2 Do not use needauth when only exporting code
We have a couple of converters (using Sweave and knitr to "tangle"
an intermediate file) that are used for exporting code chunks
contained in a .lyx file. Since the code is just exported to a text
file and is not executed, needauth is not necessary.

(cherry picked from commit 065e37e96f)
2018-05-06 19:50:55 -04:00
Juergen Spitzmueller
36096435e5 Fixes for nested ulem commands
1. \uuline must be on top of \sout
2. \uwave in \xout needs a hack to compile

(cherry picked from commit 9fd94a2dd0)
2018-05-05 10:09:04 +02:00
Juergen Spitzmueller
63c54434ae PassThru paragraphs have latex_language; consider this when checking
previous language

Fixes: #10793.
(cherry picked from commit 15df033bce)
2018-05-01 06:56:45 +02:00
Scott Kostyshak
6a808d285c Fix duplicate, disabled "Separated Frame Below"
This commit fixes an issue where the menu option "Insert Separated
Frame Below" would show up twice, with one instance disabled. This
occurred when there was a "Standard" environment nested in a
"Frame". With this commit, the duplicate instance is removed.

(cherry picked from commit 4f7a5f8c3e)
2018-04-29 00:05:15 -04:00
José Matos
f7b9d57a45 Update scripts to support simultaneously python 2 and 3
The fixes are simple and on line with the changes made during
the 2.3 development. It was an oversight to leave them out.

With this commit all the python scripts should be supported by
python 2 and 3.

(cherry picked from 5b160e82be)
2018-04-28 11:24:28 +01:00
Richard Kimberly Heck
636e998353 Fix bug #11127.
This also fixes an accidental commit of "NeedCProtect".

(cherry picked from commit 9f79ab99ed)
2018-04-27 20:17:15 -04:00
Jean-Marc Lasgouttes
5c6bc52b1b Update cursor position after committing IM string
(cherry picked from commit 01fea56eb6)
2018-04-26 22:45:57 +02:00
Richard Kimberly Heck
e7387fd348 Don't sort the bibfiles cache.
This causes problems with biblatex. Instead, we sort the old and
new lists and then compare them.

(cherry picked from commit 6b095e2b71)
2018-04-25 13:45:17 -04:00
Richard Kimberly Heck
13354c4a53 Improve error message.
(cherry picked from commit 04f7151684)
2018-04-25 12:06:07 -04:00
Jean-Marc Lasgouttes
d0a11cb8e2 Redo metrics after cancelling macro mode
When the cursor is inside a subscript that may become empty, metrics
issues can happen. This patch fixes the issue, although it is not
clear to see what the problem is.

Still, requesting a metrics update also in the case where the macro
mode is canceled makes sense.

Fixes bug #11125.

(cherry picked from commit 68ec34e603)
2018-04-25 17:03:50 +02:00