Commit Graph

26693 Commits

Author SHA1 Message Date
Richard Heck
152aba682f OK, the previous idea, that we don't need to check the masters of other
counters, was silly. So here we do.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37198 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-13 01:47:41 +00:00
Richard Heck
1ff710d0b6 Add comment.
The reason we don't need to do what I say we don't need to do is that a
given counter doesn't really care about whether it has a master. It's
when the master is stepped that we check for which other ones to reset.
So if the master doesn't exist, nothing will happen, anyway.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37197 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:22:06 +00:00
Richard Heck
874e867953 Update all layouts to format 31.
Should have done this first!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37196 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:20:07 +00:00
Richard Heck
a9411446ee Add NoCounter to layouts that need it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37195 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:19:02 +00:00
Richard Heck
d32ed4ff4e Add NoCounter lines to inc files that need them.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37194 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 23:12:28 +00:00
Richard Heck
49436e4c2d Add NoCounter layout tag. When working on output of equation numbers, I
noticed that article, for example, still has a counter "chapter". This
surprised me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37193 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 22:53:41 +00:00
Richard Heck
4b1777d2fa Inset::addToToc() can and should be const. It wasn't, I take it, because
of things like:
  pit.push_back(CursorSlice(*this));
which I've had to change to:
  pit.push_back(CursorSlice(const_cast<InsetCaption &>(*this)));
and similarly in a few other places.

If anyone thinks we should instead have:
  explicit CursorSlice(Inset const &);
then we can also do that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37192 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 22:23:27 +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
Richard Heck
ee351906e0 Fix bug #7230. Changes at r36974 had not been done properly. But this is
better than what we had, anyway, since we do not calculate the tocstring
unless we need it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37190 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 21:25:45 +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
c99a8a702c Fix bug #7233: amsthm does not work with the redefined \[ command of fixltx2e.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37187 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 19:54:46 +00:00
Richard Heck
645f9fdf6d Fix bug #6894. We save counter information during updateBuffer(), and
then output \setcounter macros during snippet generation, so that we get
the right equation values.

Note: It would be possible to use this same machinery to fix bugs in
instant preview, e.g., that you always get things like (0.3) as equation
numbers, if you use equations numbered by section. I'll perhaps post a
patch for that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37186 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 16:04:59 +00:00
Richard Heck
f1a54ebe18 Complete fix for bug #7225.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37185 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 13:50:46 +00:00
Richard Heck
f3c472e769 Remove obsolete comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37184 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 13:40:47 +00:00
Pavel Sanda
a20882a270 * RELEASE-NOTES
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37183 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 13:30:34 +00:00
Pavel Sanda
2e3953cb03 Update enumitem module and add documentation for it.
From Guenter Milde.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37182 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-12 10:12:14 +00:00
Richard Heck
68c43a2b18 XHTML output was a mess for grids output as LaTeX. This will probably
still be a mess in many cases, but hopefully we won't have to go here
very often.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37181 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 23:55:20 +00:00
Richard Heck
fe9aabf34a Fix equation number output for MathML+HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37180 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 23:34:59 +00:00
Richard Heck
7ef3d12a80 Fix equation number output for XHTML+MathML. HTML to come.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37179 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 23:18:56 +00:00
Pavel Sanda
6753cd1e63 sv.po update from Jim Rotmalm
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37178 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 21:36:41 +00:00
Richard Heck
47ca44e296 Record and use equation numbers. This is towards getting equation
numbering in XHTML output, but it's just as easy to fix this in the LyX
display.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37177 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 19:35:52 +00:00
Peter Kümmel
826298831d When getting packages via miktex 3 minutes is to short for
the timeout. 30 minutes should be enough, also for very big documents.
#7228

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37176 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-11 18:46:41 +00:00
Peter Kümmel
51558fbf23 cmake: we have 2011 and more white space changes, won't call it "use tabs" ;)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37175 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 23:28:52 +00:00
Peter Kümmel
707eeb22fb cmake: we have 2011 and more white space changes, won't call "use tabs" ;)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37174 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 23:24:00 +00:00
Peter Kümmel
cdb3b00033 cmake: cmake is really a strange macro language
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37173 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 23:01:13 +00:00
Pavel Sanda
e576a4e3b5 Remerge sv.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37171 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 22:51:38 +00:00
Peter Kümmel
78b8dc905b cmake: add the CMakeLists files, so cmake will check if a cmake file has changed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37170 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 22:49:12 +00:00
Peter Kümmel
715b9e92bd cmake: make the merged build much more usable by adding all the source files to the IDE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37169 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 22:47:58 +00:00
Pavel Sanda
aec9cfe725 New Swedish translation from Jim Rotmalm.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37168 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 22:44:22 +00:00
Jean-Marc Lasgouttes
5d2cddfaca When hyperref is active, define the \LyX macro in a way that does
not break in PDF table of contents (using texorpdfstring).

Uwe, this should allow you to remove some ERT from the documentation.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37164 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 17:27:56 +00:00
Stephan Witt
0e5369dcda #7209 avoid a crash in inMacroMode(): one cannot get the previous atom of an empty math cell
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37162 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 10:23:10 +00:00
Stephan Witt
af77fb5186 #7208 reset undo group level in Undo::clear() too
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37161 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 09:44:55 +00:00
Vincent van Ravesteijn
6eea764ead Cursor: constify.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37160 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 09:38:20 +00:00
Pavel Sanda
28c7e370f5 Back to svn
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37159 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 00:06:36 +00:00
Pavel Sanda
592e75456d Prepare beta3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37157 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-09 23:45:51 +00:00
Pavel Sanda
4f84773c29 Final remerge
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37156 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-09 22:48:25 +00:00
Abdelrazak Younes
a07d9f2192 Clear undo/redo stack when reloading buffer. This fixes #7208.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37155 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-09 17:55:16 +00:00
Peter Kümmel
23609ed7fb camke: when checking for a variable then also use it
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37154 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-09 00:55:40 +00:00
Uwe Stöhr
c17d27e066 German Tutorial.lyx: change \overrightarrow to \vec as requested on the lyx-docs list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37153 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-08 19:15:43 +00:00
Peter Kümmel
759eb1826d cmake: also build merged on mac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37152 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-08 17:16:12 +00:00
Pavel Sanda
23ac011dc8 Enumitem's "Labeling/LyX-List" should not change the original layout.
Patch from Guenter.
http://www.mail-archive.com/lyx-users@lists.lyx.org/msg84689.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37150 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 22:18:43 +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
Stephan Witt
64d9fed8c3 #7220 correct spell check state ranges for word splits
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37146 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 15:20:58 +00:00
Enrico Forestieri
8882b2b68f Update it.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37145 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 01:09:23 +00:00
Uwe Stöhr
c4a93a4909 installer: don't use Python 3.x for LyX; fixes #7143
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37144 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-07 00:28:45 +00:00
Uwe Stöhr
4cb349c468 stdmenus.inc: remove item that produced incorrect LaTeX code: a framed box can only have page breaks when there is no inner box, but this item created an framed box with a minipage as inner box _and_ allowed page breaks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37142 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 23:53:32 +00:00
Uwe Stöhr
405348e416 Merge the AdvancedSearch.lyx file to the UserGuide.lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37141 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 23:25:22 +00:00