anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ws changes only

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4934 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-08-11 16:27:10 +00:00
parent 260c7f3187
commit 8e5e952472
7 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2002-08-11 Lars Gullik Bjønnes <larsbj@gullik.net>
* paragraph.C, ToolbarDefaults.h, kbsequence.h, lyx_main.C,
lyxfunc.C lyxlex_pimpl.C: ws changes only.
* insets/insettext.C: InsetList changes
* graphics/GraphicsSupport.C (operator()): InsetList changes

6
src/ToolbarDefaults.h
View File

@ -30,11 +30,11 @@ public:
/// The special toolbar actions
enum ItemType {
/// adds space between buttons in the toolbar
SEPARATOR=-3,
SEPARATOR = -3,
/// a special combox insead of a button
LAYOUTS=-2,
LAYOUTS = -2,
/// begin a new line of button (not working)
NEWLINE=-1
NEWLINE = -1
};
///

4
src/kbsequence.h
View File

@ -25,7 +25,7 @@ class kb_keymap;
class kb_sequence {
public:
typedef std::vector<LyXKeySymPtr> KeySequence;
friend class kb_keymap;
///
@ -105,7 +105,7 @@ private:
/**
* Array holding the current key sequence as KeySyms.
* If sequence[length-1] < 0xff it can be used as ISO8859 char
* If sequence[length - 1] < 0xff it can be used as ISO8859 char
*/
KeySequence sequence;

6
src/lyx_main.C
View File

@ -570,7 +570,7 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
first_start = false;
return;
}
first_start = !explicit_userdir;
// If the user specified explicitly a directory, ask whether
@ -635,7 +635,7 @@ void LyX::readUIFile(string const & name)
ui_last
};
struct keyword_item uitags[ui_last-1] = {
struct keyword_item uitags[ui_last - 1] = {
{ "menuset", ui_menuset },
{ "toolbar", ui_toolbar }
};
@ -860,7 +860,7 @@ bool LyX::easyParse(int & argc, char * argv[])
string arg((i + 1 < argc) ? argv[i + 1] : "");
string arg2((i + 2 < argc) ? argv[i + 2] : "");
int const remove = 1 + it->second(arg, arg2);
// Now, remove used arguments by shifting

2
src/lyxfunc.C
View File

@ -1358,7 +1358,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
// changed. Suspect so. Leave as-is therefore.
if (contains(argument, "|")) {
p.setContents(token(argument, '|', 0));
p.setOptions( token(argument, '|', 1));
p.setOptions(token(argument, '|', 1));
} else {
p.setContents(argument);
}

8
src/lyxlex_pimpl.C
View File

@ -352,8 +352,8 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
is.get(cc);
c = cc;
} while (c > ' ' && c != ',' && is
&& (i != LEX_MAX_BUFF-1));
if (i == LEX_MAX_BUFF-1) {
&& (i != LEX_MAX_BUFF - 1));
if (i == LEX_MAX_BUFF - 1) {
printError("Line too long");
}
buff[i] = '\0';
@ -464,14 +464,14 @@ bool LyXLex::Pimpl::nextToken()
is.get(cc);
c = cc;
} while (c > ' ' && c != '\\' && is
&& i != (LEX_MAX_BUFF-1));
&& i != (LEX_MAX_BUFF - 1));
} else {
do {
buff[i++] = c;
is.get(cc);
c = cc;
} while (c >= ' ' && c != '\\' && is
&& i != (LEX_MAX_BUFF-1));
&& i != (LEX_MAX_BUFF - 1));
}
if (i == (LEX_MAX_BUFF - 1)) {

2
src/paragraph.C
View File

@ -692,7 +692,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
// Merge the singleton block with the next block
pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i);
if (i > 0 && pimpl_->fontlist[i - 1].font() == font)
pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i-1);
pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i - 1);
} else if (i > 0 && pimpl_->fontlist[i - 1].font() == font) {
// Merge the singleton block with the previous block
pimpl_->fontlist[i - 1].pos(pos);