Commit Graph

20959 Commits

Author SHA1 Message Date
Juergen Spitzmueller
a4feac9d0b Whitespace 2012-11-20 15:25:58 +01:00
Juergen Spitzmueller
973481a4ff typos 2012-11-20 13:30:52 +01:00
Juergen Spitzmueller
4309dd54c7 extend comments and fix caption argument conversion 2012-11-20 12:58:36 +01:00
Juergen Spitzmueller
49b738bdfd Some documentation 2012-11-19 18:44:59 +01:00
Juergen Spitzmueller
fffc46a4f7 Workaround to let tex2lyx handle the new argument syntax. This needs to be implemented properly (proper argument number) 2012-11-19 15:50:43 +01:00
Juergen Spitzmueller
2e69c66195 InsetArgument revision, first working version 2012-11-19 14:21:02 +01:00
Uwe Stöhr
63295f9dc5 Font.cpp: fix bug #8424
We must group the content which should be changed in size wit a pair of braces because the LaTeX size commands are otherwise switches. We already do so for many case, but not for the case that a size command is inside another command. This patch adds now always a brace pair around the selected text which is the safest method.
2012-11-19 01:13:37 +01:00
Pavel Sanda
4375b44dd6 Comment some headers before I ditch them again. 2012-11-18 17:42:32 +01:00
Georg Baum
9d99d3dbea Implement extractFromVC() for CVS and SVN.
Both cvs and svn are able to retrieve non-existing files from repository,
but this was only implemented for rcs. This is a prerequisite for the
planned move and copy VCV operations. I also improved error schecking and
used extractFromVC() also for files specified on the command line if they
do not exist (in GUI mode, it was already the case in non-GUI mode).
2012-11-15 22:01:19 +01:00
Georg Baum
b07383b026 improve documentation 2012-11-13 21:53:13 +01:00
Georg Baum
393e7924bd Add missing VCS updates after filename changes 2012-11-13 21:52:38 +01:00
Georg Baum
56e3d2153f Get rid of redundant CVS/SVN file_ member
It did always point to the buffer's file name, so it is not needed and it was
not used in most cases anyway. Instead, ensure that owner_ is always set and
cannot be changed later.
2012-11-13 21:44:36 +01:00
Uwe Stöhr
b53243295a unicode.cpp: make it compile again
the removal of this header in [ea1d9cb3/lyxgit] was too much
2012-11-13 00:27:46 +01:00
Pavel Sanda
8d135a9819 Typeinfo needed in Ubuntu. 2012-11-12 13:06:22 +01:00
Enrico Forestieri
cabf8e86b5 Make it compile again on systems that don't USE_WCHAR_T 2012-11-12 12:11:42 +01:00
Pavel Sanda
ea1d9cb39f Less headers in unicode.
Now lets wait for the scream from people on other compilers.
2012-11-12 03:20:50 +01:00
Pavel Sanda
d692d6f27e Less headers in docstring. 2012-11-12 03:05:30 +01:00
Pavel Sanda
2257040be4 More headers from lstrings. 2012-11-12 03:02:28 +01:00
Pavel Sanda
7cda6b9d57 Header no more needed. 2012-11-12 02:45:29 +01:00
Jean-Marc Lasgouttes
2e25a65c25 Revert "Correctly clean lyxclient.cpp in monolithic build."
Sanda has been faster than me... See 39e23a.

This reverts commit 1b74d3e729.
2012-11-06 20:48:51 +01:00
Jean-Marc Lasgouttes
1b74d3e729 Correctly clean lyxclient.cpp in monolithic build. 2012-11-05 14:28:26 +01:00
Pavel Sanda
d7ed0ba7e4 Autosaving is now always threaded. 2012-11-04 16:51:18 +01:00
Pavel Sanda
4f24d123b2 Next leftover. 2012-11-04 01:38:34 +01:00
Pavel Sanda
eb9151c599 Close tab button started with 4.5. 2012-11-04 01:37:54 +01:00
Pavel Sanda
38c836f65d Leftover. 2012-11-04 01:29:08 +01:00
Pavel Sanda
4a0911f25e Header sorting. 2012-11-04 01:26:11 +01:00
Pavel Sanda
0a9735c5f7 LyX 2.1 will support only Qt>=4.5.
(http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg175737.html)

Now start with simple cases.
2012-11-04 01:22:32 +01:00
Pavel Sanda
39e23a8c5c Let lyxclient.cpp be cleaned by make clean.
I would wait with backporting for 2.0.6.
2012-11-03 23:58:33 +01:00
Pavel Sanda
f47215c5e7 * doxy 2012-11-03 19:08:37 +01:00
Kornel Benko
d91d6e3343 Cmake build:
Cleanup the use of path-variables
2012-11-02 13:33:22 +01:00
Kornel Benko
854b168d17 Cmake build:
Correct dependencies for version-info also at build-time
(not only at configure time)
2012-11-01 13:00:19 +01:00
Lars Gullik Bjønnes
6b2232a29c src/*.cpp: reformatting to increase consistency 2012-10-28 17:42:07 +01:00
Lars Gullik Bjønnes
76a5f726a7 InsetLine.cpp: add <cstdlib>
This fixes a problem introduced in bc51243587
2012-10-28 09:20:59 +01:00
Lars Gullik Bjønnes
bc51243587 insets/InsetLine.cpp: use std::abs
Use std::abs in stead of std::max(v, -v).
2012-10-27 01:25:39 +02:00
Lars Gullik Bjønnes
d52c9fda34 Use new T not new T() 2012-10-27 01:25:38 +02:00
Lars Gullik Bjønnes
43f6b1672b Use empty() to check empty and non-empty'ness not size()
Also add FormatList::empty().
2012-10-27 01:25:38 +02:00
Lars Gullik Bjønnes
62394258da WS cleanup, remove extraeneous spaces 2012-10-27 01:25:38 +02:00
Lars Gullik Bjønnes
b6a626d8d9 Buffer.cpp: drop unused <stack> 2012-10-27 01:25:38 +02:00
Georg Baum
78a7743166 Import theorems correctly (bugs #5702, #5776)
Actually tex2lyx can handle modules since some time (#5702), but not
theorems (#5776). Now the following issues are fixed:
- Modules that depend on other modules can be loaded, since the dependencies
  are loaded first
- Default moduls of the text class are loaded correctly
- \newtheorem is recognized as a command that defines new environments and
  treated similar to \newenvironment
2012-10-26 22:23:16 +02:00
Lars Gullik Bjønnes
dd2189656b More idiomatic way of checking if a shared_ptr has an associated managed object 2012-10-25 12:12:49 +02:00
Kornel Benko
1b65a03c13 Cmake build: cleanup 2012-10-25 11:19:09 +02:00
Kornel Benko
d1ca207e94 Cmake build:
Next try to create Resources.qrc on the fly.
This time using a cmake-script instead of trying to rebuild the cache
2012-10-25 10:45:28 +02:00
Juergen Spitzmueller
7c6ae4d740 Update tex2lyx test files 2012-10-25 07:47:42 +02:00
Lars Gullik Bjønnes
46a5f60d3d Merge branch 'enable-cxx11' 2012-10-25 00:45:20 +02:00
Lars Gullik Bjønnes
54d1cb1880 support/Messages.cpp: add space to not be taken as user defined literal
In C++11 you are not allowed to have non-literal specifiers right
after a string literal.
2012-10-24 23:46:42 +02:00
Georg Baum
02b1c4aa51 Fix test targets for some build trees
The old targets only worked if the build tree was below the source tree.
2012-10-24 22:11:05 +02:00
Juergen Spitzmueller
08375b191c update TODO 2012-10-24 20:21:09 +02:00
Lars Gullik Bjønnes
abc81db388 src/lyxfind.cpp: use local typedef to simplify
Use a local typedef pair<string, string> P to avoid having to repeat
that multiple times.
2012-10-23 23:48:35 +02:00
Lars Gullik Bjønnes
48bba7fb74 src/lyxfind.cpp: use make_pair
Use make_pair(...) instead of pair<T, U>(...).
2012-10-23 23:48:25 +02:00
Lars Gullik Bjønnes
cf193344d0 src/lyxfind.cpp: cleanup formatting
Remove some eol space
re-indent where required
make some ?: constructs a bit easier to read.
2012-10-23 23:48:25 +02:00
Lars Gullik Bjønnes
435fad1463 src/Format.cpp: use make_pair
Use make_pair(...) instead of pair<T, U>(...).
2012-10-23 23:48:25 +02:00
Georg Baum
ecf24f1cb5 Add xfig import test 2012-10-23 22:09:26 +02:00
Georg Baum
b8648dea16 Implement tex2lyx -m switch (bug #8393)
With this new command line switch a list of modules can be loaded
unconditionally. This seems to be needed for the literate programming formats,
and it is useful to work around bug #5702 as well.
2012-10-23 20:45:21 +02:00
Georg Baum
8c0c28e485 Update tex2lyx manpage
Add forgotten options and remove a commented paragraph that is no longer
needed since bug #5907 is closed as WONTFIX.
2012-10-22 21:31:26 +02:00
Tommaso Cucinotta
0e81930597 Fixed bug in escape sequence, showing up with ignore format off (addressing #8380). 2012-10-22 01:05:29 +01:00
Juergen Spitzmueller
db1c1389e3 Add support for the URW Classico (Optima) LaTeX font
Patch by Liviu Andronic
2012-10-21 18:55:24 +02:00
Kornel Benko
f7680c696d Cmake build:
Added dependencies to target `test'. Now all the needed executables
are recreated prior to running tests if not already existant.
2012-10-21 16:58:45 +02:00
Kornel Benko
ed5dfa9cd7 Cmake tests:
Add tests the cmake-way. Now there is only _one_ target `test'
2012-10-21 12:05:50 +02:00
Kornel Benko
1822a10639 Cmake build:
Supply the correct path to created executable (use ${CMAKE_CFG_INTDIR})
2012-10-20 15:27:30 +02:00
Georg Baum
fbabfdfa46 Add -skipchildren command line switch (bug #4435)
This allows to skip generated files, e.g. an alternative xfig export which
we do not understand, as mentioned in bug #4435.
2012-10-18 22:01:32 +02:00
Georg Baum
33c3e63f40 Forgot to remove obsolete comment 2012-10-18 20:57:03 +02:00
Georg Baum
75ba5d3db5 Add automatic color package loading for listings
The listings inset does automatically load the color package if any parameter
contains \color. As mentioned in bug #8066 tex2lyx needs to be aware of this,
so the \usepckage{color} is automatically skipped in these cases.
2012-10-18 20:41:23 +02:00
Stephan Witt
a5317f6594 add QT_QTGUI_LIBRARY to link libraries of check programs to get access to QDesktopServices on Mac OS X 2012-10-16 22:36:23 +02:00
Kornel Benko
63ead2010d Cmake build: support tests
Next try to make it to work on APPLE (and maybe on WIN32)
a.) Create the needed data-dir at configure time
b.) Use different target names for executable and data created with them
2012-10-16 16:35:28 +02:00
Kornel Benko
419f32df91 Cmake build:
Creating LYX_DATE dynamically at configure-time caused unwanted recompilation
of the whole directories (src + src/tex2lyx) because all the relevant objects
were dependent of a common file (flags.make in case of "Unix makefiles") which changed
accordingly.
There is now a new include (lyx_date.h, with only one definition)

Nothing changes for automake, since in this case LYX_DATE is defined in config.h
2012-10-15 22:50:39 +02:00
Scott Kostyshak
250f60f36b Simplify LFUN_BUFFER_FORALL
buffer-forall only takes one parameter now, which is the LFUN to
dispatch on all non-hidden buffers. A hidden buffer is defined as being
internally open in LyX, but not visible in any window (view).

Thanks, JMarc.
2012-10-15 10:05:20 -04:00
Kornel Benko
3a5c0f66a0 Sorry, this line disappeared unintentionally in previous commit 2012-10-15 13:30:19 +02:00
Kornel Benko
24206e2c67 Cmake build:
Partially revert 75d63ad1f2
It caused recompiling everything at each commit.
Now use definition of LYX_DATE only when compiling version.cpp
2012-10-15 13:16:08 +02:00
Stephan Witt
593276f87d MenuTranslator::translate() should be const 2012-10-14 14:36:18 +02:00
Stephan Witt
70ff68b580 Inset::setMouseHover() is const - InsetExternal::setMouseHover should be const too 2012-10-14 14:34:46 +02:00
Stephan Witt
de6ff1fec2 correct format for unsigned long argument, remoteCloseLink is oneway void 2012-10-14 14:30:47 +02:00
Stephan Witt
318f6b39b7 add missing argument for log message 2012-10-14 14:29:01 +02:00
Stephan Witt
652ed30e92 correct unsigned integer compare operations 2012-10-14 14:28:19 +02:00
Kornel Benko
20359572ed Patch from Benjamin Piwowarski
Just some comments on the patch:

- The executable name has to match the information in Info.plist (development/MacOSX/Info.plist.in and CMakeLists.txt).  The autoconf config/lyxinclude.m4 file has been modified to make it work with autotools.

- The process to build OS X bundle is to first add all the files to be included to the bundle when calling add_executable (src/CMakeLists.txt) and then by calling setting the source file property of each of these files (development/cmake/Install.cmake, l.14) so that the files are properly located into the bundle. This is also why Install.cmake has to be included two times in src/CMakeLists.txt (once to build the list of files, once to set the location of the list of files).

- in CMakeLists.txt there is a line
install(CODE "set(BU_CHMOD_BUNDLE_ITEMS 1)")
What it does is to fix the owner permissions within the bundle - this is necessary because some libraries are copied within the bundle and might be owned by root

- An empty qt.conf is included in the bundle so that QT does not try to link to other QT libraries (which will not be included in the bundle)

- In development/cmake/Install.cmake, some OS X specific files (*.sdef, qt.conf, *.icns) have to be included in the bundle

Benjamin
2012-10-13 09:53:20 +02:00
Vincent van Ravesteijn
9547725c38 Disambiguate std::bind, boost::bind, std::ref, boost::ref (2)
This fixes compilation with MSVC2012.

See also [2b0a7a5e/lyxgit].
2012-10-12 21:29:57 +02:00
Vincent van Ravesteijn
926bb4b41a support/tests: Fix compilation on Windows 2012-10-12 21:24:03 +02:00
Juergen Spitzmueller
47673f560f Correctly initialize bool. Thanks, Pavel. 2012-10-11 12:55:43 +02:00
Jean-Marc Lasgouttes
06f394a3d4 Show keyboard binding when a layout selection is done in LayoutBox
The obnoxious messages in Private::setFilter cover any message set by lyx::dispatch. The solution I chose is to return early when the filter is not changed.

If this makes sense, then the same optimization should be added to CategorizedCombo, IMO.
2012-10-11 00:21:38 +02:00
Richard Heck
98656dd15b Bump layout format to 40, in preparation for conversion of layout
categories.
2012-10-10 13:22:54 -04:00
Kornel Benko
648e197021 Cmake build: Define for 'DEVEL_VERSION' already done in development/cmake/config.h.cmake 2012-10-09 22:45:12 +02:00
Kornel Benko
acddee2465 Cmake build: Define for 'DEVEL_VERSION' already done in development/cmake/config.h.cmake 2012-10-09 22:43:24 +02:00
Juergen Spitzmueller
c85135090e Stick to bformat 2012-10-09 16:12:32 +02:00
Juergen Spitzmueller
81bc1c1ff4 Fix widget relation 2012-10-09 10:16:38 +02:00
Juergen Spitzmueller
006b50b222 Really put uncategorized items at the end if sortCats is true 2012-10-09 08:51:39 +02:00
Juergen Spitzmueller
be5965ae91 remove unneeded header and declaration 2012-10-09 07:36:17 +02:00
Juergen Spitzmueller
b4dd69ee83 GUI for categorized text classes 2012-10-09 07:22:48 +02:00
Juergen Spitzmueller
32fde61c8f Add new CategorizedCombo widget
This is a combo box that provides categorization and on-the fly filtering.

Heavily derived from LayoutBox (same look and feel).
2012-10-09 07:19:55 +02:00
Juergen Spitzmueller
f18af303fe Introduce textclass categories
The categories are ascribed by \DeclareCategory{<category>} in the layout file header.
UI follows.
2012-10-09 07:17:36 +02:00
Vincent van Ravesteijn
2b0a7a5e01 Disambiguate std::bind, boost::bind, std::ref, boost::ref
This fixes compilation with MSVC2012.
2012-10-08 21:29:40 +02:00
Vincent van Ravesteijn
3bc9cbcdc8 Do not rely on make_pair converting string to FileName
This fixes compilation with MSVC2012.
2012-10-08 21:29:32 +02:00
Georg Baum
53694874f3 Make tex2lyx tests almost compilable
If the original tests cannot ve compiled with latex/pdflatex/xelatex it is
difficult to compare the visual output.
2012-10-08 21:23:11 +02:00
Juergen Spitzmueller
04d39dd5be Proper string translation 2012-10-08 17:04:02 +02:00
Scott Kostyshak
4ab8e4a009 Add tab with build information to Help > About LyX
The tab displays the same information as the 'lyx --version' command.
2012-10-07 11:30:58 -04:00
Juergen Spitzmueller
e55aa4359f Do not check for LaTeX fonts if we use nonTeXFont 2012-10-06 15:51:35 +02:00
Georg Baum
269a942294 Fix wrong parsing of \framebox[3in][s]{...}
s is a valid horizontal position for framebox (as well as for makebox, which
was already parsed correctly). There was even a test case, but with a wrong
reference.
2012-10-06 15:23:36 +02:00
Georg Baum
e119ba6094 Refine tex2lyx -copyfiles logic.
Now all files are copied if the resulting path is valid.
Before the regressions tests would fail depending on the build directory
location.
2012-10-06 13:55:25 +02:00
Georg Baum
23d7d6449f Set CJK document language instead of adding a note.
Instead of annoying the user with an automatically created note in the output
document which she needs to delete manually, determine the document language
automatically for documents that use CJK. This is done using a heuristic which
roughly counts the number of characters in each language and sets the one that
is used most often. This is not perfect, but it works for the two major use
cases: A document with only some CJK parts (in this case the babel language is
used), and a document which is mainly written in one CJK language. It is only
a minor problem if the heuristic is wrong, since the TeX export is still
correct, and there is no spell checking support for CJK anyway.
Now all regression tests do pass except for some relative path issues
depending on the location of the build directory.
2012-10-06 09:38:14 +02:00
Georg Baum
8863ac62aa Really output file format 444
The previous output was read correctly by LyX as well, but the new version is
more similar to the files written by LyX. Also update TODO with recent file
format changes.
2012-10-06 00:29:16 +02:00
Georg Baum
fce4f66718 Acknowledge additional \lang command 2012-10-05 23:58:16 +02:00
Georg Baum
c85228432c Update file format of test references 2012-10-05 23:50:28 +02:00
Georg Baum
87641e506e Fix typo 2012-10-05 23:44:21 +02:00
Georg Baum
28dc8a77ee Fix regression introduced in commit 7cfac95
Commit 7cfac95 got rid of empty lines that were created by removing \usepackage
statements. However, it added an additional newline in case the \usepackage
was not at the end of the line. This is now fixed.
2012-10-05 22:16:46 +02:00
Juergen Spitzmueller
63612ca99b Restore buffer parenthood if we exit already after the preamble 2012-10-05 19:26:07 +02:00
Juergen Spitzmueller
e6afdf1b2b Prevent the PreviewLoader from orphaning children 2012-10-05 18:28:38 +02:00
Kornel Benko
ce649ca9fd Added check for support tests in cmake build.
New target: checkregfiles
This will create the regfiles and compare with the data in source.
2012-10-05 16:56:29 +02:00
Juergen Spitzmueller
b6ecb3213b Add master's perspective in children's source preview 2012-10-05 14:30:20 +02:00
Juergen Spitzmueller
08157b5050 Merge branch 'master' of git.lyx.org:lyx 2012-10-05 10:00:13 +02:00
Jean-Marc Lasgouttes
4729b1c35d Fix make check target
A dummy getGuiMessages function was missing. Instead of adding it everywhere, a new file is created that contains all the dummy functions needed by the tests.
2012-10-05 11:55:23 +02:00
Juergen Spitzmueller
2fa840b771 Do not let the children's buffer params leak into the master (#5941) 2012-10-05 09:59:44 +02:00
Georg Baum
2f7f0c7631 Really fix bug #4468.
The old fix was incomplete (\verb~\~ was translated to \verb~~ in roundtrip).
The real cause for this bug (and also the mistranslation of \href{...}{\}})
was the misbehaviour of Token::character() (see comment in Parser.h): This
method even returns a character if the category is catEscape, and this is not
wanted in most (all?) cases.
2012-10-05 00:12:18 +02:00
Georg Baum
5afe35cc59 Compile tex2lyx before running tests 2012-10-04 22:29:43 +02:00
Kornel Benko
66cb259a96 tex2lyx tests adapted to cmake build 2012-10-03 17:04:00 +02:00
Georg Baum
d56295bcdf Add make target to update tex2lyx test references
Now "make check" does not overwrite the test references anymore, use the
updatetests target instead. "make check" now also recognizes test failures.
2012-10-03 15:23:09 +02:00
Georg Baum
adcd2281af Add evaluation for tex2lyx regression tests 2012-10-03 15:01:54 +02:00
Georg Baum
133ceaf0d4 Support out of source tests in tex2lyx test runner 2012-10-03 13:59:20 +02:00
Georg Baum
24181cf28e Add -copyfiles command line option to tex2lyx
If this option is given, included files will be copied to the output directory.
Also -roundtrip is now allowed with given output file.
-copyfiles is useful if you want to ensure that no file (not even an included
one) is overwritten by a subsequent export from LyX. Both changes are needed
for unit tests that do not write to the source directory.
2012-10-03 13:23:27 +02:00
Juergen Spitzmueller
02c73cd721 Do not let the parent interfere when I child document is exported/view standalone (#8100, #8101) 2012-10-03 10:41:07 +02:00
Juergen Spitzmueller
e3e6befc54 Ronen's patch for lfun language set
This adds an optional 'set' argument to the language lfun and reintroduces toggling.

Additions by me reintroduce the possibility to reset to the document language via 'language reset' or just 'language'
2012-10-03 07:27:36 +02:00
Scott Kostyshak
3b9c75ce27 Make text selectable in Help > About LyX > Version
This might encourage users to post this information when reporting bugs
and sometimes it's useful to be able to copy the paths of the Library
and User directories.
2012-10-02 05:39:57 -04:00
Tommaso Cucinotta
ad827243fc Adding preferences format update as due to commit 4985015 (new close_buffer_with_last_view option). 2012-10-01 22:30:13 +01:00
Pavel Sanda
536a0b44b7 Move layout editor zombie to attic. 2012-10-01 17:14:34 +02:00
Juergen Spitzmueller
f881835da2 Ask for saving changes when branch state in child was altered 2012-10-01 12:37:16 +02:00
Juergen Spitzmueller
31c7ccd4b3 Trigger preview when inserting preview inset on selection 2012-09-30 18:36:22 +02:00
Juergen Spitzmueller
3588f2f696 Context menu item to add unknown branch (rest of #7643) 2012-09-30 17:32:00 +02:00
Juergen Spitzmueller
fab7d42608 Whitespace 2012-09-30 16:27:11 +02:00
Juergen Spitzmueller
6f4b2dd4b0 Whitespace 2012-09-30 16:12:52 +02:00
Georg Baum
ccd3ecf1e9 Fix tex2lyx path handling for relative file names
The input and output file names of tex2lyx may be relative. In this case,
getMasterFilePath() and getParentFilePath() return relative paths as well.
Now the file name translation logic for all kinds of included files can
cope with that.
2012-09-30 15:06:18 +02:00
Juergen Spitzmueller
e26635bfb9 UI for separate control of master/child branch state (#7642, part of #7643) 2012-09-30 14:59:24 +02:00
Enrico Forestieri
bb67e670ef Make some strings translatable again.
These strings were inadvertently broken in [4985015e/lyxgit].
2012-09-30 00:42:55 +02:00
Pavel Sanda
86473d5556 Bump LFUN format for LyX 2.1 2012-09-29 20:06:39 +02:00
Pavel Sanda
5d9c14a322 Realign numbering. 2012-09-29 18:52:52 +02:00
Pavel Sanda
074277baf1 Next zombies found: LFUN_GETBUFNAME, LFUN_LINEATCURSOR, LFUN_LO?VIEW. 2012-09-29 18:40:48 +02:00
Pavel Sanda
49a9d3ad63 Kill LFUN_HFILL_INSERT zombie. 2012-09-29 18:34:38 +02:00
Pavel Sanda
541828ebf5 Another witch hunting case: break-paragraph -> paragraph-break. 2012-09-29 18:06:42 +02:00
Pavel Sanda
d1297047e7 Move similar LFUNs to one place. 2012-09-29 17:42:27 +02:00
Pavel Sanda
e9a28c8000 Correct naming for view-split. 2012-09-29 17:33:46 +02:00
Pavel Sanda
a72b75c50c Proper naming for tab-group-close. 2012-09-29 17:16:52 +02:00
Juergen Spitzmueller
c9f9107a7f Fix issues with xref dialog in read-only documents (#8177) 2012-09-29 16:12:31 +02:00
Juergen Spitzmueller
0b2c308a68 sort table 2012-09-29 16:11:09 +02:00
Tommaso Cucinotta
4985015e89 Now LyX closes the current document WA only by default (other WAs remain open).
If the WA is the last one showing a buffer, then the buffer may either be
closed or kept hidden, or the user is asked. The behaviour is controlled
by a new preference option.
For discussion, see http://comments.gmane.org/gmane.editors.lyx.devel/142638
2012-09-28 23:12:38 +01:00
Juergen Spitzmueller
5801ee2f9a validate encodable characters in href inset (#8357) 2012-09-28 09:27:39 +02:00
Pavel Sanda
c1e9632beb Remove leftover from 16fd47ad8f.
Catch by Kayvan Sylvan.
2012-09-28 01:09:23 +02:00
Georg Baum
a08c693f90 Add test for Parser::getFullArg()
It shows that the special handling of a single backslash in the argument
(whcih is supposed to fix bug #4468) does not work.
2012-09-25 22:25:55 +02:00
Stephan Witt
e0787e839f C++ style to avoid compiler warning for non-NLS implementation of Messages::available 2012-09-25 16:20:43 +02:00
Juergen Spitzmueller
1d84423e76 A font a day keeps the doctor away: Support for the Biolinum LaTeX font 2012-09-25 11:07:33 +02:00
Juergen Spitzmueller
398b1a450a properly validate unicode-math 2012-09-24 13:56:37 +02:00
Juergen Spitzmueller
8bf5d4b461 Very basic support for unicode-math
With non-TeX fonts, you can select a 'Non-TeX Font Default' math font, which simply loads unicode-math without actually selecting a math font, this then uses the default math otf font, currently Latin Modern. Other fonts still need to be set manually in the preamble, via \setmathfont.

The implementation suppresses unneeded package requests from unicodesymbols, but the output still uses macros instead of full unicode (both is possible with unicode-math).

The whole thing is a proof of concept, and it needs to be tested. I have tested it with the math manual, which compiles and seems to display correctly if I remove some hardcoded package loadings. OTOH I have not much experience with math.

This addresses #7449 partly.
2012-09-24 13:19:25 +02:00
Juergen Spitzmueller
909963fd5a thinko: if we have requires, do not test package 2012-09-24 08:41:44 +02:00
Uwe Stöhr
237cb51fb1 GuiTabular.cpp: don't rely on a string but on the combobox data
It was not safe in changeset 9d05ac5c to search for a text because it can be translated, better search for the data, thanks Pavel for spotting
2012-09-24 02:10:21 +02:00
Juergen Spitzmueller
ba1d137769 Support for the NewTX Math fonts (newtx, libertine, minion) 2012-09-23 18:33:04 +02:00
Juergen Spitzmueller
a41dcb5768 Recognize Provides from math fonts 2012-09-23 17:40:44 +02:00
Vincent van Ravesteijn
a1bda4e045 Fix bug #8296: Crash when clicking on completion in math
When the user clicks on the completion, the completion disappears. This
means that we have to fix the cursor before setting it.
2012-09-23 16:44:22 +02:00
Stephan Witt
273ebbef19 avoid deprecated functions on Mac - use Qt instead 2012-09-23 16:06:56 +02:00
Stephan Witt
f1ab5dfc58 remove unnecessary Carbon include 2012-09-23 16:06:56 +02:00
Stephan Witt
5a9aa21350 correct Messages class implementation for non-NLS 2012-09-23 16:06:56 +02:00
Stephan Witt
404ef2467c moving Reconfigure to LyX menu does not work 2012-09-23 16:06:55 +02:00
Juergen Spitzmueller
5170489b98 More no-math fonts
For the sake of completeness, it is now also possible to load fourier and the mathdesign fonts without changing the default math font.
2012-09-23 12:30:19 +02:00
Vincent van Ravesteijn
29e64597d0 Fix bug #6389: Make columns RTL in RTL document 2012-09-22 23:15:53 +02:00
Vincent van Ravesteijn
6b8ed2fa1d Initialize toolbar pop menu button on start
In 0aead96461 it was introduced that the toolbar popup menu buttons are not
initialized until they are being used (i.e. pressed at for the first
time). As a consequence, these buttons are always enabled on start. Now
that we have the sticky button for view and update, I'm now annoyed by
this every time I start LyX.
2012-09-22 23:15:51 +02:00
Vincent van Ravesteijn
0a2024139f InsetIPAMacro: Fix warnings about conversion from double to int 2012-09-22 19:21:00 +02:00
Juergen Spitzmueller
8f9898994d Basic UI for math (TeX) fonts
This addresses #6543 by adding an option to prevent fonts such as Palatino and Times to automatically adapt the math font (IOW it lets you load the text font only for a bunch of fonts where this is easily possible).

Furthermore it adds an interface to select a specific math font, which is defined in latexfonts. Currently, this is only euler (the only one I know), but if there are other math-only tex fonts, they can be added easily (but note that this changes the file format).

Non-TeX math fonts are not yet supported. Eventually, unicode-math support can use the existing UI, but this is not on my agenda.
2012-09-22 17:44:00 +02:00
Juergen Spitzmueller
89df1de885 No need to pass these 2012-09-22 12:14:24 +02:00
Juergen Spitzmueller
a5151c92a9 Much more flexible implementation of alternative (LaTeX) fonts
The LaTeX font now do not specify simply alternative packages or packages for OT1 encoding etc., but they refer to complete AltFonts (which are not directly accessible via the GUI). This way, alternative fonts can also have options (osf, sc etc.), and they can use all sorts of initializing methods (\usepackage, \setrmfamily etc.).
2012-09-22 10:59:53 +02:00
Juergen Spitzmueller
e2173f14ec Follow Lars' advice 2012-09-20 16:24:59 +02:00
Pavel Sanda
13dfbd1927 Simplify translation string. 2012-09-20 13:35:53 +02:00
Juergen Spitzmueller
e9ca6b6bf4 Support for the Minion Pro LaTeX font 2012-09-19 17:46:55 +02:00
Juergen Spitzmueller
f4261030e2 Implement Provides tag to LaTeXFonts
This allows to suppress conflicting packages, such as amssymb with mathdesign.
2012-09-19 15:46:19 +02:00
Juergen Spitzmueller
4517c6f9a5 Do not propose existing labels 2012-09-19 10:20:19 +02:00
Juergen Spitzmueller
86cccf1077 Do not update refs on new label creation (#8147)
This assures that refs to existing labels are not being touched if a new label with a duplicate name is created, and the name then changed by the duplicate checker.

Branch candidate.
2012-09-19 10:14:56 +02:00
Juergen Spitzmueller
f5b4cd90a3 Merge branch 'master' of git.lyx.org:lyx 2012-09-17 11:36:47 +02:00
Juergen Spitzmueller
6bf00d9fed rc.preview and rc.display_graphics are completely unrelated (bug 7562) 2012-09-17 11:36:29 +02:00
Jean-Marc Lasgouttes
538570a1e5 Fix bug #8342: Endless undo group messages
Fix thinko in Undo::endUndoGroup.
Do not reset undo groups in Undo::clean

The underlying problem remains: the various VC functions should not
always reload the buffer or at least should use the parameter
clearUndo=false.
2012-09-17 11:24:39 +02:00
Scott Kostyshak
51c380440b Constify some catches and others 2012-09-17 04:05:34 -04:00
Juergen Spitzmueller
ec078bd29d Do not search for empty string 2012-09-17 09:32:47 +02:00
Juergen Spitzmueller
e8a01d099a Calibrate log file parser
Filenames embraced in <...> can occur anywhere on the line and multiple times. This fixes for me the case that graphics included via ERT were not tracked. It probably also fixes #8336.

This is a candidate for branch.
2012-09-17 08:59:41 +02:00
Juergen Spitzmueller
ba792c4d35 Clarify the logic of fragmental file name checking
No change in functionality.
2012-09-17 07:37:49 +02:00
Scott Kostyshak
80c126b092 Typos
Clean up some comments, LFUN documentation, an error message,
and lyx --help output.
2012-09-12 19:38:26 -04:00
Scott Kostyshak
58dd5698ac Fix some typos for LFUNs.lyx 2012-09-12 18:52:16 -04:00
Uwe Stöhr
66e650e5da InsetTabular: fix resetting reset decimal alignment
If no special alignment is set the default is center not left - my mistake
2012-09-13 00:41:57 +02:00
Uwe Stöhr
b64d17e9dc GuiTabular.cpp: don't hardcode decimal align combobox item 2012-09-11 23:51:50 +02:00
Uwe Stöhr
6f157533a1 fix multirow/column logic in table dialog
GuiTabular.cpp: a cell can either be a multicolumn or multirow, not both the same time, this is already respected by the toolbar and context menu, only the dialog allowed to set this although this was correctly never applied

should also go to branch
2012-09-11 21:58:13 +02:00
Scott Kostyshak
4c1d45aac9 -help, -version, & unqualified -dbg now go to cout
Makes output consistent with other programs and allows for piping that
is more user-friendly.
2012-09-11 01:22:23 -04:00
Scott Kostyshak
1451c7cf66 Get rid of a Qt-generated stderr message
The stderr message "Object::disconnect: Unexpected null parameter"
often appeared when closing and opening buffers.
GuiView::on_currentWorkAreaChanged should not pass a null pointer
to Object::disconnect.
2012-09-10 23:18:22 -04:00
Uwe Stöhr
9d05ac5c91 Fix UI for decimal table alignment (bug #8285)
Fixes 2 issues:
1. LyX uses for a decimal alignment a multicolumn and having for a cell a multicolumn _and_ a multirow is invalid LaTeX.
2. It was impossible to unset a decimal alignment via the context menu or toolbar button.
2012-09-11 02:10:29 +02:00
Jean-Marc Lasgouttes
740c83637d Correctly initialize a member variable
This has be diagnosed by valgrind, I do not know how important it is.
2012-09-08 16:59:19 +02:00
Jean-Marc Lasgouttes
7a7b9abf1b Tracking correctly available translations (take 2)
The previous scheme of loading all possible translations and checking
whether the work is a bit too much "brute force" and causes problems
on Mac OS X (documents loaded with the wrong language).

Now there is an helper static method in Messages class that checks
whether a readable .mo file exist for the language. There should be an
API in gettext for doing that, but alas it is not possible.

As a consequence the method Language::translated() has been removed,
along with its cache.
2012-09-08 16:59:19 +02:00
Jean-Marc Lasgouttes
a86de5d3c0 Revert "Read list of translated languages from a file"
This reverts commit ed1515ef69.
2012-09-08 16:59:18 +02:00
Enrico Forestieri
91afc2430d Protect underlined \ref{} commands by enclosing them in \mbox{}.
This is the same protection used for \cite{}. Although "ulem" commands
don't strictly need this protection with \ref{} and friends, this helps
when one wants to use another package souch as "soul".
Indeed, ulem's \uline{} doesn't hyphenate words, while soul's \ul{} does,
and thus the output is much nicer.

With this patch, replacing ulem with soul is as simple as adding
\usepackage{soul}
\renewcommand{\uline}[1]{\ul{#1}}
to the preamble, without worrying about manually enclosing in \mbox the
\ref commands. In any case, the output from ulem remains unchanged.

Another possibility offered by soul is that of typesetting as
"yellow highlighted" the underlined text. This is achieved by adding
\usepackage{color,soul}
\renewcommand{\uline}[1]{\hl{#1}}
to the preamble.
2012-08-30 14:09:23 +02:00
Juergen Spitzmueller
458c143e49 Fix forward search with okular
Implement a placeholder 2008f which points to the tex file with full path, since this is what okular expects nowadays.
2012-08-26 11:42:43 +02:00
Juergen Spitzmueller
719ec62e28 Fix thinkos in LaTeX font reading 2012-08-25 10:48:37 +02:00
Juergen Spitzmueller
2a22d999b2 Implement plaintext for tie bars 2012-08-24 10:12:17 +02:00
Juergen Spitzmueller
706c5d25de Fix documentation 2012-08-23 17:47:12 +02:00
Juergen Spitzmueller
ee1fc9130a Add support for some basic non-unicoded IPA macros
We now support everything on the IPA chart via the toolbar
2012-08-23 17:42:53 +02:00
Juergen Spitzmueller
b6a63bfce8 An IPA toolbar
Translators: sorry ;-)
2012-08-21 14:56:34 +02:00
Juergen Spitzmueller
042a1c4d3b Make tipa shortcuts work for combining chars 2012-08-21 12:48:34 +02:00
Enrico Forestieri
f251e01892 Fix bug #8305: ^ symbol does not render into upward arrow when using mhchem
The mhchem package treats the caret both as a shorthand for \uparrow or
as a superscript operator according to whether it is surrounded by
spaces or not. The \ce and \cf insets allow inserting spaces but there
is no provision for inserting a space after the caret, which is always
considered by LyX as a superscript operator. The solution here is to
insert a space after the caret if the superscript is empty or an empty
brace inset.

Mathed does not allow empty superscripts, so an empty brace has to be
inserted when working in LyX. On the other hand, when importing latex
code, an empty superscript is retained.

This has no effect whatsoever for normal latex code, as a space after
the caret is ignored. In any case, the output is only changed if an
empty brace inset is used as superscript. Specifically, the output is
changed from "^{{}}" to "^ {}".
2012-08-21 01:30:51 +02:00
Jean-Marc Lasgouttes
3a99e351d9 Merge branch 'master' of git.lyx.org:lyx 2012-08-20 17:39:25 +02:00
Jean-Marc Lasgouttes
6a936d63d3 Fix crash with undo in nested insets introduced by commit 6ec1683
The code in DocIterator::sanitize now follows more closely the
previous StableDocIterator::asDocIterator code. In particular, it adds
the slices one by one, since fixIfBroken will chop the cursor
otherwise.
2012-08-20 17:20:59 +02:00
Juergen Spitzmueller
c235e73301 Merge branch 'master' of git.lyx.org:lyx 2012-08-20 09:32:04 +02:00
Juergen Spitzmueller
1267319117 The tipa tone macro requires the tone package from the tipa bundle 2012-08-20 08:52:42 +02:00
Stephan Witt
4674c3e1c5 Patch from Benjamin Piwowar - see ticket #8185:
In order to interact with native osx applications, AppleScript support is a plus.
Here is a patch that makes LyX respond to a simple command (run) and that allows to communicate with LyX as with the LyX client.
Example of use:
	tell application "LyX" to run "server-get-filename" with argument ""'
returns
	message:/Users/bpiwowar/newfile1.lyx, code:0
with a message and the error code
2012-08-19 22:27:20 +02:00
Juergen Spitzmueller
66729e434e TIPA fixes 2012-08-19 16:59:53 +02:00
Juergen Spitzmueller
54c41ce26e Support for the TeX Gyre fonts (#4332) 2012-08-19 11:57:48 +02:00
Tommaso Cucinotta
0f97ae5480 Avoid that, if an error dialog pops up during a long operation, it freezes LyX. 2012-08-18 22:45:21 +01:00
Juergen Spitzmueller
b501845b2c Support for the mathdesign fonts (#6072) 2012-08-18 14:45:41 +02:00
Juergen Spitzmueller
6dd333b432 Add missing option commas 2012-08-18 13:29:14 +02:00
Juergen Spitzmueller
c409c9e3d1 Allow for general package options for LaTeX font packages (needed e.g. by mathdesign) 2012-08-18 13:10:34 +02:00
Juergen Spitzmueller
a9ad5c3337 Factor out duplicated code 2012-08-18 11:57:16 +02:00
Juergen Spitzmueller
924f71c792 Remove unused variable 2012-08-18 10:14:32 +02:00
Juergen Spitzmueller
03943ef730 Issue a warning if a LaTeX font is not available
Also output font in source preview notwithstanding availability.
2012-08-18 09:58:19 +02:00
Juergen Spitzmueller
292f48d6b5 Add support for the txtt font (#4979) 2012-08-17 18:24:18 +02:00
Juergen Spitzmueller
bfec6d2552 typo 2012-08-17 17:24:09 +02:00
Juergen Spitzmueller
37137f43f4 Support for the libertine font (#3881) 2012-08-17 14:11:02 +02:00
Pavel Sanda
f4fe5a8fa0 Another attempt at #8295.
This bug occur only at certain Qt versions and systems and we do
not really understand what is going on.

Quoting Stephan - the parent path of "." e.g. never should be ".".
The inconsistency between the name of FileName and the internal QFileInfo
state looks very dangerous.
2012-08-16 20:33:43 +02:00
Stephan Witt
2ecc895775 ensure VCS::checkparentdirs() starts with an absolute path (ticket #8295) 2012-08-16 13:47:27 +02:00
Juergen Spitzmueller
869b84aef9 Clean up LaTeX font handling (#4999)
The LaTeX font information are now centralized and outsourced. This removes a lot of hardcoding and duplication and makes it easier to support new LaTeX fonts.
2012-08-16 13:23:39 +02:00
Stephan Witt
4f1fb3f6d1 add debug messages to VCS::checkparentdirs (ticket #8295) 2012-08-15 17:50:24 +02:00
Juergen Spitzmueller
4950bb5ebc Comments 2012-08-08 17:23:02 +02:00
Juergen Spitzmueller
1db9ff9b1a Add a way to surpass special English treatment in useBabel
Normally, we do not load babel when English is the only language. However, if we check if babel is used from Font::validate, we need to surpass this test, else no secondary language is registered if English is the main language.
2012-08-08 17:02:12 +02:00
Juergen Spitzmueller
8f451fdbef Add missing breaks in switch 2012-08-08 11:27:37 +02:00
Juergen Spitzmueller
a18af62087 Complete default_language rc removal 2012-08-08 09:31:46 +02:00
Juergen Spitzmueller
2dd84b3417 Remove lyxrc \default_language which has been dropped from the GUI some time ago
The default language of new documents is set via the template
2012-08-07 08:29:46 +02:00
Juergen Spitzmueller
6d2ed04800 Decouple lyxrc-default_language from useLanguagePackage() 2012-08-07 08:00:42 +02:00
Richard Heck
166deba79b Wow, that last commit was dumb. So let's fix #8278 properly. 2012-08-05 17:31:00 -04:00
Richard Heck
2375982f7e Fix bug #8278, as suggested there by Ronen. 2012-08-04 17:33:47 -04:00
Stephan Witt
a9de2597ed Merge branch 'master' of git.lyx.org:lyx 2012-07-30 14:34:12 +02:00
Stephan Witt
430cf3ee5e Fix the wrong cursor move when forward flag is false:
The forward flag is used to place the cursor behind the replaced text if it's true.
But it's not correct to move the cursor if it's false. The cursor is in front of the
replacement already after the replaceSelectionWithString() was done.
2012-07-30 14:32:29 +02:00
Kornel Benko
ea76d6de95 Roundtrip tex2lyx, cmake-build:
1.) test.ltx, test.lyx.tex in build-dir (missed this one in previous commit)
2.) Added dependency to "lyx" to work on clean build dir too
2012-07-30 10:04:45 +02:00
Kornel Benko
6fa12b0971 Adapt tex2lyx roundtrip to cmake build.
Use build tree only.
2012-07-30 09:30:16 +02:00
Stephan Witt
44b3278006 Fix bug #8238: correct the forward argument of replace2string() in on_replacePB_clicked(). 2012-07-27 00:34:17 +02:00
Juergen Spitzmueller
b55a6454d9 Whitespace 2012-07-23 14:59:45 +02:00
Juergen Spitzmueller
0b5c20fc0f Fix direction of brackets in Hebrew when using Polyglossia (bug #8251) 2012-07-23 14:56:00 +02:00
Juergen Spitzmueller
6c1326cdeb Rework language package detection
This puts the diverse use[LangPack] function into one (less error-prone) function and differentiates the custom package from the babel case
2012-07-23 14:34:24 +02:00
Juergen Spitzmueller
508dd27e44 Fix thinko 2012-07-23 11:39:41 +02:00
Juergen Spitzmueller
566a5f2b75 Fixes to the language package call
* Assure that really no language package is called when none is selected.
* Only call global custom package if global is desired.
This is a candidate for branch as well.
2012-07-23 11:36:55 +02:00
Juergen Spitzmueller
a1e2e12ba4 Suppress babel RTL commands when using polyglossia (part of #8251) 2012-07-23 08:40:37 +02:00
Juergen Spitzmueller
f30d6acb04 Compile fix
Richard, please check.
2012-07-22 11:45:39 +02:00
Richard Heck
394e559ffc Add a FIXME about when the appendix should be enabled. 2012-07-21 14:19:10 -04:00
Richard Heck
894569e601 Fix a long-standing FIXME by resetting only the counter for top-level
sectioning when we see an appendix. This fixes bug #8271, whose root
cause was the fact that we were resetting all the counters inside ERT.
2012-07-21 14:19:10 -04:00
Jean-Marc Lasgouttes
6774176aab Implement new LFUN buffer-forall [<BUFFER-TYPE>] <LFUN-COMMAND>
This is a patch from Scott Kostyshak. See the thread here for some
background info:
http://thread.gmane.org/gmane.editors.lyx.devel/142300/focus=142362
2012-07-20 10:50:29 +02:00
Jean-Marc Lasgouttes
ed1515ef69 Read list of translated languages from a file
The previous scheme of loading all possible translations and checking whether the work
is a bit too much "brute force" and causes problems on Mac OS X (documents loaded
with the wrong language).

In the new scheme, autotools install a file lib/installed_translations that contains a list of installed languages (the .gmo files that got installed). This file is read
in Languages::readInstalledTranslations and allows to set the translated() property
of each language.
2012-07-19 00:21:28 +02:00
Jean-Marc Lasgouttes
c999e35e54 Make sure that undo is recorded when magic tricks are played with InsetBibitem.
Fixes bug #7111: Assertion with undo and InsetBibitem

  * add Paragraph::brokenBiblio(), with tells whether there is something to fix.
  * rename Paragraph::checkBiblio to fixBiblio; simplify it greatly by using
    InsetList methods
  * In TextMetrics::redoParagraph, call recordUndo before fixBiblio (only when
    there is something to fix obviously)

Special care is taken to update cursor only when it makes sense. Note
that there are cases where undo information is not recorded (current
cursor not in the slice where action happens)
2012-07-18 15:36:58 +02:00
Juergen Spitzmueller
4d5bef1bdc Add \makeat switches to babel settings if necessary.
Babel settings might contain @ characters. Check for this and wrap the settings into \makeatletter ... \makeatother switches if necessary (see discussion at #8265).
2012-07-18 12:41:53 +02:00
Jean-Marc Lasgouttes
467422f9df Do not kill the undo stack when doing a Save As...
The code does a reload on the buffer to avoid loose pointers if the
file changes directory. This commit adds a bool parameter to
Buffer::reload to allow for keeping the undo stack intact. This is of
couse only wanted in this case, not when reloading an earlier version
of the file.
2012-07-18 10:31:47 +02:00
Jean-Marc Lasgouttes
6ec1683aee Fix crash introduced in my previous commit f6b1c24b
Cursor::fixIfBroken does not do what I thought it did. Lift some code
from StableDocIterator::asDocIterator instead.
2012-07-17 22:26:44 +02:00
Jean-Marc Lasgouttes
e2b42b1726 Fix bug #8242: undo fails for longest label width
In the existing code for setting layout of pragraph parameters,
Text::undoSpan is used to "guess" which paragraphs should be saved in Undo.
With this patch the approach is more precise: before every explicit change
to a paragraph, a Cursor::recordUndo call is inserted. This is much more robust than trying to guess.

In particular, we do not look at depth changes at all, since they are now
handled in updateBuffer since #8159 has been fixed.
2012-07-16 23:39:24 +02:00
Jean-Marc Lasgouttes
02ce050fb8 Make the toolbar code less noisy when the session file is not found 2012-07-16 23:11:26 +02:00
Jean-Marc Lasgouttes
2e1c618824 Typo introduced in commit 16fd47ad. 2012-07-16 00:30:28 +02:00
Pavel Sanda
7b1b9823ff Add comment in lstrings.h 2012-07-15 23:25:58 +02:00
Jean-Marc Lasgouttes
16fd47ad8f Fix bug #7741: incorrect locale when starting R from LyX?
The goal here is to get rid of the old code that modified variables
LANGUAGE and LC_ALL, therefore creating the problems mentionned
in the ticket.

In the new system, there is no explicit "GUI" message handler, that
needs to be reset at each language change. Instead, getGuiMessages
calls getMessages with the correct parameter. This allows to simplify
greatly the code and to remove a lot of old cruft.
2012-07-15 22:22:10 +02:00