Commit Graph

24492 Commits

Author SHA1 Message Date
Juergen Spitzmueller
7c8d167f8e Longtable: only output the caption contents in a caption row.
Fixes: #10791
(cherry picked from commit 538b38f78c)
2017-11-20 19:51:32 +01:00
Juergen Spitzmueller
3561caa3a1 Fix footnote output in description item
Fixes: #9387
(cherry picked from commit aaa6150089)
2017-11-20 09:50:23 +01:00
Juergen Spitzmueller
55bc365872 Allow footnotes in floating tables via tablefootnote package
See #808.

(cherry picked from commit 5017a0a1c6)
2017-11-20 09:49:36 +01:00
Juergen Spitzmueller
c2d121f663 Fix footnote output in tables outside floats and longtable header/footer
Fixes: #808 (sic!), #5869
(cherry picked from commit 3affde3957)
2017-11-20 09:49:10 +01:00
Juergen Spitzmueller
7920a12065 Disable non-functional table rotation for longtables
In the long run, proper longtable rotation via [pdf]lscape should
be implemented.

See #9194

(cherry picked from commit 84f7dafe89)
2017-11-20 09:37:01 +01:00
Juergen Spitzmueller
1a8873d7be InsetExternal: update renderer after preview status change
This fixes a crash when changing instant preview prefs while
document with previewed external inset is opened.

Fixes: #10785
(cherry picked from commit 0842e22f45)
2017-11-12 18:31:00 +01:00
Juergen Spitzmueller
fadb93ae68 Collapsable -> Collapsible (part 5)
Preferences update and prefs2prefs routine.

This was forgotten in the process.
2017-11-02 16:51:23 +01:00
Enrico Forestieri
43a6fe8375 Fix #10778 (issue with CJK and language nesting)
When using CJK, don't try to close a language that was never
opened before, such as when it is the main language.

(cherry picked from commit 7e51b5f301)
2017-11-02 11:07:11 +01:00
Juergen Spitzmueller
8f98423e92 Enable OK/Apply buttons when resetting to class defaults.
(cherry picked from commit b851a349b6)
2017-11-01 23:09:59 +01:00
Enrico Forestieri
8be0ec0db5 Fix issue with change-tracked deleted display math
- If a display math not starting a new paragraph is deleted, the
  current \lyxdeleted macro (if any) must be closed and a new one
  started, otherwise the display math will be shifted up.

- Use \linewidth instead of \columnwidth because the former will adapt
  to the reduced horizontal width in list environments, avoiding shifting
  to the right the diplay math.

(cherry picked from commit 7f23ca912c)
2017-10-25 19:51:14 +02:00
Juergen Spitzmueller
a81a0c5534 Implement ParamInfo::HANDLING_LTRIM and use it to ltrim InsetBibitem
output

See #9847.

(cherry picked from commit 76f49fad78)
2017-10-23 09:07:22 +02:00
Juergen Spitzmueller
d088f7f03f Do not add deleted text to inset button label.
Fixes: #10775
(cherry picked from commit 70b0df85c8)
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 d58d3f6774)
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 3b43fbfbb1)
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 88a0666d6c)
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 b8206a0832)
2017-10-16 21:41:30 -04:00
Richard Heck
1bef592999 Revert "ABOVE and CENTERED labels need special treatment."
This reverts commit 08bf9781ee.
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 c466baaa5b)
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 648ddd25ec)
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 02847641a8.
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 c16ccdb5fd)
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 88d0390724)
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 ce4f39d414)
2017-10-12 00:02:54 +02:00
Richard Heck
da7f539358 Reset cursor before beginning reload sequence.
(cherry picked from commit af381a2fb2)
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 f93ec4a1f4)
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 d6aecbda0f)
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 040e9d32a6)
2017-09-24 22:55:06 +02:00
Juergen Spitzmueller
64007533a7 Fix some spelling errors reported by Sven
Fixes: #10678
(cherry picked from commit b498646b2e)
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 3f1944a7c9)
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 5c54557350)
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 59e2c40564)
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 48f099d93a)
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 c874641e95)
2017-08-28 14:36:50 +02:00
Juergen Spitzmueller
9bbcfebb95 Amend 7e121117bb 2017-08-13 12:01:49 +02:00