Commit Graph

953 Commits

Author SHA1 Message Date
Uwe Stöhr
f397989137 tex2lyx/preamble.cpp: revert r39962 (the string initialization was already reverted)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40019 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 19:53:29 +00:00
Vincent van Ravesteijn
042d0118ae Constify some variables in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40013 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 14:04:22 +00:00
Uwe Stöhr
dc7a53aeb4 tex2lyx/text.cpp: fix 2 typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40012 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 13:37:32 +00:00
Uwe Stöhr
e8c0344791 tex2lyx: support for hyperlinks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40005 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 05:02:37 +00:00
Uwe Stöhr
f68b287be6 tex2lyx/text.cpp: code simplification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40004 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 04:14:45 +00:00
Uwe Stöhr
df95c6273d tex2lyx: support for sideway floats including their starred (wide) counterparts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40003 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 03:23:31 +00:00
Uwe Stöhr
c55326048a tex2lyx: add strike-outs etc. to the TeX testfile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40002 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 02:46:26 +00:00
Uwe Stöhr
6dccac85ce tex2lyx: fix problem that non-empty \date in the preamble would be lost
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39994 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:29:24 +00:00
Uwe Stöhr
0cd0f955fb tex2lyx: addendum to r39989; support for basic (predefined) colors; useful for things like \color{green}
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39991 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:18:27 +00:00
Uwe Stöhr
7be5a98e1d tex2lyx: testfiles: the spaces are already in box-color-size-space-align.tex
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39990 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 01:16:19 +00:00
Uwe Stöhr
e9d2c866b4 tex2lyx: addendum to r39949; handle the case that LyX's defined colors are defined but not used, now it is assures that only the color is used that is actually used for \color and \pagecolor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39989 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-26 00:31:02 +00:00
Uwe Stöhr
fc75fcafbd tex2lyx: fix a typo and a whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39987 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 23:34:59 +00:00
Uwe Stöhr
e2d9adadaa tex2lyx: fix bug #7856
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39983 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 23:17:24 +00:00
Uwe Stöhr
d1d597d9cf tex2lyx: support for beraserif.sty
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39979 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 22:37:16 +00:00
Uwe Stöhr
2de511d90c TODO.txt: restore an entry
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39978 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 22:24:06 +00:00
Georg Baum
2736d09656 Adjust comment (thanks Jose)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39976 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 20:02:59 +00:00
Uwe Stöhr
01f9794b50 tex2lyx: addendum to r39964, although utopia.sty is outdated and even listed in l2tabu, users might use it anyway and supporting it doesn't harm
(info I missed in r39965: beraserif.sty does not exist on CTAN, Bera's sansserif is named "berasans" and is already supported by tex2lyx)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39968 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 17:44:55 +00:00
Uwe Stöhr
05a59595e8 tex2lyx: support for different language packages: none, babel or a custom one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39967 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 17:30:27 +00:00
Uwe Stöhr
c5f5d559fb tex2lyx: nothing to do for the new math spaces as shown by the updated TeX testfile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39966 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 16:47:31 +00:00
Uwe Stöhr
bd42b9f25a tex2lyx: support for chancery and ccfonts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39965 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 16:25:37 +00:00
Uwe Stöhr
999222b0c2 tex2lyx: fix handling of fourier: Utopia as roman font can be combined with any other tt font, not only with tt-fourier
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39964 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:54:53 +00:00
Uwe Stöhr
ad8c0df251 tex2lyx/preamble.cpp: correct a mistake from previous commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39963 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:43:11 +00:00
Uwe Stöhr
80523bbe07 tex2lyx: adapt handling of \fontencoding to LyX 2.x's syntax
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39962 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:39:50 +00:00
Uwe Stöhr
ff9deb53f1 tex2lyx/TODO.txt: columnsep is already supported
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39961 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 15:23:28 +00:00
Uwe Stöhr
8f2791ed20 tex2lyx: support width setting of \printnomenclature
(the tex2lyx support in branch for \printnomenclature is currently broken so this must be backported to branch for 2.0.2, OK Richard?)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39960 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 00:11:02 +00:00
Uwe Stöhr
46e4463066 tex2lyx: support for phantom insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39958 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 22:39:54 +00:00
Uwe Stöhr
8ed06703aa tex2lyx: support for the LaTeX command \rule
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39957 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 21:07:00 +00:00
Uwe Stöhr
5e38d7ff26 tex2lyx: fix bug #7845
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39954 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:22:35 +00:00
Uwe Stöhr
3b6c927814 tex2lyx/TODO.txt: add a note
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39953 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:21:47 +00:00
Uwe Stöhr
45bdfb2fe8 test-structure.tex: forgot this testcase in last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39952 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:14:43 +00:00
Uwe Stöhr
483891b7cf tex2lyx: support the case that \date{} is used in the preamble to suppress the date
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39951 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 02:06:05 +00:00
Uwe Stöhr
0c1c13bbd0 tex2lyx: roundtrip support for the suppress_date option, for the remaining part I opened bug #7844
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39950 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 01:17:30 +00:00
Uwe Stöhr
2a8dcf2b10 tex2lyx:
- support for box background color, document fontcolor and background color (note_fontcolor was already supported)
- add colors and a nested box to the testfile

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39949 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-24 00:29:59 +00:00
Georg Baum
5247de506c Import \textvisiblespace, \negmedspace and \negthickspace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39942 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 11:16:11 +00:00
Georg Baum
3d373d9135 Was already supported
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39940 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 11:08:37 +00:00
Georg Baum
c697b2ee2c All encodings of lib/encodings are already supported if they are supported by inputenc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39938 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 11:02:50 +00:00
Georg Baum
c5c04954f3 Import \uuline, \uwave and \sout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39937 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 10:58:05 +00:00
Georg Baum
b62d8f2c6a Tie file formats of LyX and tex2lyx, since there are implicit depencies anyway.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39936 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 10:29:21 +00:00
Georg Baum
34a033b20a Increase tex2lyx output format to 416 (current trunk format).
414: Nothing to do (empty lyx2lyx conversion)
415: Added \use_undertilde preamble parameter
416: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39935 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 10:11:39 +00:00
Georg Baum
5fc072a079 Support fontenc options in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39926 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:54:31 +00:00
Georg Baum
9ce23fd5c2 More paper sizes for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39925 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:37:10 +00:00
Georg Baum
f7cfdc48a5 Increase tex2lyx output format to 413 (LyX 2.0.x).
411: Added \language_package preamble parameter
412: Nothing to do (empty lyx2lyx conversion)
413: Added \html_css_as_file preamble parameter


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39924 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:27:46 +00:00
Georg Baum
436a0c13a5 Increase tex2lyx output format to 410.
406: Convert noweb layouts to new syntax (untested, see bug #7838)
407: Nothing to do (empty lyx2lyx conversion)
408: Activated the already existing script inset code
409: Nothing to do (tex2lyx does not support XeTeX)
410: Nothing to do (the old code already used the new layouts)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39923 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 19:09:56 +00:00
Georg Baum
544f5033bf Increase tex2lyx output format to 405.
402: Nothing to do (tex2lyx does not support bibtotoc)
403: Nothing to do (the old code already used the new layouts, bug #7780)
404: Nothing to do (write new prettyref syntax)
405: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39920 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 17:25:34 +00:00
Georg Baum
5bfba3e564 Increase tex2lyx output format to 401.
400: Convert \lyxline to new InsetLine syntax
401: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39919 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 16:58:32 +00:00
Georg Baum
997ca078bf Increase tex2lyx output format to 399.
399: Added \use_mathdots preamble parameter


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39917 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 11:17:57 +00:00
Georg Baum
ce4c8e64ee Increase tex2lyx output format to 398.
394: Added use_makebox parameter to InsetBox
395: Nothing to do (empty lyx2lyx conversion)
396: Nothing to do (empty lyx2lyx conversion)
397: Nothing to do (tex2lyx does not support nameref)
398: Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39916 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 11:11:50 +00:00
Georg Baum
16935917de Increase tex2lyx output format to 393.
389: Nothing to do (html output changes)
390: Nothing to do (empty lyx2lyx conversion)
391: Nothing to do (empty lyx2lyx conversion)
392: Activated already prepared required arguments code
393: Renamed OptArg inset to Argument


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39915 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 10:59:39 +00:00
Georg Baum
a1030cc599 Increase tex2lyx output format to 388.
379: Nothing to do (html output changes)
380: Nothing to do (empty lyx2lyx conversion)
381: Nothing to do (empty lyx2lyx conversion)
382: Activated already prepared notefontcolor code
383: Nothing to do (empty lyx2lyx conversion)
384: Nothing to do (empty lyx2lyx conversion)
385: Nothing to do (empty lyx2lyx conversion)
386: Nothing to do (empty lyx2lyx conversion)
387: Nothing to do (empty lyx2lyx conversion)
388: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39912 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-21 21:11:37 +00:00
Georg Baum
81505cc5a3 Increase tex2lyx output format to 378.
369: Nothing to do (empty lyx2lyx conversion)
370: Nothing to do (empty lyx2lyx conversion)
371: Added \use_mhchem parameter
372: Nothing to do (empty lyx2lyx conversion)
373: Nothing to do (the old version was wrong since it used the new g-brief
     layout files with the old file format)
374: Nothing to do (html output changes)
375: Nothing to do (empty lyx2lyx conversion)
376: Nothing to do (empty lyx2lyx conversion)
377: Nothing to do (empty lyx2lyx conversion)
378: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39911 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-21 20:18:49 +00:00
Georg Baum
081fb1c4d8 Increase tex2lyx output format to 368.
357: Added comment about \underbar and \ulem
358: Nothing to do (empty lyx2lyx conversion)
359: Nothing to do (empty lyx2lyx conversion)
360: Nothing to do (empty lyx2lyx conversion)
361: Nothing to do (empty lyx2lyx conversion)
362: Nothing to do (empty lyx2lyx conversion)
363: Nothing to do (empty lyx2lyx conversion)
364: Nothing to do (empty lyx2lyx conversion)
365: Nothing to do (empty lyx2lyx conversion)
366: Nothing to do (empty lyx2lyx conversion)
367: Nothing to do (empty lyx2lyx conversion)
368: Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39910 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-21 19:57:03 +00:00
Georg Baum
beb87874e9 that was wrong
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39898 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-20 20:55:25 +00:00
Georg Baum
024bd206af Increase tex2lyx output format to 356.
352: New syntax for InsetIndex and printindex command inset
353: Nothing to do (empty lyx2lyx conversion)
354: Nothing to do (empty lyx2lyx conversion)
355: Nothing to do (empty lyx2lyx conversion)
356: Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39897 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-20 20:52:19 +00:00
Georg Baum
ac166e196d Increase tex2lyx output format to 351.
346: Nothing to do (swiss german is not supported by babel/polyglossia)
347: Nothing to do (empty lyx2lyx conversion)
348: Nothing to do (empty lyx2lyx conversion)
349: Nothing to do (empty lyx2lyx conversion)
350: Nothing to do (empty lyx2lyx conversion)
351: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39896 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-20 20:16:37 +00:00
Georg Baum
d267511d42 Fix bug #7468 (at least for standard environments).
List environments (as the one in the bug report) can't
be handled correctly in tex2lyx as long as LyX does not allow contents
after the environment start but before the first \item.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39871 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-16 19:57:10 +00:00
Abdelrazak Younes
27f3327fa1 tex2lyx: disambiguate duplicate trim() function by reusing trim() from src/support.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39870 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-16 08:22:20 +00:00
Julien Rioux
23ab7f0819 tex2lyx : Also allow -h and -v command-line options, manpage update.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39807 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-06 16:21:58 +00:00
Julien Rioux
18f79eeddc tex2lyx : More descriptive --help message and implement --version (#6827).
The init_package before easyParse is necessary to initiate the default
values for userdir and sysdir, which are now part of the help message.
This step would be necessary anyway if we ever internationalize tex2lyx.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39799 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 17:47:37 +00:00
Kornel Benko
3004722131 Add framework AppKit to cmake as in the automake case (MAC only)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39798 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:49:06 +00:00
Stephan Witt
3c846d98ac to succesfully link lyx on mac the AppKit framework is needed only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39791 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-30 16:05:46 +00:00
Jean-Marc Lasgouttes
9e53e98b05 Link against Cocoa and/or Carbon for Mac OS X. This is needed for autoOpen and Linkback.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39772 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-27 07:27:19 +00:00
Jean-Marc Lasgouttes
79fb39058c Fix bug #7640: Importing underlined text fails in LyX 2.0
Just recognize \uline as a synonym or \underbar.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39182 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-21 13:24:26 +00:00
Peter Kümmel
41a0adcb47 cmake: build a .dmg file on Mac, looks not as nice as the official installer but it runs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38765 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 13:21:18 +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
eef204ca33 cmake on mac: also build with LYX_NLS=0
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38733 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 22:06:06 +00:00
Kornel Benko
5c1666c0e1 In colaboration with Stephan Witt, adapted to our libintl to MAC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38695 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 19:18:44 +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
Georg Baum
12f8e7a6f9 Small improvement for bug #7509 as suggested by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38628 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 08:23:42 +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
1bd35e75f7 just to be sure: don't know if other compilers mangle the access
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38093 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 07:10:40 +00:00
Peter Kümmel
2874889b9b fix msvc linker error: for the linker struct and class isn't the same here
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38092 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 07:06:20 +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
Georg Baum
a750126b54 prevent endless loop
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37744 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-20 18:57:13 +00:00
Georg Baum
4ec822909f Fix bug #7306
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37731 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-18 20:55:50 +00:00
Georg Baum
29ee44e84c LyX does not support optional arguments of ref commands
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37730 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-18 20:39:58 +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
Georg Baum
9b4ee44620 Improve roundtrip of Customization.lyx:
The lstlistings environment is no longer be unknown.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37355 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 21:20:48 +00:00
Georg Baum
b2e1eb0dda Clean up parsing of optional arguments:
If an optional argument can be followed by another one, we need to use
getFullOpt(). Otherwise it would not be possible to parse \foo[][bar].
Remove getOptContent to avoid confusion (it does exactly the same as
getArg('[', ']') which is used in most places.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37354 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 20:29:06 +00:00
Georg Baum
d3c385de20 Next step towards a working roundtrip of files generated by LyX:
Try to recognize modules.
Again, this is needed because the complete LyX preamble is ignored.
It is not possible to recognize a module in all cases, but at least the simple
ones are handled now. As a prerequisite I also had to revive the filling of
known_environments. This has been removed (probably by accident) some time ago.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37306 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-23 21:10:20 +00:00
Georg Baum
87944eedc7 The roundtrip of the math manual produces a compilable document now:
- translate the arguments of \texorpdfstring, so that the floating footnote
  code gets enabled
- honor the ForcePlainLayout flag of insets like the Index inset
- remove hardcoded \url support, this is handled by the general Flex inset code


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37297 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 12:00:33 +00:00
Georg Baum
85d2c53532 handle commands from xargs.sty correctly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37289 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-21 21:21:58 +00:00
Georg Baum
c0778a3d0e Translate all known box insets. This is needed since the super-clever preamble
parser discards all needed packages like calc.sty or framed.sty, so the
resulting document would be uncompilable with those boxes as ERT.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37287 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-21 18:29:10 +00:00
Georg Baum
7a74bbf06b Ignore \protect if it is directly in front of \LyX{} (otherwise it would
accumulate for each round trip, since LyX  writes \protect if needed)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37214 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-14 20:06:15 +00:00
Georg Baum
cfd6767ec1 Import notefontcolor (one more step towards a working roundtrip for the LyX documentation)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37213 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-14 20:00:55 +00:00
Georg Baum
7c83f74f26 Exclude more conditional commands from preamble parsing:
LyX would output the parsed stuff unconditionally, so we must not translate
it in LyX document settings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37191 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 22:03:15 +00:00
Georg Baum
b8d6c10e6c add list of missing tex2lyx features
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37189 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 21:19:01 +00:00
Georg Baum
acd57ccaaf Fix language handling in tex2lyx:
- Add missing babel synonyms (taken from a standard TeXLive 2010 install).
  Some synonyms might still be missing (if they are defined not by babel
  itself, but additional packages). Adding these is now simple: Only
  known_languages and known_coded_languages need to be touched.
- Translate babel language name arguments of \foreignlanguage and
  \selectlanguage to LyX names.
- Translate second argument of \foreignlanguage to LyX.
- Cleanup mixed language names in the preamble parser: Now all checks are
  done with LyX names, not a mix of babel and LyX names. This sets correct
  quotes even if the language as given as an alias.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37188 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 21:04:39 +00:00
Georg Baum
f49a526afc Parse Flex insets defined in the layout. This is needed e.g. for
lib/doc/Math.lyx, since tex2lyx swallows the LyX part of the preamble, and
thus \shortcut would not be defined.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37149 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 21:04:16 +00:00
Georg Baum
f8f69ca920 math macros do not understand \newcommand* and \renewcommand*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37148 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 20:21:10 +00:00
Georg Baum
6ead3daac9 Fix invalid \size output with no active layout before sectioning environments.
Fix missing \size reset after sectioning environments.
Fix invalid \lang default (use english instead, as in the preamble)
Convert hard coded layout output of caption insets to Context class.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37147 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 19:58:31 +00:00
Georg Baum
9ac7fa483d Fix misparsing of \usepackage in
\@ifundefined{textcolor}{\usepackage{color}}{}


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37140 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 21:38:26 +00:00
Georg Baum
416d19ff84 hyperref support for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37138 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 20:57:16 +00:00
Georg Baum
006a906858 forgot to declare debugToken() in r37117
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37133 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 18:36:03 +00:00
Georg Baum
0f3c4c2f04 Fix several false errors "stray '}' in text" that were caused by
misinterpreting "\}" as "}" when it occured inside a pair of unescaped
braces, like in "\code{@\{*\}r||p\{1in\}@\{*\}}".
The reason for this bug is that Token::character() behaves differently in
tex2lyx than in mathed. See the comment in Parser.h for a more general fix.
For now I played on the safe side and only changed those places where I
definitely know that the old code was wrong.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37117 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-05 20:32:45 +00:00
Georg Baum
8b2ea705df Fix wrong setting of bibinset options if \cite{*} was found.
Improve heuristic for outputting \bibliographystyle: Now it is suppressed
if \bibliography follows immediately, since LyX adds it automatically in that
case.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37066 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 18:16:23 +00:00
Georg Baum
5c53dcf88f tex2lyx: Do not swallow a user defined \parindent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37065 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 16:54:58 +00:00
Georg Baum
812c27d793 Improve tex2lyx roundtrip of test-insets.tex:
- Replace special verbatim commands by standard LaTeX, since it would be
  extremely difficult to make tex2lyx understand them)
- Comment duplicated \bibliography{xampl}, since LaTeX cannot handle two
  \bibliography calls
- Fix a regression with spaces after commands, introduced in r36943
- Parse \multicolumn with space/comments between two arguments correctly
- Parse optional arguments correctly if there are space or comments between
  the command and the argument
- Remove duplicate "LyX" phrase handling (I overlooked that in r37052)
- Add new commands created with \let to the list of known commands. This is
  needed to parse the arguments correctly


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37064 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 15:39:48 +00:00
Georg Baum
ef10797f59 Also prevent replacement of LyX => \LyX{} if it is part of a word.
The automatic replacement in LyX is pretty broken (see bug 4752).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37055 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 11:59:33 +00:00
Georg Baum
bce18bacfc partial man page update (it is still horribly outdated)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37054 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 11:57:25 +00:00
Uwe Stöhr
73cdd2547e tex2lyx/preamble.cpp: support for
- polytonic Greek
- Mongolian
- Mexican Spanish

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37053 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 07:31:59 +00:00
Georg Baum
3403727940 Translate "\LyX{}" and "LyX" correctly in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37052 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 21:56:55 +00:00
Georg Baum
05bd78904a Fix translation of \pagebreak and \linebreak with optional arguments.
Please don't add new features to tex2lyx without testing.
In this case, the test case was even provided in test-insets.tex.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37051 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 21:03:36 +00:00
Georg Baum
d6ccb86f15 fix translation of \nobreakdash in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37050 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-30 20:38:47 +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
Georg Baum
3cdb7d3062 fix parsing of test document
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37017 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 21:12:40 +00:00
Georg Baum
84be0a0db4 fix parsing of \let: tex2lyx must not enclose the arguments with {}.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37016 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 20:15:24 +00:00
Georg Baum
8f037c8e91 Increase tex2lyx output format to 345 (LyX 1.6.x).
344: Remove pdf_pagebackref header flag
345: Nothing to do (this is a docbook-only change)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37015 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:19:19 +00:00
Georg Baum
32d435e150 Increase tex2lyx output format to 343.
343: Write the use_default_options header flag


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37014 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:16:22 +00:00
Georg Baum
4a54c581a2 Increase tex2lyx output format to 342.
335:     Create space inset in new syntax
336:     Nothing to do (empty lyx2lyx conversion)
337:     Nothing to do (tex2lyx does use the display flag)
338-339: Nothing to do (empty lyx2lyx conversion)
340:     Nothing to do (tex2lyx does not output empty layout names)
341-342: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37013 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:14:55 +00:00
Georg Baum
5247a0ed1c Increase tex2lyx output format to 334.
331:     Set the caption flag for longtable caption rows
332:     Nothing to do (empty lyx2lyx conversion)
333:     Nothing to do (tex2lyx did already use the new style names because it
         uses the current layout files)
334:     Nothing to do (tex2lyx did already produce the new format, since it
         used the LaTeX paper names also in the output and did not suffer from
	 bug 4868)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37012 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:10:23 +00:00
Georg Baum
6da25359f0 Increase tex2lyx output format to 330.
324:     Create newline inset in new syntax
325:     Nothing to do (tex2lyx does not support the japanese language)
326-327: Nothing to do (empty lyx2lyx conversion)
328:     Nothing to do (tex2lyx did never support embedding of files)
329-330: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37011 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 18:03:26 +00:00
Georg Baum
6639d78601 Increase tex2lyx output format to 323.
323: Create newpage inset in new syntax


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37010 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 17:58:36 +00:00
Georg Baum
e4efa00f8c Increase tex2lyx output format to 322.
321: Move leftlines/rightlines from column headers to cells
322: Nothing to do (tex2lyx does not produce plain layouts)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37009 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 17:56:48 +00:00
Georg Baum
94160f97c0 adjust xfig conversion to newer xfig as suggested by Jean-Pierre at
http://www.lyx.org/trac/ticket/3016#comment:6


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36972 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 21:35:08 +00:00
Georg Baum
77a8eb9288 fix bug #7189 (this worked originally, but after fixing protected \hfill I
forgot to recheck \hspace)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36971 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 20:45:18 +00:00
Uwe Stöhr
bea8c9ef8d tex2lyx/preamble.cpp: prerequisites for further language support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36962 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 03:34:00 +00:00
Uwe Stöhr
79f5a4a396 tex2lyx/text.cpp: support \nocite{*} (since format 310)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36961 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 02:47:58 +00:00
Uwe Stöhr
54cee82fb6 tex2lyx:
- support for \nocite (since format 309)
- add \nocite{*} option to testfile

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36960 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 02:08:22 +00:00
Uwe Stöhr
a0ff0a15cf tex2lyx/preamble.cpp: support Vietnamese (since format 291)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36959 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:47:34 +00:00
Uwe Stöhr
fd3bd1a06a tex2lyx/preamble.cpp: add some further missing things from r36947: support for Latin and North Sami
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36958 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:36:27 +00:00
Uwe Stöhr
3d75bdc035 tex2lyx/text.cpp: add some further missing things from r36947
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36957 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:29:48 +00:00
Uwe Stöhr
cc1710e943 tex2lyx/preamble.cpp: whitespace only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36956 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:14:18 +00:00
Uwe Stöhr
2385086972 tex2lyx/text.cpp: fix other missing issues from r36947
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36955 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:12:35 +00:00
Uwe Stöhr
3fa2875355 tex2lyx/preamble.cpp: add missing things from r36947
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36954 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 01:11:02 +00:00
Georg Baum
300cd0dedd Increase tex2lyx output format to 320.
320: Support protected hfill
Detect other horizontal spaces that are already part of format 319
Add forgotton use_parbox tag to boxes (confuses lyx2lyx, but no lyx)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36949 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 21:24:24 +00:00
Georg Baum
58fde18a9f Increase tex2lyx output format to 319.
311:     Nothing to do (tex2lyx produced already the new format, because it
         uses the current layout files. This is also a reason why it should
	 not lag behind too much with the format.)
312:     Nothing to do (empty lyx2lyx conversion)
313:     Nothing to do (tex2lyx does not know about modules)
314-315: Nothing to do (empty lyx2lyx conversion)
316:     Nothing to do (tex2lyx does not know subfigures)
317-318: Nothing to do (empty lyx2lyx conversion)
319:     Convert horizontal spaces to new format (and convert some newly
         supported spaces)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36948 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 20:23:55 +00:00
Georg Baum
d1be0d2af7 Increase tex2lyx output format to 310.
299-302: Nothing to do (empty lyx2lyx conversion)
303:     Nothing to do (tex2lyx did not use the serbocroation language)
304:     Convert framed and greyed out notes to box insets
305-310: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36947 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 19:29:07 +00:00
Georg Baum
2d5e1123d1 Increase tex2lyx output format to 298.
298: All math macros are exported with \\global to LaTeX now, so a \\global
     in front of a math macro has to be recognized. Since the math macros do
     no longer use the same syntax in .lyx and .tex (which is a mistake IMHO)
     an exact match is no longer possible except for \global\long\def.
Bugfix this time: \\providecommand was errornously recognized as math macro


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36946 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 19:21:53 +00:00
Georg Baum
ec22820cbf Increase tex2lyx output format to 297.
297: new name for upper sorbian language, new languages albanian and lower
sorbian (actually lower sorbias was (incorrectly) already recognized)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36945 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 15:21:01 +00:00
Georg Baum
ac85b252cb Increase tex2lyx output format to 296.
296: new syntax of include inset


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36944 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 15:08:35 +00:00
Georg Baum
93232c3ad6 Improve roundtrip of tex2lyx test documents:
- Make test-insets.tex and test-structure.tex compilable
- Avoid duplicate definition of \lyxarrow in test-insets.lyx
- Prevent subscript package from being ignored in test-insets.lyx
- Prevent commands listed with optional arg in syntax.default from being
  concatenated with the next word if no optional arg is given
- Handle spaces and comments inbetween a command an "{}" consistently


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36943 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 14:54:23 +00:00
Georg Baum
e5fd128200 Increase tex2lyx output format to 295.
294: Nothing needed, but add some placeholders to the preamble for documentation
295: Convert URL command inset to Flex inset


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36941 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 20:41:41 +00:00
Georg Baum
1d03cfa8c0 Increase tex2lyx output format to 293.
289:     Use new syntax for index inset
290-291: Nothing to do (empty lyx2lyx conversion)
292:     Nothing to do, tex2lyx does not know japanese yet
293:     Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36929 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-17 21:41:15 +00:00
Georg Baum
86f320f6e0 fix halfway converted bibtex inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36928 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-17 21:35:27 +00:00
Georg Baum
7610b9add5 Increase tex2lyx output format to 288.
278:     Nothing to do, tex2lyx writes already an \end_deeper for each \begin_deeper
279-280: Nothing to do, tex2lyx does not produce character styles yet
281-282: Nothing to do (empty lyx2lyx conversion)
283:     Nothing to do, tex2lyx does not produce character styles yet
284-286: Nothing to do (empty lyx2lyx conversion)
287:     Nothing to do, tex2lyx does not produce wrapped figures yet
288:     Use new syntax for command inset
This time, the (not format related) bug fix is to parse the starred jurabib
and natbib citation commands correctly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36927 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-17 21:02:39 +00:00
Georg Baum
5e5a078503 Increase tex2lyx output format to 277.
Nothing to do, since tex2lyx does not produce the invalid tables.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36847 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 20:01:53 +00:00
Georg Baum
6f951a9821 Fix bug #6051 by applying the patch from Pelle.
I could reproduce the warnings, and comparing the man output with and without
patch verified that the quotes were completely missing in the old version
while they are OK in the new one.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36846 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 19:39:21 +00:00
Georg Baum
5aedfc6b9f Increase tex2lyx output format to 276 (LyX 1.5.x).
Add support for arabic (arabi package), and two languages that are already
avaiilable in previous formats, but have been forgotten: latvian and lithuanian.
Again, the previous format was not handled correctly:
arabic (arabi) was parsed as arabic (arabtex).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36845 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 18:47:02 +00:00
Georg Baum
04233bf5eb Increase tex2lyx output format to 275.
Nothing to do for 274: tex2lyx did not implement the special whitespace
handling that would have been needed for the old format.
Use the scaleBeforeRotation keyword for graphics (275).
This fixes actually a bug with the old version, that implicitly converted
all graphics to scale before rotation.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36843 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 17:47:36 +00:00
Georg Baum
19c27cba66 Increase tex2lyx output format to 273.
Nothing to do, since lyx2lyx conversions are empty except for version 271,
and tex2lyx already outputs the new format for 271.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36842 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 14:55:14 +00:00
Georg Baum
c0b20c1c92 increase tex2lyx output format to 265
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36841 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 14:33:34 +00:00
Georg Baum
1b04aa7301 Do not use math commands from unicodesymbols in tex2lyx text mode,
since they are usually invalid in text mode (partial fix of bug 6797).
Also, prepare proper translation of \\slash{} and \nobreakdash.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36840 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 13:23:05 +00:00
Georg Baum
a4a7502769 textsubscript and textsuperscript for tex2lyx
(deactivated until format is recent enough)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36839 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 12:16:18 +00:00
Georg Baum
e693a60c34 Fix bug #5716.
Since separators are not allowed by the current .lyx version written by
tex2lyx, an empty note is used instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36838 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-12 11:45:09 +00:00
Georg Baum
cb1fc51b9c Fix bug #3016: tex2lyx fails to convert xfig figures to Xfig insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36833 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-11 18:22:47 +00:00
Vincent van Ravesteijn
f27853ad41 Cosmetics, typos and comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36492 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 16:53:56 +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
Richard Heck
22c1d47b02 Fix bug #6762. Silly mistake.
Also, disable corresponding code for required arguments. tex2lyx does
not produce a high enough file format yet for this to make sense, I
don't think.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34635 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 15:08:04 +00:00
Richard Heck
b0097bcddb Introduce a new "RequiredArgs" tag for layouts. This functions much as
the OptionalArgs tag does and is implemented by the now misnamed
InsetOptArgs, except that its content gets wrapped in "{}" rather than
"[]". Required arguments do not actually have to be provided, but they
are always output. 

This will allow e.g. beamer's Block environment to be implemented
without ERT.

Documentation to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34591 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 21:50:08 +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
Richard Heck
dcc7497bde Fix crash reported by Bennett. We could try to catch these exceptions
elsewhere, but I actually don't know why I put them here in the first
place.

The tex2lyx stuff allows us not to wrap the calls to
frontend::Alert::warning in "#ifdef TEX2LYX" blocks.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34192 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-17 22:36:31 +00:00
Vincent van Ravesteijn
69fd1193e5 Fix bug #6219: Latex problem with multi-line citep arguments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34011 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 23:31:05 +00:00
Vincent van Ravesteijn
ba97587b16 Fix bug #6631: tex2lyx doesn't handle \textquotedbl{} nicely.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34010 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-01 22:49:52 +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
Vincent van Ravesteijn
487e9ad92a Fix bug #6377: Tex2lyx error with multiple languages.
We have to set the language again when a new paragraph is started. Otherwise the n'th paragraph in a certain language is set to the document language.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33727 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-12 18:36:19 +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
Vincent van Ravesteijn
b9b872f36a Fix bug #6474: Tex2lyx skips all spaces in the preamble.
Partially reverting r30113.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33711 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-11 16:56:41 +00:00
Peter Kümmel
3a5d681a9b cmake: fix merge build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33660 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-07 11:03:23 +00:00
Enrico Forestieri
51d70699ef Fix bug #5525: Windows XP doesn't shut down with LyX open
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33077 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-17 23:01:48 +00:00
Uwe Stöhr
9c7b52dd3b preamble.cpp: extend a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32496 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-12 21:23:54 +00:00
Uwe Stöhr
c7dfe186fb preamble.cpp: fix comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32482 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 23:14:36 +00:00
Uwe Stöhr
91ce0aa188 preamble.cpp:
- proper solution to determine the quotes language
- add Kazakh, that we already support in LyX for ages


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32476 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 04:11:44 +00:00
Uwe Stöhr
6b26b4abd1 preamble.cpp: tex2lyx creates fileformat 264 - the encoding "ascii" is known to LyX since fileformat 262 so that a special handling for this encoding is no longer necessary
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32472 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 01:26:07 +00:00
Uwe Stöhr
96c6a139c4 preamble.cpp: simplify code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32471 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 01:22:48 +00:00
Uwe Stöhr
a831919c0c preamble.cpp: simplify code and reintroduce code that was accidentally deleted in previous commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32449 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 03:07:36 +00:00
Uwe Stöhr
64ede202fa preamble.cpp: set correct quotes language (currently an Italian document gets the non-existing quotes language "italian")
- also to branch?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32448 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 02:41:33 +00:00
Uwe Stöhr
d04377a231 preamble.cpp: adjust comments for better clarity
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32447 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 02:29:49 +00:00
Vincent van Ravesteijn
e3b26029cc Fix bug #6365: tex2lyx uses wrong encoding in the preamble.
Everything is ok while reading the file, but when the lyxfile is written, only the first byte of a double-byte character is written to the file. This is because t.character() is sort of defined as cs_[0] in which cs_ is a docstring. This thus seems to fail for multi-byte characters.

Compare with src\tex2lyx\text.cpp line: 1250.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32441 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-09 12:29:48 +00:00
Jean-Marc Lasgouttes
ccfcd71b36 Get rid of Token::asString(), which is equivalent to cs().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32439 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-09 11:53:16 +00:00
Jean-Marc Lasgouttes
0a868fb846 remove special TEX2LYX code in Spacing,h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31783 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-28 10:07:10 +00:00
Jean-Marc Lasgouttes
0c1ff6d89e Move some functions that only required a FontInfo parameter from Font.*
to FontInfo.*

This allows tex2lyx to use the plain FontInfo object (via Layout), and to remove
several '#ifdef TEX2LYX' in the code

Reorder a bit the makefile in tex2lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31772 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 16:16:15 +00:00
Uwe Stöhr
d319b368c7 tex2lyx/preamble.cpp: improve the fix from r31440:
- when languages are given in the documentclass options _and_ the babel options, babel takes the last language option of the \usepackage call
 - there is no quote language "ngerman", it is in both cases "german"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31685 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-20 01:45:33 +00:00
Jean-Marc Lasgouttes
4fc6c1247a Fix bug #6276: tex2lyx fails to import captions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31638 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-15 14:22:35 +00:00
Jean-Marc Lasgouttes
7a52f14bc0 fix bug #6249: optional argument of \bibitem is not imported correctly by tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31489 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-01 09:58:53 +00:00
Jean-Marc Lasgouttes
d87a67d8dc Fix a bug when the language passed as an option to babel is ignored.
This can be seen by trying out the document attached to ticket #6142.

The problem was that handle_opt() is not used only to parse languages,
and thus setting a lang-related bool in there is asking for trouble.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31440 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-22 13:23:36 +00:00
Jean-Marc Lasgouttes
eef60e5197 fix part of ticket #6142: avoid a memory access error when an encoding is unkonwn
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31222 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-24 22:06:51 +00:00
Enrico Forestieri
0695afbc55 Don't rely on the signal delivered by raise(), as this may cause a bogus
assertion when Qt is compiled in debug mode, and simply directly perform
an emergency cleanup when a shutdown event occurs on Windows.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31029 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 13:19:02 +00:00
Uwe Stöhr
be82f88695 tex2lyx/preamble.cpp: revert r30103 and r30448 as discussed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30974 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-11 00:07:08 +00:00
Vincent van Ravesteijn
6c2ab16e55 Revert previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30917 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-08 00:07:52 +00:00
Vincent van Ravesteijn
1b28af61e5 Fix part of bug #6127: Roundtrip Lyx->Latex->Lyx fails.
Add the package amstext to the list of known packages.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30916 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-07 22:51:02 +00:00
Jean-Marc Lasgouttes
d9e4ced1d4 Remove dummy gettext.cpp from tex2lyx source and use a dummy message
object instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30505 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 14:49:30 +00:00
Uwe Stöhr
20f8c82aa8 tex2lyx/preamble.cpp: take also care of lyxlist, lyxcode, and lyxaddress
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30448 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-10 12:38:22 +00:00
Uwe Stöhr
c4675cc4be tex2lyx/preamble.cpp: support for fileformat 264 (nothing to do for tex2lyx)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30173 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:37:05 +00:00
Uwe Stöhr
6b85e6f99f tex2lyx/preamble.cpp: support for fileformat 263: support for the document languages Brazilian and Portuguese
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30172 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:28:20 +00:00
Uwe Stöhr
e06029fda5 tex2lyx/preamble.cpp: support for fileformat 262 (nothing to do for tex2lyx)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30171 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:10:18 +00:00
Uwe Stöhr
1b16d1545b tex2lyx/preamble.cpp: comment out no longer used code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30169 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:00:46 +00:00
Uwe Stöhr
0aa4d9d25e tex2lyx/preamble.cpp: remove no longer used code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30166 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 23:41:55 +00:00
Uwe Stöhr
1bcba82d8d tex2lyx/preamble.cpp: fix a bug reported by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30165 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 23:35:49 +00:00
Uwe Stöhr
8bda8d10b8 tex2lyx/text.cpp: \linebreak and \pagebreak are first supported by LyX with fileformat 300
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30106 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:33:54 +00:00
Uwe Stöhr
693b64674b tex2lyx/preamble.cpp: textcomp is also supported by LyX since we support Unicode
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30105 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:33:05 +00:00
Uwe Stöhr
d69af206ee tex2lyx/preamble.cpp: forgot this in last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30104 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:21:34 +00:00
Uwe Stöhr
affc633c38 tex2lyx/preamble.cpp:
- better whitespace preamble output (still not perfect)
- support for fileformat 258
- proper solution how to treat LyX specific preamble stuff; this solves long standing issues (the old solution failed when more than one LyX specific command was used in a file)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30103 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:16:31 +00:00
Uwe Stöhr
0eb2e5c22c tex2lyx/test/test-insets.tex: correct code for nomenclatures
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30102 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:15:13 +00:00
Uwe Stöhr
36e82b8d45 tex2lyx/text.cpp: tipo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30101 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 23:58:37 +00:00
Uwe Stöhr
868ffa3864 tex2lyx: whitespace and typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30100 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 21:29:24 +00:00
Uwe Stöhr
14021f7233 tex2lyx: support for fileformat 257: command inset instead of layout inset for captions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30098 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 14:21:20 +00:00
Uwe Stöhr
f1a2bf1c66 test/test-structure.tex: add caption with OptArg
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30097 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 14:20:22 +00:00
Uwe Stöhr
c9a726bd43 tex2lyx/preamble.cpp: support for fileformat 256
- the code for \clear***page was already there
- tex2lyx allows already to use any input encoding

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30096 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:39:07 +00:00
Uwe Stöhr
6f1cd6eba2 tex2lyx/preamble.cpp: using amsmath and esint automatically is safer than not to use them. The automatic usage is also our default when you create a new LyX file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30095 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:25:17 +00:00
Uwe Stöhr
a65af1e391 tex2lyx/preamble.cpp: support for fileformat 254: esint
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30094 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:21:30 +00:00
Uwe Stöhr
1e4def9460 tex2lyx:
- correct the conversion of InsetCommand
- code optimization
- support for format 253: nomenclature is now recognized

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30093 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 02:16:51 +00:00
Uwe Stöhr
6dad0a4cd7 test/test-structure.tex: add nomenclature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30092 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 02:14:42 +00:00
Uwe Stöhr
5858128386 tex2lyx/text.cpp: code optimization as also suggested by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30087 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-13 15:34:31 +00:00
Uwe Stöhr
ebda762af9 test/test-structure.tex: add labeling list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30069 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 13:07:20 +00:00
Uwe Stöhr
f2d0a94b91 tex2lyx/test/test-insets.tex: more tests
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30060 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:56:48 +00:00
Uwe Stöhr
f8d655d4e2 tex2lyx/text.cpp: tex2lyx supports now fileformat 252
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30059 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:46:41 +00:00
Uwe Stöhr
be48e7f9e5 tex2lyx/preamble.cpp:
- support for url, varioref, prettyref
- reduce the sometimes huge amount of whitespace in the preamble after importing files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30058 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:45:17 +00:00
Uwe Stöhr
5742cf9ce6 tex2lyx: testfiles modified as preparation for the upcoming tex2lyx work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30044 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 17:56:05 +00:00
Richard Heck
4df7d8ab1a A little cleanup of the layout files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29903 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-02 13:45:32 +00:00
Jean-Marc Lasgouttes
3e3179b4d4 Hopefully complete fix to bug #5935
Make several Parser methods return copies of tokens, because the
vector containing the token may get reallocated when it grows.

Revert now useless changeset 29557.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29627 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-11 11:02:25 +00:00
Jean-Marc Lasgouttes
440df1c789 (partial?) fix to bug 5935
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29557 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-07 10:09:03 +00:00
Abdelrazak Younes
33924e31ef Fix MSVC warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29511 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-03 13:27:53 +00:00
Enrico Forestieri
ccc77c73da Speed up FileName operator== (Georg's solution).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29498 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-02 17:12:31 +00:00
Enrico Forestieri
b0936fac4c When performing a reverse DVI search and the tmpdir is a symlink, the
DVI viewer passes back the resolved path, such that the search fails,
as internally LyX uses the unresolved path.
This patch fixes this bug by using the new method FileName::realPath
which resolves a path by getting rid of any '.', '..', or symlink
path components.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29476 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-01 15:18:11 +00:00
Jean-Marc Lasgouttes
0a99e817f1 Fix bug #5912: http://www.lyx.org/trac/ticket/5912
The problem was that \" was forgotten in the list of accents to check
in unicodesymbols (because it used to have its own german-centric derogatory
handling).

I took the Comprehensive LaTeX Symbols List (table 6) and added all the
missing accents.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29387 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-23 13:08:31 +00:00
Jean-Marc Lasgouttes
2e45185cd5 improve tex2lyx Usage display (on error...); describe option -e on man page; remove non-implemented -p and -r options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29346 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-19 22:13:43 +00:00
Uwe Stöhr
8b96731805 math.cpp: fix a typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28976 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-30 01:43:40 +00:00
Jean-Marc Lasgouttes
a6d6c632fd Overhaul of the tex2lyx manpage
- make it autogenerated
- clean up the markup
- remove obsolete information
- try to update in general

Hopefully I did not break the markup...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28871 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-19 22:31:22 +00:00
Uwe Stöhr
662846f227 preamble.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5846
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28751 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-10 23:55:25 +00:00
Jürgen Spitzmüller
c4f0fb88f1 * tex2lyx/Makefile.am:
- add tex2lyx.1 to the distribution.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28728 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-08 10:49:06 +00:00
Richard Heck
f946b6ed0b Move some more code around so as to make module-related routines available
to tex2lyx.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28574 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-21 16:45:37 +00:00
Jürgen Spitzmüller
3ccf39a084 * tex2lyx/preamble.cpp:
- fix thinko that caused tex2lyx to silently drop custom preamble entries in non-LyX-generated tex files.
	  (bug 5788). Patch from Jean-Marc.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28567 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-20 09:46:03 +00:00
Richard Heck
52d3a1e426 Move some code around in an effort to make information about modules
available to tex2lyx. The point is to move the crucial routines that 
deal with modules out of BufferParams.cpp, which tex2lyx does not have,
and into TextClass.cpp, which it does.

This is all cleanup that makes a lot of sense independently.

Note that LayoutModuleList will shortly become a real class.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28456 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-11 23:22:10 +00:00
Jean-Marc Lasgouttes
f83ae91f05 Add a new command line parameter -e that sets the default (latex) encoding.
This is overridden by any subsequent inputenc command.

The current encoding is also passed down to \input or \included files.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28295 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-30 14:47:06 +00:00
Jean-Marc Lasgouttes
a4391b65ca now that tex2lyx reads the files as utf8, file names should be correct
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28294 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-30 14:42:35 +00:00
Jean-Marc Lasgouttes
632da1cc57 very basic support for switching encoding in a document (no context of grouping right now)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27721 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-27 14:16:02 +00:00
Jean-Marc Lasgouttes
c0828f5c52 small spacing bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27599 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 23:29:11 +00:00
Jean-Marc Lasgouttes
552da336ac Now tex2lyx is able to parse stuff that is in unicodesymbols file, as well
as accents. Time will tell how robust this is.

All support for InsetLatexAccent has been removed.

I did not do the support for \inputencoding yet, because it is more difficult 
to get right...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27596 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 23:24:56 +00:00
Jean-Marc Lasgouttes
28f43b1896 Now tex2lyx is able to set the encoding from what it reads in the preamble.
What works:
- parsing of inputenc should work
- \inputencoding is acted on in the preamble

What does not work:
- \inputencoding in the text
- all the corner cases I have not considered, and all buggy stuff in the
  'what works' paragraph
- InsetLatexAccent are still created, but I do not know when they got added
to the code.

The only notable trick in the code is that I had to disable buffering. Otherwise
the whole text was read before I had a chance to change the encoding...

Finally I remove the artificial limitation that forbid
  \usepackage[opt1,opt2]{package1,package2}



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27592 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 21:51:18 +00:00
Enrico Forestieri
d2bd215690 Fix for mingw/cygwin
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27573 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 19:18:40 +00:00
Jean-Marc Lasgouttes
337c6d1577 First serious step for utf8 file format format. tex2lyx is now able to
read utf8 tex documents and translate them to lyxformat 249.

There is still no code to discover the encoding and use it, but it is the
easiest part (I hope).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27563 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 17:02:00 +00:00
Jean-Marc Lasgouttes
7d9a6e19fd forgot to move one file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27550 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 14:27:01 +00:00
Jean-Marc Lasgouttes
bb04efd5a8 Now the document is not parsed at the beginning anymore.
Instead, new token are read when requested. The idea from now is
to be able to chenge encoding on the fly.

Now it is time to see whether idocstream actually works...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27489 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 20:30:45 +00:00
Jean-Marc Lasgouttes
ffafdb2bbe move the catInit call around
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27481 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 19:30:58 +00:00
André Pönitz
bb12808b20 remove libtool
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27468 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 17:45:55 +00:00
Jean-Marc Lasgouttes
e4c9689906 forgot that
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27458 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 15:14:44 +00:00
Jean-Marc Lasgouttes
6419342fbf let Parser store the stream it is working on
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27457 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 15:09:59 +00:00
Jean-Marc Lasgouttes
fa3ea10057 break parser::tokenize in parts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27454 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 14:38:27 +00:00
Jean-Marc Lasgouttes
0aaed41dd7 rename man page
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27453 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 14:36:52 +00:00
Jean-Marc Lasgouttes
357a148282 remove stuff that was actually relevant to reLyX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27445 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 13:20:33 +00:00
Jean-Marc Lasgouttes
3caf85d510 and this...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27444 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 13:11:44 +00:00
Jean-Marc Lasgouttes
c8b2234f39 move test files in their own directory
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27442 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 13:04:15 +00:00
Jean-Marc Lasgouttes
363d5e2d36 remove unused method
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27438 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 11:46:05 +00:00
André Pönitz
95cd89f6d6 revert accidental change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27428 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 16:33:15 +00:00
André Pönitz
7ffa606290 introduce unneeded whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27426 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 16:16:45 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +00:00
Jean-Marc Lasgouttes
ee81b844d3 remove useless comments in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27016 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-21 21:27:12 +00:00
André Pönitz
cb5a9b28d7 be kind to XaFooBarTeX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26871 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 19:19:41 +00:00
André Pönitz
01bb9e2a57 fix problem with non-recognized utf8 encoding that lead to broken .lyx
files


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26844 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-11 16:07:14 +00:00
Jean-Marc Lasgouttes
1899c81d3e whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26608 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-29 08:30:41 +00:00
Uwe Stöhr
8f76634f10 tex2lyx/preamble.cpp: fix bug 19, patch by JMarc (I'm working with this patch for 4 months now and it is really stable.)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26603 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-28 20:15:08 +00:00
Jürgen Spitzmüller
63ca4f8caa * update tex2lyx man page, mostly done bei Uwe (bug 2770).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25929 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-28 07:52:27 +00:00
Uwe Stöhr
b3531611e7 tex2lyx/test-insets.tex: add test for bounding box and clipping of \includegraphics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25919 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-27 21:44:24 +00:00
Jean-Marc Lasgouttes
3b99db73e4 Remove our in tree gettext version and replace with a mechanism to import it.
* autogen.sh: use autopoint to poulate the gettext code; simplify.

	* po/Rules-lyx: move the LyX-specific code of the Makefile here.

	* configure.ac: add magic incantation telling autopoint to import 
	gettext 0.16.1. Generate config.h in toplevel directory to please 
	gettext.

	* src/tex2lyx/Makefile.am:
	* src/client/Messages.cpp: compile fix

	* remove all files that came from a gettext distribution.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25167 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-06 15:25:55 +00:00
Abdelrazak Younes
31517754ad fix MSVC warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24864 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-20 11:24:12 +00:00
Uwe Stöhr
fdea53d34b tex2lyx/preamble.cpp: handle also onecolumn and oneside as discussed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24811 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-17 15:11:41 +00:00
Uwe Stöhr
8c8a2794b3 tex2lyx/preamble.cpp: support for the \geometry settings and the paper orientation, fixes bug 4826.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24809 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-16 20:25:44 +00:00
Uwe Stöhr
001c77d65b tex2lyx/preamble.cpp: cosmetics again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24793 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 23:02:53 +00:00
Uwe Stöhr
f185e01c68 - tex2lyx\box-color-size-space-align.tex: add preamble options to test the geometry settings
- tey2lyx\test-structure.tex: add paper size document class option for testing

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24791 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 22:48:54 +00:00
Uwe Stöhr
34bdb2151b tex2lyx/preamble.cpp: cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24790 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 21:09:53 +00:00
Uwe Stöhr
2546bde017 tex2lyx/preamble.cpp: support for the document class options twocolumn and twoside, fixes bug 4867
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24789 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 21:05:25 +00:00
Uwe Stöhr
ffe427cfdd tex2lyx/text.cpp: only whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24727 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-11 14:13:23 +00:00
Uwe Stöhr
bbd5ddeff3 tex2lyx/text.cpp: support for the centering environment used to center e.g. images
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24708 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-10 00:01:46 +00:00
Uwe Stöhr
2b69b18cdd tex2lyx/text.cpp: fix bug 20
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24673 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-07 22:52:56 +00:00
Jean-Marc Lasgouttes
4b07e1ea92 Fix bug 4806
* Context.cpp (begin_layout): make it a (private) method, and output
	the extra stuff here.
	(add_par_extra_stuff): this is used for stuff that is only for next 
	paragraph (like extra_stuff used to be); add_extra_stuff is now for 
	code that is output for all paragraphs in the context.

	* text.cpp: update to new Context methods. Every user of add_extra_stuff
	uses add_par_extra_stuff, except alignment (which has to be repeated
	to fix bug 4806).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24656 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-07 13:55:03 +00:00
Uwe Stöhr
d50354fc5b tex2lyx/box-color-size-space-align.tex: 2 small changes for better output
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24649 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-07 00:29:44 +00:00
Uwe Stöhr
35b677045e tex2lyx/test-structure.tex: add an appendix
tex2lyx/test-insets.tex: add an unindented paragraph

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24622 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-05 22:45:22 +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
Jürgen Spitzmüller
93cc3b9416 revert some new features so that tex2lyx outputs format 247 proper again.
The reverted features could (and should) be reapplied as soon as tex2lyx can output unicode (bug 4379).

The patch of this change can be found here:
http://bugzilla.lyx.org/show_bug.cgi?id=4379

and can be applied with -R in this case.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24557 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-29 18:11:46 +00:00
Uwe Stöhr
b84e0c158d tex2lyx/text.cpp: cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24551 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-29 00:12:56 +00:00
Uwe Stöhr
455d441029 - tex2lyx/text.cpp: correct font size handling because font size switches don't affect section headings, fixes bug 4807
- box-color-size-space-align.tex: add testcase for the above fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24550 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-29 00:03:55 +00:00
Uwe Stöhr
43ef7962bb box-color-sizes-space-align.tex: add testcases for defined horizontal spaces
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24549 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 22:59:43 +00:00
Uwe Stöhr
f0e4582a0b tex2lyx/text.cpp: support for \hspace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24548 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 22:49:10 +00:00
Uwe Stöhr
6363e27250 tex2lyx/text.cpp: \InsetSpace has no begin and end (LyX 1.5 was tolerant to the missing end, LyX 1.6 is correctly not tolerant)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24547 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 22:47:47 +00:00
Uwe Stöhr
0d7fe3346f - tex2lyx/test-insets.tex: make it compilable, update the document, and add some testcases
- tex2lyx/box-color-sizes-spacings-alignments.tex: update the document
- tex2lyx/text.cpp: correct some typos

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24521 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-27 13:32:20 +00:00
Uwe Stöhr
1396dc00a5 tex2lyx/text.cpp: remove support for \centering and the like as first step to fix the broken paragraph alignment import, see bug 4806
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24520 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-27 12:44:09 +00:00
Uwe Stöhr
04911c0462 tex2lyx/text.cpp:
- fix an off by one error in the font size handling, fixes bug 4803
- support \lyxline, fixes bug 4795

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24518 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-27 10:54:06 +00:00
Uwe Stöhr
329461c700 tex2lyx/text.cpp: take care of the brace pair after comment environments that are there when the TeX file was created by LyX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24498 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-25 00:38:59 +00:00
Uwe Stöhr
f68a8d097c tex2lyx/preamble.cpp: only cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24419 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-21 22:08:52 +00:00
Uwe Stöhr
d4355c552b tex2lyx/preamble.cpp: fix the import of paragraph settings, fixes http://bugzilla.lyx.org/show_bug.cgi?id=4773
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24404 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 23:22:36 +00:00
Uwe Stöhr
b6eed01602 - tex2lyx/preamble.cpp, text.cpp: add support for \textcolor fixes http://bugzilla.lyx.org/show_bug.cgi?id=2457
- box-color.tex: testfile for tex2lyx to check if colors and boxes are correctly imported

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24403 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 23:16:55 +00:00
Jürgen Spitzmüller
5445b04a9b * src/tex2lyx/tex2lyx.man:
- make the man page a bit less outdated (bug 2770).

note that the page isn't really up to date yet. I didn't check anything thoroughly (especially the "what's supported" and "what's not supported" part). Uwe, maybe a job for you, as you are most familiar with it nowadays.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24386 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 15:22:17 +00:00
Jean-Marc Lasgouttes
a77cd8c0c6 cleanup parser code at least
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24323 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-18 12:26:21 +00:00
Uwe Stöhr
7ba6ed2654 tex2lyx/Parser.cpp: rename a function since it returns a mandatory argument
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24310 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-17 00:22:16 +00:00
Uwe Stöhr
d3b2f94388 tex2lyx: text.cpp, Parser.h, Parser.cpp:
fix the import of \makebox, fixes http://bugzilla.lyx.org/show_bug.cgi?id=2504

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24244 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-12 12:50:04 +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
Uwe Stöhr
8d6583e9ce tex2lyx/preamble.cpp: change encoding from ascii to auto when importing TeX files, fixes
http://bugzilla.lyx.org/show_bug.cgi?id=4719

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24196 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-09 20:19:47 +00:00
André Pönitz
835d051ae3 more Lexer;
also move tex2lyx specific code to tex2lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24129 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-05 19:01:43 +00:00
José Matox
45d42022f7 Add headers necessary to compile with g++ 4.3 (I am not sure about the typeinfo, the others are clearly correct).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23862 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 11:26:20 +00:00
José Matox
7ef2816cd0 remove lengthcommon.cpp and use it as a link from the upper dir
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23849 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-20 13:20:18 +00:00
José Matox
2b1859e8f0 Fighting with autotools to have a building system :-(
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23836 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-19 19:37:35 +00:00
Stefan Schimanski
29dca708f7 * comments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23625 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:57:45 +00:00
Stefan Schimanski
97a1fcc721 * \newcommandx parsing for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23623 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 12:52:37 +00:00
Abdelrazak Younes
cab2fe4cce MSVC compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23533 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 07:21:13 +00:00
Richard Heck
6edb3984bf BaseClassList --> LayoutFileList
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23532 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 03:53:21 +00:00
Richard Heck
ac6e5b871c Get rid of the boost::shared_ptr's in TextClass.{h,cpp}. It's not clear what these were really doing here now, and they will cause bugs now that DocumentClass objects are more dynamic.
Abdel suggested it might be worth pimpl'ing the FloatList and Counter objects, to get the header dependencies back down.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23530 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-07 03:41:12 +00:00
Richard Heck
6f1cb456cf Improve performance of TextClass type objects by making BaseClassList and DocumentClassBundle containers of pointers rather than of objects, thus reducing the need to copy. Since these classes are singletons that live the life of the process, there's not much need to worry about memory leaks.
We take the opportunity to make TextClass objects noncopyable, nonassignable, etc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23526 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 23:31:40 +00:00
Richard Heck
926ad3d183 Get rid of LayoutPtr.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23524 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 21:55:33 +00:00
Richard Heck
f401ce5d29 Changes LayoutList from a vector<LayoutPtr> to a vector<Layout>.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23519 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 20:01:30 +00:00
Abdelrazak Younes
a56dec8330 fix the bug fix in 23507
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23508 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 09:47:14 +00:00
Abdelrazak Younes
682f4efd13 compile fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23507 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 09:15:53 +00:00
Richard Heck
2b3bd7b5f4 This is the last of the commits that hopes to enforce the distinction between "layout files" and "document classes" that was introduced by the modules code. For the most part, these changes just refactor code from TextClass between: (a) a TextClass base class; (b) a LayoutFile subclass, which represents the information in a .layout file; and (c) a DocumentClass subclass, which represents the layout information associated with a Buffer---a LayoutFile plus Modules. Methods from TextClass have been apportioned between the three classes depending upon what is needed where, and signatures have been changed where necessary so that the right kind of class is required.
At this point, there are no simple TextClass objects in the main LyX code, and it is impossible to create them, since the TextClass constructor is protected. Only LayoutFile and DocumentClass objects can be constructed, and for the most part these are constructed only by their respective containers: BaseClassList and DocumentClassBundle. There is an exception: LayoutFile does have a public default constructor, but if anyone knows how to make it go away, please do.

There will be one or two more commits along these lines, but these will be simple renamings. For example, BaseClassList should be LayoutFileList.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23343 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 02:45:33 +00:00
André Pönitz
30fff63257 compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23169 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 22:21:03 +00:00
Jean-Marc Lasgouttes
8b342f0478 compilation fix for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23123 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 10:16:18 +00:00
Abdelrazak Younes
d7d41ee59d header cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22572 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-14 23:17:24 +00:00
Stefan Schimanski
5636ca5dea * indention fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22284 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-23 16:33:34 +00:00
Stefan Schimanski
3f5e1c0e27 * tex2lyx support for multiple optional argument using \newlyxcommand
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22282 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-23 16:33:01 +00:00
Stefan Schimanski
f85fccef65 * newlyxcommand support as LaTeX feature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22281 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-23 16:32:00 +00:00
Richard Heck
e285d2a7d8 Support for nocite, provided by Bernhard Reiter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22217 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-20 15:46:14 +00:00
Abdelrazak Younes
9439b6e6e0 * get rid of support::absolutePath()
* remove FileName.h inclusion from filetools.h


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22188 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-17 16:04:46 +00:00
Abdelrazak Younes
e7bb71ff4e header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22178 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-16 22:09:28 +00:00
Abdelrazak Younes
7c392af6ea getting rid of superfluous lyx::support:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22106 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:57:42 +00:00
Abdelrazak Younes
9abb7db468 getting rid of superfluous std:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22104 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:28:07 +00:00
Abdelrazak Younes
b89cc942eb 'using namespace lyx::support' instead of 'using support::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:57:56 +00:00
Abdelrazak Younes
9383f4c3c6 'using namespace std' instead of 'using std::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 10:16:00 +00:00
Jürgen Spitzmüller
49497a6803 * src/tex2lyx/text.cpp:
- add space between bounding box arguments (bug 4418).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22086 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-11 17:14:01 +00:00
Uwe Stöhr
b2f965270c preamble.cpp: whitespace only
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22074 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-11 00:45:30 +00:00
Uwe Stöhr
dc9dcc9c1f set encoding from utf8 back to latin1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22047 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-09 17:47:41 +00:00
Uwe Stöhr
b3cf152185 preamble.cpp: full babel language support for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22046 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-09 17:42:05 +00:00
Uwe Stöhr
a11ae22aa3 preamble.cpp: fix whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22040 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-09 15:26:31 +00:00
Uwe Stöhr
0667412a89 preamble.cpp: code simplification to r21970 suggested by Angus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22034 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-09 14:14:34 +00:00
Uwe Stöhr
2ea605f85a tex2lyx/text.cpp: support for all quotation marks (bug2703).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22032 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-09 13:40:03 +00:00
Uwe Stöhr
a1b9eedee8 preamble.cpp: don't add \makeatother twice
\makeatother and \makeatletter are already added by LyX around the user preamble

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22027 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-08 20:49:01 +00:00
Uwe Stöhr
e71e663b8e preamble.cpp: remove unused code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22016 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-08 14:58:53 +00:00
Peter Kümmel
2944cdd82a fix wrong tex2lyx hack
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22008 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-08 10:50:30 +00:00
Uwe Stöhr
863aebb177 preamble.cpp: handle the (n)german options correctly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21998 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-06 22:57:15 +00:00
Uwe Stöhr
d81a3617de preamble.cpp: cleanup the list of supported languages
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21997 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-06 22:49:18 +00:00
Uwe Stöhr
5cbb164e89 preamble.cpp: correct recognition of all cases of font scalings (fix for method introduced in r21970)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21994 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-06 22:09:31 +00:00
Uwe Stöhr
3fa9187e7c preamble.cpp: addition to r21970: ad support for the two possible font options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21993 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-06 18:58:32 +00:00
Uwe Stöhr
cdffbf18bd tex2lyx: support font settings -> move fileformat to 247
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21970 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-05 20:02:49 +00:00
Uwe Stöhr
2ac7c35667 preamble.cpp: update the list of supported languages to the one of LyX 1.4.5.1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21959 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-04 21:35:08 +00:00
Uwe Stöhr
646b2e9ee2 preamble.cpp: small cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21953 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-04 20:53:43 +00:00
Uwe Stöhr
d8013aa18d preamble.cpp, text.cpp:
- fix bug 27
 - support for multi-language files
 - code cleanups

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21950 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-04 20:09:40 +00:00
Uwe Stöhr
2d6aaff2f7 preamble.cpp: update fileformat
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21941 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-03 22:17:38 +00:00
André Pönitz
9d0ea8aeff Move debug.{cpp,h}, Messages.{cpp,h} and gettext.{cpp,h} to support/.
Now support/* should have no dependencies on src/* anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21851 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 07:04:28 +00:00
Uwe Stöhr
163d6f3a11 revert r21813 part 2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21842 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-28 00:05:54 +00:00
Uwe Stöhr
396dba93b7 revert r21813
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21841 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-28 00:03:11 +00:00
André Pönitz
c8fd502b56 some de-boostification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21830 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-27 20:30:22 +00:00
Abdelrazak Younes
1ecd06410a tex2lyx.cpp does not need boost::filesystem. Only remaining use is in the lyx client. Somebody on linux should take care of that.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21818 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-27 10:06:59 +00:00
Uwe Stöhr
116740d7e3 very big tex2lyx patch:
tex2lyx Version 0.1.5

Commands

- support for \lyxline
- fix for bug 27:
  - support for \selectlanguage
  - support for \foreignlanguage
  - support for \inputencoding
- updated support for \printindex
- support for \printnomenclature
- updated support for \listof
- updated support for \tableofcontents

Environments

- support for hyperlink
- support for shaded note
- support for framed note

Preamble

- support for font settings
- updated preamble format to lyxformat 303
  (tex2lyx will still use lyxformat 245 for a while)
- updated language support
- support for multi-language documents that use babel
  (CJK follows later)
- fix bug 2310:
  - support for document encoding

Packages

- support for esint
- updated support for amsmath

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21813 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-27 01:38:50 +00:00
Uwe Stöhr
12f7869ac0 support for \linebreak:
- fileformat change
- tex2lyx support
- rename LFUN_BREAK_LINE to LFUN_NEW_LINE because this is what the lfun does and to avoid confusions
- new menu entry
- new shortcut C-S-Return

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21778 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-25 18:34:37 +00:00
Peter Kümmel
23bf70368a fix compile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21770 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-25 17:55:27 +00:00
André Pönitz
d95451ae5c s/isFileReadable/isReadableFile;
introduce isReadableDirectory
replace isReadable by either isReadableFile or isReadableDirectory
remove isReadable


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21769 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-25 11:18:16 +00:00
Uwe Stöhr
650c2a816c tex2lyx/text.cpp: - support for LyX 1.6's hyperlink inset (\href)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21765 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-24 20:07:05 +00:00
Uwe Stöhr
cf87469cb2 tex2lyx/text.cpp:
- support for \newline
- support for framed and shaded notes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21764 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-24 18:04:26 +00:00
Uwe Stöhr
97aa558cac support for \pagebreak:
- rename former "pagebreak" to "newpage" since it produces a \newpage
- new LFUN
- menu entry
- tex2lyx support
- fileformat change


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21732 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-23 02:10:00 +00:00
André Pönitz
14f7e7fffe shuffle stuff around
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21511 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-08 00:09:58 +00:00
André Pönitz
cf7b238479 more use of support::FileName.
Would be nice if people tested read/write, and Bo perhaps the 'embedded'
feature?



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21492 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-07 19:52:11 +00:00
Abdelrazak Younes
dc2a6f95ff Transfer some code from InsetFlex to InsetCollapsable. Add some safeguards and FIXMEs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21400 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-03 09:03:08 +00:00
Stefan Schimanski
e43dc9d38c * Added conversion of latex macros with optional parameters
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21330 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-01 11:15:05 +00:00
Martin Vermeer
225d92ba43 Fix tex2lyx for inset font inheritance changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21319 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-01 09:47:02 +00:00
Stefan Schimanski
aa9bb01f27 * make it compile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21314 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-01 00:04:13 +00:00
Abdelrazak Younes
5ddc612b73 Splitup Font in saner bits:
* Font::FontBits -> FontInfo
* Font::FONT_XXX -> all enums transfered to FontEnums.h and renamed to FontXxx

I've replaced Font uses with FontInfo were the language() member was not needed, basically all draw() and metrics methods. There's one problematic cases with InsetQuotes which I solved by taking the Buffer main language.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21240 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-28 18:51:54 +00:00
André Pönitz
e7aa8ce683 cosmetics... less than intented
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21190 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-24 22:55:02 +00:00
Bo Peng
2e953e8aad Fix tex2lyx for the isFileReadable change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21049 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-19 01:14:57 +00:00
André Pönitz
0e08bc5e16 start using FileName::exists()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21044 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-18 19:29:32 +00:00
Uwe Stöhr
7075eaadef The huge URL patch:
- rename the lfun to href-insert.png
- rename the files to Hyperlink...
- the former URLUi produces now \href commands (hyperref)

Only missing thing is the lyx2lyx conversion routine - this will be done by Richard

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20950 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-13 19:06:09 +00:00
André Pönitz
ca304dea84 compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20600 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-29 21:06:50 +00:00
André Pönitz
581b67b26e move ChangeLogs to the attic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20587 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-29 14:12:55 +00:00
José Matox
309c75046e Make --without-include-boost compile (autotools)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20407 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-21 07:18:21 +00:00
Lars Gullik Bjønnes
26f336769a Remove warnings reported with gcc 4.3:
- Modifier on return type ignored
	- Ambigous else
	- Ambigous logical operators
	- Semi-colon instead of empty block
	- Missing header files
	- Missing using std::XX
	- Initialization out of order


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20304 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-16 10:36:57 +00:00
Martin Vermeer
b6546d8a93 Compile fix after bg color patch, thx Bo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19826 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-27 08:36:18 +00:00
André Pönitz
39c7e2faf0 rename Layout_ptr into LayoutPtr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19758 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-23 19:59:07 +00:00
André Pönitz
9d711c62fc simplify build process of tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19712 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-21 23:17:37 +00:00
Enrico Forestieri
3f35b50b05 Fix tex2lyx linking
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19597 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 01:18:55 +00:00
André Pönitz
848c89564f remove lyxrc dependence from support/*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19441 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-11 22:37:09 +00:00
André Pönitz
c055741c51 fix tex2lyx linking
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19433 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-11 20:21:09 +00:00
André Pönitz
8cea333572 fix building with automake; break scons, cmake and qmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19427 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-11 15:48:15 +00:00
André Pönitz
67e61a3956 enable building of shared libraries. reduces final linktime. also combine boost stuff into a single library
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19410 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-10 22:33:54 +00:00
Abdelrazak Younes
ada0bd00f0 more std declaration fixes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-17 17:40:44 +00:00
Abdelrazak Younes
4a53fa6e01 Allow unicode in Layout names.
* Layout.h:
  - name_, obsoleted_by_, depends_on_ are now docstrings.

All other changes results from the above string -> docstring changes. In particular, we now try to translate the layout names only if possible (i.e. if they are ASCII only).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19042 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-11 13:39:08 +00:00
Jean-Marc Lasgouttes
af9464dfe8 the -lz for zlib is already in LIBS
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18985 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-04 21:54:28 +00:00
Jean-Marc Lasgouttes
a6f32927ea Fix bug 3750: this code is a kludge and should be removed when tex2lyx is
updated to support format >= 257 (with InsetCaption).

	* src/Layout.cpp (forCaption): new method. Returns a pointer to a newly 
	allocated Layout suitable for representing a caption.

	* src/tex2lyx/tex2lyx.cpp (tex2lyx): allocate a captionlayout object

	* src/tex2lyx/text.cpp: use the captionlayout object to recognize the 
	\caption command.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18962 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-02 16:02:41 +00:00
Jürgen Spitzmüller
d226c1de12 * src/tex2lyx/tex2lyx.cpp:
- use internal_path (bug 3788), patch by Hangzai Luo and me).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18953 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-01 15:16:08 +00:00
Georg Baum
05f882271d * src/tex2lyx/text.cpp
(parse_box): Fix default height value (from Micha Feigin)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18675 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-05 07:01:47 +00:00
Lars Gullik Bjønnes
897436efbb Whitespace cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18550 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-28 22:27:45 +00:00
Stefan Schimanski
e23f96ef2e * Import newcommand/providecommand/renewcommand/def macros as MathMacros
if they are compatible (i.e. no optional arguments, no patterns)
* Recursive macros are also imported, but they only work correctly in the
  limits of the current macro implementation in LyX
* Fixes http://bugzilla.lyx.org/show_bug.cgi?id=21


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18483 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 06:52:08 +00:00
Stefan Schimanski
78378912a3 * fix http://bugzilla.lyx.org/show_bug.cgi?id=3668:
\input{foo} means to input foo.tex, so add the .tex extension. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18470 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 07:27:13 +00:00
Jean-Marc Lasgouttes
aeeac15128 Patch from "hzluo" <memcache@gmail.com>:
Remove all explicit 8bit characters from the source, to fix compilation
with windows xp under a chinese locale (bug 3496).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18256 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-10 10:35:57 +00:00
André Pönitz
757d5d67ac resolve the layout.h <=> Layout.h conflict
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18099 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 22:04:32 +00:00
André Pönitz
6add1994c7 rename LyXTextClass* into TextClass*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 19:53:54 +00:00
André Pönitz
0bf9ac02a8 rename LyXLayout into Layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18096 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 18:58:28 +00:00
André Pönitz
fc6ce7cd08 rename LyXFont to Font except in tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18095 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 18:17:15 +00:00
André Pönitz
8c622e4ff0 rename/merge LyXLength related stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18067 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-28 12:58:49 +00:00
André Pönitz
39e79d8602 rename LyXLex into Lexer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18033 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 11:30:54 +00:00
Bo Peng
138b23fac8 Rename files in src/support, step one.
src/support/package.h                              src/support/Package.h    Package
src/support/package.C.in                           src/support/Package.C.in  Package
src/support/path.h                                 src/support/Path.h    Path
src/support/fs_extras.h                            src/support/fs_extras.h NOCLASSES
src/support/RandomAccessList.h                     src/support/RandomAccessList.h    RandomAccessList
src/support/lyxmanip.h                             src/support/lyxmanip.h NOCLASSES
src/support/rename.C                               src/support/rename.cpp  NOCLASSES
src/support/abort.C                                src/support/abort.cpp  NOCLASSES
src/support/lyxlib.h                               src/support/lyxlib.h NOCLASSES
src/support/ExceptionMessage.h                     src/support/ExceptionMessage.h    ExceptionMessage
src/support/copy.C                                 src/support/copy.cpp  NOCLASSES
src/support/limited_stack.h                        src/support/limited_stack.h    limited_stack
src/support/filefilterlist.C                       src/support/FileFilterList.cpp    ['FileFilterList', 'Filter']
src/support/cow_ptr.h                              src/support/cow_ptr.h    cow_ptr
src/support/os_unix.C                              src/support/os_unix.cpp  NOCLASSES
src/support/socktools.h                            src/support/socktools.h NOCLASSES
src/support/forkedcontr.h                          src/support/ForkedcallsController.h    ForkedcallsController
src/support/os.h                                   src/support/os.h NOCLASSES
src/support/FileMonitor.h                          src/support/FileMonitor.h    FileMonitor
src/support/copied_ptr.h                           src/support/copied_ptr.h    copied_ptr
src/support/translator.h                           src/support/Translator.h    Translator
src/support/filetools.C                            src/support/filetools.cpp  NOCLASSES
src/support/unlink.C                               src/support/unlink.cpp  NOCLASSES
src/support/os_win32.C                             src/support/os_win32.cpp    GetFolderPath
src/support/lstrings.C                             src/support/lstrings.cpp  NOCLASSES
src/support/qstring_helpers.C                      src/support/qstring_helpers.cpp  NOCLASSES
src/support/getcwd.C                               src/support/getcwd.cpp  NOCLASSES
src/support/systemcall.C                           src/support/Systemcall.cpp    Systemcall
src/support/lyxalgo.h                              src/support/lyxalgo.h NOCLASSES
src/support/filefilterlist.h                       src/support/FileFilterList.h    ['FileFilterList', 'Filter']
src/support/unicode.C                              src/support/unicode.cpp    IconvProcessor
src/support/userinfo.C                             src/support/userinfo.cpp  NOCLASSES
src/support/lyxtime.C                              src/support/lyxtime.cpp  NOCLASSES
src/support/kill.C                                 src/support/kill.cpp  NOCLASSES
src/support/docstring.C                            src/support/docstring.cpp    to_local8bit_failure
src/support/os_cygwin.C                            src/support/os_cygwin.cpp  NOCLASSES
src/support/lyxsum.C                               src/support/lyxsum.cpp  NOCLASSES
src/support/environment.C                          src/support/environment.cpp  NOCLASSES
src/support/filetools.h                            src/support/filetools.h NOCLASSES
src/support/textutils.C                            src/support/textutils.cpp  NOCLASSES
src/support/mkdir.C                                src/support/mkdir.cpp  NOCLASSES
src/support/forkedcall.C                           src/support/Forkedcall.cpp    ['ForkedProcess', 'Forkedcall']
src/support/tempname.C                             src/support/tempname.cpp  NOCLASSES
src/support/os_win32.h                             src/support/os_win32.h    GetFolderPath
src/support/types.h                                src/support/types.h NOCLASSES
src/support/lstrings.h                             src/support/lstrings.h NOCLASSES
src/support/forkedcallqueue.C                      src/support/ForkedCallQueue.cpp    ForkedCallQueue
src/support/qstring_helpers.h                      src/support/qstring_helpers.h NOCLASSES
src/support/convert.C                              src/support/convert.cpp  NOCLASSES
src/support/filename.C                             src/support/FileName.cpp    ['FileName', 'DocFileName']
src/support/tests/convert.C                        src/support/tests/convert.cpp  NOCLASSES
src/support/tests/filetools.C                      src/support/tests/filetools.cpp  NOCLASSES
src/support/tests/lstrings.C                       src/support/tests/lstrings.cpp  NOCLASSES
src/support/tests/boost.C                          src/support/tests/boost.cpp  NOCLASSES
src/support/docstream.C                            src/support/docstream.cpp    ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/std_istream.h                          src/support/std_istream.h NOCLASSES
src/support/systemcall.h                           src/support/Systemcall.h    Systemcall
src/support/chdir.C                                src/support/chdir.cpp  NOCLASSES
src/support/std_ostream.h                          src/support/std_ostream.h NOCLASSES
src/support/unicode.h                              src/support/unicode.h    IconvProcessor
src/support/path.C                                 src/support/Path.cpp    Path
src/support/fs_extras.C                            src/support/fs_extras.cpp  NOCLASSES
src/support/userinfo.h                             src/support/userinfo.h NOCLASSES
src/support/lyxtime.h                              src/support/lyxtime.h NOCLASSES
src/support/docstring.h                            src/support/docstring.h    to_local8bit_failure
src/support/debugstream.h                          src/support/debugstream.h    basic_debugstream
src/support/environment.h                          src/support/environment.h NOCLASSES
src/support/textutils.h                            src/support/textutils.h NOCLASSES
src/support/forkedcall.h                           src/support/Forkedcall.h    ['ForkedProcess', 'Forkedcall']
src/support/socktools.C                            src/support/socktools.cpp  NOCLASSES
src/support/forkedcallqueue.h                      src/support/ForkedCallQueue.h    ForkedCallQueue
src/support/forkedcontr.C                          src/support/ForkedcallsController.cpp    ForkedcallsController
src/support/os.C                                   src/support/os.cpp  NOCLASSES
src/support/convert.h                              src/support/convert.h NOCLASSES
src/support/filename.h                             src/support/FileName.h    ['FileName', 'DocFileName']
src/support/docstream.h                            src/support/docstream.h    ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/FileMonitor.C                          src/support/FileMonitor.cpp    FileMonitor



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 05:12:52 +00:00
Bo Peng
04591a6e34 Rename .C ==> .cpp for files in src/tex2lyx, part two
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18023 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:53:30 +00:00
Bo Peng
8cc88bf1ec Rename files under src/tex2lyx
src/tex2lyx/lyxfont.C                              src/tex2lyx/LyXFont.cpp    LyXFont
src/tex2lyx/lyxfont.h                              src/tex2lyx/LyXFont.h    LyXFont
src/tex2lyx/texparser.C                            src/tex2lyx/Parser.cpp    ['Token', 'Parser']
src/tex2lyx/tex2lyx.C                              src/tex2lyx/tex2lyx.cpp  NOCLASSES
src/tex2lyx/texparser.h                            src/tex2lyx/Parser.h    ['Token', 'Parser']
src/tex2lyx/text.C                                 src/tex2lyx/text.cpp  NOCLASSES
src/tex2lyx/tex2lyx.h                              src/tex2lyx/tex2lyx.h NOCLASSES
src/tex2lyx/context.C                              src/tex2lyx/Context.cpp    ['Font', 'Context']
src/tex2lyx/gettext.C                              src/tex2lyx/gettext.cpp  NOCLASSES
src/tex2lyx/boost.C                                src/tex2lyx/boost.cpp  NOCLASSES
src/tex2lyx/table.C                                src/tex2lyx/table.cpp  NOCLASSES
src/tex2lyx/preamble.C                             src/tex2lyx/preamble.cpp  NOCLASSES
src/tex2lyx/math.C                                 src/tex2lyx/math.cpp  NOCLASSES
src/tex2lyx/context.h                              src/tex2lyx/Context.h    ['Font', 'Context']
src/tex2lyx/Spacing.h                              src/tex2lyx/Spacing.h    Spacing
src/tex2lyx/lengthcommon.C                         src/tex2lyx/lengthcommon.cpp  NOCLASSES



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18022 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:53:06 +00:00
Bo Peng
00e305c9d9 Rename .C ==> .cpp for files in src, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18018 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:41:58 +00:00
Bo Peng
98ebb77841 Rename .C => .cpp for files in src/frontends/controllers, step 1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17999 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 18:04:04 +00:00
André Pönitz
4b7da6b24e move lyxlex_pimpl.* into lyxlex.C
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17941 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-24 10:52:22 +00:00
Georg Baum
3213757e9a remove unused stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17697 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-02 12:42:02 +00:00
Georg Baum
0f83c2563b Convert makeRelPath to docstring (from Michael Gerz)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17586 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-27 07:24:16 +00:00
Georg Baum
d1f8c007f0 Get rid of some locale dependant functions
* src/output_plaintext.C
	(writePlaintextParagraph): Use compare_ascii_no_case instead of
	compare_no_case, since the strings to compare are pure ASCII anyway.

	* src/frontends/qt4/QPrefsDialog.C
	(setComboxFont): ditto

	* src/MenuBackend.C
	(Menu::checkShortcuts): ditto

	* src/frontends/qt4/QLImage.C
	(QLImage::loadableFormats): Use ascii_lowercase instead of lowercase
	since the input is pure ASCII anyway.

	* src/tex2lyx/text.C
	(splitLatexLength): ditto

	* src/support/lstrings.[Ch]
	(compare_no_case): Get rid of both std::string variants
	(lowercase): Get rid of std::string variant
	(uppercase): Change std::string variant to docstring

	* src/support/tests/regfiles/lstrings: Add new expected output

	* src/support/tests/lstrings.C: Add tests for docstring functions


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17371 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-26 18:54:03 +00:00
Abdelrazak Younes
85f66bcd90 Fix support lib dependency problem.
* docstring.C: Implement utf8ToUcs4() locally.

* all other files: remove utf8ToUcs4().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17361 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-26 12:46:44 +00:00
Georg Baum
4b449892e1 Fix import of \={\i}
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17203 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-15 20:49:29 +00:00
Enrico Forestieri
cc5b44cb1c Fix compiler warning about multi-character constant
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16845 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-25 02:06:06 +00:00
Abdelrazak Younes
801f807063 Display error/warning dialogs if possible.
* ExceptionMessage: new exception based message for errors and warnings.

* package.C.in:
  - replace lyxerr based errors and warning with ExceptionMessage throwing.
  - bail_out(): erased!

* os_win32.C:
  - replace lyxerr based errors and warning with ExceptionMessage throwing.
  - bail_out(): erased!

* tex2lyx.C: catch any exception from Package class.

* lyx_main.C:  catch any exception from Package class and act accordingly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16834 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-24 15:49:20 +00:00
Enrico Forestieri
fc3a2761de Log:
Move OS dependent code where it belongs.

	* src/lyx_cb.C:
	Remove unused include

	* src/support/os.h
	* src/support/os_unix.C
	* src/support/os_win32.C
	* src/support/os_cygwin.C:
	Move here the code from fontutils.[Ch]

	* src/support/os_cygwin.C
	(external_path, external_path_list): don't differentiate anymore
	on Qt/X11 or Qt/Win builds.

	* src/support/environment.C
	(setEnvPath): get rid of the #ifdef for cygwin.

	* src/lyx_main.C
	(LyX::exec): addFontResources and restoreFontResources are now
	in the os namespace.

	* src/support/Makefile.am
	* src/client/Makefile.am
	* src/tex2lyx/Makefile.am
	* development/scons/scons_manifest.py:
	Updated

	* src/support/fontutils.[Ch]:
	Removed



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16655 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-11 21:22:18 +00:00
Georg Baum
d96c36e555 Fix bug 3052: Always start a new paragraph after a noweb code chunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16467 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-02 12:35:53 +00:00