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

trivial shit

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5286 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-09-12 14:58:06 +00:00
parent a91395a490
commit df71b75d4a
6 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
2002-09-12 John Levon <levon@movementarian.org>
* LyXAction.C: tidy
* factory.h:
* factory.C: add header
* paragraph_funcs.h:
* paragraph_funcs.C: cleanup
2002-09-11 John Levon <levon@movementarian.org>
* PrinterParams.h: odd/even default to true

6
src/LyXAction.C
View File

@ -536,10 +536,10 @@ string const LyXAction::getActionName(int action) const
if (!ev.argument.empty())
ev.argument.insert(0, " ");
info_map::const_iterator iit = lyx_info_map.find(ev.action);
info_map::const_iterator const it = lyx_info_map.find(ev.action);
if (iit != lyx_info_map.end())
return iit->second.name + ev.argument;
if (it != lyx_info_map.end())
return it->second.name + ev.argument;
return string();
}

9
src/factory.C
View File

@ -1,3 +1,12 @@
/**
* \file factory.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/
#include "funcrequest.h"
#include "bufferparams.h"

13
src/factory.h
View File

@ -1,12 +1,13 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
/**
* \file factory.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* LyX, The Document Processor
* \author André Pönitz
*
* Copyright 2002 The LyX Team.
*
* ====================================================== */
* Full author contact details are available in file CREDITS
*/
#ifndef FACTORY_H
#define FACTORY_H

46
src/paragraph_funcs.C
View File

@ -1,12 +1,12 @@
/* This file is part of
* ======================================================
/**
* \file paragraph_funcs.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* LyX, The Document Processor
* \author Lars Gullik Bjønnes
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
* Full author contact details are available in file CREDITS
*/
#include <config.h>
@ -43,7 +43,7 @@ void breakParagraph(BufferParams const & bparams,
tmp->setLabelWidthString(par->params().labelWidthString());
}
bool isempty = (par->layout()->keepempty && par->empty());
bool const isempty = (par->layout()->keepempty && par->empty());
if (!isempty && (par->size() > pos || par->empty() || flag == 2)) {
tmp->layout(par->layout());
@ -75,24 +75,24 @@ void breakParagraph(BufferParams const & bparams,
}
}
// just an idea of me
if (!pos) {
tmp->params().lineTop(par->params().lineTop());
tmp->params().pagebreakTop(par->params().pagebreakTop());
tmp->params().spaceTop(par->params().spaceTop());
tmp->bibkey = par->bibkey;
if (pos)
return;
tmp->params().lineTop(par->params().lineTop());
tmp->params().pagebreakTop(par->params().pagebreakTop());
tmp->params().spaceTop(par->params().spaceTop());
tmp->bibkey = par->bibkey;
par->bibkey = 0;
par->params().clear();
par->bibkey = 0;
par->params().clear();
par->layout(bparams.getLyXTextClass().defaultLayout());
par->layout(bparams.getLyXTextClass().defaultLayout());
// layout stays the same with latex-environments
if (flag) {
par->layout(tmp->layout());
par->setLabelWidthString(tmp->params().labelWidthString());
par->params().depth(tmp->params().depth());
}
// layout stays the same with latex-environments
if (flag) {
par->layout(tmp->layout());
par->setLabelWidthString(tmp->params().labelWidthString());
par->params().depth(tmp->params().depth());
}
}

16
src/paragraph_funcs.h
View File

@ -1,13 +1,13 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
/**
* \file paragraph_funcs.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* LyX, The Document Processor
* \author Lars Gullik Bjønnes
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
* Full author contact details are available in file CREDITS
*/
#ifndef PARAGRAPH_FUNCS_H
#define PARAGRAPH_FUNCS_H
@ -49,4 +49,4 @@ bool isFirstInSequence(Paragraph * par);
int getEndLabel(Paragraph * para, BufferParams const & bparams);
#endif
#endif
#endif // PARAGRAPH_FUNCS_H