20062 Commits

Author SHA1 Message Date
Juergen Spitzmueller
54ac0bb970 Restore default output format after tex fonts switch (#8191) 2012-06-08 20:24:09 +02:00
Uwe Stöhr
d6835864c8 Preamble.cpp: whitespace only 2012-06-08 00:56:05 +02:00
Jean-Marc Lasgouttes
18c887f2db Fix bug #7956: Assertion When Trying to Paste Into Table
For some unknown reason, the paste code likes to call Cursor::setSelection(), which is not appropriate here since we are not trying to set a selection at this point.
2012-06-05 11:36:45 +02:00
Juergen Spitzmueller
9df0a930d4 Add missing undo recording.
This adds a change of the printindex type (with multiple indices) to the undo stack and marks the buffer dirty on that action (bug #8182)
2012-06-04 19:13:31 +02:00
Pavel Sanda
99ada23d97 Backport f6921819. 2012-05-31 14:02:40 +02:00
Juergen Spitzmueller
026f53f41c Fix crash when removing last converter (bug 8178) 2012-05-29 15:40:07 +02:00
Juergen Spitzmueller
daf44909c0 Load bibtopic after hyperref (bug #8005) 2012-05-29 13:23:08 +02:00
Richard Heck
7740226c9f A few more small optimizations noted along the way.
(cherry picked from commit c1e3d795f62e88b6c5dda52fafba1404972fe8cc)

Conflicts:

	src/tex2lyx/text.cpp
2012-05-28 18:22:50 -04:00
Jean-Marc Lasgouttes
3a09afa985 Backport "Performance" fixes suggested by cppcheck.
These are completely safe, and it seems best to me to keep trunk
and branch in sync whenever possible, as it makes backporting
easier.

(cherry picked from commit a756403301ff8fb78df4dc1e131e4cd50cd976e1)

Conflicts:

	src/BufferParams.cpp
	src/tex2lyx/Preamble.cpp
	src/tex2lyx/text.cpp
2012-05-28 18:14:15 -04:00
Vincent van Ravesteijn
dacab5cf7b Fix bug #8166: Crash on clicking away from empty last paragraph
We always have to call 'notifyCursorLeaves', but we only have to make sure
that we call the 'fixIfBroken()' functions first.
(cherry picked from commit d20cb73b874a30b82fe01d3b8f385ef066fafedf)
2012-05-23 08:16:03 +02:00
Lars Gullik Bjønnes
d581412353 TextMetrics.cpp: comment out addressBreakPoint function
Only user of this function is code that has been commented out, comment
out this function as well.

Signed-off-by: Lars Gullik Bjønnes <larsbj@gullik.org>
(cherry picked from commit fb3ecca01cdd1e3f5af05e429801f7ef2abdf84e)
2012-05-20 20:41:42 +02:00
Juergen Spitzmueller
993fa89009 If a file is saved as, reset its master if it has any, thus preventing a crash (bug 8161) 2012-05-19 14:03:50 +02:00
Vincent van Ravesteijn
7dfca01f48 Allow an unnamed buffer to be saved with the same name
The check whether fname != oldname does not work for unnamed buffers.
Therefore, we check explicitly whether the Buffer that already exists with
the same name isn't really the buffer we are trying to save.
(cherry picked from commit 30475664d380474f4ea0666e9aaf006cf22c1c7e)
2012-05-14 15:43:24 +02:00
Vincent van Ravesteijn
d475caf278 Fix bug #7641: Freeze when removing itemized first paragraph
Text::outerFont looks recursively for paragraphs before the current one
which has a lower depth. If such a paragraph cannot be found, depthHook
and outerHook return the current paragraph. As such, we end up in an
infinite loop. So, if we find a par_depth that was the same as the
previous one, we apparently can't find a suitable paragraph and we should
quit the loop.
(cherry picked from commit b17250d7eb46cdc58c7288e177282c3ab4448dac)
2012-05-14 15:09:21 +02:00
Enrico Forestieri
3a3f6c838c Backport fix for bug #7982: LyX does not work if working directory a
hard disk drive like D:\.

In this case, the working dir has already a slash at the end.
Appending another one would result in a path ending with a double slash,
which has a special meaning when used in TEXINPUTS (all subdirs would
be recursively scanned). So, avoid doing that.

(cherry picked from commit 93ebb7a863377f6dbcaf724972b747b5c3f20c24)
2012-05-14 08:56:35 -04:00
Vincent van Ravesteijn
86d8e5cfc5 Fix bug #8152: Uneditable long rows for 'Right addresses'
As long as leftMargin() is not correctly implemented for
MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here. Otherwise, long
rows will be painted off the screen and will not be editable.
(cherry picked from commit 92ac678715b07ff7c7adc4b32674382b5e224a44)
2012-05-13 20:51:37 +02:00
Vincent van Ravesteijn
c9cbd538b8 New function BufferList::newInternalBuffer
This solves the problem that newBuffer() already use Buffer::isInternal
but there was no chance to set it yet.

(cherry picked from commit 6cf1847b31617cd2ad190919d0ceaa51e1601ad8)
2012-05-13 20:50:57 +02:00
Richard Heck
3192dc16a9 Fix bug #8156.
We want the key as id, not the label (which is optional).
We also need a kind of namespace for the citation ids.
We should also clean the id tag before using it.

(cherry picked from commit 207d7e4ada31d521b75e9290575b97b6bb1e8c38)
2012-05-13 14:02:10 -04:00
Georg Baum
30219ffc37 Forgot the test case for bug #8116. 2012-05-13 19:42:53 +02:00
Georg Baum
72023030d9 Fix bug #8116.
The string we parse as name may contain backslashes if \csname ... \endcsname
is used. Therefore we have to output it using asInput() instead of cs().
2012-05-13 19:42:41 +02:00
Jean-Marc Lasgouttes
dbcfbe5b76 In replaceSelectionWithString, do not select the new string
This is a patch from Scott Kostyshak. The problem it solves is as follows:

1. enable continuous spell check.
2. type a misspelled word and press space so that it has a wavy red underline.
3. right-click and choose a suggested replacement word.
4. press the backspace button.

Result: nothing happens. If you press the backspace button again, then it works as normal.

The selection code was added for the benefit of the spellchecker, but the code has been rewritten since then.
2012-05-11 17:37:41 +02:00
Richard Heck
57e5eba4c1 Backport fix for bug #8087: Include children in plaintext export.
(cherry picked from commit 98a810c9d8b8d6bc0086779b7fa2d5be434bdbe2)

Forgot the return value.
(cherry picked from commit 0459c43769e507a68f2ec6e053350d4a77d19534)
2012-05-10 16:10:22 -04:00
Vincent van Ravesteijn
b59496c70d Properly mark a buffer as internal
Checking the extension of the temporary filename doesn't work anymore
since the naming of temporary files was corrected.

(cherry picked from commit 5279d5a8a58b9e59442b9f3f504ea397274e2b19)
2012-05-06 23:12:49 +02:00
Vincent van Ravesteijn
17c6bb42e5 Factor out painting of text decorations
(cherry picked from commit 53b75399e75f4895880861908d05eed119dca3a8)
2012-05-06 17:55:20 +02:00
Vincent van Ravesteijn
cf27d693d8 Fix bug #953: Paint text decorations for spaces
(cherry picked from commit c671703f05a74e5b005666c29aff2626931cb239)
2012-05-06 17:23:23 +02:00
Vincent van Ravesteijn
abce7966e6 Fix bug #5167: Correctly paint special characters in InsetMathFont
When using, e.g., a 'mathcal' inset in math, the inline completion and
other special characters like '\#', '{..}' are are painted in the
'mathcal' font as well. This is overcome by setting the mathnormal font
before painted these characters.

(cherry picked from commit 63772964923f765e4ab975946215725086a9c838)
2012-05-06 17:23:21 +02:00
Vincent van Ravesteijn
58946a2996 Always require a mask to get a temporary filename
If no mask is supplied or the mask is attached to the end of the filename, we end up with unexpected names like
  <system-temp-dir>\lyx_tmpdir.qHp780.vcr780_<mask>
instead of a temporary file in the lyx temporary directory like
  <system-temp-dir>\lyx_tmpdir.qHp780\<mask>.vcr780.

(cherry picked from commit 5e4e4b674c00bc546213d42258f19e13a2b28bc3)
2012-05-06 17:23:20 +02:00
Georg Baum
1be371baae Fix bug #8104 (\date argument was eaten)
I introduced this bug in r40091 where support for empty dates was added.
I also noticed that the title_layout_found flag was not properly passed down
to all variants of parse_text*. Since this is rather a global variable I
placed it into the preamble class.

The test case of bug #8104 shows other problems as well, but those are no
regressions and will be fixed separately.

OK for branch?
2012-05-06 12:42:11 +02:00
Richard Heck
264948348e Fix bug 8124. We enable LFUN_INSET_MODIFY in InsetBox if it
is intended for us, i.e., if the first argument is "box". Maybe we
should also check to make sure that the rest of the arguments are
good, but we used just to return true no matter what the argument
was, so this is an improvement.

LFUN_INSET_MODIFY is really kind of a mess.
2012-05-02 17:43:18 -04:00
Vincent van Ravesteijn
3a53a52b1c Fix bug #7914: Freeze on docbook export of lists and bibliography
The LATEX_LIST_ENVIRONMENT and LATEX_BIB_ENVIRONMENT type paragraphs are
not yet implemented in DocBook export. However, we need to actively skip
these paragraphs in order not to end up in an endless loop.

(cherry picked from commit fa9bd04ea48bc7a3101bedcf8bab9b5e00d009bc)
2012-05-02 18:27:13 +02:00
Vincent van Ravesteijn
2e771bf78d Fix bug #8089: Handle spaces at the end of the stream
If the stream is good (i.e. there are still tokens) and we expect an
argument, we call getArg(). However, if there are only spaces, the stream
suddenly isn't good anymore after 'skipSpaces' and we would get an error
when calling 'getChar'. Therefore we have to check whether the stream is
still good.

MathParser: Do not rewind the stream if we can't read from it

If the stream is not good, we don't need to 'putback', because we didn't
read anything yet. If we now do rewind the stream, we are asking for
problems as in bug #8089.

This was introduced in [3cafb856\lyxgit] to fix bug #4318.

(cherry picked from commit 26dcfcd34374f86562af56dfe5f858d10ea587db)
(cherry picked from commit 1ef930c05826340d7497d6994338f6d63772de5f)
2012-05-02 18:24:24 +02:00
Vincent van Ravesteijn
39f06f37c3 Fix bug #7518: Assert when selecting in RTL text
If we are in rtl text, we *need* to check whether the first character is a
space. We can't use the rtl variable for this because this is only
computed on the last row.

This bug was introduced in [0a137e31/lyxgit] to fix the computation for
freespacing paragraphs. We better can just check whether the paragraph is
freespacing or not.

(cherry picked from commit d7f68078cf3bbf3ea7f5d2b3ac5c7e73555c4681)
2012-05-01 11:45:58 +02:00
Vincent van Ravesteijn
0665673d03 Fix bug #8078: Assertions in xhtml output on Windows
(cherry picked from commit 3c0e3c16c8c75524cd25e2fd9f34e2f2e17af150)
2012-05-01 11:42:52 +02:00
Enrico Forestieri
124bc762a7 Fix bug #8140: Crash with math macros and input completion
When clicking away in the same math inset after hitting '\', the
cursor may be broken and all of its instances have to be fixed.

(cherry picked from commit 982562179801340feff7eb108addd99ec4a05d08)
2012-05-01 01:01:03 +02:00
Vincent van Ravesteijn
013dc6cb3a Fix bug #7653: Quotation marks have wrong color
Quotation marks had the wrong color when using change tracking, or when
selecting.

(cherry picked from commit 14ef7d2b82f22836f792a983b1f07d3b57e249e7)
2012-04-29 17:00:14 +02:00
Vincent van Ravesteijn
d4238397b9 Fix bug #7667: Pixmap cache and CT lead to random colors
The signature of the character in cache should take into account the
change tracking baseColor (author) and mergeColor (added/deleted). If not,
we will mixup different cached pixmaps.

(cherry picked from commit 63279938670e753b825ebb42c68d9b6be3a3937a)
2012-04-29 17:00:13 +02:00
Vincent van Ravesteijn
a102ba7564 Reset the (running) change in PainterInfo
When an InsetText is deleted, all lines in the inset are painted as
deleted. This status should be restored afterwards. If not, insets will be
painted in the wrong color afterwards (e.g. tables).

(cherry picked from commit af4e31ec28c71815ca07bebd6e5c3893535f4bf8)
2012-04-29 17:00:12 +02:00
Vincent van Ravesteijn
76bff4cc04 BufferView::dispatch(): add a missing break
(cherry picked from commit 3a395ca0f57ded024031c501ffe636ee38f1e248)
2012-04-29 17:00:11 +02:00
Vincent van Ravesteijn
921445239a Do not show deleted text in the html title
(cherry picked from commit 77c8c159470d4d6cd7c433523a0581a3fdcd0f94)
2012-04-29 17:00:10 +02:00
Enrico Forestieri
7a605c4535 Fix bug #8139 and a thinko in [737e9b2c/lyxgit].
No status.20x entry needed, as this should have been part
of [3285ce1d5/lygit].

(cherry picked from commit 66a95b9c1bd26da63459fe430452991b0bc3ec3a)
2012-04-26 17:20:23 +02:00
Pavel Sanda
7cea9372d5 Backport 217ef5bf3 (#81380 2012-04-26 14:19:05 +02:00
Pavel Sanda
ca0434c0df Attempt to fix #8137 (arrived at r40862).
1) Revert to designer compilable by older Qt's
2) Remove spacer in right part of dialog
3) Decrease height.
Richard, please check.
2012-04-24 01:32:45 +02:00
Richard Heck
ddee4f872b Don't output extra body tags with included files. 2012-04-23 14:14:01 -04:00
Richard Heck
650ab1783a Use InsetLayout to style the XHTML output.
Note that we have also changed the layout name to uppercase, but
this should be fine, since it was so far unused.

Conflicts:

	src/insets/InsetScript.cpp
2012-04-17 09:28:28 -04:00
Enrico Forestieri
482355e7b4 Fix bugs #6871 and #8119.
Both bugs above were due to a missing screen update. This patch
updates the current view after dispatching a lyxserver command
and thus solves both.

The patch is quite strightforward and the only difficulty was due
to the fact that the lyxserver needs the result of the dispatched
command. Now, GuiApplication::dispatch(FuncRequest const &)
does update the view, but does not return any result, while
GuiApplication::dispatch(FuncRequest const &, DispatchResult &),
which is also called by the former, does not update the view.
So, I split the first one, isolating the code performing the update,
such that the second one can also update the current view when
the caller is the lyx server. When the action is initiated by
anything different from the lyx server, the behavior is unchanged.

(cherry picked from commit ea3154184833f4f2426eb2a956878e83ddd822d9)
2012-04-16 00:19:22 +02:00
Enrico Forestieri
fe47997587 Fix bug #8105: Crash when deleting math macro from the inside
It seems that parameterless macros are not wrapped into a MathAtom.
Rather than touching the macro code (which is tantamount to opening
a can of worms, IMHO), I prefer this solution.

(cherry picked from commit d07f9eec20c8709b648a494586d4b03f75cfef47)
2012-04-15 23:59:18 +02:00
Pavel Sanda
e67f402cec Compile fix 2012-04-11 21:11:06 +02:00
Enrico Forestieri
99fe8ef2ba Use the right latex backend when a converter needs aux files.
If a converter specifies the needaux flag, latex (or xelatex) is
always run to produce the needed auxiliary files. This is wrong
because there are documents that can only be compiled with a specific
backend and thus the conversion may fail. On the other hand, even if
the document specifies the backend to be used, LyX ignores this info.

This commit rectifies this behavior by letting LyX run the same flavor
of the latex backend that shall be used for previewing the document
also for producing the auxiliary files.

(cherry picked from commit 3285ce1d5cb9ba79af700d004401115269e97ada)

Conflicts:

	src/Converter.cpp
2012-04-11 20:32:27 +02:00
Peter Kümmel
229fa2cd88 clang: std::string is used here, fwd is not enough
(cherry picked from commit f41057cae61b9c0d1e14033f689e190912c242da)
2012-04-09 15:17:17 +02:00
Vincent van Ravesteijn
036e0c2abd Fix bug #8114: LyX does not retrieve negative bbox parameters
LyX fails to read the bounding box from an EPS file if it has
negative values. Adjusting the regex will overcome this problem.
Negative values do not pose big problems later on, but the GUI
doesn't handle it correctly yet (see bug #5718).

(cherry picked from commit f0754582b8af481dc636c6d31eb3a52c853d7db0)
2012-04-09 15:17:07 +02:00