Commit Graph

472 Commits

Author SHA1 Message Date
Lars Gullik Bjønnes
fc1437e74e Bug: 1025
2003-10-08  Lars Gullik Bj�nnes  <larsbj@gullik.net>

* text2.C (incrementItemDepth): new function, use a backtracking
algorithm to discover the correct item depth.
(resetEnumCounterIfNeeded): new function, use a backtracking
algorithm to discover if counter reset is needed.
(setCounter): use them. Simplify a bit. Add different labels for
different item depths for itemize.

* paragraph.C (Paragraph): remove initialization of enumdepth
(operator=): ditto

* paragraph.h: get rid of enumdepth, and use itemdepth both for
enumerate and itemize. Change the type of itemdepth to signed char.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7882 a592a061-630c-0410-9148-cb99ea01b6c8
2003-10-08 17:44:32 +00:00
André Pönitz
6810aa2ab8 * lyxtext.h: make the paragraphs_ a pointer instead a ref to make the
thing assignable.
	* text.C:
	* text2.C: adjust

	* tabular.[Ch]: fix crash after 'row-insert'

insets:

 * insetcollapsable.C:
  * insettext.[Ch]: saner 'init' structure

  * updatableinset.[Ch]: remove unneeded code


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7880 a592a061-630c-0410-9148-cb99ea01b6c8
2003-10-08 14:29:16 +00:00
Lars Gullik Bjønnes
44cd0fc9a1 The std::string mammoth path.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7862 a592a061-630c-0410-9148-cb99ea01b6c8
2003-10-06 15:43:21 +00:00
Angus Leeming
e7e92ec660 Remove IsInsetChar and IsWordChar from textutils.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7771 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-16 12:12:33 +00:00
André Pönitz
92a24f6f99 the automatic label patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7739 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-12 17:13:22 +00:00
Angus Leeming
57a24ea912 Replace 'using namespace abc;' with 'using abc::xyz;'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7725 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-09 22:13:45 +00:00
Lars Gullik Bjønnes
fcdb71906b Change Assert to BOOST_ASSERT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7722 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-09 17:25:35 +00:00
Angus Leeming
f9c1cafbe6 Pragmatic pimpl-ing of BufferParams.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7721 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-09 17:00:19 +00:00
Angus Leeming
e835c9477b Pimpl Buffer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7719 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-09 11:24:33 +00:00
Angus Leeming
fd36f5ad76 Make buffer's member variables private; use accessor functions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7717 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-09 09:47:59 +00:00
Angus Leeming
4c6e0fe422 Removed all redundant using directives from the source.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7704 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-08 00:33:41 +00:00
Angus Leeming
462eca7d1a Remove a couple of #includes from buffer.h
Reorder #includes in lots of files into some semblence of a coherent order.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7695 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-06 18:38:02 +00:00
Angus Leeming
2e1eeac0b9 Replace ParagraphList.h with ParagraphList_fwd.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7693 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-06 12:36:58 +00:00
Angus Leeming
b0a5773d95 Reduce 115 dependencies on RowList.h to just 10 dependencies on lyxrow.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7692 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-06 11:01:50 +00:00
Angus Leeming
f239801ae3 Changes due to the removal of using directives from support/std_sstream.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7686 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-05 18:02:24 +00:00
Angus Leeming
236ea81bc5 Replace LString.h with support/std_string.h,
Lsstream.h with support/std_sstream.h,
support/LIstream.h with support/std_istream.h,
support/LOstream.h with support/std_ostream.h.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7685 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-05 17:23:11 +00:00
Angus Leeming
91de22ef34 Strip 320 #includes from the files in src.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7684 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-05 16:31:30 +00:00
Lars Gullik Bjønnes
bf053299a6 fix cursorEnd, remove lastPrintablePos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7664 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-04 15:21:34 +00:00
Angus Leeming
1dffc5cfe4 Move #includes out of header files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7659 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-04 03:54:04 +00:00
John Levon
0769f8d599 remove cursor.i[xy]
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7640 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-02 17:08:54 +00:00
John Levon
c96136c040 bug 1376 partial fix and simplification.
End will still place the cursor on the next row visually if there's another row after the
current one in the par. This is a general problem, dunno why it's doing it now.

.ix() breakage possibly


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7638 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-02 15:44:36 +00:00
Lars Gullik Bjønnes
b881ed2d5a Use Buffer const reference in most placees possible.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7623 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-28 07:41:31 +00:00
Alfredo Braunstein
cf6549229d moves top_y from lyxtext to BufferView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7616 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-27 14:55:20 +00:00
Alfredo Braunstein
7338f3b980 Add In nsetOld * argument to updateInset to rebreak the correct par.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7615 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-27 13:51:18 +00:00
André Pönitz
407c8f08bc remove InsetOld::par_owner & handling
(const correct after Angus' comment)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7610 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-26 16:36:53 +00:00
André Pönitz
ef2290cf5e Martin's fullRow patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7605 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-26 10:33:59 +00:00
Alfredo Braunstein
189b00a5c9 Rationalise the position of calls to updateRowPostitions, remove the returned (and computed) y position from getRow and getRowNearY (and solve a bug in this one).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7603 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-25 10:24:26 +00:00
Angus Leeming
0be0fcfd59 If I ever see another licence blurb again, it'll be too soon...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7598 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-23 00:17:00 +00:00
André Pönitz
cb5af90a1b support for \overset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7594 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-22 16:01:13 +00:00
André Pönitz
95e822007d next try to single Inset::metrics() computation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7592 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-22 12:38:21 +00:00
André Pönitz
359519bda4 remove the spurious metrics() (ex-update()) call from setRowHeight()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7590 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-22 11:54:02 +00:00
André Pönitz
0510f56da8 the lyxrow changes including accessors.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7583 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-22 09:40:56 +00:00
André Pönitz
b7f49f9b42 * lyxrow.[Ch]: add end_ member
* lyxrow_funcs.C: use LyXRow::end_

	* lyxtext.h (singleWidth): add LyXFont parameter

	* rowpainter.C:
	* text2.C: adjust LyXText::singleWidth() calls

	* text.C (redoParagraph): simplify row breaking logic


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7580 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-22 07:49:57 +00:00
André Pönitz
040a03e4a4 rowpainter.C: remove extra metrics calls
lyxtext.h: merge the two constructors into a single one,
 pass reference to owner's par list

 BufferView_pimpl.C:
 text.C:
 text2.C: adjust


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7557 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-15 14:54:19 +00:00
André Pönitz
f48ccf9641 re-enable DEPM for setCursorFromCoordinate
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7556 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-15 13:20:45 +00:00
André Pönitz
43637efd25 better fix for anchorrow problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7555 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-15 13:12:24 +00:00
André Pönitz
9a7cef54a6 partial fix for anchor_row problems
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7554 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-15 12:53:57 +00:00
André Pönitz
c83eaea4d2 draw a bit more than strictly necessary.....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7553 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-15 12:09:25 +00:00
André Pönitz
09e0187997 split LyXText::rowlist_ into individual Paragraph::rows_ chunks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7551 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-15 08:03:54 +00:00
André Pönitz
55a3d84728 some infrastructure to prepare the rowlist split
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7544 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 14:10:13 +00:00
André Pönitz
29eb0e10ce more getPar
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7541 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 11:56:04 +00:00
André Pönitz
648523b389 some more getPar removals
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7539 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 11:16:31 +00:00
André Pönitz
85296c7253 getPar
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7538 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 10:10:19 +00:00
André Pönitz
b54607cb4f remove four getPar()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7537 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 09:59:05 +00:00
André Pönitz
003bb374a5 next try...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7536 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 08:34:13 +00:00
André Pönitz
a9d4d09715 grr.. revert. wrong patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7535 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 08:17:27 +00:00
André Pönitz
87cab819b4 remove Row::pit_ member
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7534 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-14 07:43:57 +00:00
André Pönitz
566e084f63 weekend stuff less the chunk John "*strongly* disagrees with"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7527 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-11 09:09:01 +00:00
André Pönitz
87d49485e9 more not-so-useful stuff removed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7526 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-08 16:24:32 +00:00
André Pönitz
0a2ca7c7e0 remove unneeded LyXText::redoHeightOfParagraph
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7525 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-08 16:05:41 +00:00