anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-14 15:05:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,964 Commits 31 Branches 172 Tags 617 MiB
b1d94940ee
Commit Graph

14964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Marc Lasgouttes
601a8e0192 Rewrite the label numbering code. 
* buffer_funcs.cpp (updateLabels): new function taking a buffer and
	a ParIterator as arguments. This one is used to update labels
	into an InsetText. Cleanup the code to reset depth. Call setLabel
	for each paragraph, and then updateLabel on each inset it contains.
	(setCaptionLabels, setCaptions): removed.
	(setLabel): use Counters::current_float to make caption paragraphs
	labels.

	* insets/Inset.h (updateLabels): new virtual method, empty by
	default; this numbers the inset itself (if relevant) and then all
	the paragraphs it may contain.

	* insets/InsetText.cpp (updateLabels): basically calls
	lyx::updateLabels from buffer_func.cpp.

	* insets/InsetCaption.cpp (addToToc): use the label constructed by
	updateLabels.
	(computeFullLabel): removed.
	(metrics, plaintext): don't use computeFullLabel.
	(updateLabels): new method; set the label from
	Counters::current_float.

	* insets/InsetWrap.cpp (updateLabels):
	* insets/InsetFloat.cpp (updateLabel): new method; sets
	Counters::current_float to the float type.

	* insets/InsetBranch.cpp (updateLabels): new method; the numbering
	is reset afterwards if the branch is inactive. (bug 2671)

	* insets/InsetNote.cpp (updateLabels): new method; the numbering
	is reset after the underlying InsetText has been numbered.
	(bug 2671)

	* insets/InsetTabular.cpp (updateLabels): new method (also handles
	longtable)

	* insets/InsetListings.cpp (updateLabels): new method; mimics what
	is done for Floats (although Listings are not floats technically)

	* insets/InsetInclude.cpp (getScreenLabel): in the listings case,
	use the computed label.
	(updateLabels): new method; that either renumbers the child
	document or number the current listing.

	* LyXFunc.cpp (menuNew): do not updateLabels on empty documents
	(why do we do that at all?)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19482 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 21:43:58 +00:00
André Pönitz
f78fcc859e add QT_NO_KEYWORDS 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19481 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 21:41:39 +00:00
Uwe Stöhr
522f352ac0 EmbeddedObjects.lyx: Add section about longtable alignment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19479 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 21:30:54 +00:00
Christian Ridderström
e54ae72e5f Fixed some lines that were too long. It compiled afterwards. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19475 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 20:16:28 +00:00
André Pönitz
c534500a9b more verbose message 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19473 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 19:24:05 +00:00
André Pönitz
8613a2f29e fix crash after assertion when using %s with integer arguments 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19472 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 18:58:59 +00:00
Christian Ridderström
5d356249a0 fix warning on possibly(?) unused precompiled headers due to different -fPic settings on pch creation and use 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19469 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 18:46:23 +00:00
Christian Ridderström
559c2f6482 fix warning on possibly(?) unused precompiled headers due to different -fPic settings on pch creation and use 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19468 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 18:42:57 +00:00
Christian Ridderström
9b541f922f fix warning on possibly(?) unused precompiled headers due to different -fPic settings on pch creation and use 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19467 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 18:39:06 +00:00
Jean-Marc Lasgouttes
121b80a227 small tweak of configure help messages 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19466 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 18:31:25 +00:00
Jean-Marc Lasgouttes
1afbb2301e also install en.lproj file in the bundle on the mac 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19463 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 17:49:50 +00:00
José Matox
f130c13c7b Increase the file format, now every \\begin_deeper has a corresponding \\end_deeper. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19461 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 14:56:49 +00:00
André Pönitz
31d782b820 shuffle (la)texstream around a bit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19460 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 14:54:54 +00:00
André Pönitz
2515a3bded remove reference to LaTeXStream 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19459 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 14:22:31 +00:00
André Pönitz
1a0f0fa186 some renamimg 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19458 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 14:03:48 +00:00
Martin Vermeer
273631ea6d only include precompiled headers once 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19456 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 13:38:45 +00:00
José Matox
ca81b43f03 Fix bug 518 (thanks to Jean Marc and Martin for the help) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19455 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 13:25:36 +00:00
Uwe Stöhr
8622ebaa4d UserGuide.lyx updates: - add description of thesaurus 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19454 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 13:16:34 +00:00
André Pönitz
e2a5dd2fc6 whitespace 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19453 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 12:51:00 +00:00
André Pönitz
ed73dc21ad cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19452 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 12:44:42 +00:00
André Pönitz
6b229b2250 cosmetics (whitespace and no-op functions) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19451 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 12:40:11 +00:00
André Pönitz
a33b2f1ca9 remove HSV color 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19450 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 11:19:26 +00:00
André Pönitz
b202985f2d remove unsued classes HSVColor and NamedColor 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19449 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 11:08:51 +00:00
Uwe Stöhr
f12f6f8043 UserGuide.lyx updates: - revise descriptions of Branches and Nomenclature 
- add a nomenclature
                       - many other cleanups

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19448 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 11:05:26 +00:00
André Pönitz
333103801b add missing header 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19447 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 10:50:49 +00:00
André Pönitz
2caa98bee0 disable some tests for standard C++ features; add a line counting stream for lates output 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19446 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-12 08:57:17 +00:00
André Pönitz
a4e8658088 moccable files are special after all 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19445 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 23:36:42 +00:00
André Pönitz
3649087ce9 add client building 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19443 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 23:02:37 +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
Jean-Marc Lasgouttes
8f818f241a typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19440 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 21:22:33 +00:00
Jean-Marc Lasgouttes
2a3cfcec5e the file has been removed 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19436 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 20:58:38 +00:00
Jean-Marc Lasgouttes
7c6a6e02c4 fix linking of qt4 frontend 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19435 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 20:55:10 +00:00
André Pönitz
f88d076a77 fix client linking 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19434 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 20:22:38 +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
Jean-Marc Lasgouttes
55d7d1cfeb rename the generated package.C to Package.cpp, as it should. You may have to rebuild all, at least in support (but you are used to it, now....) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19431 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 18:35:13 +00:00
André Pönitz
da1c04ea9a fix linking error in the frontend 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19430 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 18:24:00 +00:00
Jean-Marc Lasgouttes
ff2a74b41d * Counter.cpp (hasCounter): new method. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19429 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 18:23:30 +00:00
Jean-Marc Lasgouttes
fe8c51c822 fix running lyx with libtools and shared libraries 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19428 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 18:15:33 +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
d9af2acb53 make scons cope with renamed ui_*.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19426 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 11:24:17 +00:00
André Pönitz
168f6a5a50 fix position of inferior libraries 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19425 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 11:09:09 +00:00
André Pönitz
5d80a87ceb merge {mathed,insets,graphics}/Makefile.am into src/Makefile.am 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19424 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 10:32:36 +00:00
André Pönitz
12b09d5251 merge controllers/Makefile.am and controllers/tests/Makefile.am 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19423 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 09:36:14 +00:00
André Pönitz
15b104953a merge support/Makefile.am and support/tests/Makefile.am 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19422 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 09:15:35 +00:00
André Pönitz
b99bbdb7f1 move tex2lyx and client subdir handling to the main Makefile.am, so they won't be considered when building in src only. Faster roundtrips... 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19421 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 08:48:57 +00:00
André Pönitz
d4069f6519 fix configure.ac 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19420 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 08:30:24 +00:00
André Pönitz
9cf79551b6 readd pch.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19417 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 08:03:47 +00:00
Uwe Stöhr
7878a3558d UserGuide.lyx: fix some typos 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19416 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 01:48:54 +00:00
Uwe Stöhr
5564407c2c UserGuide.lyx updates: - Finish the descriptions of the bibliography and the document settings dialog 
- add a BibTeX bibliography

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19415 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 01:20:33 +00:00
André Pönitz
8a79744d8b merge qt4/Makefile.am and qt4/ui/Makefile.am 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19414 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-10 23:19:07 +00:00