Commit Graph

37561 Commits

Author SHA1 Message Date
Enrico Forestieri
c5c480bb3c Was forgetting to add the caption to the list of listings 2017-06-10 21:00:43 +02:00
Enrico Forestieri
3dfa1cb417 Allow captions also on non-floating minted listings
Minted provides for captions only with floating listings. However,
listings always allows captions, and our machinery is geared accordingly.
So, instead of discriminating the floating and non-floating cases,
always allow for captions with minted, too. When minted does not provide
for a caption, we will provide one.
In the child document case the caption will always be before the listing,
while for the inset case the caption will be before the listing if it
is entered as the first line, after the listing otherwise.
2017-06-10 18:43:23 +02:00
Juergen Spitzmueller
f34f0c1db4 Oops: currentData() is Qt 5 only. 2017-06-10 18:17:43 +02:00
Juergen Spitzmueller
5685080356 Correct restoration of citation style selection between engine switches
We stored the combo position index, but this changes on engine switch.

This also fixes a crash due to out-of-bound index at engine switch.

Fixes: #10692
2017-06-10 14:29:07 +02:00
Enrico Forestieri
9913fe650d Was forgetting this at 4722e955 2017-06-10 02:43:16 +02:00
Enrico Forestieri
4722e955a8 Remove the minted external template
That functionality is now provided by the new support for minted.
Also change the example file and accordingly rename it.
2017-06-10 00:14:04 +02:00
Scott Kostyshak
98da276164 Typo in comment 2017-06-09 13:15:58 -04:00
Pavel Sanda
1d1859283d doc - last updates are from 2015. 2017-06-09 12:50:28 +02:00
Enrico Forestieri
ca2d972a36 Amend fd075614
Actually, only when using minted it is not possible to insert a
caption in a non-floating listing.
2017-06-09 12:37:05 +02:00
Jean-Marc Lasgouttes
183c97d8a8 Give a 2 pixels space for markers around math objects
This is necessary when markers are nested. Ideally this should only be
done when there is risk of nesting.

Fixes (part of?) bug #10688.
2017-06-09 11:58:26 +02:00
jpc
e1e85b547b Update fr.po 2017-06-09 09:39:24 +02:00
Enrico Forestieri
8fa0e539e5 Extend minted support to listings as child documents
This was slipping through the cracks, apparently...
2017-06-08 19:35:48 +02:00
Kornel Benko
6461d6aa1b Update translation of Listings by Jari-Matti Mäkelä
Correction for layouttranslations from 	Jari-Matti Mäkelä <jmjmak@utu.fi>
2017-06-08 19:32:11 +02:00
Kornel Benko
c6b18ce318 Update fi.po
Translations from Jari-Matti Mäkelä <jmjmak@utu.fi>
2017-06-08 19:28:06 +02:00
Kornel Benko
31f83f2bc7 Update sk.po 2017-06-08 17:59:56 +02:00
Kornel Benko
3ea8f0f81b Amend 268ae66: Enable use of '\\' chars and empty lines in HelpText 2017-06-08 17:57:32 +02:00
Jean-Marc Lasgouttes
cb5464ea2b Revert "Fix drawing of collpsable insets"
This was definitely not meant to be pushed, especially since I
reverted it recently. Sorry folks.

This reverts commit 6fc72a1a1f.
2017-06-08 16:47:26 +02:00
Jean-Marc Lasgouttes
a33b633111 Revert "Fix bad cursor positioning when entering an inset"
This is not ready yet.

This reverts commit 7ca7873112.
2017-06-08 16:46:49 +02:00
Jean-Marc Lasgouttes
1538a8352c Revert "Give a 2 pixels space for markers around math objects"
This is not ready yet.

This reverts commit 5a3962958f.
2017-06-08 16:46:19 +02:00
Jean-Marc Lasgouttes
29fbd062cc Properly use top/bottom edit marker for grid inset
This was an oversight when marker() was introduced.

Fixes part of #10688.
2017-06-08 16:03:14 +02:00
Jean-Marc Lasgouttes
5a3962958f Give a 2 pixels space for markers around math objects 2017-06-08 15:22:03 +02:00
Jean-Marc Lasgouttes
7ca7873112 Fix bad cursor positioning when entering an inset
The test added at 359aef92 was incorrect. Actually, Inset::editXY
returns the inset when it is edited and also when it is not, which
can be confusing. So if we are unlucky and the slices positions in the
text area and in the inner inset match, the code below triggers and
many bad things can happen.

editXY() should probably have a documented way to indicate whether the
cursor has entered the inset, although the test used right now is
probably OK. The inset value is useful mainly for context menus or
tasks that need to know which inset the (x, y) coordinates
point to.

Note finally that the documentation of TextMetrics::editXY is
incorrect concerning the return value. It will return a non-null value
if the cursor is on a not editable inset.

Fixes #10691.
2017-06-08 13:48:51 +02:00
Jean-Marc Lasgouttes
6fc72a1a1f Fix drawing of collpsable insets
This is a follow-up to e194c9ce. There was actually no reason to let
InsetCollapsable and InsetText draw their own background. It is more
correct to remove the existing code and let the generic
Inset::drawBackground take command.

This allows to revert d207e85c.

Fixes bug #10587.
2017-06-08 10:11:27 +02:00
Enrico Forestieri
3cc3ff39a0 Simplify preamble code when using listings
Following an idea from Guillame.
2017-06-08 04:25:53 +02:00
Kornel Benko
6a4a88e98a Overtake layout translations from fi.po, ja.po, zh_CN.po 2017-06-07 18:27:32 +02:00
Kornel Benko
28e487c949 Update sk.po 2017-06-07 18:21:25 +02:00
Enrico Forestieri
fd0756141c Don't allow captions in non-floating listings
It was possible to insert a caption in a listing not marked as
floating. This didn't cause errors but the caption simply was
disappearing in the output.
2017-06-07 18:15:59 +02:00
Jean-Marc Lasgouttes
48144c474b Revert "Fix drawing of collpsable insets"
This patch cuses unintended issues (see #10587).

This reverts commit 18fb9cd7f9.
2017-06-07 16:01:58 +02:00
Enrico Forestieri
aae04d25b9 Fix a small glitch
When choosing a code language that has dialects in the languages
combo box, the dialects combo gets activated also when minted is
in use. However, minted does not support the concept of dialects
and the combo should not be enabled. This is harmless because the
dialects are simply ignored and the dialects status is restored
after apply, but it may fool the user in thinking that a dialect
can be actually selected. So, always disable it with minted.
2017-06-07 15:31:13 +02:00
Jean-Marc Lasgouttes
18fb9cd7f9 Fix drawing of collpsable insets
This is a follow-up to e194c9ce. There was actually no reason to let
InsetCollapsable and InsetText draw their own background. It is more
correct to remove the existing code and let the generic
Inset::drawBackground take command.

This allows to revert d207e85c.

Fixes bug #10587.
2017-06-07 12:20:33 +02:00
Jean-Marc Lasgouttes
a98df58537 Fix warning about signed/unsigned 2017-06-07 11:05:29 +02:00
Jean-Marc Lasgouttes
83cd3f4293 Output default mathindent value as "default"
This is like parindent now. The old code would avoid outputing the
value when it was empty (default indentation).

Fixes bug #10657.
2017-06-07 10:53:37 +02:00
Enrico Forestieri
a338971700 Add another minted example
This one illustrates the usage of the new minted support.
2017-06-07 02:28:21 +02:00
Enrico Forestieri
268ae66e3c Rename the minted 'lang' external template option as 'language'
This is for consistency with the newly introduced support in the
listings inset, where the option name is dictated by the listings
package and cannot be changed.
2017-06-07 01:25:35 +02:00
Enrico Forestieri
8dab1cfe7e Fix bug #9101
Update the listings inset to optionally use the minted package
(instead of the listings one) for typesetting code listings.
Only one of the two packages can be used in a document, but it
is possible to switch packages without issues if the used options
are the same. If a switch is made and the options differ, one needs
to manually adjust them if they were entered in the advanced options
tab, or apply again the gui settings.
Note that minted requires the -shell-escape option for the latex
backend and the installation of additional software (python pygments).
2017-06-07 00:55:23 +02:00
Richard Heck
f9835d054d Fix bug #10295.
As it was, the comparison buffer was sharing a DocumentClass with
the buffer from which the document settings are taken.
2017-06-04 18:30:55 -04:00
Scott Kostyshak
b1ddae0514 Fix border when inserting column (#10538, #9306)
When inserting a column in tabular, the border of the new column
should be copied from the border of the (previously) right-most
column.

Also remove a redundant line. The line

    setRightLine(i, true);

was only reached if rightLine(i) was true.

Patch from Daniel Ramöller.
2017-06-04 15:24:10 -04:00
Kornel Benko
482d0ebc66 Script to finxing linebreaks in po-files.
Bad linebreaks could slip in if merging from branch on a Windows OS.
2017-06-04 18:32:47 +02:00
Enrico Forestieri
8ae652eb16 Fix up 0cf394dd 2017-06-04 03:28:49 +02:00
Enrico Forestieri
71f532db4b Do not output a \par inside a local language switch command 2017-06-04 03:14:14 +02:00
Scott Kostyshak
5febcf6236 aa.lyx: fix mixed layouts causing wrong PDF output
LyX correctly gave a warning about mixing InTitle layouts: There was
a LyX note in a Title environment, then there were standard
environments, and then a Title environment. This setup caused
several missing elements in the PDF.

Simply changing the Title environment of the Note to standard solved
the problems: The PDF output is now correct and LyX no longer gives
a warning.
2017-06-03 18:53:27 -04:00
Scott Kostyshak
a5ea68a37e Update a .lyx format 2017-06-03 18:50:37 -04:00
Scott Kostyshak
301b8637fc subequations.lyx: reference LyX module
Reference the LyX module instead of the LaTeX amsmath package.
2017-06-03 18:17:13 -04:00
Scott Kostyshak
bf832437b0 Update a .lyx format and add \origin 2017-06-03 17:33:31 -04:00
Scott Kostyshak
beed118c32 Add subequations module and example (#10029)
The module allows to use the subequations environment.

There is still a pending request to implement this environment
natively in LyX's mathed.

Contributed by Joel Kulesza.
2017-06-03 17:13:22 -04:00
Scott Kostyshak
4d789cc267 ANNOUNCE: give warnings about using a pre-release
In general, make the ANNOUNCE sound a little less celebratory and
a little more precautionary. The celebratory version will be used
for the final release.
2017-06-03 14:56:42 -04:00
Scott Kostyshak
124096e132 Update ANNOUNCE
Update the pre-release to beta1, even though we are not ready to
release it yet.
2017-06-03 14:56:24 -04:00
Enrico Forestieri
55bbd67cde Fix bugs #10650 and #9598 2017-06-03 17:26:05 +02:00
Enrico Forestieri
6d0f941b0f Update it.po 2017-06-03 16:10:32 +02:00
Scott Kostyshak
f4b14fcf49 RELEASE-NOTES: explain new mixing layouts warning 2017-06-01 16:19:17 -04:00