Commit Graph

250 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
062c0017a4 Another fix for bug 3081 (related to booktabs this time)
* tabular.C (TeXRow): do not forget to increment the row counter


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17376 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-27 10:42:34 +00:00
Michael Schmitt
e7f4618bcc * src/tabular.[Ch]: simplify plaintext methods, because there
is no longer a need to count the number of lines


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-18 18:50:08 +00:00
Michael Schmitt
1f7a1257f1 * change LFUN file-insert-ascii to file-insert-plaintext
* change LFUN file-insert-ascii-para to file-insert-plaintext-para
* change LyXRC::RC_ASCIIROFF_COMMAND to LyXRC::RC_PLAINTEXT_ROFF_COMMAND
* change LyXRC::RC_ASCII_LINELEN to LyXRC::RC_PLAINTEXT_LINELEN
* replace "ascii" by "plaintext" in method names


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16697 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-15 22:49:14 +00:00
Georg Baum
31bc611f34 Fix bug 3067: Special column attributes can contain non-ascii characters,
so store them in a docstring.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16537 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-05 17:11:32 +00:00
Georg Baum
48dd256733 rename parameters to sensible names, the old names where misleading
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15933 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-15 09:17:40 +00:00
Michael Schmitt
c07d1814ac * src/tabular.C: remove change tracking FIXMEs; the code looks OK
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15648 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-31 20:58:12 +00:00
Abdelrazak Younes
eb651c3d61 Move BufferView cached pointer out of LyXText:
* LyXText
  - bv(), bv_owner, : deleted.
  - These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
  - These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
  - recUndo(): now need a LCursor argument.
 
* CoordCache::get(LyXText const *, pit_type):
  - now const.
  - use const_iterator instead of iterator.

* FontIterator:
  - add (Buffer const &) argument to ctor
  - buffer_: new const reference to applicable BufferView.

* InsetBase
  - xo(), yo(), covers() and neverIndent() are now const.

* InsetText::setViewCache(): deleted

All other changes are due to the LyXText and InsetBase API changes.



 
  

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
Edwin Leuven
91d32deed9 have row on 1 line when exporting to latex
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15576 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 09:54:56 +00:00
André Pönitz
6c300f72a2 move everything into namespace lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15422 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 00:16:43 +00:00
Michael Schmitt
c3a9c54632 change tracking:
* src/insets/insetbase.h: replace markErased(...) by
        setChange(...)
        * src/insets/insettext.h: replace markErased(...) and
        markNew(...) by setChange(...)
        * src/insets/insettabular.h: replace markErased(...) by
        setChange(...)
        * src/insets/insettabular.C:
        * src/insets/insetbase.C:
        * src/insets/insettext.C:
        * src/paragraph_pimpl.C:
        * src/tabular.C: adjust properly


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15392 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-20 09:29:19 +00:00
Lars Gullik Bjønnes
0d449056ef Output docbook as utf8. Probably quite a bit more work needed, but then help form a docbook person is needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15387 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-19 21:00:33 +00:00
Georg Baum
8b67659646 Use UTF8 for LaTeX export.
Known problems:
- No space is output after a \hfill. I probably broke this with the
  InsetCommand patch. I'll have a look later.
- Although the encoding is now UTF8 the arguments of the inputenc package
  are still the old ones, so LaTeX will not run.
- Labels and references with non-ASCII characters are broken. This needs to
  be fixed in lyx::support::escape(), but this is a file format change.
- Something seems to be wrong with index entries, but this is probably also
  due to the InsetCommand changes.

Have fun!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15378 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-19 16:51:30 +00:00
Georg Baum
34b7650cbb Introduce wide streams. This fixes the remaining problems of plain text
export (e.g. the ToC) and the navigate menu.

	* src/insets/insetbase.h
	(InsetBase::plaintext): output to a docstream
	(InsetBase::textString): ditto

	* src/mathed/TextPainter.h
	(TextPainter::show): ditto

	* src/support/docstream.[Ch] New file and string streams for
	docstring. The file streams convert to UTF8 on the fly.

	* many more files: Adjust to the changes above


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15301 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-11 19:40:50 +00:00
Michael Schmitt
eb11f2c542 Change tracking:
* rename output_changes to outputChanges
 * rename tracking_changes to trackChanges
 * add FIXMEs for later revision
 * remove trackChanges(); the CT data structure will always be set up
 * decouple LFUNs changes-output/change-accept/change-reject/
   all-changes-accept/all-changes-reject from LFUN changes-track



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15261 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-06 18:53:35 +00:00
Georg Baum
70d57a2300 Implement copying of rows and columns in tables
* src/insets/insettabular.C
	(InsetTabular::getStatus): enable COPY_ROW and COPY_COLUMN features
	(InsetTabular::tabularFeatures): handle COPY_ROW and COPY_COLUMN

	* src/tabular.h
	(TabularFeature): add COPY_ROW and COPY_COLUMN

	* src/tabular.[Ch]
	(LyXTabular::copyRow): new method, copy a row
	(LyXTabular::copyColumn): new method, copy a column


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15173 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-27 16:28:09 +00:00
Michael Schmitt
2a71306d77 drop linuxdoc support (part 4)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14821 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-23 11:16:08 +00:00
Georg Baum
0c0c43b8eb merge booktabs branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14319 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 19:13:56 +00:00
Lars Gullik Bjønnes
3b9338a3a8 Whitespace cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13565 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-05 23:56:29 +00:00
Georg Baum
a7ec02ea03 revert my faulty fix of bug 2380 and use one by Jean-Marc instead:
* insets/insettabular.C
        (InsetTabular::insertAsciiString): set BufferView cache of cell


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13524 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-29 10:13:40 +00:00
Georg Baum
2129ed9082 Fix bug 2380:
* src/insets/insettabular.C
        (InsetTabular::hasPasteBuffer):
        (InsetTabular::doDispatch):
        (InsetTabular::insertAsciiString): Construct LyXTabulars with a
        BufferView
* src/tabular.[Ch]
        (cellstruct): Set bv_owner of the text inset
        (LyXTabular::fixCellNums):
        (LyXTabular::appendRow):
        (LyXTabular::deleteRow):
        (LyXTabular::appendColumn):
        (LyXTabular::read): Construct cellstructs with a BufferView


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13516 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-28 12:49:47 +00:00
Jean-Marc Lasgouttes
0711d8e045 fix bug 2188
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10723 a592a061-630c-0410-9148-cb99ea01b6c8
2006-01-11 14:22:11 +00:00
Georg Baum
94a6cafe4a Don't hardcode standard layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10688 a592a061-630c-0410-9148-cb99ea01b6c8
2005-12-29 10:03:38 +00:00
Georg Baum
dd6c706cef restore 1.3 behaviour when changing tabular columns to variable width
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10625 a592a061-630c-0410-9148-cb99ea01b6c8
2005-11-28 11:52:03 +00:00
Jean-Marc Lasgouttes
52a2eb2c52 John&JMarc's change tracking patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10424 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-07 10:37:05 +00:00
John Levon
c273557259 fix bug 1748
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10341 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-20 00:10:56 +00:00
José Matox
c32b732f9d fix handling of one column tables
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10296 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-17 16:38:28 +00:00
André Pönitz
575bb2a15a fix bug 1815
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10285 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-17 14:23:33 +00:00
Martin Vermeer
5230d7b794 Fix tabular paste (and conflict markers in ChangeLog file :-)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9939 a592a061-630c-0410-9148-cb99ea01b6c8
2005-05-12 12:22:39 +00:00
Martin Vermeer
5d23b3046d Remove obsolete comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9911 a592a061-630c-0410-9148-cb99ea01b6c8
2005-05-05 18:50:33 +00:00
Lars Gullik Bjønnes
342cdf4322 the convert patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9538 a592a061-630c-0410-9148-cb99ea01b6c8
2005-01-27 21:05:44 +00:00
Lars Gullik Bjønnes
9c2ba3c4ff rename tostr.[Ch] to convert.[Ch]
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9448 a592a061-630c-0410-9148-cb99ea01b6c8
2005-01-06 16:39:35 +00:00
Lars Gullik Bjønnes
6a55be9506 tostr -> convert and some bformat work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9446 a592a061-630c-0410-9148-cb99ea01b6c8
2005-01-06 15:40:49 +00:00
José Matox
742ffb3032 Move convertion code from the C++ source (where is never called) to lyx2lyx.
(longtables).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9336 a592a061-630c-0410-9148-cb99ea01b6c8
2004-12-03 18:33:19 +00:00
Georg Baum
e70294c413 use better index types for tabular rows, columns and cells than int
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9334 a592a061-630c-0410-9148-cb99ea01b6c8
2004-12-03 13:57:50 +00:00
Lars Gullik Bjønnes
59413be9a0 clone NVI, other small stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9295 a592a061-630c-0410-9148-cb99ea01b6c8
2004-11-23 23:04:52 +00:00
José Matox
1ecc7b79cd Remove mixed_content from output parameters.
Escape ids to always produce legal output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9157 a592a061-630c-0410-9148-cb99ea01b6c8
2004-11-02 11:25:20 +00:00
Angus Leeming
e978fa42e3 Whitespace, only whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9044 a592a061-630c-0410-9148-cb99ea01b6c8
2004-10-05 10:11:42 +00:00
José Matox
f17505a8fb Remove space at end of line, when superfluous.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8953 a592a061-630c-0410-9148-cb99ea01b6c8
2004-08-16 11:27:51 +00:00
Jean-Marc Lasgouttes
d194cfffa5 get rid of ownerPar(), which was super slow; fix tabular crash due to recently introduced BOOST_ASSERTs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8951 a592a061-630c-0410-9148-cb99ea01b6c8
2004-08-16 00:32:04 +00:00
Jean-Marc Lasgouttes
c6204d60c2 small stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8934 a592a061-630c-0410-9148-cb99ea01b6c8
2004-08-14 21:28:59 +00:00
Lars Gullik Bjønnes
d20f0af816 some nicer margins and some small cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8925 a592a061-630c-0410-9148-cb99ea01b6c8
2004-08-14 15:55:22 +00:00
José Matox
d2f9e0a569 Fix bug 1147.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8899 a592a061-630c-0410-9148-cb99ea01b6c8
2004-08-13 13:07:02 +00:00
Lars Gullik Bjønnes
7c15014ec2 change "support/std_sstream.h" to <sstream>
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8849 a592a061-630c-0410-9148-cb99ea01b6c8
2004-07-24 10:55:30 +00:00
André Pönitz
0d43ba149a the stuff from the sneak preview:
For one, it still contains a few things that are already in CVS (the
'brown paperbag' changes).

Secondly, this changes the ParagraphList to a std::vector but does not
yet take full advantage of it except removing LyXText::parOffset() and
similar.

I had an extensive talk with my profiler and we are happy nevertheless.

This also moves almost all Cut&Paste specific stuff from text.C to
CutAndPaste.C. Much smaller interface now... Namespace CutAndPaste is
now  lyx::cap::. Was inconsistent with the rest....

Make ParagraphList a proper class. We'll need this later for a
specialized erase/insert.

Remove some unneeded prototypes and function declarations

Use ParameterStruct directly instead of ShareContainer<ParameterStruct>

Inline a few accesses to CursorSlice members as suggested by the profiler.

Fix commandline conversion crash reported by Kayvan.

Replace PosIterator by DocumentIterator. The latter can also iterate
through math and nested text in math...

Remove math specific hack from Documentiterator

Derive InsetCollapsable from InsetText instead of using an InsetText
member. This give us the opportunity to get rid of the InsetOld::owner_
backpointer.

Cosmetics in CutAndPaste.C and cursor.C. Fix nasty crash (popping slices
off an empty selection anchor). Add a few asserts.

Remove all 'manual' update calls. We do now one per user interaction which
is completely sufficient.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8527 a592a061-630c-0410-9148-cb99ea01b6c8
2004-03-25 09:16:36 +00:00
Alfredo Braunstein
f16a17fa42 Kayvan's patch (crash fix)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8507 a592a061-630c-0410-9148-cb99ea01b6c8
2004-03-21 10:16:39 +00:00
André Pönitz
e6b54c9fb6 * dispatchresult.h: rename 'FINISHED' to 'FINISHED_LEFT'
* cursor.[Ch]: prepare for localized getStatus()

	* lyxtext.h:
	* tabular.C:
	* text.C:
	* text2.C:
	* text3.C:  streamlines the LyXText cursor movement handlers a bit.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8453 a592a061-630c-0410-9148-cb99ea01b6c8
2004-02-20 17:19:53 +00:00
André Pönitz
357a3741c0 * insettabular.[Ch]: remove remains of the 'update' mechanism,
simplify cursor moving function,
	  re-enable horizontal scrolling for large tables

	* insetbase.C:
	* insetbase.[Ch]: remove explicit 'DispatchResult' return type and
	  implicitly assume 'DispatchResult(true, true) with exception of
	  InsetBase::priv_dispatch which does the equivalent of
	  'retrun DispatchResult(false)'

	* inset*.[Ch] (priv_dispatch): adjust


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8435 a592a061-630c-0410-9148-cb99ea01b6c8
2004-02-16 11:58:51 +00:00
André Pönitz
02291d14f1 some table work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8432 a592a061-630c-0410-9148-cb99ea01b6c8
2004-02-13 16:22:53 +00:00
André Pönitz
1eaa3eb913 more IU
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8371 a592a061-630c-0410-9148-cb99ea01b6c8
2004-01-26 10:13:15 +00:00
André Pönitz
4b2c271e23 * buffer.[Ch]:
* lyxtext.h: move ParagraphList member to LyXText
	rename LyXText::ownerParagraphs to LyXText::paragraph

	* CutAndPaste.C:
	* bufferview_funcs.C:
	* iterators.[Ch]:
	* lyx_cb.C:
	* paragraph.C:
	* rowpainter.C:
	* tabular.C:
	* text.C:
	* text2.C:
	* text3.C: adjust

	* lyxfunc.C: move LFUN_INSET_TOGGLE handling to insets.

	* undo.C: fix cursor positioning
	* insetbase.h: whitespace

	* inset.[Ch]: remove latexTextWidth
	make setBackgroundColor virtual

	* insettext.[Ch]:  move ParagraphList member to LyXText

	* insetcollapsable.[Ch]: handle LFUN_INSET_TOGGLE

	* insetcharstyle.C:
	* insetenv.C:
	* insetert.[Ch]:
	* insetfloat.[Ch]:
	* insetminipage.[Ch]:
	* insettabular.C:
	* insetwrap.[Ch]: adjust paragraphs and background color handling,


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8166 a592a061-630c-0410-9148-cb99ea01b6c8
2003-12-01 13:35:49 +00:00