mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-29 05:01:49 +00:00
more white spacei changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4267 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
53e01413db
commit
d62a9764da
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
* text.C:
|
* text.C:
|
||||||
* sp_pspell.h:
|
* sp_pspell.h:
|
||||||
|
* textclasslist.[Ch]:
|
||||||
* sp_ispell.h: whitespace change
|
* sp_ispell.h: whitespace change
|
||||||
|
|
||||||
2002-05-29 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
2002-05-29 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||||
|
@ -129,19 +129,14 @@ bool LyXTextClassList::Read ()
|
|||||||
lyxerr[Debug::TCLASS] << "Fname: " << fname << endl;
|
lyxerr[Debug::TCLASS] << "Fname: " << fname << endl;
|
||||||
if (lex.next()) {
|
if (lex.next()) {
|
||||||
string const clname = lex.getString();
|
string const clname = lex.getString();
|
||||||
lyxerr[Debug::TCLASS]
|
lyxerr[Debug::TCLASS] << "Clname: " << clname << endl;
|
||||||
<< "Clname: " << clname << endl;
|
|
||||||
if (lex.next()) {
|
if (lex.next()) {
|
||||||
string const desc = lex.getString();
|
string const desc = lex.getString();
|
||||||
lyxerr[Debug::TCLASS]
|
lyxerr[Debug::TCLASS] << "Desc: " << desc << endl;
|
||||||
<< "Desc: " << desc << endl;
|
|
||||||
// This code is run when we have
|
// This code is run when we have
|
||||||
// fname, clname and desc
|
// fname, clname and desc
|
||||||
LyXTextClass tmpl(fname,
|
LyXTextClass tmpl(fname, clname, desc);
|
||||||
clname,
|
if (lyxerr.debugging(Debug::TCLASS)) {
|
||||||
desc);
|
|
||||||
if (lyxerr.
|
|
||||||
debugging(Debug::TCLASS)) {
|
|
||||||
tmpl.load();
|
tmpl.load();
|
||||||
}
|
}
|
||||||
Add(tmpl);
|
Add(tmpl);
|
||||||
|
@ -42,18 +42,14 @@ public:
|
|||||||
///
|
///
|
||||||
const_iterator end() const { return classlist.end(); }
|
const_iterator end() const { return classlist.end(); }
|
||||||
|
|
||||||
/** Gets textclass number from name.
|
/// Gets textclass number from name, -1 if textclass name does not exist
|
||||||
Returns -1 if textclass name does not exist
|
|
||||||
*/
|
|
||||||
std::pair<bool, lyx::textclass_type> const
|
std::pair<bool, lyx::textclass_type> const
|
||||||
NumberOfClass(string const & textclass) const;
|
NumberOfClass(string const & textclass) const;
|
||||||
|
|
||||||
///
|
///
|
||||||
LyXTextClass const & operator[](lyx::textclass_type textclass) const;
|
LyXTextClass const & operator[](lyx::textclass_type textclass) const;
|
||||||
|
|
||||||
/** Read textclass list.
|
/// Read textclass list. Returns false if this fails.
|
||||||
Returns false if this fails
|
|
||||||
*/
|
|
||||||
bool Read();
|
bool Read();
|
||||||
private:
|
private:
|
||||||
///
|
///
|
||||||
|
@ -317,8 +317,7 @@ void LyXText::computeBidiTables(Buffer const * buf, Row * row) const
|
|||||||
bool rtl0 = false;
|
bool rtl0 = false;
|
||||||
pos_type const main_body = beginningOfMainBody(buf, row->par());
|
pos_type const main_body = beginningOfMainBody(buf, row->par());
|
||||||
|
|
||||||
for (pos_type lpos = bidi_start;
|
for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) {
|
||||||
lpos <= bidi_end; ++lpos) {
|
|
||||||
bool is_space = row->par()->isLineSeparator(lpos);
|
bool is_space = row->par()->isLineSeparator(lpos);
|
||||||
pos_type const pos =
|
pos_type const pos =
|
||||||
(is_space && lpos + 1 <= bidi_end &&
|
(is_space && lpos + 1 <= bidi_end &&
|
||||||
@ -434,6 +433,7 @@ bool LyXText::isBoundary(Buffer const * buf, Paragraph * par,
|
|||||||
return rtl != rtl2;
|
return rtl != rtl2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void LyXText::drawNewline(DrawRowParams & p, pos_type const pos)
|
void LyXText::drawNewline(DrawRowParams & p, pos_type const pos)
|
||||||
{
|
{
|
||||||
// Draw end-of-line marker
|
// Draw end-of-line marker
|
||||||
|
20
src/text2.C
20
src/text2.C
@ -915,9 +915,9 @@ void LyXText::fullRebreak(BufferView * bview)
|
|||||||
// important for the screen
|
// important for the screen
|
||||||
|
|
||||||
|
|
||||||
/* the cursor set functions have a special mechanism. When they
|
// the cursor set functions have a special mechanism. When they
|
||||||
* realize, that you left an empty paragraph, they will delete it.
|
// realize, that you left an empty paragraph, they will delete it.
|
||||||
* They also delete the corresponding row */
|
// They also delete the corresponding row
|
||||||
|
|
||||||
// need the selection cursor:
|
// need the selection cursor:
|
||||||
void LyXText::setSelection(BufferView * bview)
|
void LyXText::setSelection(BufferView * bview)
|
||||||
@ -1147,11 +1147,11 @@ pos_type LyXText::beginningOfMainBody(Buffer const * buf,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* the DTP switches for paragraphs. LyX will store them in the
|
// the DTP switches for paragraphs. LyX will store them in the first
|
||||||
* first physicla paragraph. When a paragraph is broken, the top settings
|
// physicla paragraph. When a paragraph is broken, the top settings rest,
|
||||||
* rest, the bottom settings are given to the new one. So I can make shure,
|
// the bottom settings are given to the new one. So I can make shure,
|
||||||
* they do not duplicate themself and you cannnot make dirty things with
|
// they do not duplicate themself and you cannnot make dirty things with
|
||||||
* them! */
|
// them!
|
||||||
|
|
||||||
void LyXText::setParagraph(BufferView * bview,
|
void LyXText::setParagraph(BufferView * bview,
|
||||||
bool line_top, bool line_bottom,
|
bool line_top, bool line_bottom,
|
||||||
@ -1339,9 +1339,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
|
|||||||
par->enumdepth = par->depthHook(par->getDepth())->enumdepth;
|
par->enumdepth = par->depthHook(par->getDepth())->enumdepth;
|
||||||
par->setCounter(6 + par->enumdepth,
|
par->setCounter(6 + par->enumdepth,
|
||||||
par->depthHook(par->getDepth())->getCounter(6 + par->enumdepth));
|
par->depthHook(par->getDepth())->getCounter(6 + par->enumdepth));
|
||||||
/* reset the counters.
|
// reset the counters.A depth change is like a breaking layout
|
||||||
* A depth change is like a breaking layout
|
|
||||||
*/
|
|
||||||
for (int i = 6 + par->enumdepth + 1; i < 10; ++i)
|
for (int i = 6 + par->enumdepth + 1; i < 10; ++i)
|
||||||
par->setCounter(i, 0);
|
par->setCounter(i, 0);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user