anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-23 00:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,401 Commits 30 Branches 171 Tags 681 MiB
e04523f77b
Commit Graph

1673 Commits

Author SHA1 Message Date
Enrico Forestieri
0eedbdee03 Don't rely on Qt for setting an environment variable. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39049 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-06-14 18:06:57 +00:00
Kornel Benko
e307b60811 Revert the not needed part for 'Run in place', as it was already done 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38805 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-21 14:15:55 +00:00
Kornel Benko
9190519e98 1.) Run in place feature: If everything fails, try with source path 
2.) Read the PATCH_VERSION from configure.ac too
3.) Ident-text in script


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38804 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-21 13:48:45 +00:00
Peter Kümmel
b4fc66621d improve function name 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38756 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-14 13:03:48 +00:00
Peter Kümmel
1af61e659c run in-place: don't speculate where the lyx binary is, search for it at the common places 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38753 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-14 12:26:11 +00:00
Peter Kümmel
1e7e6fd8e9 cmake: sorry for the noise, seems may source dir was not clean 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38749 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-14 07:47:18 +00:00
Peter Kümmel
6a953f81ad cmake on mac: build with external libintl, find gettext, build merged 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38729 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-12 21:11:35 +00:00
Peter Kümmel
897edc10c0 cmake: move CMakeLists.txt into source dir (multiple steps) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38691 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-10 17:44:41 +00:00
Enrico Forestieri
1717ef203c Introduce the possibility of setting a prefix for the TEXINPUTS environment 
variable. This is done in the preferences, much like as the PATH prefix.
A single '.' in the paths will get replaced with the current document dir
and also non-absolute paths will be prefixed with that dir.

The default semantics of TEXINPUTS apply, such that, for example, if a
path is terminated with a double slash, all subdirectories will be also
searched by both the TeX engine and ancillary programs such as dvi
previewers or dvips. As an example, if the prefix is set to ".:figs", the
TEXINPUTS variable will be set as ".:<docdir>:<docdir>/figs:$ORIGTEXINPUTS",
where <docdir> is the document directory.

The initial '.' is necessary to address the actual current dir (this will
be the temp dir at preview time), while if TEXINPUTS was initially unset,
such that $ORIGTEXINPUTS is empty, a colon (or semicolon on Windows) will
end the path list. This is very important, because we don't want to replace
the system directories but to complement them and, in order to do that, an
empty element has to be present in the list. Indeed, according to the
TEXINPUTS semantics, an empty element means the standard search path.
This works whether TEXINPUTS is originally set or not, because if the
original TEXINPUTS starts with a colon (meaning that the standard search
path is wanted there) we will have an empty element at that point,
otherwise the final colon will simply serve as a path separator.

Of course, on Windows a ';' has to be used as a path separator. LyX will
take care of transforming the platform path list into one understandable
by the TeX engine. For example, this will be the case for a Cygwin version
of LyX using a native Windows TeX engine or viceversa. I tested all of
this and it works for me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38681 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-09 23:25:51 +00:00
Kornel Benko
45b61c6ecf 1.) Corrected internal compilation for Libintl 
2.) Changed cmake-files accordingly
Patch from Jean-Marc Lasgouttes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38606 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-06 19:24:54 +00:00
Enrico Forestieri
3efc6385d7 See r37176. Let's keep this a Windows only "feature". 
Something went wrong with a script while previewing a document and now
I have to wait for 30 minutes for quitting LyX without killing it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38578 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-04 00:17:07 +00:00
Peter Kümmel
1d5e483b44 move call stack code, add TODOs 
(only disabled code is touched)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38494 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-25 09:14:50 +00:00
Peter Kümmel
56712287a6 demangle names of call stack, thx to JM for the <cxxabi.h> tip 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38473 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-21 20:07:08 +00:00
Peter Kümmel
dd64477e3b #7407, home_dir could be a static function and also be called by the 
Package constructor


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38370 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-13 19:11:55 +00:00
Peter Kümmel
efeeb06418 add comment about backtrace requirement 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38357 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-12 21:37:03 +00:00
Georg Baum
95d2b2f082 Fix bug #7402. Many thanks to Vincent who found the wrong revision. 
Read the comment of odocstream in src/support/docstream.h if you want to 
know why this fix is correct.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38335 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-11 20:11:27 +00:00
Peter Kümmel
0a48051f27 add debug function which prints the callstack to stderr, disabled by default 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38334 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-11 19:39:40 +00:00
Jürgen Spitzmüller
8d4c3ae854 * Messages.cpp (get): 
- set again bind_textdomain_codeset before calling gettext.
	  This works around the infamous bug #7371

Patch from Peter Kümmel.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38325 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-10 16:53:10 +00:00
Peter Kümmel
8e91dbd4f0 remove debug code, we know the translation failed 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38323 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-09 22:13:58 +00:00
Peter Kümmel
c3352f6a6b temporary code to find bug #7371 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38320 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-04-09 09:42:52 +00:00
Peter Kümmel
97a5c0882d Messages::init(); needs Package. this fixes a crash on windows which presents parsing of the argument 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38139 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-29 22:18:21 +00:00
Enrico Forestieri
b1c7450f73 Fix make check 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38088 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-27 23:47:58 +00:00
Enrico Forestieri
a99340cd10 Infrastructure for choosing different icon sets. This currently works 
through the rc setting \icon_set. Preferences dialog will follow shortly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38038 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-25 01:59:34 +00:00
Pavel Sanda
c664b63949 Better handling checksum on samba - allow fallback to ifstream. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38022 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-24 10:12:55 +00:00
Pavel Sanda
40ad67e5f1 comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38006 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-23 14:52:18 +00:00
Pavel Sanda
44c0b9d7da Fix samba related crashes 
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg166543.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38003 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-23 14:28:23 +00:00
Peter Kümmel
6a6706ca67 add link about msvc10 bug 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37927 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-14 23:26:55 +00:00
Peter Kümmel
4620034eda Fix crash when using msvc10's regex, seems boost's regex couldn't replaced by msvc's in ECMAScrip mode. 
Solution: use boost also for msvc10

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37832 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-02 21:28:36 +00:00
Stephan Witt
aedbdb6ce4 native spell checker of Mac OSX Tiger does not support language enumerate - assume true to get some spell check going 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37743 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-20 18:28:12 +00:00
Stephan Witt
269450b2e0 make it compilable for Mac OSX Tiger (again) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37738 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-20 11:12:35 +00:00
Joost Verburg
1e190a2af2 use return value of regex_match to check whether a match was found 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37722 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-17 19:39:07 +00:00
Joost Verburg
75218491f9 fix replacement of multiple environment variables (result was not cleared for next iteration) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37699 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-16 18:59:19 +00:00
Enrico Forestieri
05491c58cc Also catch the endl manipulator for automatic line counting. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37657 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-14 17:09:39 +00:00
Pavel Sanda
2f572f7a28 Rest of gcc 4.6 issues from Orion Poplawski. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37604 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-12 22:10:56 +00:00
Georg Baum
f792fe8037 fix bug #7288: add configure option for external mythes library 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37585 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-10 20:31:07 +00:00
Enrico Forestieri
d866717ef7 Integrate texrow with otexstream in order to perform automatic line 
counting when exporting to latex. This is done for the code comprised
between \begin{document} and \end{document}, while the preamble code
still needs manual calls to TexRow::newline() for registering new lines.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37584 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-10 20:02:48 +00:00
Richard Heck
4c55d02ec6 Fix a couple of compilation issues with gcc 4.6. See bug #7285. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37550 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-07 22:47:02 +00:00
Enrico Forestieri
ab9548d06d In order to avoid code replication, use a template-based solution for 
all types requiring the exact same code, as suggested by Tommaso.
This allows to simply add a single-line instantiation declaration
if there's the need of adding another type requiring the same code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37366 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-29 19:44:53 +00:00
Enrico Forestieri
1ef605f625 Introduce a wrapper class for odocstream to help ensuring that no 
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-29 02:41:13 +00:00
Stephan Witt
9e16f14464 introduce the lyx_dir() of Package, automatically set LyXDir environment, correct the replaceEnvironmentPath() function (see #4177) and replace environment variables in path_prefix at runtime 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37326 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-25 21:10:49 +00:00
Richard Heck
f7bfb018a7 Update error message. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37244 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-17 21:49:28 +00:00
Richard Heck
0e2828917b Utility functions for converting preference files. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37230 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-16 19:51:02 +00:00
Peter Kümmel
b5216b25f7 update other build systems, use lyx::Mutex 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37223 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-15 21:40:09 +00:00
Peter Kümmel
06f26e85df Fix crash on Windows: 
1. open LYX
2. CRTL-N
3. CRTL-D hold D --> crash

Graph must be thread save to fix this.

And for sure, we need a mutex also later.

Mutex is a simple wrapper around QMutex, with
pseudo-value semantic.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37222 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-15 21:06:28 +00:00
Pavel Sanda
6aca54134f add comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37218 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-15 20:06:13 +00:00
Peter Kümmel
e1f8907816 fix #7240 Random crashes: iconv() is not thread save 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37217 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-15 19:52:55 +00:00
Peter Kümmel
826298831d When getting packages via miktex 3 minutes is to short for 
the timeout. 30 minutes should be enough, also for very big documents.
#7228

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37176 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-11 18:46:41 +00:00
Georg Baum
90f795a29e Add -roundtrip argument to tex2lyx for tex->lyx->tex roundtrip testing. 
The reasons for doing this in tex2lyx instead of an external script are:
- Correct choice of latex/pdflatex export
- Using the correct LyX executable regardless of running inplace or from an
  installation, or with or without version suffix


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37049 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-30 20:29:33 +00:00
Jürgen Spitzmüller
0a34b1e047 fix some typos. Patch by Yuri Chornoivan. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37039 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-29 16:57:04 +00:00
Richard Heck
4aead1ffde Improve the wrapParas routine. Previously, we had "..." as the last 
line, if we were too big. Now, we put "..." at the end of the last line.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36988 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-22 01:28:32 +00:00
Stephan Witt
ac86039473 non-system languages from cocoAspell are enumerated with long names - therefore a mapping from lang code to name is needed 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36973 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-20 21:45:41 +00:00
Abdelrazak Younes
065483dae3 Small Timer helper class useful for performance investigation in src/. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36940 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-18 18:40:21 +00:00
Abdelrazak Younes
f48f0ad0bf latexParagraphs(): cleanup a bit and switch to a 'for' loop. Hopefully this should fix the performance problem when exporting very big document to latex. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36932 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-18 08:23:14 +00:00
Abdelrazak Younes
ca91d508b2 LaTeX export small speedup: Introduce RandomAccessList::position() and use it. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36931 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-18 07:37:12 +00:00
Jean-Marc Lasgouttes
bbea06a0c6 fix comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36905 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-16 17:51:30 +00:00
Stephan Witt
5179e2f4d8 remove superfluous semicolons at the end of namespaces 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36901 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-16 08:06:00 +00:00
Stephan Witt
7a537da7c0 correct use of NSNumber constructor for NSTimeInterval;remove superfluous semicolons;fix data type conversion related compiler warnings 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36900 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-16 08:03:24 +00:00
Stephan Witt
e7da6a6bc9 fix data type conversion related compiler warnings 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36899 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-16 07:58:38 +00:00
Enrico Forestieri
4457cd44e8 Compile fix for those platforms using the locale facets implemented 
in docstring.cpp (this was an oversight in r36748).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36767 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-07 22:53:07 +00:00
Pavel Sanda
c420c81ec2 Replay r36748 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36757 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-07 00:13:19 +00:00
Pavel Sanda
c68d754a74 Revert commits from 36745 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36749 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-07 00:05:40 +00:00
Stephan Witt
430d03811e #7026 substitute isDigit() by isDigitASCII() and ditch isDigit(); introduce isNumber() and use it in spell checker; change isdigit() to isDigitASCII() otherwise 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36748 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-06 22:35:15 +00:00
Stephan Witt
fefb5e7f71 without NLS dummy available() should return false 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36720 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-04 17:42:38 +00:00
Stephan Witt
58f1126355 attempt to make LyX linkable without NLS, assuming dummy available() should return true without NLS 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36711 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-04 08:28:10 +00:00
Georg Baum
53a72a4526 fix bug #6584 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36687 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-03 17:48:06 +00:00
Georg Baum
dea050cb93 fix bug 3008: Add subscript/superscript inset for text 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36424 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-21 17:00:12 +00:00
Richard Heck
0940cd77d4 Better way of doing these checks, suggested by Enrico. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36356 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-17 22:17:53 +00:00
Richard Heck
d764a97cf4 Hadn't see this empty_docstring() thing before. Very useful. 
Add a comment to strfwd.h.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36355 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-17 22:11:33 +00:00
Richard Heck
67a4b590aa We don't generally use "static" this way in the LyX code any more. (Just 
a bit of cleanup while studying other things....)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36354 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-17 22:00:42 +00:00
Richard Heck
e54afe6367 Remove redundant code. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36353 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-17 21:41:23 +00:00
Vincent van Ravesteijn
4397cef1f8 src/support/debug.h/cpp: 
- rename the private member dt to dt_,
- rename second_ and second_used_ to second_stream and second_enabled_ to have the same terminology as the stream_ and enabled_ member,
- remove FIXME because now we have a Qt pane showing the messages,
- adjust some comments.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36149 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-06 00:22:47 +00:00
Vincent van Ravesteijn
a4fd294373 Add a static assert to prevent compilation on platforms where int/usigned int are not 32-bits/4-bytes. 
This is added to be sure that the to-be-added author hash is always 32-bit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36126 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-05 16:51:09 +00:00
Pavel Sanda
5075f0f25f typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35973 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-01 20:24:29 +00:00
Peter Kümmel
d0feccc7ed switch mouse to busy symbol every 3 seconds and then back to show the 
user something is done in the background


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35795 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-23 10:49:45 +00:00
Peter Kümmel
cf570e0a8d update .am files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35742 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 01:15:12 +00:00
Peter Kümmel
f54200b078 no QtGui in support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35740 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 00:07:48 +00:00
Peter Kümmel
391634eb67 first include config.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35738 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-20 23:58:22 +00:00
Peter Kümmel
699ff50301 line ending 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35736 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-20 23:51:31 +00:00
Peter Kümmel
c259957b69 add generic helper class for calling functions in gui thread 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35735 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-20 23:50:49 +00:00
Pavel Sanda
0978e91ecf This stuff is general enough for lstrings 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35646 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-14 11:01:15 +00:00
Uwe Stöhr
b33182bc3d filetools.cpp: introduce a new method to be able to distinguish between valid LaTeX filenames and filenames causing troubles on some DVI viewers. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35514 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-27 02:39:22 +00:00
Uwe Stöhr
f772315090 filetools.cpp: revert r35499 until we found a proper solution as discussed in http://article.gmane.org/gmane.editors.lyx.devel/129471 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35500 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-25 16:04:52 +00:00
Uwe Stöhr
052f689daa filetools.cpp: fix #6916 - round parentheses are valid in filenames (they are even standard in paths in WinXP 64bit); they should also make no problems on UNIX systems 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35499 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-25 14:25:19 +00:00
Richard Heck
4244a15ca3 Keeping the comma leads to bug #6914, since we end up with mangled names 
like:
  0_tmp_the,_test_tst.bib
and then code like:
  \bibliography{0_tmp_the,_test_tst}
which confuses LaTeX. Easy solution: Mangle the comma.

Jurgen, this is in branch, too.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35493 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-24 16:12:02 +00:00
Enrico Forestieri
4a2243135c Instead of specifically addressing glibc, use NULL as second argument 
of realpath() when PATH_MAX is not defined in limits.h.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35466 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-20 17:53:40 +00:00
Pavel Sanda
1291b07c05 PATH_MAX is not guaranteed by POSIX (fixes bug #6906). 
Patch from Samuel Thibault.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35452 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-19 21:29:09 +00:00
Abdelrazak Younes
ef3c8c10e1 Fix gcc warning. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35294 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-06 07:11:27 +00:00
Abdelrazak Younes
cb40d51906 whitespace 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35293 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-06 07:10:35 +00:00
Stephan Witt
9b1e0fc3c8 avoid spell check with out of range start value 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35292 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-06 06:55:31 +00:00
Stephan Witt
1d499cbf73 avoid compiler warning 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35288 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-06 06:14:25 +00:00
Stephan Witt
4bde2bc7bc implement the paragraph check feature for apple speller 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35276 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-04 07:48:15 +00:00
Stephan Witt
4b6fe42475 avoid assignment in if-expression 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35245 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-31 13:25:29 +00:00
Stephan Witt
fa3c8d6894 prepare native spell checker interface for check of multiple words at once 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35183 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-22 13:55:28 +00:00
Jean-Marc Lasgouttes
8a9d765739 Bug #6842, part II 
Make sure that Package can be initialized several time.s
Make sure that Package is not used before being initialized.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35080 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-07 11:42:27 +00:00
Jean-Marc Lasgouttes
e4f2484cb5 Implement LFUN_SPELLING_REMOVE (patch from switt) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35055 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-05 20:10:40 +00:00
Jean-Marc Lasgouttes
79346452c7 silence some warnings by removing unused parameters 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35053 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-05 19:00:57 +00:00
Jean-Marc Lasgouttes
4c3333d1df tiny simplification 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35045 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-03 22:31:16 +00:00
Peter Kümmel
30bae1710a cmake: fix merged build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34954 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 22:24:30 +00:00
Peter Kümmel
c09d33120d UNDO: enc 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34943 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 16:09:26 +00:00
Pavel Sanda
59598a0d25 Fix tarball creation 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34936 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 14:17:44 +00:00
Peter Kümmel
56a7a67783 add first version of .lyx file encryption. It's disabled by default and could out-of-the-box only by compiled on Linux with cmake and with openssl-devel packeges. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34931 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:26:11 +00:00
Enrico Forestieri
be3fba333b Remove left over. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34919 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-16 14:43:12 +00:00
Enrico Forestieri
952a31a43e Fix output to terminal when LyX is launched from a GUI on *nix 
aka
Surrender to Windowsisms
aka
Resistance is futile, you will be assimilated


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34918 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-16 14:30:46 +00:00
Peter Kümmel
2467a88cde no output to stdout when redirecting, cleanup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34915 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-16 09:57:46 +00:00
Peter Kümmel
146b1083a1 fix stupid renaming error 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34914 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-16 08:14:00 +00:00
Peter Kümmel
7c4122cc4b lyx sytle 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34912 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-16 08:09:38 +00:00
Peter Kümmel
52e58a3700 CamelCase 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34911 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-16 06:08:12 +00:00
Peter Kümmel
48dca70f9e only guard terminal output. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34910 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-16 05:55:31 +00:00
Stephan Witt
aebcaa74b0 correct result array use in makeSuggestionAppleSpeller 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34862 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-11 22:04:29 +00:00
Stephan Witt
7b34b13b71 avoid LYX_PLATFORM_DARWIN10 macro 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34861 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-11 21:30:47 +00:00
Stephan Witt
0a326e90f7 provide native spell checker for Mac OS X 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34801 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-07 17:40:50 +00:00
Stephan Witt
55afdeb980 restore original version 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34749 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-03 16:25:15 +00:00
Stephan Witt
2bb7b6d4ea add checks for empty word list to avoid crashes later in MyThes::binsearch() 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34742 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-02 07:03:15 +00:00
Jean-Marc Lasgouttes
af928c503d rework regexp processor magic ; make tr1 work with autotools 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34730 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 11:04:30 +00:00
Peter Kümmel
69036ced37 TR1: move TR1 check to config.h / buildsystem 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34729 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 10:53:45 +00:00
Peter Kümmel
103310c401 TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems, no support of regex in gcc 4.4 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34728 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 08:47:41 +00:00
Peter Kümmel
615d42d357 TR1: use std::tr1 regex with msvc10 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34725 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-29 17:09:40 +00:00
Peter Kümmel
86172fbebe mingw fix 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34724 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-29 17:08:17 +00:00
Joost Verburg
23df7e16a9 Include io.h only on Windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34723 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-29 13:23:33 +00:00
Joost Verburg
e6254e6fb2 Launch external Windows processes for e.g. display image conversion using CreateProcess with a CREATE_NO_WINDOW flag, allowing LyX to be compiled as a GUI application without console windows popping up. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34721 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-28 17:45:04 +00:00
Pavel Sanda
88fa080978 File missing in the tarball 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34655 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-14 18:16:23 +00:00
Peter Kümmel
ddc38c93ca don't block GUI when showing all debug messages 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34612 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-07 20:25:41 +00:00
Peter Kümmel
807fc1443a also use TR1 code for bind and shared_ptr when compiling with GCC >= 4.4 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34600 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-05 11:06:13 +00:00
Peter Kümmel
52c51e5485 msvc10 work around: use complete std:numpunct<char> implementation otherwise it crashes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34488 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-24 15:17:08 +00:00
Pavel Sanda
9488a18569 Keep the string in synchro with the code around 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34415 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-16 22:02:13 +00:00
Peter Kümmel
5b75a45bc1 don't forget to pack numpunct_lyx_char_type.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34269 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 22:04:21 +00:00
Peter Kümmel
ed05787e41 add new files to Makefile.am. 
numpunct_lyx_char_type.h is msvc specific.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34265 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 16:01:23 +00:00
Peter Kümmel
5b916eb7c5 don't pollute the global namespace, move bind and shared_ptr into the lyx scope. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34264 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 15:56:20 +00:00
Peter Kümmel
4654a8bf96 build with GCC 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34263 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 14:40:57 +00:00
Peter Kümmel
e948caf637 build with msvc10. Seems there is a bug in their STL code: 
// std::numpunct has a hardcoded dllimport in definition, but we wanna it with 32 bit 
// so we can't import it and must define it but then the compiler complains.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34262 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 14:28:52 +00:00
Peter Kümmel
c9b9748cee msvcUsing "using namespace std" with msvc10 makes also std::tr1::shared_ptr visible and generates conflicts with boost::shared_ptr. 
Solution: don't use boost::shared_ptr for msvc10 (could also be extended  to several GCC versions)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34259 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 11:37:32 +00:00
Peter Kümmel
87c6a4679a at least compile with msvc10. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34258 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 11:19:49 +00:00
Peter Kümmel
61b2bd5e7f Using "using namespace std" with msvc10 makes also std::tr1::bind visible and generates conflicts with boost::bind. 
Solution: don't use boost::bind for msvc10 (could also be extended  to several GCC versions)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34257 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 11:16:58 +00:00
Pavel Sanda
e1cabbf70e Last bits. 
Trunk should be funcFileName consistent now.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34245 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:36 +00:00
Pavel Sanda
bb59d0fd0a support: 
isLyXFilename -> isLyXFilename
isValidLaTeXFilename -> isValidLaTeXFileName
isSGMLFilename -> isSGMLFileName

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34242 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:31 +00:00
Pavel Sanda
72a6c77a51 support: 
frontends:
onlyFilename -> onlyFileName

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34240 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:28 +00:00
Pavel Sanda
266ad9501d DocFileName::unzippedFilename -> DocFileName::unzippedFileName 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34239 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:26 +00:00
Pavel Sanda
9d43d32240 DocFileName.outputFilename -> DocFileName.outputFileName 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34238 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:25 +00:00
Pavel Sanda
b6a764eef3 FileName.mangledFilename -> FileName.mangledFileName 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34236 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:22 +00:00
Pavel Sanda
e5fc2cbdc6 Filename.relFilename -> Filename.relFileName 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34235 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:20 +00:00
Pavel Sanda
62ca7f3ae5 Proper camel case for FileName.absFilename 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 01:19:09 +00:00
Pavel Sanda
e45427de38 Fix bug #6649 - fix texrow structure generated by InsetIndex 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34181 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-16 23:47:39 +00:00
Stephan Witt
fb43bbbf6c tiger support on mac snow leopard, include Qt4 frameworks, smart build script with parameters 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34132 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-14 13:22:00 +00:00
Stephan Witt
4c859c9835 add support for private aspell framework for mac os 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34098 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-08 22:56:12 +00:00
Stephan Witt
4b0a8f2dfb reduce compiler warnings (deprecated method, uninitialized vars) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34097 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-08 22:41:49 +00:00
Richard Heck
c6721161b0 If the translation fails for some reason, just return what we were 
given. This is already how it is done in client/.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33935 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-29 21:33:26 +00:00
Richard Heck
29c93f87e6 Make these const, too. I mean, why not? 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33934 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-29 21:31:17 +00:00
Enrico Forestieri
0f8929d5d1 Fix command line parsing and allow unicode arguments for tex2lyx on Windows. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33723 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-12 01:18:39 +00:00
Pavel Sanda
a7b921aeeb Fix unsafe use of fixed width arrays. 
Fix crash when MathMatrix has more than 80 columns

Patch from John McCabe-Dansted, approved from Andre.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33641 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-06 14:57:16 +00:00
Pavel Sanda
8f136a5467 Remove unused SignalSlot files per Abdel's suggestion 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33637 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-06 12:48:02 +00:00