Richard Heck
9a95390791
Enable XHTML export of LilyPond files.
...
(cherry picked from commit b35661b755
2016-07-31 01:36:09 -04:00
Richard Heck
5555661bf6
Allow XHTML export of Dia diagrams.
...
(cherry picked from commit 3f1199d56a
2016-07-31 01:36:08 -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 daf7cd4c05
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 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
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 e1f597e3da
2016-07-30 21:58:59 -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
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
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
Uwe Stöhr
5e6f9d1753
Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x
2016-07-26 23:40:34 +02:00
Uwe Stöhr
2da990973b
Win installer: add an MSVC DLL
...
the compiled lyx.exe does not use it but since its distribution is recommended by Microsoft it doesn't harm to distribute it with the installer
2016-07-26 23:40:19 +02: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
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
Richard Heck
12a4b52a72
Fix directory in build script.
2016-07-21 14:34:19 -04:00
Richard Heck
03906e0530
Remerge strings.
2016-07-21 14:31:23 -04:00
Richard Heck
7c8fd8d026
Update gmo files for German and Brazilian Portuguese.
2016-07-21 14:29:54 -04:00
Richard Heck
ad72f2b554
Start preparations for 2.2.1.
2016-07-21 14:25: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
54bcdd2468
prepare installer for 2.2.1
2016-07-20 23:44:11 +02:00
Uwe Stöhr
2a5498ed7d
status.22x: mention Brazilian update
2016-07-20 01:50:02 +02:00
Uwe Stöhr
9633b1b9c5
pt_BR.po: updates by Georger
2016-07-20 01:46:03 +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
4604388e7c
Ignore .dirstamp.
2016-07-18 13:02:56 -04:00
Richard Heck
4a75d358a1
The way this was previously, it had to fail if the GUI language
...
was not English: We return the the abbreviated author "One and Two",
but translated to the GUI language; then we search that for " and "
in order to pull the authors apart again.
I've just replaced the distinct routines with a single one that handles
both cases, depending upon whether a Buffer is provided as one argument.
(cherry picked from commit fb84ccd9fb
2016-07-17 22:56:14 -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
Jean-Marc Lasgouttes
85b8c040bd
Fix i18n.inc creation with some out of tree builds
...
Actually, POFILES already contains the relative path to the po files,
so that the old code was only working by chance when the source and
build directories were at same level.
(cherry picked from commit bd890842f5
2016-07-17 22:18:22 -04:00
Uwe Stöhr
bf67b7250c
INSTALL.Win32: update file
...
The file was hopelessly outdated. I updated it by moving the updated info to the Wiki. The Wiki allows to use some screenshots because images explain more than text.
2016-07-18 01:34:30 +02:00
Richard Heck
c7de07a41b
Add InStar module to the distribution.
2016-07-16 11:09:03 -04:00
Uwe Stöhr
edf1a236da
doc files: remove unnecessary TeX braces
2016-07-16 12:39:34 +02:00
Uwe Stöhr
1af511754b
Math.lyx: a nitpick
2016-07-16 02:30:40 +02:00
Uwe Stöhr
d15950ffde
Math.lyx: add shortcuts for font styles
2016-07-16 02:27:56 +02:00
Uwe Stöhr
771950a14e
example files: remove unnecessary latexpar
...
- fixes part of bug #10068
2016-07-16 00:22:37 +02:00
Uwe Stöhr
2111e775f5
MergedManuals.lyx: fix a file path
2016-07-16 00:08:58 +02:00
Uwe Stöhr
494f3991dc
examples/templates: remove unnecessary parbreak
...
- fixes part of bug #10068
2016-07-15 23:59:20 +02:00
Uwe Stöhr
7e92e875d3
examples/templates: remove unnecessary latexpar
...
- fixes part of bug #10068
2016-07-15 23:52:38 +02:00
Uwe Stöhr
78f59f72ac
doc files: remove unnecessary latexpar
...
- fixes part of bug #10068
2016-07-15 23:48:00 +02:00
Uwe Stöhr
1d95e99423
UserGuide.lyx: re-add the \origin
...
(it drives me crazy that it will always automatically be removed)
2016-07-15 23:09:18 +02:00
Uwe Stöhr
d048e48a96
UserGuide.lyx: correct a menu name
...
- also remove unnecessary latexpars
2016-07-15 22:58:32 +02:00
Richard Heck
46167c1a91
Add .dirstamp to the list of ignored files.
...
This seems to be generated by recent versions of automake. It isn't
an issue if you use a separate build directory, but not everyone
does that.
(cherry picked from commit 0858cdddc7
2016-07-15 13:37:56 -04:00
