24881 Commits

Author SHA1 Message Date
Juergen Spitzmueller
d088f7f03f Do not add deleted text to inset button label.
Fixes: #10775
(cherry picked from commit 70b0df85c80120e0a0eeaa9e3fec721d91d53849)
2017-10-23 08:26:01 +02:00
Guillaume MM
25678dae12 Fix math mode for InsetMathMacro on output
After 6642152e, user macros were no longer wrapped in \ensuremath. In 2.2 and
before, InsetMathMacro behaved as follow:

* Textmode global symbols are wrapped in \text when in math.

* Other global symbols, and user macros, are wrapped in \ensuremath when in
  text.

* Undefined macros (ERT) are wrapped neither in \text nor in \ensuremath.

This is also consistent with the documentation of MathEnsurer in
mathed/MathStream.h.

This patch defines InsetMathMacro::currentMode() accordingly (respectively
TEXT_MODE, MATH_MODE and UNDECIDED_MODE) and uses it to determine the output.

After this patch, there is a mismatch between screen and pdf output for user
macros in \text. This is not a regression wrt 2.2 and is because linearization
does not satisfy currentMode() currently.

(cherry picked from commit 767f0df18fcd61611de1d1e10e0fd1867479fb59)
2017-10-23 00:07:08 +02:00
Enrico Forestieri
8f7b40955c Account for shadowed system macros
Part of #10694.

(cherry picked from commit d58d3f677442fc8b2ee2454a1da8f5eedd8b95ac)
2017-10-22 23:15:56 +02:00
Enrico Forestieri
5a3201a8c4 Speed up exit time
Instantiating a single QSettings and using it for each ui element
can significantly shorten the time required to save the various
states at exit. The speed up can be better appreciated on *nix,
where the settings are saved on disk, rather than on Windows where
they are held in memory (in the registry).

(cherry picked from commit 3b43fbfbb18cc4535aba3fd77c6a3cf21835dafa)
2017-10-18 13:38:16 +02:00
Juergen Spitzmueller
4947476da8 Do not scan BibTeX files multiple times in a collectBibKeys() procedure.
Scanning is rather slow, so this improves performance in specific
situations (multiple inclusion of larger files in master/child or
chapterbib context)

(cherry picked from commit 88a0666d6c039decfbd0da0dee6c9b4ba4923806)
2017-10-18 12:21:29 +02:00
Richard Heck
ffd175b99f Use of div for labels causes validation errors. See #8843.
(cherry picked from commit b8206a0832ff4a6d8da8a71b6058d65d721bd0e8)
2017-10-16 21:41:30 -04:00
Richard Heck
1bef592999 Revert "ABOVE and CENTERED labels need special treatment."
This reverts commit 08bf9781ee86ea7fe2c9f3a0d670cad92807a017.
2017-10-16 21:37:59 -04:00
Juergen Spitzmueller
a59301eaff Collapsable -> Collapsible (part 2)
The current spelling is not strictly wrong, but flagged as unusual or
historical by some authorities. It is also found fault with many
spell checkers. Thus we decided to move to the more standard "-ible"
form once and for all.

See #10678 for discussion

This part covers the most tricky part: the internal naming.
Translations and layouts will follow.

This will all also all be backported to 2.3.x, for the sake of backwards
compatibility (cherry-picking).

(cherry picked from commit c466baaa5b99e44ea25616556bd0918197f4b54c)
2017-10-16 11:24:41 +02:00
Juergen Spitzmueller
e040ccb0e8 Collapsable -> Collapsible (part 1)
The current spelling is not strictly wrong, but flagged as unusual or
historical by some authorities. It is also found fault with many
spell checkers. Thus we decided to move to the more standard "-ible"
form once and for all.

See #10678 for discussion

This part only covers the usage in comments and the like. More to follow.

This will all also all be backported to 2.3.x, for the sake of backwards
compatibility (cherry-picking).

(cherry picked from commit 648ddd25eca045f34569405aca15c5d638bbb723)
2017-10-16 11:22:13 +02:00
Richard Heck
402d41b82d Revert "Fix bug #8782."
This caused slowness on undo and redo that was reported at
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg202292.html

This reverts commit 02847641a8b97a57d1866120bb446427e0bda7a4.
2017-10-15 20:56:25 -04:00
Enrico Forestieri
2e253eab0f Fix issue with regular expressions
At least with gcc 6.4, if the first parameter passed to
regex_match() is afterward changed, the second one gets
corrupted. This is avoided by using a temporary string.

(cherry picked from commit c16ccdb5fd25a14c096ef9dfa68975c77377bf41)
2017-10-15 15:42:39 +02:00
Juergen Spitzmueller
88c285219b Fix PDF output of clipped graphics with recent graphics package
The previous redirection of the senseless option "bb" to "viewport" in
PDFLaTeX output has been removed in a recent graphics package update.

This breaks documents, since clipped graphics silently stop displaying.

This change restores the previous output by using "viewport" instaed of
"bb" for non-PS/DVI output, while leaving PS/DVI untouched (where "bb"
and "viewport" behave differently.

Fixes: #7910
2017-10-13 08:28:26 +02:00
Jean-Marc Lasgouttes
80983a3553 Do not forget to set cursor current font when selecting
Fix several unreleated cases where the `selecting' code path did not
reset cursor font correctly. This leads to a caret that does not have
the correct size, and can cause caret droppings with the new display
scheme.

(cherry picked from commit 88d0390724c60410dd680a2528eab5c91b1252ce)
2017-10-12 21:13:55 +02:00
Enrico Forestieri
b79d07f4a5 Fix issue with language switch in Arguments insets
In some insets such as Arguments, a local language switch has to be
used. However, if the language inside the inset was set to be equal
to the outer language, the code decided not to switch language. But
then got confused and tried to close a switch that was never opened.
This patch forces the switch even if the outer language is the same.

(cherry picked from commit ce4f39d414a26edcf54c1e24d6142e6b929586d7)
2017-10-12 00:02:54 +02:00
Richard Heck
da7f539358 Reset cursor before beginning reload sequence.
(cherry picked from commit af381a2fb25df71b43668fa46ba9b6395f266751)
2017-10-08 23:07:13 -04:00
Kornel Benko
a506c6b73b Cmake build: Only use the new lyxconvert on MAC 2017-10-03 22:14:37 +02:00
Kornel Benko
9da29ac788 Add suffixed lyxconvert to cmake build.
This should amend f93ec4a, but is not tested on apple
2017-10-03 22:09:57 +02:00
Stephan Witt
c75d9bf7c4 Add Qt-based fallback-converter for Mac to compensate missing ImageMagick convert utility
(cherry picked from commit f93ec4a1f41b70a4607ff355e19f4721f9338028)
2017-10-03 20:10:29 +02:00
Jean-Marc Lasgouttes
cda56c0dc3 Avoid empty space above the top of the document
If the height of the first row of the document has become smaller (for
example when it contains an image which size has shrunk), that the
anchor offset has to be adapted so that there is not a large blank
space at the top of the document.

(cherry picked from commit d6aecbda0f5929ab04805ac6e19cd48f3c4a059b)
2017-09-28 13:57:36 +02:00
Juergen Spitzmueller
4f50cbcfe4 Fix crash when closing master with children and grandchildren
In some cases, it is possible that the BufferPositionMap has
dangling pointers. We thus check whether the Buffer is loaded
before accessing it.

Fixes: #10766
2017-09-28 09:06:33 +02:00
Juergen Spitzmueller
745b43784c Whitespace cosmetics 2017-09-27 18:05:58 +02:00
Jean-Marc Lasgouttes
f2f7ea9edc Do not apply mathindent to inline math insets
(cherry picked from commit 040e9d32a6c1f69c444ed6593e67f96829f8052f)
2017-09-24 22:55:06 +02:00
Juergen Spitzmueller
64007533a7 Fix some spelling errors reported by Sven
Fixes: #10678
(cherry picked from commit b498646b2eb880b420b493a94144dd8dce2e32c7)
2017-09-22 09:34:51 +02:00
Juergen Spitzmueller
d8c018b8c6 Reset InsetArgument language after passthru status change
Fixes: #10664
2017-09-15 16:21:05 +02:00
Juergen Spitzmueller
7309ae50b4 Allow to provide xunicode. 2017-09-15 09:36:16 +02:00
Stephan Witt
97dc585138 #10662 use drawers for bibliography dialogs
This change solves dialog stacking problems on newer Mac OS X in combination with the OS provided file open dialog.
2017-09-12 11:05:42 +02:00
Jean-Marc Lasgouttes
e781628575 Update row width when inset is indented
Fixes bug #10758

(cherry picked from commit 3f1944a7c97444c6cb5b74a1772ac17f13012902)
2017-09-11 12:42:08 +02:00
Juergen Spitzmueller
e50a7d5b12 GuiBibtex: Use appropriate title when using Biblatex 2017-09-10 10:57:48 +02:00
Juergen Spitzmueller
abc145f250 Use default btprint value in the UI if none is given. 2017-09-10 10:51:42 +02:00
Juergen Spitzmueller
1adfb8a6c7 Disallow newlines in biblatex options
Fixes: #10757
2017-09-10 10:05:10 +02:00
Juergen Spitzmueller
242f543e01 Add default output format for pLaTeX
Fixes: #10747
2017-09-09 08:53:08 +02:00
Juergen Spitzmueller
e96c5c8f96 Make the session zoom relative to the default zoom
Also rename lyxrc.zoom to lyxrc.defaultZoom

Fixes: #10455
2017-09-06 18:11:31 +02:00
Juergen Spitzmueller
a034af5d5f Consider insets that are chars in InsetCollapsable::getNewLabel()
This fixes the display of closed ERTs, Indexes etc. when they contain
special chars, logos or quotation marks.

(Since quotation marks in ERTs are now insets, not chars anymore,
this also fixes a bug/regression of the display of babel shortcuts
such as "= in closed ERTs; hence I consider this fix necessary for 2.3.x)
2017-09-06 10:11:01 +02:00
Jean-Marc Lasgouttes
b92ceba9a1 Honor trailing spaces in LabelString and friends
Remove the trimming operation on LabelString, LabelStringAppendix,
EndLabelString and LabelCounter. This trimming meant that quotes
strings were not preserved, which is wrong.

To preserve layouts, the Layout format has been updated to 64, so that
layout2layout can remove extra spaces on existing strings, which
ensures that behavior is unchanged for old layouts (courtesy of rgheck).

It is now possible to re-add spaces in label strings where it makes
sense.

Fixes bug #10723.

(cherry picked from commit 5c545573507bbf55f78c294188537c6aff959bc0)
2017-09-02 16:08:56 +02:00
Juergen Spitzmueller
30eb6dfaeb Add special chain for Modules with OutputFormat for pLaTeX (Japanese)
Fixes: #8823
2017-09-01 10:32:22 +02:00
Jean-Marc Lasgouttes
bd88740b06 When a row is shortened, reset its flushed() attribute.
Fixes bug #10699.

(cherry picked from commit 59e2c40564f441044d38f2082b8a038cc093c932)
2017-08-31 14:58:20 +02:00
Jean-Marc Lasgouttes
cc28353922 Fix Lexer::getLongString prefix pruning logic
This fixes 3 bugs:
1/ only spaces are considered as part of the prefix
2/ leading tabs are removed unconditionally
3/ off-by-one error in the removal

The new intended behavior is:

1/ find the prefix (sequence of spaces and tabs) before the first
   line; remove this prefix from the line
2/ on the next lines, check whether they start with the same prefix,
  and if they do, strip this prefix

(cherry picked from commit 48f099d93ab179eef76594ced6b735aa912c03f6)
2017-08-29 16:05:09 +02:00
Jean-Marc Lasgouttes
4d845baf08 Fix computation of string width when using a QTextLayout
It was not a good idea to rely on QTextLine::naturalTextWidth() to
compute a string width. The correct method is horizontalAdvance().

Also round the value to the nearest pixel, since this is what
QFontMetrics::width() does.

Fixes bug #10700 (and maybe others).

(cherry picked from commit c874641e95b763a6d4691fb12fba893580f3018a)
2017-08-28 14:36:50 +02:00
Juergen Spitzmueller
9bbcfebb95 Amend 7e121117bb3203 2017-08-13 12:01:49 +02:00
Juergen Spitzmueller
7e121117bb Vietnamese no longer requires any special handling.
It is a normal babel support package.
2017-08-13 11:53:41 +02:00
Scott Kostyshak
acc1cc394f Remove a sometimes blocked call to dispatch
Dispatching LFUN_BUFFER_ZOOM inside of GuiView::restoreLayout() was
blocked in some cases because the function can be called without a
buffer (and the LFUN is marked as needing a buffer). Instead of
conditioning on a buffer, the call is removed because in testing it
does not appear why it is needed.

This commit removes the status message that is displayed if starting
LyX without opening a buffer:

    "Command not allowed without any document open"

See discussion at:

    https://www.mail-archive.com/search?l=mid&q=20170718084344.3kjmu7hzoyajt7vd%40steph

This commit amends 4183a9f4.
2017-08-12 11:46:11 -04:00
Juergen Spitzmueller
7a7c2117bf Fix compilation order
(This is the pedant in me)
2017-08-12 10:22:45 +02:00
Juergen Spitzmueller
0e711b414e Add missing break
As correctly pointed out by gcc7.
2017-08-12 09:55:06 +02:00
Juergen Spitzmueller
e9c9ad8055 Forgot this one. 2017-08-12 09:24:01 +02:00
Juergen Spitzmueller
1249e5e13e Mark some intentional fall-throughs (in a way understandable to gcc)
This silences -Wimplicit-fallthrough warnings with gcc7.

(Re-Apply without the unintended commits)
2017-08-12 09:06:29 +02:00
Juergen Spitzmueller
0120c3fc10 Revert "Mark some intentional fall-throughs (in a way understandable to gcc)"
This reverts commit 6dc1884d05ee0d51dd896c7b924fdec758ea3d8e.
2017-08-12 09:04:23 +02:00
Juergen Spitzmueller
b73879691f Another (IMHO false) fall-through warning silenced
With a FIXME. The case should be checked.
2017-08-12 08:59:26 +02:00
Juergen Spitzmueller
6dc1884d05 Mark some intentional fall-throughs (in a way understandable to gcc)
This silences -Wimplicit-fallthrough warnings with gcc7.
2017-08-12 08:57:02 +02:00
Juergen Spitzmueller
b2841e9570 Require textquotedbl def with second language that has internal fontenc
Since these switch locally to encodings that do not define \textquotedbl
themselves.
2017-08-10 11:47:52 +02:00
Enrico Forestieri
40e9dea551 Use the OK/Apply paradigm for all document settings
Due to its peculiarity of not being saved in the document, the
shell escape setting was applied immediately without the need
for hitting the Apply or OK buttons. However, for uniformity
sake, it is better to adhere to the established paragdim of
confirming any changes before applying them.
2017-08-10 01:32:23 +02:00