Commit Graph

26567 Commits

Author SHA1 Message Date
Richard Heck
2b39534042 Greyed out notes do produce output, which means that their counters need
to be treated as part of the document. For example, the footnote numbers
in LyX are wrong prior to this patch.

This will also affect word and character count, but should not affect
anything else. If that seems wrong, we can either (a) explicitly exclude
notes from the word count or else (b) introduce 
  bool countWordsInInset() const;
and call that, instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36976 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 22:33:12 +00:00
Richard Heck
68aa0b5b91 Add comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36975 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 22:29:41 +00:00
Richard Heck
9e9c96035c Finish disentangling tocString(). We introduce a new method, forToc(),
that also makes sure it doesn't do more work than it needs to do, by
limiting the size to 40 characters. Previously, InsetBranch::addToToc()
would have added a string representing the entire contents of the
branch! It's hard to imagine that having to recalculate that sort of
thing doesn't cause some problems with speed, especially in documents
with lots of notes and branches and such.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36974 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 21:55:09 +00:00
Stephan Witt
ac86039473 non-system languages from cocoAspell are enumerated with long names - therefore a mapping from lang code to name is needed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36973 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 21:45:41 +00:00
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
Stephan Witt
c95d441818 non-system languages from cocoAspell are enumerated with long names - therefore a mapping from lang code to name is needed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36970 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 20:40:32 +00:00
Vincent van Ravesteijn
8adcffff0c Fix bug #7166: Insets that shouldn't appear in the TOC were included. From now on use AS_STR_INTOC as an option for Paragraph::asString() for insets that should not be included in the strings for the TOC, like IndexInset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 19:18:56 +00:00
Enrico Forestieri
8b88c3edde Refine fix for bug #7183.
Using updateMacros() entails a performance hit when loading a document
with really a lot of macros. So, revert to the original strategy of
tracking macros at creation time. In order to also account for macros
defined in a child document, the child is now loaded by the include inset
at construction time instead of after the master has finished loading.
This strategy mimics what updateMacros() was accomplishing without
incurring in its drawbacks, such that loading time is practically
unchanged even with a thousand macros.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 18:15:39 +00:00
Pavel Sanda
289a52c9c9 * cs.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 14:51:04 +00:00
Pavel Sanda
01677a6577 Unneeded quotes in ui title
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36966 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 14:31:38 +00:00
Uwe Stöhr
696ee1157d UserGuide.lyx: describe new branches features, thanks Jürgen!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36965 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 12:41:37 +00:00
Stephan Witt
c12ab2f090 fix typo: duplicate semicolon at line end of code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 12:01:12 +00:00
Stephan Witt
3bb4d6559d little optimization: avoid a duplicate cursor get from buffer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36963 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 07:10:05 +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
Richard Heck
e328ed52c2 Squash warnings. The latter might matter.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36953 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 00:57:16 +00:00
Vincent van Ravesteijn
aa0aae25f2 Add DEVEL_VERSION to cmake.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36952 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 22:54:45 +00:00
Pavel Sanda
121fdba366 Attempt to workaround movement and editation slowness.
If it turns out to be too annoying for other we can disable it again.
Hopefully fix #7138.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg164385.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36951 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 22:27:21 +00:00
Pavel Sanda
5007ee4dad Let filenames to be longer in window title.
Fixes first part of #7182


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36950 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 22:05:48 +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
Uwe Stöhr
61eeab7405 Math.lyx: new section about CAS support
Pavel, many thanks for this addition, but please always use cange-tracking if you modify manuals.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36942 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 03:03:41 +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
Abdelrazak Younes
065483dae3 Small Timer helper class useful for performance investigation in src/.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36940 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 18:40:21 +00:00
Abdelrazak Younes
2ab1601311 Coding style/de-indent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36939 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 16:32:29 +00:00
Abdelrazak Younes
41aa051d22 Coding style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36938 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 16:19:05 +00:00
Abdelrazak Younes
3626b46109 Coding style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36937 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 16:11:38 +00:00
Abdelrazak Younes
1614a64e15 TeXOnePar() simplification: use pit_type instead of iterator
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36936 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 15:57:27 +00:00
Abdelrazak Younes
fd73107054 TeXOnePar() Be on the safe side and reinitialize runparam.par_begin and par_end
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36935 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 14:04:02 +00:00
Abdelrazak Younes
8e092e6ca6 greatly simplify and comment TeXEnvironment():
* only one for loop
* uses runparams.par_end

InsetInclude and InsetIext: initialize runparams.par_begin and runparams.par_end

Except for a few additonal empty lines the LateX exports are identical for all help files. The reason for the additional empty lines is the more consistent TeXEnvironment() call.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36934 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 13:49:39 +00:00
Abdelrazak Younes
ffea94c5e6 latexParagraphs(): code polish.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36933 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 08:31:34 +00:00
Abdelrazak Younes
f48f0ad0bf latexParagraphs(): cleanup a bit and switch to a 'for' loop. Hopefully this should fix the performance problem when exporting very big document to latex.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36932 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 08:23:14 +00:00
Abdelrazak Younes
ca91d508b2 LaTeX export small speedup: Introduce RandomAccessList::position() and use it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 07:37:12 +00:00
Enrico Forestieri
280f7a7ced Fix bug #7183 (User math macros defined in child documents are shadowed on loading)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36930 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 02:27:25 +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