Commit Graph

195 Commits

Author SHA1 Message Date
Georg Baum
7e37dc20eb Add xlsx format
We do already have docx, but xlsx was missing. This is a separate format
because of the MIME type. nd because some users might need converters which
can only handle one format. Now the spreadsheet template does not hide the
fact anymore that it can deal with xlsx files as well.
2016-09-08 20:54:40 +02:00
Juergen Spitzmueller
a7d0a7369d Update docs wrt Separator 2016-09-08 10:33:12 +02:00
Juergen Spitzmueller
03f889a46c Remove duplicate context menu item
Fixes: #10368
2016-09-07 09:53:26 +02:00
Juergen Spitzmueller
7d52d37662 Fix for recent luatex versions. 2016-09-04 17:35:11 +02:00
Enrico Forestieri
874bbe2166 If available, use qtchooser to select correct Qt tools
When the Qt directory is specified by --with-qt-dir, the tools
are only searched for in the corresponding bin subdir and their
full path is retained, so that it is not necessary modifying the
PATH and PKG_CONFIG_PATH environment variables to select a custom
Qt version. Otherwise, if qtchooser is detected early in the PATH,
the generic names are attempted with proper arguments to select the
desired Qt version (e.g., "moc -qt=qt5" if --enable-qt5 is specified).
Failing all of the above, the generic names with and without proper
suffixes (either -qt4 or -qt5) are checked in the PATH.
Eventually, a check is performed and a warning is issued if the
selected tools do not match the chosen Qt libraries.
2016-08-29 22:35:09 +02:00
Jean-Marc Lasgouttes
9e44cd672a Simplify menus when there is only one caption type
This removes the submenu indirection in Insert and the type changer in
contextual menu. Interestingly, the code was there, but it did not
work at all.

(cherry picked from commit e7a33cacf1
and made compatible with C++98)
2016-08-29 13:49:50 +02:00
Jean-Marc Lasgouttes
bbeb3773a1 Do not set layout for no-op paragraph break
When breaking paragraph in an empty top-level paragraph, nothing
happens on screen but yet there is an undo step because the layout is
reset to what it already was.

Avoid this case.

Fixes bug #10089.
(cherry picked from commit 2ad52918da)
2016-08-29 12:09:53 +02:00
Guillaume Munch
1dc8278fef LaTeX highlighter: make at a letter in the user preamble
Syntax highlighting now provides the appropriate cue that the user preamble is
inside \makeatletter…\makeatother.

(cherry picked from commit 10f6eb2e7e)
2016-08-28 02:38:02 +01:00
Guillaume Munch
8a42918b2f status.22x. 2016-08-28 01:51:16 +01:00
Juergen Spitzmueller
010284dbe5 Implement proper dialog titles in InsetParamsDialogs
Fixes: #10329
2016-08-26 18:51:01 +02:00
Juergen Spitzmueller
c0f5c1dd9f Fix \@ifundefined check for covexample(s)
Fixes: #10340
2016-08-26 18:45:23 +02:00
Jean-Marc Lasgouttes
a957879839 Move correctly the end of proof marker when row is large
This was a regression from 2.1.x in LtR mode, and it never worked correctly in RtL mode.

Fixes bug #10344.

(cherry picked from commit 07c7dae367)
2016-08-24 12:04:19 +02:00
Jean-Marc Lasgouttes
3e432ec631 Reset anchor before selecting with S-button1
(cherry picked from commit b583fb26e8)
2016-08-24 11:59:01 +02:00
Jean-Marc Lasgouttes
e2489c1c31 Let M-x give focus to minibuffer when it is already open
(cherry picked from commit 65b0e84b54)
2016-08-23 12:25:16 +02:00
Jean-Marc Lasgouttes
e0730fe070 Remove horizontal spacing around previews
This concerns the preview version of InsetPreview and InsetIPA.

Fixes bug #10304.
(cherry picked from commit 4ddad2f6cd)
2016-08-22 10:20:01 +02:00
Enrico Forestieri
93003eee16 Fix exit code from runCommand on Windows
On Windows, runCommand has never returned the exit code of the
spawned process but the result of correctly closing the input handle.

Fixes #10327

(cherry picked from commit fb46b3a1ee)
2016-08-18 17:00:55 -04:00
jpc
efa0bfed9f Update French UI localization 2016-08-05 09:06:16 +01:00
Juergen Spitzmueller
fe117aa7db Correct default font of beamer article layouts
Fixes: #9977
2016-08-05 07:21:17 +02:00
Richard Heck
50162ebb1e Fix XHTML export of German Additional Features manual.
There was an oddity in the manual that exposed a problem with the
test for the "special case" of an inset all by itself in a pargraph.
If a font change is applied to that inset, we still need to open the
paragraph.

(cherry picked from commit 3be23d18b6)
2016-08-04 22:47:32 -04:00
Richard Heck
4df7b051fa Status for last commit. 2016-08-04 17:47:57 -04:00
José Matos
61a9f04754 Fix bug #10273
The export of compressed files to previous lyx versions failed on windows.

The change in this case is to explicitly pass the output file since we know it.

At the same time take care of the fact that lyx2lyx knows what file format
versions corresponds to each lyx version.
2016-08-01 11:04:39 +01:00
Richard Heck
199e63fa19 Simplify CSS classes for floats.
Fixes bug #8605 and probably parts of #8755 and #9328.

(cherry picked from commit 50c1391950)
2016-07-31 03:45:05 -04:00
Richard Heck
ffd6a28a97 Fix HTML display of math matrices.
(cherry picked from commit 60ce2b7570)
2016-07-31 03:41:13 -04:00
Richard Heck
ddb7c5884b Fix output of floats, etc, inside environments.
Fixes bug #9094.

(cherry picked from commit 98feadd61e)
2016-07-31 03:20:00 -04:00
Richard Heck
1c9bb3f6de Add 'dir="auto"' to the body tag for XHTML export. This should take
care of much of what we need to do for RTL languages. It does not
take care of inline language changes, probably.

(cherry picked from commit 07dcb1c525)
2016-07-31 02:54:28 -04:00
Richard Heck
5fa071ec1e Fix display of code listings in XHTML.
Fixes bug #8362.

(cherry picked from commit ab3a49973f)
2016-07-31 01:48:57 -04:00
Richard Heck
1bcede451a Enable export of spreadsheets with XHTML.
(cherry picked from commit 1840e2dbaf)
2016-07-31 01:36:43 -04:00
Richard Heck
f457b11fa7 Fix substitution for $$Contents.
The second argument here is the length of the string to replace,
not the position of the final character.

(cherry picked from commit 6b97f2c075)
2016-07-31 00:17:22 -04:00
Richard Heck
a536ee7718 Fix preview of external material with plaintext and DocBook.
(cherry picked from commit 93a612220e)
2016-07-30 23:51:06 -04:00
Richard Heck
d7ecdedd67 Fix indentation of fen2ascii script so it will run.
(cherry picked from commit 22e1063cb9)
2016-07-30 23:18:46 -04:00
Richard Heck
8c6b947eb5 Use scaling factor in XHTML output.
(cherry picked from commit 47c52db13e)
2016-07-30 22:02:48 -04:00
Richard Heck
21ccd006ee Fix some symbols that are displayed incorrectly in MathML export.
(cherry picked from commit 8860365565)
2016-07-30 21:12:24 -04:00
Richard Heck
0ab8ea6682 Fix bug #10154. 2016-07-30 20:18:03 -04:00
Richard Heck
9d3917a4b6 Only trim right end of lines in header. This allows us to preserve
whitespace in local layout.

(cherry picked from commit a11e07a62f)
2016-07-29 23:52:47 -04:00
Richard Heck
909fcb7fcc Fix problem with branch handling. The problem was that we were not
dealing properly with the paragraph separator tag.

We really need to use that tag as a kind of general marker for which
tags we're responsible for in a given paragraph and which tags we are
not. So the changes to InsetText.cpp use the tag as that kind of marker.

Note that, as of this commit, the User Guide again exports without any
kind of error. I haven't yet checked the other manuals.

This fixes bug #8022.

(cherry picked from commit 31e25c8ec6)
2016-07-29 23:50:13 -04:00
Richard Heck
275bdcd845 Fix display of colors in labels of arguments.
We need to handle this specially, just as we do the main font.

(cherry picked from commit 96a8156557)
2016-07-29 23:42:40 -04:00
Richard Heck
46a16b0ca7 Merge branch '2.2.x' into 2.2.2-staging 2016-07-25 14:55:16 -04:00
Richard Heck
c0a8259d68 Start development of 2.2.2. 2016-07-25 14:50:10 -04:00
Richard Heck
a4a1c11b2d Fix hang reported at #10307.
Also, add a FIXME explaining what we'd need to do to fix the
convert_TeX_brace_to_Argument routine properly.

(cherry picked from commit 0f4c14bba2)
2016-07-23 13:45:32 -04:00
Jean-Marc Lasgouttes
cf6b30ae76 Recompute Paragraph::beginOfBody() earlier
In redoParagraph, this should be done before coping with the insets,
other wise some graphic gliches may occur. This is a better fix for

Fixes bug #10163.

(cherry picked from commit 71374b38c2)
2016-07-21 10:37:41 +02:00
Jean-Marc Lasgouttes
5f2023796a When painting only insets, paint also change and language marks
Fixes bug #10265.

(cherry picked from commit c73923c519)
2016-07-21 01:09:32 +02:00
Uwe Stöhr
2a5498ed7d status.22x: mention Brazilian update 2016-07-20 01:50:02 +02:00
Jean-Marc Lasgouttes
6633e7aa3e Add feedback in status bar when zooming
Moreover enforce better the lower limit of 10 and avoid overflow due
to unsigned int.

Fixes bug #10212.

(cherry picked from commit 8884c4044d)
2016-07-20 00:58:30 +02:00
Jean-Marc Lasgouttes
28e347b0a6 Realize inset argument label font before using it
Also fix a few typos in status.22x.

(cherry picked from commit e35110eab7)
2016-07-19 22:58:36 +02:00
Richard Heck
32b56ee8f7 Do not crash is release mode if we stumble across an unrealized font.
(cherry picked from commit 3203fb1c5f)
2016-07-18 13:03:47 -04:00
Richard Heck
e98334098b Fix thinko that led 2-authors citations to be displayed with "et al."
(cherry picked from commit d5633f17e5)
2016-07-17 22:56:14 -04:00
Richard Heck
dde4c68c91 Merge branch '2.2.x' into 2.2.2-staging 2016-07-15 13:28:07 -04:00
jpc
f86b797e95 Update fr.po and status.22x 2016-07-15 09:58:16 +01:00
Stephan Witt
6bcc05919f Correct wrong bug reference. 2016-07-15 07:29:03 +02:00
Stephan Witt
ab1dd332e1 Remove special code for Qt5 to manage HiDPI. It's not needed anymore and leads to strange icon scaling problems in mixed resolution environment.
For reference see the screen shots in bug tracker ticket #10114.

(cherry picked from commit d5fb80ed87)
2016-07-15 07:20:50 +02:00
Enrico Forestieri
2b9047b27e Update it.po 2016-07-12 17:51:11 +02:00
Guillaume Munch
ffec1b5169 status.22x 2016-07-12 15:02:17 +01:00
Uwe Stöhr
e1315930d4 status.22x: mention Slovakian 2016-07-12 00:16:22 +02:00
Juergen Spitzmueller
343c4c0af8 Polyglossia is no longer restricted to XeTeX.
Thus enable the use of LuaTeX for all polyglossia-supported languages.
2016-07-11 16:16:14 +02:00
Juergen Spitzmueller
90e337c84d Generate a proper error dialog title for XeTeX/LuaTeX
(see bug #10013)

Candidate for stable
2016-07-10 16:04:24 +02:00
Richard Heck
b02a93d7e8 Fix thinko in Buffer::preview. It is possible for this routine to
be called when we do not have a cloned Buffer, namely, if we do not
have EXPORT_in_THREAD defined.

(cherry picked from commit d8aab4af9e)
2016-07-10 01:17:54 -04:00
Juergen Spitzmueller
87bc92cfe1 Document 35a78ae0e9 and 53425c7e99 2016-07-09 15:13:46 +02:00
Guillaume Munch
d47b8a05fa status.22x 2016-07-08 17:39:18 +01:00
Juergen Spitzmueller
4aab3a12e8 Document fix 2016-07-08 17:41:27 +02:00
Georg Baum
26c0bb9bea Export svg in xhtml, not svgz (bug 10160)
LyX did not distinguish compressed and uncompressed svg files previously.
Therefore XHTML export of vector graphics did use svgz images directly, which
is not supported by browsers. If svg and svgz are treated as two formats then
all works fine. This is also consistent with the loadable image formats
reported by qt: It reports both svg and svgz.
The gunzip dependency in converters is not new (it is already used internally),
but the gzip dependency is new, so it might not be available on windows.
This is not important at the moment, since we do not yet need to convert svg
to svgz, I only added the converter for completeness.
2016-07-07 21:45:12 +02:00
Jean-Marc Lasgouttes
39e8cbf4e5 Record undo when deleting end of paragraph in change tracking mode
Fixes bug #10253.
(cherry picked from commit 86c33c96a0)
2016-07-05 16:47:50 +02:00
Enrico Forestieri
f5f8c6fd38 Bring window to front after loading a document
Fixes #7875.
2016-07-04 20:44:13 +02:00
Georg Baum
3fb8d71869 Fix CAS input on windows (bug 10262)
This is the well known file locking problem: The TempFile class keeps the
created file locked for the own process, and this prevents the CAS to read it.
2016-07-03 19:48:15 +02:00
Georg Baum
67d7a17af5 Make LyX compiled by MSVC 2015 run on Vista again
Patch and tests from Dima Ruinskiy, comments by me. For details see discussion
in bug 10186.
2016-07-02 10:16:48 +02:00
Richard Heck
bfeee826b4 ABOVE and CENTERED labels need special treatment.
Fixes bug #8843.

(cherry picked from commit 08bf9781ee)
2016-06-29 23:56:54 -04:00
Richard Heck
c52f30f253 Make sure we center displayed equations.
(cherry picked from commit a8aa7feb89)
2016-06-29 23:20:56 -04:00
Richard Heck
24d8d880c1 Add class attribute for \mathbb in XHTML output. Fixes part of 8251.
Patch from Josh.

(cherry picked from commit e3625b5b80)
2016-06-29 23:02:28 -04:00
Richard Heck
f3fbfcfd05 Use symbols file to lookup entities for delimiters. Fixes bug #8280.
Based upon work by Josh Hieronymus.

(cherry picked from commit 04b8f5cdc4)
2016-06-29 22:42:03 -04:00
Richard Heck
98ba7cf49d Don't be so cute with VSpace: We just output it inline now for
XHTML.

Fixes bug #8154.

(cherry picked from commit 8ea3d1f130)
2016-06-29 21:59:44 -04:00
Richard Heck
63f6ee213c Output column width info for XHTML.
(cherry picked from commit ddc28f0374)
2016-06-29 21:49:28 -04:00
Richard Heck
88f6da78af Fix bug #8782: We need to query the cell, not just the inset.
(cherry picked from commit f49556b3ed)
2016-06-29 21:28:05 -04:00
Richard Heck
2417d9cb5d Add missing buffer update after pasting unformatted text.
Fixes bug #8735.

(cherry picked from commit 6ecb05e6ea)
2016-06-29 13:34:22 -04:00
Jean-Marc Lasgouttes
a097e0cf82 Fix right_boundary properly after a row is shortened
Instead of resetting it to false, do a proper test to see whether
there is a separator at the end of the row.

Fixes bug #10180.
(cherry picked from commit 5e5440f2f3)
2016-06-29 17:55:47 +02:00
Richard Heck
9d02f0bcf1 JSS template should load math packages automatically.
Fixes bug 9242.
2016-06-28 23:39:13 -04:00
Richard Heck
f1f78c0333 Revert "JSS template should load math packages automatically."
This reverts commit 525e01ce29.
2016-06-28 23:38:15 -04:00
Richard Heck
525e01ce29 JSS template should load math packages automatically.
Fixes bug 9242.
2016-06-28 23:37:28 -04:00
Enrico Forestieri
7b423a4eb3 Make command buffer icons same size as QLineEdit height
Part of bug #10125

(cherry picked from commit 458d2015dc)
2016-06-27 18:44:50 -04:00
Richard Heck
46133b26be Let "provides [fontspec|listings|subfig] 1" work.
(cherry picked from commit f46a52d97f)
2016-06-27 17:48:08 -04:00
Richard Heck
1207d93951 Fix bug #8814: Ask where to export file if it is not
yet saved.
2016-06-25 03:29:30 +01:00
Uwe Stöhr
8b82998617 ia.po: updates from Giovanni 2016-06-24 02:16:18 +02:00
Richard Heck
ba1cf3e5ce Minor updates to ANNOUNCE and status. 2016-06-22 14:15:18 -04:00
Richard Heck
774c00c457 By default, charstyles should not permit layout changes internally.
Fixes #10237.

(cherry picked from commit 152817576a)
2016-06-21 15:55:12 -04:00
Richard Heck
d1c11283a3 Fix bug #10213 as discussed there: We now display the same button
whether the branch is open or closed.

(cherry picked from commit 3573b7270c)
2016-06-21 15:02:01 -04:00
Georg Baum
380475f4db Skip paragraph parameters for dash conversion
Some of them are directly passed to LaTeX, but for all of them a token
\twohyphens or \threehyphens is not valid. This fixes bug #10243.
2016-06-20 20:22:23 +02:00
Richard Heck
bf06e9338e Add new module:
Provides two new styles:

1. An "In Premable" style that puts whatever is entered into it into the preamble.
   This can be used, if one wishes, to include preamble code in the body of the
   LyX document.
2. An "In Title" style that will put its contents into the body of the LaTeX
   document, but before \maketitle is issued. This is useful for making branches
   and notes in title-related material. (If you put these in a Standard layout,
   this signals to LyX to output \maketitle, which may then come too early.)

The ForceLocal machinery allows the module to be added to stable.

(cherry picked from commit a9af5333b2)
2016-06-20 11:10:07 -04:00
Richard Heck
8731689d41 Fix bug #10153: There's a mechanism in XHTML output that defers the
output of tags until we know they're needed. In the case of HTML
tables, empty cells should of course be output, so we need to force
the tags to be output.

(cherry picked from commit 35d449c5da)
2016-06-20 10:26:40 -04:00
Richard Heck
fb97294229 Status for previous commit. 2016-06-18 13:02:29 -04:00
Richard Heck
adcdf22042 Restore last selected label when using the "go to label" feature
of the reference dialog.

(cherry picked from commit 9d5ffa8e75)
2016-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
3c7c63376f Take inset dimension into account in row signature
In some cases, the insets may change height or width without changing
the other apsects of the row.

Fixes bug #6991 and #10182.

(cherry picked from commit 508518ad95)
2016-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
aa522e7071 Fix drawing of buttonText (enforce same left/right spacing)
The computation of the width of the button was wrong. If <--> stands
for TEXT_TO_INSET_OFFSET/2 spacing, and if `[]' marks the button's
limits, then the intent is
  <-->[<-->button text<-->]<-->

Therefore the physical grey rectangle width is
   width - Inset::TEXT_TO_INSET_OFFSET

With this change, the spacing on the right of the button is not larger
than the left one.

Fixes bug #10147.
(cherry picked from commit 516d5d29dc)
2016-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
cba0b073aa Remove extra spacing around InsetCommand buttons
There is already a spacing of 2 pixels on each side of a button (e.g.
collapsed inset). There is no need to add one extra pixel for command
insets.

Fixes part of bug #10149.
(cherry picked from commit 68149e380d)
2016-06-15 22:32:53 +01:00
Juergen Spitzmueller
2d6f1e6551 Add forgotten fix to status 2016-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
b6552d017b \\pagebreak is a fragile command in general
As such, it shall be protected in moving arguments, such as sections.

Fixes bug #10092.
(cherry picked from commit 86ee2699c30b63e5b4de3ad725519756d17aec2c)
2016-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
dbd83603b0 Fix getStatus for math-mutate and math-display
Those two functions used two different hackish and buggy
implementation to know when the function is disabled. Replace that by
asking the containing inset whether it accepts inserting display math
inset.

Fixes bug #10033.
(cherry picked from commit de5630a1562054cb969b106e35f84bfe1e99002a)
2016-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
f012b73e78 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-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
c25ba48f0a 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-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
f3cb98c784 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-06-15 22:32:53 +01:00
Guillaume Munch
5e6de175fa status.22x 2016-06-15 22:32:53 +01:00
Jean-Marc Lasgouttes
e359124a86 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-06-15 22:32:52 +01:00
Jean-Marc Lasgouttes
76c06e3535 Add missing entry in status.22x
This was forgotten in fe5e1170.
2016-06-15 22:32:52 +01:00