Commit Graph

14251 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
f756c02329 The counters labelstring patch. Part 2: Use the new code.
* src/Paragraph.cpp (expandLabel): if the labelstring is empty,
	use \thecounter instead; when processing @layout@ tokens, pass the
	process_appendix boolean.

	* src/buffer_funcs.cpp (setLabel):
	* src/insets/InsetFoot.cpp (updateLabels): 
	* src/insets/InsetCaption.cpp (updateLabels): use
	Counters::theCounter.

	* src/insets/InsetBibitem.cpp: remove the ad-hoc numbering code
	and replace it with a proper updateLabels-based solution.

	* src/insets/InsetCommands.cpp (refresh): new method.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19603 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 11:12:56 +00:00
Jean-Marc Lasgouttes
88177a89cb The counters labelstring patch. Part 1: the infrastructure.
* src/Counters.cpp (Counter::labelString/labelStringAppendix): new
	accessors for two new variables
	(Counter::setMaster): removed
	(Counter::Counter): add a version with arguments.
	(Counters::newCounter): add relevant arguments; allow to redefine
	an existing counter.
	(Counters::reset): reset the current float float.
	(Counters::theCounter): return a representation of a given counter
	using its labelstring or by default \themaster.\arabic{counter}.
	Handle appendix too.
	(Counters::counterLabel): add support for macros of the form
	\thecounter. 

	* src/TextClass.cpp (readCounters): also read LabelString and
	LabelStringAppendix. 
	(readFloats): allow to update an existing float; create the
	counter associated with the float.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19602 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 11:07:00 +00:00
Enrico Forestieri
eb658ebabc Cosmetics (alignment)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19599 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 05:15:06 +00:00
Richard Heck
5bb22d9498 Re-write of the BibTeX representation. The main change is that we now have
a structure representing field->value instead of just a single string with
all the data. The data structures are defined in src/Biblio_typedefs.h, and
the main changes are to the parser code in src/insets/InsetBibtex.cpp.

-src/Biblio_typedefs.h
 Contains typedefs for new representation. Separating them out limits how much 
 gets #include'd by other files, and also resolves a circularity problem with
 Buffer.h.

-src/Biblio.{h,cpp}
 Signature changes and massive simplifications to routines that report
 BibTeX data, since we now have an articulate representation.

-src/insets/InsetBibtex.{h,cpp}
 Re-write the parser code so we store a key->value map of the BibTeX data
 rather than just one long string. This is the main work.

-src/frontends/controllers/ControlCitation.{h,cpp}
-src/insets/InsetBibitem.{h,cpp}
-src/insets/InsetCitation.cpp
 Adaptations and simplifications.

-src/insets/Inset.h
-src/Buffer.{h,cpp}
-src/insets/InsetInclude.{h,cpp}
 Signature changes.

-src/Makefile.am
-development/scons/scons_manifest.py
 Add src/Biblio_typedefs.h


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19598 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 01:59:20 +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
de137b3013 fix client linking
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19596 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 23:12:45 +00:00
José Matox
345c44c3eb Add Susana to list of contributors
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19593 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 20:32:49 +00:00
Jean-Marc Lasgouttes
1c1a1eca82 fix file format
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19592 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 19:25:59 +00:00
Abdelrazak Younes
bf33e34869 fix signal crash with gcc 3.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19591 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 15:13:22 +00:00
Jean-Marc Lasgouttes
9ac7aa9115 compilation fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19590 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 13:47:32 +00:00
Abdelrazak Younes
5958daf51b Fix child document labeling (const missing from overloaded updateLabels()).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19589 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 12:15:16 +00:00
André Pönitz
c52c82f0cd add Biblio.{cpp,h}
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19588 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 10:12:36 +00:00
Abdelrazak Younes
20c7daed31 eol-style to native.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19587 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 08:57:58 +00:00
Abdelrazak Younes
eb14ee5e22 * Buffer.cpp: load all child documents in one go where it makes sense. This has the advantage to call updateLabels() only once for the master buffer. We can think of maintaining a child document list in the future.
* Biblio.cpp: fillWithBibKeys(): ditto.

* InsetInclude.cpp: loadIfNeeded(): set the parent name in any case.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19586 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 08:55:36 +00:00
Abdelrazak Younes
4d8c291cd0 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19585 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 08:29:10 +00:00
Alfredo Braunstein
da48080cc7 whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19584 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 06:53:25 +00:00
Richard Heck
92b707bebc Minor adjustment to previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19582 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 04:37:14 +00:00
Richard Heck
de373da67b Add LFUN_PARAGRAPH_PARAMS (= paragraph-params), used for changing a paragraph's alignment, spacing, etc. This is complementary to LFUN_PARAGRAPH_PARAMS_APPLY, which sets the parameters. The difference is that APPLY over-rides all existing parameters, setting any not given to the default, whereas this one simply changes those that are given. So
paragraph-params \align right
will align the paragraph right, leaving spacing, etc, as they were, whereas
  paragraph-params-apply \align right
will align the paragraph right but also reset all other parameters to defaults. Note, by the way, that this means that
  paragraph-params-apply
sets everything to default.

Some new arguments have also been introduced. These are:
  \indent
  \indent-toggle
  \spacing default
Of course, none of these are found in valid LyX files, but they are useful in menu bindings, etc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19581 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-15 02:21:09 +00:00
Jean-Marc Lasgouttes
58e6dba95f properly properly traces of alternative frontends
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19580 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 23:24:38 +00:00
Uwe Stöhr
3101c0bbc9 documentation: apply the last cleanups also to the other languages
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19579 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 23:09:56 +00:00
Uwe Stöhr
856489ffde installer: forgot changelog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19576 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 22:55:22 +00:00
Uwe Stöhr
17fb8c31f4 UserGuide.lyx: fix a chapter title
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19575 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 22:53:07 +00:00
Uwe Stöhr
4d83b4c7ae EmbeddedObjects.lyx: fix version number
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19574 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 22:52:31 +00:00
Uwe Stöhr
2427bfaf0f DummyDocument1/2.lyx: fix author names, a relict of a bug in LyX 1.5.0beta times
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19573 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 22:52:09 +00:00
Uwe Stöhr
88c869c928 installer: support for the new Portuguese translation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19570 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 22:32:02 +00:00
Jean-Marc Lasgouttes
80d05ab95c compilation fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19568 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 22:18:27 +00:00
Richard Heck
a3f613f0ca Cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19567 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 17:01:22 +00:00
Abdelrazak Younes
8f83eab31f Fix crash when the Outline dialog is opened on an empty document. This was caused by the commented out updateLabels() in LyXFunc::menuNew().
* Text: new empty() method.

* buffer_funcs.cpp:updateLabels(): return early in case of empty document.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19566 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 16:59:59 +00:00
Richard Heck
8a221dc70c Move the lyx::biblio namespace into src/. Also make changes to how the BibTeX
information is acquired. This involves (i) moving the bulk of fillWithBibKeys() 
into Biblio.cpp, (ii) introducing a virtual method Inset::fillWithBibKeys() that,
by default, does nothing, and (iii) over-riding this method in the insets that do
need to do something.

This is all preparatory for a more substantial re-working of the BibTex code,
which should follow shortly.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19565 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 16:50:51 +00:00
Abdelrazak Younes
59aa19e920 * callback.cpp: newFile() takes a LyXView instead of a BufferView.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19564 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 15:32:58 +00:00
Abdelrazak Younes
550649963c Transfer q_key_state() from GuiWorkArea.cpp to QKeySymbol.cpp. This will also be used later in GuiView.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19562 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 15:00:09 +00:00
Abdelrazak Younes
92ee23acb4 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19561 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 14:41:06 +00:00
Abdelrazak Younes
4080450341 Fix crash with updateLabels(). I changed the the test in the assertion but endless loops should be equally prevented with this version.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19560 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 14:31:41 +00:00
Martin Vermeer
249e97e216 fixing the 580 fix also for trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19559 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 14:21:46 +00:00
Abdelrazak Younes
588c4ba3ec Probable compile fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19557 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 13:20:16 +00:00
Abdelrazak Younes
3d1cfa550b Transfer Drag&Drop handling from GuiWorkArea to GuiView.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19556 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 13:14:47 +00:00
Abdelrazak Younes
db59cc47ee headers
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19555 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 12:25:21 +00:00
Abdelrazak Younes
4e92d79770 fix eol-style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19554 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 12:13:55 +00:00
Abdelrazak Younes
32268e2632 cosmetics + move frontends/* to frontend namespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19553 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 09:54:59 +00:00
Abdelrazak Younes
7ef45b8610 fix MSVC warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19552 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 09:44:38 +00:00
Abdelrazak Younes
55aafd2403 Cosmetic changes and more assertions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19551 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 08:53:34 +00:00
André Pönitz
d53be50ec1 add --with-qmake options to ./configure. using it overwrites the automake generated Makefiles with qmake generated ones
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19546 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 08:03:23 +00:00
José Matox
0b06fd0118 Update po directory, new Portuguese translation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19544 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 07:37:47 +00:00
André Pönitz
8964ea9140 prepare ground for a hybrid autoconf/qmake build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19542 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 05:30:05 +00:00
Bo Peng
9f77f2a39a fix scons, telling scons how to moc files is still needed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19541 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 05:02:50 +00:00
Uwe Stöhr
54bc047c85 UserGuide.lyx:
- finish Appendix A, the document is now ready except of Appendix B (description of the preferences dialog)
- add hint about XeTeX
- cleaned up index and cross-references
- add description of clearpage

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19540 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 02:16:56 +00:00
Enrico Forestieri
60c73c05a3 Add version information to the lyx executable on Windows.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19537 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 01:34:26 +00:00
Enrico Forestieri
d74be992b3 Fix dist target
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19536 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 01:30:33 +00:00
Jean-Marc Lasgouttes
131edb2214 more cleanups
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19535 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 00:46:11 +00:00
André Pönitz
76b12b85af add ugly hack to make client link again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19533 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 00:25:45 +00:00