Commit Graph

2314 Commits

Author SHA1 Message Date
Enrico Forestieri
7d4ec3f944 Fix bug 5393
http://bugzilla.lyx.org/show_bug.cgi?id=5393


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27044 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-23 00:48:06 +00:00
Enrico Forestieri
946287b882 Fix bug 5263
http://bugzilla.lyx.org/show_bug.cgi?id=5263


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27020 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-22 09:11:42 +00:00
Stefan Schimanski
c8f87b06fb * Added Uwe's comment and a word about \global
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27013 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-21 15:44:15 +00:00
Stefan Schimanski
5baf9d3f20 * use \long for \def macros (fixes http://bugzilla.lyx.org/show_bug.cgi?id=5371, patch due to Uwe)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27011 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-21 13:04:22 +00:00
Enrico Forestieri
7923d0b90e Correct logic: single characters must also be parsed when quiet == false.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26987 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 00:18:29 +00:00
Jürgen Spitzmüller
30a777e8a8 honour requirements for dots (bug 5376).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26947 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-18 14:15:56 +00:00
Uwe Stöhr
02d28d981c mathparser_flags.h: follow our naming convention part 2/2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26937 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-18 12:25:03 +00:00
Uwe Stöhr
8cacb191aa mathparser_flags.h: follow our naming convention part 1/2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26936 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-18 12:23:59 +00:00
Enrico Forestieri
6bd593d8b3 When pasting into mathed, take into account the current mode.
For example, this allows to paste something like $x$ to a textmode
inset and get the expected result. If $x$ is pasted in mathmode,
it is pasted verbatim, such that no compile errors can arise.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26935 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-18 09:06:27 +00:00
Enrico Forestieri
02ebfa000b Fix bug 3397
http://bugzilla.lyx.org/show_bug.cgi?id=3397


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26934 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-17 21:40:11 +00:00
Stefan Schimanski
af9206b392 * Call metrics of the parameters with the correct font in MathMacros, for example
if they are in an index and should be drawn smaller.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26927 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 21:27:43 +00:00
Pavel Sanda
792ece8130 Fix whitespaces so the diff between branches is not so huge.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26881 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-13 11:25:37 +00:00
Stefan Schimanski
c874e95030 * Be more conservative about leaving out parenthesis by checking for < 0x80.
This fixes lyxmathsym characters as macro arguments.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26802 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-07 16:24:07 +00:00
Enrico Forestieri
f505227f6e Smash remaining drawbacks for bug 2315
http://bugzilla.lyx.org/show_bug.cgi?id=2315


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26792 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 22:49:30 +00:00
Enrico Forestieri
5ca3be4d67 In mathmode, treat nonascii chars with diacritical marks as an input method
for entering math accents, such that an umlauted A is translated as \ddot{A},
for example.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26577 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-26 15:53:15 +00:00
Enrico Forestieri
b5dcdbc960 When in mathmode, always use the mathcommand replacement from the
unicodesymbols file. Also take into account that a unicode symbol
may appear in both mathmode and textmode and thus both the mathmode
and textmode features may be required. As a side effect, the problem
that the \lyxmathsym definition is added to the preamble even when
a unicode symbol appears only in textmode is solved.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26548 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-25 18:38:25 +00:00
André Pönitz
4c7fdddd74 streamlining setter syntax. using mutable references seems a bit
outlandish compared to the rest of LyX


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26527 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-24 21:27:41 +00:00
Jean-Marc Lasgouttes
b23bdfa00b use Length::inPixel and not Length::inBP to get screen lengths
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26441 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-18 13:59:35 +00:00
Jean-Marc Lasgouttes
00c0933502 bad behaviour of recordUndoInset has been fixed in http://www.lyx.org/trac/changeset/14791
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26431 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-17 15:45:47 +00:00
Enrico Forestieri
3e55de70dd Introduce LFUN_FONT_BOLDSYMBOL, performing the same as LFUN_FONT_BOLD
except when in math mode, where \boldsymbol is used instead of \mathbf.
Restore the previous binding of Ctrl-B and make sure that LFUN_FONT_BOLDSYMBOL,
now bound to Ctrl-Alt-B, can be toggled.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26418 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-15 16:49:11 +00:00
Richard Heck
e16468d72e Revert 26348 and 26350. Wrong solution.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26353 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-10 14:36:38 +00:00
Richard Heck
e3b15701a7 Forgot this part.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26350 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-09 18:46:38 +00:00
Richard Heck
e78347a673 Restore toggling behavior to math bold.
I've left mathbf in the symbols file. We should perhaps restore it as something that can be toggled.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26348 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-09 17:50:37 +00:00
Pavel Sanda
c1173eb11c Coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26335 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-08 01:18:33 +00:00
Stefan Schimanski
849b405c73 * typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26314 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-06 15:10:10 +00:00
Enrico Forestieri
8fde2a6fa7 Implement the EnsureMath inset in mathed for nesting math mode in text mode.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26304 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-04 22:24:07 +00:00
Enrico Forestieri
105e0dfe29 Add FIXME
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26294 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-03 19:07:54 +00:00
Enrico Forestieri
8d6b5113ec We may have buffers with different encodings, that, in turn, may also
be different from the language default ones.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26290 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-03 08:17:00 +00:00
Enrico Forestieri
1c362c80b2 Specify that we are in math mode. This avoids unnecessary \ensuremath
commands when using math in text mode (such as in $\text{$\phi$}$, where
\phi would be enclosed in \ensuremath{} as it is inside \text{}).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26288 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-02 20:04:05 +00:00
Enrico Forestieri
ad91dd139c Take into account the latex encoding when generating math preview snippets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26287 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-02 20:02:08 +00:00
André Pönitz
68c1719929 fix off-by-two drawing error
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26232 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-24 21:16:09 +00:00
Jean-Marc Lasgouttes
97e6476feb Fix bug 3407: Undo with text-in-mathmode
http://bugzilla.lyx.org/show_bug.cgi?id=3407

	* InsetMathNest.cpp (doDispatch/LFUN_MATH_MODE): handle undo


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26173 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-15 15:50:42 +00:00
Stefan Schimanski
ae410deed1 * \xymatrix added to completion (fixing bug 5123)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26082 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-06 18:44:35 +00:00
Pavel Sanda
97812e8718 Clean debug logs before rc1.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26033 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-02 14:11:04 +00:00
Enrico Forestieri
dac70247f0 Fix bug 5041
http://bugzilla.lyx.org/show_bug.cgi?id=5041


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26002 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-30 15:07:06 +00:00
Uwe Stöhr
c08f8291f9 - InsetMathAMSArray.cpp: code cosmetic
- Math.lyx: leftovers from bug 5090

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25916 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-27 11:32:26 +00:00
Uwe Stöhr
5aece0832c - InsetMathAMSArray.cpp: load the amscd package when the command \CD was used, fixes bug 5090
- LaTeXFeatures.cpp: add amscd

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25909 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-27 00:47:28 +00:00
Uwe Stöhr
180448cf14 InsetMathHull.cpp: whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25908 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-27 00:45:19 +00:00
Jürgen Spitzmüller
a2a3d8337f * src/mathed/InsetMathHull.cpp:
- update labels cache after a label has been erased (bug 4929).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25757 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-21 08:48:16 +00:00
Enrico Forestieri
0e834b9342 When producing latex output, check whether a character entered in mathed
can be encoded in the current latex encoding before resorting to the
unicodesymbols file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25725 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-20 01:50:54 +00:00
Enrico Forestieri
aabd9d03bb Fix bug 4992
http://bugzilla.lyx.org/show_bug.cgi?id=4992


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25458 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-05 23:29:48 +00:00
Enrico Forestieri
2477901f07 Fix color of math macros
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25403 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-28 22:49:40 +00:00
Enrico Forestieri
4fa59cbd9b Fix bug 4320
http://bugzilla.lyx.org/show_bug.cgi?id=4320


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25367 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-24 05:51:15 +00:00
Enrico Forestieri
419b5a1551 Fix the new incarnation of bug 4687
http://bugzilla.lyx.org/show_bug.cgi?id=4687


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25355 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-22 22:32:48 +00:00
Enrico Forestieri
ab9a074f20 Trust Andre'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25319 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-19 09:17:57 +00:00
Enrico Forestieri
c691839abe Fix bug 4687
http://bugzilla.lyx.org/show_bug.cgi?id=4687


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25318 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-19 09:16:05 +00:00
Enrico Forestieri
e224ef029b Implement the suggestion by Andre'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25287 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-17 11:10:43 +00:00
Enrico Forestieri
01398327df Ops
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25285 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-16 20:39:40 +00:00
Enrico Forestieri
4781794e4e The mode changing math insets already provide the needed info, so
this is definitely better.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25284 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-16 20:25:44 +00:00
Enrico Forestieri
aace605564 Avoid 11 from_ascii calls
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25282 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-16 18:52:54 +00:00
Enrico Forestieri
31713932b2 Use a helper method in order to avoid code repetition.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25273 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-16 14:32:51 +00:00
Enrico Forestieri
90837aaf6e Fix bug 1527
http://bugzilla.lyx.org/show_bug.cgi?id=1527

* src/mathed/*.cpp:
	- Track mode (math or text) when outputting latex code and
	  properly wrap commands that are in the wrong mode with
	  either \ensuremath or \lyxmathsym.

* src/mathed/MathParser.cpp:
	- Parse \ensuremath and \lyxmathsym, such that exported latex
	  produces the same result when imported back.
	- Replace latex commands with corresponding unicode symbols.

* src/Encoding.cpp:
	- Implement Encodings::fromLaTeXCommand() for converting either
	  a single or a sequence of latex commands to unicode symbols.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25270 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-16 01:21:17 +00:00
Pavel Sanda
8ab36ddef7 Let LFUN_MATH_SPACE use various spaces we support.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25266 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-15 22:12:40 +00:00
Pavel Sanda
cb5ce8348b Ressurect LFUN_MATH_SIZE, set toolbars accordingly.
http://thread.gmane.org/gmane.editors.lyx.devel/108469


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25250 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-14 18:38:14 +00:00
Pavel Sanda
154fe36eb2 Old, unused and handled elsewhere.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25227 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-11 09:05:46 +00:00
Pavel Sanda
07113cf424 LFUN_FONT_FREE_* -> LFUN_TEXSTYLE_*
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg141274.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25225 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-11 08:35:15 +00:00
Enrico Forestieri
4ad2d0e15c Produce a cleaner latex output by avoiding \lyxmathsym when in text mode
inside math mode, and also ensure the proper mode inside math when using
the symbols from the unicodesymbols file. This hopefully fixes bug 3938.
Note that this approach could also be used for fixing bug 1527.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25109 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-04 00:36:04 +00:00
Jürgen Spitzmüller
e8d99617b5 * Allow the use of eqrefs in mathed (bug 4623).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25092 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-03 06:23:45 +00:00
Enrico Forestieri
69bd59cc8b Be sure to insert a space after a macro when needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25088 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-03 00:09:20 +00:00
Enrico Forestieri
1a2af1197e Allow to specify either text mode or math mode commands (or both) in the
unicodesymbols file. When the command for a mode is not specified, the
other one is used (taking care that it also works in the "wrong" mode).
This allows to avoid the \lyxmathsym macro when a native math command
is available. Patch from Georg, modifications to the unicodesymbols
file by me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25061 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-02 01:35:42 +00:00
Enrico Forestieri
3e95457d4c Rename \mathsym -> \lyxmathsym in order to avoid potential clashes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25049 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 14:11:36 +00:00
Enrico Forestieri
c9d2c73706 Simplify the definition of \mathsym by using the package relsize.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25042 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-01 04:46:50 +00:00
Enrico Forestieri
a694de895e Fix bug 3938
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25028 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-31 20:54:50 +00:00
Richard Heck
77ed747114 FuncStatus::enabled(bool) --> FuncStatus::setEnabled(bool)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24999 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-29 15:14:00 +00:00
Stefan Schimanski
3c591515e9 * enabled() is the getter, enabled(bool) is the setter method.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24989 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-29 08:09:58 +00:00
Abdelrazak Younes
1e51e87f68 Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator. The idea is to have more accurate navigation in the paragraph. But this doesn't work yet.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24747 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-13 08:23:44 +00:00
Jean-Marc Lasgouttes
048ae6f2b8 silence warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24639 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 14:11:20 +00:00
Jean-Marc Lasgouttes
ecb715d682 unbreak compilation (part 2)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24632 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 10:36:32 +00:00
Abdelrazak Younes
b90ec7288d remove unneeded includes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24629 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 06:53:44 +00:00
Abdelrazak Younes
45bc27809b remove unneeded includes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24628 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 06:48:38 +00:00
Jürgen Spitzmüller
b64a7173bc * InsetMathHull:
- fix rest of bug 518.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24627 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 06:41:08 +00:00
Jean-Marc Lasgouttes
9b4a26a252 rename assert.h to lassert.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24559 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 08:26:40 +00:00
Uwe Stöhr
82fca3a08d InsetMathNest.cpp: fix bug 4720 for trunk as well
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24287 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 23:44:23 +00:00
André Pönitz
7f461f4392 infrastructure for 'graceful asserts'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-10 21:49:34 +00:00
André Pönitz
aac50f83e5 cosmetics, maily s/NULL/0/g as hinted by Joost
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24160 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-07 20:43:02 +00:00
André Pönitz
1d022b19ba fix #4713
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24158 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-07 19:19:03 +00:00
Dov Feldstern
7412bd1fb1 allow extending a selection to outside a math inset (broken since r22930)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24143 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-06 20:11:05 +00:00
André Pönitz
11a0458d3f next try...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24100 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-02 23:06:22 +00:00
André Pönitz
2012beb58e revert last patch. there's something wrong, possibly unrelated to this
patch, but as this was rather largish...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24099 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-02 22:44:33 +00:00
André Pönitz
7677e9487c simplify Lexer use a bit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24098 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-02 22:14:45 +00:00
Enrico Forestieri
2ad48f204b Fix bug 4668
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24080 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-01 02:29:41 +00:00
Enrico Forestieri
b5acd03891 Allow using \binom without amsmath and add support for \brace and \brack
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24067 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-31 01:23:25 +00:00
Abdelrazak Younes
99a6fbfbe7 MSVC warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24015 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-28 09:04:48 +00:00
André Pönitz
f9b81e51e9 remove remaining MailInsets.
please check your favourite insets, I am sure I broke _something_...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24006 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-27 22:26:24 +00:00
Stefan Schimanski
98787bbec6 * corrected handling of validation of math macros. The macro instances
will require the needed LaTeXFeatures of their definition and their
  paramenters.
* Require the "xargs" package when there is a macro with optional
  parameters which is prepended to a child document which is rendered alone.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23971 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-26 12:55:36 +00:00
Jürgen Spitzmüller
c876a2e7c7 Merge the two linebreak insets into one.
* src/Buffer.cpp:
	- file format change to 324
* development/FORMAT:
	- document file format change

* src/insets/InsetNewline.{cpp,h}:
	- the former two separate derivates are now merged into one inset
	  with proper Params and Mailer. This simplifies the structure and allows for
	  switching between the two kinds.

* src/Text3.cpp:
	- The newline insets are now being generated with 
	   newline-insert [newline|linebreak]

* src/factory.cpp:
* src/Text.cpp:
	- Newline inset is now a proper inset with opening and closing tag.

* src/FuncCode.h:
* src/LyXAction.cpp:
* src/Text3.cpp:
* src/insets/InsetCollapsable.cpp:
* src/insets/InsetTabular.cpp:
* src/mathed/InsetMathGrid.cpp:
* src/mathed/InsetMathHull.cpp:
	- remove LFUN_NEW_LINE, LFUN_LINE_BREAK,
	  add LFUN_NEWLINE_INSERT

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- conversion and reversion routines for newline insets.

* lib/ui/stdmenus.inc:
* lib/ui/stdcontext.inc
	- adapt menu and add context menu to switch between newpage variants.

* lib/bind/*.bind:
	- adapt to new lfuns.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-26 08:10:01 +00:00
Stefan Schimanski
aad4651830 * another try on http://bugzilla.lyx.org/show_bug.cgi?id=4566:
"Eqnarray multiple cells size change erases what they contain"

  We also apply LFUN_MATH_INSERT to every selected cell if a single math inset is inserted.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23804 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-18 10:58:57 +00:00
Stefan Schimanski
224fb0b4b5 * cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23803 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-18 10:58:35 +00:00
Uwe Stöhr
b1e077a7d2 compilation fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23797 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 21:11:17 +00:00
Stefan Schimanski
685970043e * make forward deletion of formula labels/numbers more intuitive:
** We show (Eq:bla,#) for labeled formulas
** The first forward delete removes the label
** The second forward delete removes the number

Fixes http://bugzilla.lyx.org/show_bug.cgi?id=2556


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23762 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-15 11:40:04 +00:00
André Pönitz
5e0121cf58 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23759 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-15 08:43:16 +00:00
Stefan Schimanski
7269440c83 * reset current_view_ when deleting a GuiView.
* check for current_view_ when exiting to avoid segfaults


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23752 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-15 02:42:59 +00:00
André Pönitz
a98f82c292 s/kb_action/FuncCode/g
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23749 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-15 01:20:36 +00:00
André Pönitz
f2c9b56fb4 cosmetics/#include cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23747 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-15 00:22:54 +00:00
Jürgen Spitzmüller
ad5ba124be * src/mathed/InsetMathNest.cpp:
- also handle the Color_inherit case.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23688 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 18:50:50 +00:00
Enrico Forestieri
ba496b94ac Merge InsetMathBoldSymbol and InsetMathBM by providing \boldsymbol
through the bm package.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23684 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 14:33:16 +00:00
Stefan Schimanski
2f67f8c2b3 * handle the multiple-selected-cells case also for color changes in mathed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23682 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 14:04:25 +00:00
Stefan Schimanski
5e2aeffc43 * half of the fix for http://bugzilla.lyx.org/show_bug.cgi?id=4091
"Applying Text-style to math generates \color{ignore}"

Which kind of font changes do we want to support here? After all the
text style dialog is meant for text. So it only really make sense for
\mbox'es. But there we probably cannot store every font change because
it still math up to now.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23681 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 13:20:40 +00:00
Stefan Schimanski
e01f7e7105 * fix a serious data loss problem: undo did not save the whole
selection in mathed if more than one cell was selected.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23675 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 00:59:29 +00:00
Stefan Schimanski
40c4d50c82 * fix for http://bugzilla.lyx.org/show_bug.cgi?id=4566
"Eqnarray multiple cells size change erases what they contain"

  We now loop over the selected cells and change the font in each of them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23673 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 00:19:31 +00:00
Stefan Schimanski
b2e8d557cc * only use selection of current cell when starting a macro (fixes http://bugzilla.lyx.org/show_bug.cgi?id=4566 for macros)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23670 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 00:18:39 +00:00
Stefan Schimanski
ed4919cd1a * fix for http://bugzilla.lyx.org/show_bug.cgi?id=518
"wrong numbering of multline environment inside LyX"


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23665 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-11 17:54:05 +00:00
Stefan Schimanski
5354a5d592 * fix http://bugzilla.lyx.org/show_bug.cgi?id=4622
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23663 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-11 17:23:14 +00:00
Stefan Schimanski
b1ac3c3e83 * also forward delete numbering in math hull
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23643 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 17:09:02 +00:00
Stefan Schimanski
0e20c40ad2 * typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23633 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 14:20:27 +00:00
Stefan Schimanski
5e6ffc2549 * split different macro cases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23631 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 13:43:42 +00:00
Stefan Schimanski
c17df2980b * cosmetic and comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23624 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:54:00 +00:00
Stefan Schimanski
21eddc8fe2 * math macro definition context menu
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23621 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:51:14 +00:00
Stefan Schimanski
5d48c7ef6a * \newcommandx support for the math parser
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23619 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:50:10 +00:00
Stefan Schimanski
ec1f626284 * small fixes of the temporary change display of macro templates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23618 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:49:50 +00:00
Stefan Schimanski
76dc2c0d30 * make macros global. This is conceptionally much easier for the user,
and moreover simplifies the code a lot.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23616 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:49:02 +00:00
Stefan Schimanski
c8c5fc65d0 * xargs export support. No parser support yet.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23615 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:48:46 +00:00
Stefan Schimanski
9a9e94bca2 * fix for http://bugzilla.lyx.org/show_bug.cgi?id=2556
"not possible to delete a label of a formula":

  Press forward delete at the end of a row and the label is deleted.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23610 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-09 23:43:05 +00:00
Uwe Stöhr
8151dd5852 InsetMathNest.cpp: Ctrl-b uses now \boldsymbol (fixes http://bugzilla.lyx.org/show_bug.cgi?id=499)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23608 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-09 23:23:50 +00:00
Pavel Sanda
5e79b2ca4f Add math context menu.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23591 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-09 15:07:27 +00:00
Abdelrazak Younes
5da55588f2 * Buffer::getLabelList(): Speed up and simplify by using the tocBackend.
* Inset and derived class: get rid of getLabelList()
* BufferView::gotoLabel(): Speed up and simplify by using the tocBackend.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23541 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 19:46:04 +00:00
Abdelrazak Younes
fd16c64b35 add comment about std::vector<bool>
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23535 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 13:05:04 +00:00
Richard Heck
a01cb111a0 Change the interface to a paragraph's layout. We still store a LayoutPtr, but now privately, and make a Layout const & available to clients.
The need for a LayoutPtr arises from the fact that (a) we do not want to give our clients a Layout &, since we do not want them to be able to change our Layout; but (b) we also need to be able to change which layout is ours. So we cannot store a Layout const &. Or so it seems to the compiler.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23522 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 21:31:27 +00:00
Bernhard Roider
a99c5828f8 Add support for \bm from bm.sty
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23520 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 20:49:59 +00:00
Abdelrazak Younes
1e4f5ba47c Per Andre' advice: No need to check for pointer nullity for delete.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23515 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 19:31:14 +00:00
Abdelrazak Younes
a4d5b78430 Transfer and bug fix LFUN_BUFFER_BEGIN/END_SELECT to BufferView.cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23512 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 15:39:30 +00:00
Jürgen Spitzmüller
6488414cf8 * src/insets/InsetMathBox.{cpp,h}:
- add validate method and validate \tag[*] (bug 4586)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23483 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 18:57:08 +00:00
Stefan Schimanski
be444fafcb * remove parameter here as well
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23452 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 14:57:57 +00:00
Stefan Schimanski
cf15bd840b * cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23451 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 14:57:46 +00:00
Stefan Schimanski
8aac28367e * the look does not depent on "editing" anymore as the edit-layout is dynamic.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23450 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 14:57:34 +00:00
Stefan Schimanski
03a1c9192e * store the selection in the InsetMathUnknown and insert it into the
first argument after finalizing the macro. This also works with real
  math macros.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23449 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 14:49:24 +00:00
Stefan Schimanski
501763cafa * add appetite concept to the math macro to restrict the number of parameter which are eaten greedily.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23448 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 14:49:03 +00:00
Abdelrazak Younes
ed5350bae7 Found a cleaner solution for the buffer reference problem in mathed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23445 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 14:18:34 +00:00
Abdelrazak Younes
7d65f6931f compile fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23442 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 13:16:50 +00:00
Abdelrazak Younes
e4f0872233 gcc compile fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23441 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 13:15:02 +00:00
Abdelrazak Younes
4723fa0f2c LateX export must not depend on screen label.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23440 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 13:00:20 +00:00
Abdelrazak Younes
f9662a5591 tentatively fix gcc compilation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23439 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 12:50:06 +00:00
Abdelrazak Younes
6e3e2ae19b InsetMathHull: LFUN_INSET_INSERT: Fix label insertion
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23437 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 12:43:20 +00:00
Abdelrazak Younes
de5fb7caf9 Fix and improves labels and references in mathed.
* InsetMathHull:
- label_: now is a vector of InsetLabel instead of docstring
- addToToc() and updateLabels() update the existing labels.
- nonum_ : use bool instead of int



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23435 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 12:22:48 +00:00
Stefan Schimanski
d87c5c062b * Update::SinglePar should be enough for most cases. In notifyCursorLeaves though we might need a fullscreen redraw if we don't add more clever checks whether the cursors moved to another paragraph.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23415 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 15:21:13 +00:00
Abdelrazak Younes
7a6971bb28 We don't want a buffer_ member in InsetMathChar.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23362 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 20:52:24 +00:00
Stefan Schimanski
9a56c45a7b * insertParam assumes that the cursor has the macro template in the top slice.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23351 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 10:02:40 +00:00
Stefan Schimanski
e59560a1fa * the automatic arity changing proposed by Uwe: you go into a macro and type \#9. The arity is visually adapted right away. The real change though takes place when you leave the macro with the cursor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23350 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 10:02:25 +00:00
Stefan Schimanski
154907af38 * merge InsetMathMakebox and InsetMathFramebox
* only output second parameter if the first is available. That's how LaTeX defines make/framebox.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23320 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 12:46:32 +00:00
Stefan Schimanski
a085842f14 * fixing the framebox part of http://bugzilla.lyx.org/show_bug.cgi?id=2461:
"wrong cursor position in \framebox and \makebox environment"

  The drawing and metrics calculations were totally broken.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23319 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 12:45:36 +00:00
Abdelrazak Younes
e56e5e213c InsetMathHull::addToToc(): Work around buffer reference in InsetMathHull. This inset is created at too many places (see Parser::parse1() in MathParser.cpp).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23307 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 10:04:15 +00:00
André Pönitz
768cfbb308 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23296 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 23:11:50 +00:00
André Pönitz
db8c16d554 progress on buffer-reference-in-insets. beware of instabilities...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23289 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:43:16 +00:00
Stefan Schimanski
c0e2c0cd5c * better fix for * math commands. We allow the * for known math commands and for known math macros which are valid at that point in the buffer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23273 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 10:46:38 +00:00
Stefan Schimanski
dee531e765 * allow macro names with *
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23272 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 10:43:29 +00:00
Stefan Schimanski
1b0591b28e * fix for http://bugzilla.lyx.org/show_bug.cgi?id=4584:
"not possible to use the command \tag*"


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23263 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-26 22:40:59 +00:00
Stefan Schimanski
4413bf3783 * Update::SinglePar is enough, Update::Force is a fullscreen update
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23251 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-26 14:22:56 +00:00
Stefan Schimanski
b6be7d908f * adapt to the changed signature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23229 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 14:25:49 +00:00
Abdelrazak Younes
962fdc2923 Change CompletionList::data() signature and cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23226 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 13:11:09 +00:00
Stefan Schimanski
c4a002d94d * this was not meant to be added
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23215 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 02:00:22 +00:00