23225 Commits

Author SHA1 Message Date
Richard Heck
3fe8c04274 Fix monolithic build. 2016-10-10 10:24:08 -04:00
Enrico Forestieri
ae0679926e Improve systemlyxdir handling
Do not assume that the /systemlyxdir path prefix in \origin refers
to the system directory of the running instance, but check through
some heuristics what the real system dir is. In this way, a document
in the system dir of any other LyX installation is correctly spotted
and the \origin tag properly updated. For example, one can use an
installed version of lyx to edit a document in the lib/doc dir of a
git repo and obtain the same result as when running lyx in place.

(cherry picked from commit ade098e2896bd9d7d87b3df1a9276661dd3f7c78)
2016-09-25 12:09:24 -04:00
Georg Baum
701f10a502 Fix data loss with [ in first cell of aligned
If the first character in the first cell of an aligned math environment is
'[', and the environment does not use top or bottom vertical alignment,
then LyX did write the '[' unprotected so that it got misinterpreted as
optional argument, both when reading the .lyx file in LyX and when reading
the .tex file in LaTeX => data loss!
The fix is to output an empty optional argument in this case, which is
interpreted as default alignment both by LyX and LaTeX. It would also be
possible to output \[ in the first cell instead, but this would be more
difficult to implement.
2016-09-12 20:56:05 +02:00
Jean-Marc Lasgouttes
69f0efd797 Set vertical lines in math arrays correctly on Y axis
This is a fixup to commit 39329935. The two fixes are
* add forgotten offset `y' when drawing the line
* in order to have a continuous vertical line, draw from the offset of
  the previous row.

Fixes bug #10363.

(cherry-picked from a27ff136)
2016-09-09 09:56:44 +02:00
Georg Baum
1cbc3b6e54 Fix filter filter regex
Now the external material file dialog shows the file types defined in the
template again. Before this fix it did only show "All files (*)".
I don't know what the old syntax was supposed to do or whether it ever worked
with boost::regex, but with std::regex the new one is correct.
2016-09-08 20:54:40 +02:00
Juergen Spitzmueller
b14d9186bb Amend 7d52d37662f69
\@ifundefined is an If-Then-ELSE construct.
2016-09-04 17:43:51 +02:00
Juergen Spitzmueller
7d52d37662 Fix for recent luatex versions. 2016-09-04 17:35:11 +02:00
Jean-Marc Lasgouttes
36d0e3032d Amend 3e432ec6314
It failed in the case where a selection already existed (the anchor would be wrongly reset).

(cherry picked from commit 68d825fed8f34aa98053e6264cf0668d08534549)
2016-08-29 18:25:56 +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 e7a33cacf171ee41609d6fe31e19eff6df1691bf
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 2ad52918da1d0f375bf2831df4c51f6afa7ea448)
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 10f6eb2e7eeffc757b7f54059524441e90008240)
2016-08-28 02:38:02 +01:00
Guillaume Munch
c8381f7873 LyXToolBox: a QToolBox with minimum size management
The purpose of this custom widget is to allow the use of a QToolBox in a limited
area. The stock QToolBox does not provide a minimum size hint that depends on
the size of the pages; it assumes that there is enough room.  This subclass sets
the minimal size of the QToolbox. Without this, the size of the QToolbox is only
determined by values in the ui file and therefore causes portability and
localisation issues. Note that the computation of the minimum size hint depends
on the minimum size hints of the page widgets. Therefore page widgets must have
a layout with layoutSizeContraint = SetMinimumSize or similar.

(cherry picked from commits 576cb5df77604b50175b2410ac006c5c5c110e2b
                            7e9d0a938bb02510304822f6bce4df3bcfe4bfc9
                            efbc297b955da58cef7bf2d63dfbc8b2942c671e)
2016-08-28 01:43:46 +01:00
Guillaume Munch
2da2f6c00c Basic implementation of QSignalBlocker for qt4
(cherry picked from commit bc8eb059db9f25b0cb44af0a26fba13170971f40)
2016-08-26 20:42:52 +01:00
Guillaume Munch
49ce94f636 Fix "scroll here" feature of scrollbar (#10311)
Prevent setRange() from causing a recursive call to scrollTo(). Reduces three
calls of scrollTo() to one call for all scrolling functions of the scroll bar
(e.g. clicking on the arrow, dragging, or clicking somewhere on the scrollbar).

(cherry picked from commit 4d7b912ca1890b5b0b3ed29568b7091a7e7baef0)
2016-08-26 20:41:08 +01:00
Juergen Spitzmueller
010284dbe5 Implement proper dialog titles in InsetParamsDialogs
Fixes: #10329
2016-08-26 18:51:01 +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 07c7dae367aea2ebc6486d1cc67b11c409f2d8a0)
2016-08-24 12:04:19 +02:00
Jean-Marc Lasgouttes
3e432ec631 Reset anchor before selecting with S-button1
(cherry picked from commit b583fb26e89ccdc242e5c11d5e9d8b0606bee957)
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 65b0e84b5428897e36ff05fdf701bbba4acee8e8)
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 4ddad2f6cdefcfdd873ae3d4cea8b272495f9aba)
2016-08-22 10:20:01 +02:00
Scott Kostyshak
deec55866c Warn in GUI when mixing Title and InTitle layouts
Since we process layouts sequentially, we export LaTeX code for the
title once we arrive to a layout that has InTitle false. If the
document then later has a layout with InTitle true, we do not
(currently) go back to add it to the title and just output it
in-place. We previously warned with LYXERR0, but since this can
cause missing or unexpected output we now warn in the GUI.

For more information, see the following lyx-devel thread:
https://www.mail-archive.com/search?l=mid&q=a65ae226-d3bd-8fc5-a93b-7bb23f1cda82%40lyx.org

(cherry picked from commit 0b1cf1330d850b21313f5e68a83bb5053e52e6ec)
2016-08-18 21:07:42 -04:00
Scott Kostyshak
b3a6f51f30 Improve a layout LYXERR0 message
The name of the layout is now included in an error message about
layouts. This will help with finding the root issue of several
documents we have.

(cherry picked from commit c949268da7a56368cf848199f37659c218a57808)
2016-08-18 21:07:38 -04: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 fb46b3a1ee642b66b9712c6f376f543c47a2695e)
2016-08-18 17:00:55 -04: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 3be23d18b64d1409d14e0c1c95f4192e9a23e543)
2016-08-04 22:47:32 -04:00
Richard Heck
928c7a3d68 We don't need to crash here, but can try to continue in release
mode.

(cherry picked from commit 0a603c5d0e370c8b9c9e0f5dfa024b6e500b2dd4)
2016-08-04 22:46:26 -04:00
Richard Heck
c92b1aa359 Special characters should be output to the TOC.
(cherry picked from commit f15c4159aa9fa1c78b7b642e58edbff333292d5a)
2016-08-04 22:45:56 -04:00
Richard Heck
b5a37a856c Fix bug #10320.
Layout::write needs to allow for the possility that the name of the
style may contain a space. It seems sufficient just always to quote it.
2016-08-04 17:10:39 -04:00
Richard Heck
612dc74f75 Fix problem noticed by Scott.
(cherry picked from commit 16d39b1f83253ff039c3db23124a74c02994e231)
2016-08-02 18:56:46 -04:00
Richard Heck
199e63fa19 Simplify CSS classes for floats.
Fixes bug #8605 and probably parts of #8755 and #9328.

(cherry picked from commit 50c139195083120fb79a215d21cedda516a3451c)
2016-07-31 03:45:05 -04:00
Richard Heck
98d4fba57b Fix CSS for math cases.
Fixes bug #8755.

(cherry picked from commit 752c89ae1320fdfa86d3b91dcfdc82e6f20b1407)
2016-07-31 03:42:38 -04:00
Richard Heck
ffd6a28a97 Fix HTML display of math matrices.
(cherry picked from commit 60ce2b7570e65ccf31738c39211b0997113e4d57)
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 98feadd61eb80ec330cd1884f2321952313ea4b1)
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 07dcb1c525435c6f22de4314ba31150c53502429)
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 ab3a49973f8f948884186f13fe8fd07ecd453198)
2016-07-31 01:48:57 -04:00
Richard Heck
de3284ba9a Activate export of external material for XHTML.
As of this commit, this is ineffective, since no changes have been
made to external_templates.

(cherry picked from commit daf7cd4c05f55c7eb957df7076ec91dcd2eca543)
2016-07-31 01:35:53 -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 6b97f2c0751ff79fc19ea0e11b4ef957fd71324c)
2016-07-31 00:17:22 -04:00
Richard Heck
a536ee7718 Fix preview of external material with plaintext and DocBook.
(cherry picked from commit 93a612220ed4ce604c864b72b14efc59e8ce6683)
2016-07-30 23:51:06 -04:00
Richard Heck
8c6b947eb5 Use scaling factor in XHTML output.
(cherry picked from commit 47c52db13e2f58224d31a2e26a69320f1f5b16cf)
2016-07-30 22:02:48 -04:00
Richard Heck
e1bad06103 If we cannot find the input format for a graphic, we cannot convert it.
Also includes some minor code cleanup.

(cherry picked from commit e1f597e3da26865cb01eab5bef6ad5d9e862ff7a)
2016-07-30 21:58:59 -04:00
Richard Heck
0ab8ea6682 Fix bug #10154. 2016-07-30 20:18:03 -04:00
Richard Heck
c760707548 Fix thinko from earlier commit.
We need to output the deferred material AFTER the paragraph is closed.
2016-07-30 01:30:37 -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 31e25c8ec695f864bec3679c3e11495e3011a0e2)
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 96a8156557731a914087b29ec7e976960c0b8c36)
2016-07-29 23:42:40 -04:00
Richard Heck
0dceac6288 orig_x can and so prsumably should be a double. 2016-07-26 13:33:41 -04:00
Richard Heck
68487d5197 Fix indentation. 2016-07-25 15:07:03 -04:00
Richard Heck
46a16b0ca7 Merge branch '2.2.x' into 2.2.2-staging 2016-07-25 14:55:16 -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 71374b38c26585dc060e923452f2dd873ef00f15)
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 c73923c51901ef7d7b0a0a3e0a4a581671fbe0f1)
2016-07-21 01:09:32 +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 8884c4044d7c1d29526aca7b0be1734231c89207)
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 e35110eab7a540deaf8dc52483f1e5a55a773f46)
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 3203fb1c5fcfa8e1b3c4e4e802c18241bdbc4272)
2016-07-18 13:03:47 -04:00