anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,410 Commits 31 Branches 172 Tags 616 MiB
7dcffe09f4
Commit Graph

16410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Heck
7dcffe09f4 It used to be that things like InsetFlex, InsetCaption, and the like used the default layout, whatever that is---usually Standard. That gave rise to bug 2178, the solution to which is to define a new empty layout, which insets like these use instead of the default. See r22966. 
So, when we have an older LyX file, it will look like this:
\begin_inset ERT
status open

\begin_layout Standard

this that
\end_layout

\end_inset
which is now invalid, because ERT uses only PlainLayout. So I had put some code into Text::readParToken, where the layout for a paragraph gets set as it is read:
       if (par.forceEmptyLayout()) {
           // in this case only the empty layout is allowed
           layoutname = tclass.emptyLayoutName();
       } else if (par.useEmptyLayout()) {
           // in this case, default layout maps to empty layout
           if (layoutname == tclass.defaultLayoutName())
               layoutname = tclass.emptyLayoutName();
       } else {
           // otherwise, the empty layout maps to the default
           if (layoutname == tclass.emptyLayoutName())
               layoutname = tclass.defaultLayoutName();
       }
This turns out not to work, because par.forceEmptyLayout() and par.useEmptyLayout() always return false here, because par.inInset() always returns a null pointer, because the paragraph's inset hasn't yet been set when Text::readParagraph() gets called from Text::read() gets called from InsetText::read(). The solution is to set the paragraph's inset when it is created, which means passing a pointer to the various read() routines along the way.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23057 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-19 02:35:07 +00:00
Jean-Marc Lasgouttes
85c0bf5e16 * CutAndPaste.cpp (eraseSelectionHelper): when the last paragraph that 
is cut is completely erased, remove it regardless of its layout (fixes
	bug 3995).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23054 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-18 10:16:43 +00:00
Jean-Marc Lasgouttes
c075a285a0 * TextClass.cpp (read): do not use istrstream (which is deprecated), 
but istringstream instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23053 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-18 10:03:30 +00:00
Jean-Marc Lasgouttes
6f5e86e065 more compile fixes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23052 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-18 09:55:14 +00:00
Abdelrazak Younes
d4e9968494 Compile fix by Kornel Benko. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23051 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-18 09:44:02 +00:00
Abdelrazak Younes
b09542af9d cosmetics. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23050 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-18 07:44:07 +00:00
Abdelrazak Younes
2bf1c09376 header cleanup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23049 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-18 07:14:42 +00:00
Abdelrazak Younes
ba76bf5eb8 header cleanup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23048 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-17 20:47:04 +00:00
Abdelrazak Younes
c38f62d71b header cleanup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23047 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-17 20:18:12 +00:00
Abdelrazak Younes
8d5bcad767 header cleanup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23046 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-17 20:17:33 +00:00
Abdelrazak Younes
9f3c7cf1ea Factorize closeEvent() for GuiDialog based dialogs. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23045 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-17 20:16:14 +00:00
Uwe Stöhr
db2f9afc84 de.po: more updates by Jürgen 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23043 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-17 14:09:20 +00:00
Uwe Stöhr
87fedd9c42 de.po: updates by Jürgen 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23040 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-16 21:00:21 +00:00
Dov Feldstern
deb86513df Fix typing of digits in RTL text, which was broken way back during the Font/Language separation (r21240). 
The problem was that when typing a digit in RTL text, the language was being 
switched to LTR, which is wrong.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23037 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-16 18:39:20 +00:00
Uwe Stöhr
ef1bca5f70 de.po: some updates by Jürgen and me 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23035 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-16 17:23:07 +00:00
Jürgen Spitzmüller
8aec041bcc * lib/examples/addressExample.adr: 
- don't use German abbreviations (such as "w") and expressions.
	- add some documentation.
* lib/examples/de/serienbrief[1-3]: 
	- fix spelling

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23031 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-16 09:23:35 +00:00
Uwe Stöhr
f35ff8f60d Color.cpp, ColorCode.h: define new colors for inset labels and insets text 
stdinsets: use the new colors to allow the users to customize them

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23029 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 23:38:16 +00:00
Richard Heck
e7c8aa0977 Define algorithm. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23026 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 17:03:07 +00:00
Abdelrazak Younes
cabae2b079 cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23024 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 14:30:08 +00:00
Jürgen Spitzmüller
ebc4649508 Fix a crash following the input of an invalid paragraph separation value in the document settings dialog (bug 4556). 
* src/frontends/qt4/GuiDocument.cpp:
	- disallow input of defskip length without actual length value.

* src/BufferParams.cpp (readToken):
	- there might be documents with the invalif "\defskip defskip" param. Reset this to "\defskip medskip".

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23022 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 14:13:05 +00:00
Jürgen Spitzmüller
fa10443c54 * src/insets/InsetTabular.cpp: 
- fix check for top- and bottomlines (rev. 23011).
	  topLine and bottomLine take a cell argument, not a row.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23020 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 11:36:05 +00:00
Martin Vermeer
b2c9fa1cfc Document flex-insert 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23019 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 10:13:50 +00:00
Abdelrazak Younes
c3a8b3a566 * Inset: Prepare for an eventual merge of updateLabels() and addToToc() 
* TocBackend: add non const toc() and tocs() access methods.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23018 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 10:13:32 +00:00
Abdelrazak Younes
5b7eb343ec InsetFoot::updateLabels(): fix potentially dangerous bug. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23017 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 09:41:53 +00:00
Abdelrazak Younes
17efe15322 Outliner: Fix synchronous navigation for all types. 
* GuiToc::currentIndex(): remove FIXME


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23016 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 08:50:35 +00:00
Abdelrazak Younes
d8ee26ec6c * InsetXXX::addToToc(): properly use passed ParConstIterator. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23015 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 08:39:58 +00:00
Abdelrazak Younes
0a64dfa594 * ParConstIterator::push_back(): new method for easier iterative construction. 
* InsetCaption::addToToc(): use that.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23014 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 08:32:27 +00:00
Abdelrazak Younes
f1c4a07544 Add list of numbered equations. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23013 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 08:09:35 +00:00
Uwe Stöhr
82984ec711 InsetTabular.cpp: revert the \bottomline fix from the previous commit because it inly works for certain cases. (I'm running out of ideas to fix this for all case, see http://bugzilla.lyx.org/show_bug.cgi?id=4554#c6 ) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23012 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 01:28:46 +00:00
Uwe Stöhr
c9329d272b InsetTabular.cpp: check for top and bottom lines, fixes http://bugzilla.lyx.org/show_bug.cgi?id=4554 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23011 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 00:28:42 +00:00
Uwe Stöhr
f647ae9e8a stdinsets.inc: use minimalistic style for listings as intended by Richard (I changed this unwanted in 22923) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23010 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 22:44:42 +00:00
Uwe Stöhr
31bc8149d3 the missing bits of r23003 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23008 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 22:17:54 +00:00
Uwe Stöhr
21c5540c8e adjust SCons according to r23006 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23007 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 22:13:30 +00:00
Richard Heck
85deaeb165 Get rid of GuiIndex since we no longer need it. Simplify the remaining code. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23006 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 18:06:47 +00:00
Richard Heck
b1306a979a Code rules. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23005 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 17:00:40 +00:00
Abdelrazak Younes
1a4891dec0 InsetNote::addToToc(): Stupid Bug fix causing crash on Mac. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23004 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 15:29:22 +00:00
Martin Vermeer
370afc3567 Minimalistic module 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23003 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 11:23:44 +00:00
Abdelrazak Younes
15ff669dd0 factorize code between GuiFontMetrics::rectText() and buttonText(). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23000 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 09:44:12 +00:00
Abdelrazak Younes
9e4780ffd8 * buttonText(): painting tweaks. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22999 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 08:49:45 +00:00
Abdelrazak Younes
b0b7fbad8e InsetText::draw() Painting tweaks; reduce the frame by two pixels. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22998 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 08:24:52 +00:00
Abdelrazak Younes
f30f4129e9 * InsetNote::addToToc(): Prefix toc entries with note type. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22997 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 07:30:33 +00:00
Richard Heck
14d7b57487 Cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22996 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 07:10:12 +00:00
Richard Heck
10476b2264 Protect our data. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22995 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 05:28:59 +00:00
Richard Heck
71c1bd5b2e Do not inherit from std::map here either. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22994 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 05:14:22 +00:00
Richard Heck
485478e47c Do not inherit from std::map. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22993 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 05:00:54 +00:00
Martin Vermeer
f850b0b281 Improve flex-insert doxy 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22992 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 04:38:01 +00:00
Richard Heck
369d21f4e2 Fix Layout::read() API. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22991 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 04:12:15 +00:00
Richard Heck
b9670d7209 Fix previous commit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22990 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 03:49:12 +00:00
Richard Heck
3dc5bc09dd Make sure we write a valid file even if InsetFlex is undefined. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22989 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 03:42:54 +00:00
Richard Heck
b76e95b942 Fix TextClass::read API. Also some cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22988 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 03:38:08 +00:00