mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
Whitespace, only whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9877 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming
parent
aabd481ab6
commit
fb70c52b05
@ -74,7 +74,7 @@ public:
|
||||
///
|
||||
bool empty() { return list.empty(); }
|
||||
///
|
||||
void clear() { list.clear(); }
|
||||
void clear() { list.clear(); }
|
||||
///
|
||||
const_iterator begin() const { return list.begin(); }
|
||||
const_iterator end() const { return list.end(); }
|
||||
|
||||
@ -157,7 +157,7 @@ public:
|
||||
int offset_ref() const;
|
||||
/// access to anchor
|
||||
lyx::pit_type anchor_ref() const;
|
||||
|
||||
|
||||
/// access to full cursor
|
||||
LCursor & cursor();
|
||||
/// access to full cursor
|
||||
|
||||
@ -682,7 +682,7 @@ void eraseSelection(LCursor & cur)
|
||||
for (InsetBase::col_type col = c1; col <= c2; ++col)
|
||||
p->cell(p->index(row, col)).clear();
|
||||
// We've deleted the whole cell. Only pos 0 is valid.
|
||||
cur.pos() = 0;
|
||||
cur.pos() = 0;
|
||||
}
|
||||
cur.resetAnchor();
|
||||
} else {
|
||||
|
||||
@ -81,12 +81,12 @@ void LaTeXFeatures::getAvailable()
|
||||
|
||||
lex.setFile(real_file);
|
||||
|
||||
if (!lex.isOK())
|
||||
if (!lex.isOK())
|
||||
return;
|
||||
|
||||
// Make sure that we are clean
|
||||
packages_.clear();
|
||||
|
||||
|
||||
bool finished = false;
|
||||
// Parse config-file
|
||||
while (lex.isOK() && !finished) {
|
||||
|
||||
@ -51,10 +51,10 @@ class Undo;
|
||||
/** The buffer object.
|
||||
* This is the buffer object. It contains all the informations about
|
||||
* a document loaded into LyX.
|
||||
* The buffer object owns the LyXText (wrapped in an InsetText), which
|
||||
* The buffer object owns the LyXText (wrapped in an InsetText), which
|
||||
* contains the individual paragraphs of the document.
|
||||
*
|
||||
*
|
||||
*
|
||||
* I am not sure if the class is complete or
|
||||
* minimal, probably not.
|
||||
* \author Lars Gullik Bjønnes
|
||||
|
||||
@ -379,10 +379,10 @@ void setCounter(Buffer const & buf, ParIterator & it)
|
||||
// is it a layout that has an automatic label?
|
||||
if (layout->labeltype == LABEL_COUNTER) {
|
||||
if (layout->toclevel <= buf.params().secnumdepth
|
||||
&& (!layout->isEnvironment()
|
||||
&& (!layout->isEnvironment()
|
||||
|| isFirstInSequence(it.pit(), it.plist()))) {
|
||||
counters.step(layout->counter);
|
||||
string label = expandLabel(textclass, layout,
|
||||
string label = expandLabel(textclass, layout,
|
||||
par.params().appendix());
|
||||
par.params().labelString(label);
|
||||
}
|
||||
@ -453,7 +453,7 @@ void setCounter(Buffer const & buf, ParIterator & it)
|
||||
--i;
|
||||
InsetBase * const in = &it[i].inset();
|
||||
if (in->lyxCode() == InsetBase::FLOAT_CODE
|
||||
|| in->lyxCode() == InsetBase::WRAP_CODE)
|
||||
|| in->lyxCode() == InsetBase::WRAP_CODE)
|
||||
type = in->getInsetName();
|
||||
break;
|
||||
}
|
||||
|
||||
@ -210,10 +210,10 @@ public:
|
||||
/// revision tracking for this buffer ?
|
||||
bool tracking_changes;
|
||||
/** This param decides if change tracking marks should be output
|
||||
* (using the dvipost package) or if the current "state" of the
|
||||
* document should be output instead. Since dvipost needs dvi
|
||||
* (using the dvipost package) or if the current "state" of the
|
||||
* document should be output instead. Since dvipost needs dvi
|
||||
* specials, it only works with dvi/ps output (the param will be
|
||||
* ignored with other output flavors and disabled when dbipost is
|
||||
* ignored with other output flavors and disabled when dbipost is
|
||||
* not installed).
|
||||
*/
|
||||
bool output_changes;
|
||||
|
||||
@ -214,15 +214,15 @@ CurStatus status(BufferView const * bv, DocIterator const & dit)
|
||||
namespace {
|
||||
|
||||
bool gotoNextInset(LCursor & cur,
|
||||
vector<InsetBase_code> const & codes,
|
||||
vector<InsetBase_code> const & codes,
|
||||
string const & contents)
|
||||
{
|
||||
LCursor tmpcur = cur;
|
||||
|
||||
|
||||
while (tmpcur) {
|
||||
InsetBase const * inset = tmpcur.nextInset();
|
||||
if (inset
|
||||
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
|
||||
if (inset
|
||||
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
|
||||
&& (contents.empty() ||
|
||||
static_cast<InsetCommand const *>(inset)->getContents() == contents)) {
|
||||
cur = tmpcur;
|
||||
@ -237,7 +237,7 @@ bool gotoNextInset(LCursor & cur,
|
||||
}
|
||||
|
||||
|
||||
void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
|
||||
void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
|
||||
bool same_content)
|
||||
{
|
||||
string contents;
|
||||
@ -246,7 +246,7 @@ void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
|
||||
|
||||
if (same_content) {
|
||||
InsetBase const * inset = tmpcur.nextInset();
|
||||
if (inset
|
||||
if (inset
|
||||
&& find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
|
||||
contents = static_cast<InsetCommand const *>(inset)->getContents();
|
||||
}
|
||||
@ -255,13 +255,13 @@ void gotoInset(BufferView * bv, vector<InsetBase_code> const & codes,
|
||||
if (!gotoNextInset(tmpcur, codes, contents)) {
|
||||
if (tmpcur != doc_iterator_begin(tmpcur.inset())) {
|
||||
tmpcur.reset(tmpcur.bottom().inset());
|
||||
if (!gotoNextInset(tmpcur, codes, contents))
|
||||
if (!gotoNextInset(tmpcur, codes, contents))
|
||||
bv->cursor().message(_("No more insets"));
|
||||
} else {
|
||||
bv->cursor().message(_("No more insets"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
tmpcur.clearSelection();
|
||||
bv->setCursor(tmpcur);
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ CurStatus status(BufferView const * bv, DocIterator const & dit);
|
||||
Point coordOffset(DocIterator const & dit);
|
||||
|
||||
// Moves cursor to the next inset with one of the given codes.
|
||||
void gotoInset(BufferView * bv, std::vector<InsetBase_code> const & codes,
|
||||
void gotoInset(BufferView * bv, std::vector<InsetBase_code> const & codes,
|
||||
bool same_content);
|
||||
|
||||
// Moves cursor to the next inset with given code.
|
||||
|
||||
@ -500,7 +500,7 @@ int Changes::latexMarkChange(std::ostream & os,
|
||||
{
|
||||
if (!output || old == change)
|
||||
return 0;
|
||||
|
||||
|
||||
string const start("\\changestart{}");
|
||||
string const end("\\changeend{}");
|
||||
string const son("\\overstrikeon{}");
|
||||
|
||||
@ -89,7 +89,7 @@ public:
|
||||
|
||||
/// output latex to mark a transition between two changetypes
|
||||
/// returns length of text outputted
|
||||
static int latexMarkChange(std::ostream & os, Change::Type old,
|
||||
static int latexMarkChange(std::ostream & os, Change::Type old,
|
||||
Change::Type change, bool const & output);
|
||||
|
||||
/// output .lyx file format for transitions between changes
|
||||
|
||||
@ -133,7 +133,7 @@ public:
|
||||
ParPosCache const & getParPos() const { return pars_; }
|
||||
private:
|
||||
CoordCacheBase<MathArray> arrays_;
|
||||
|
||||
|
||||
// all insets
|
||||
CoordCacheBase<InsetBase> insets_;
|
||||
|
||||
|
||||
@ -1167,7 +1167,7 @@ void LCursor::fixIfBroken()
|
||||
<< ". Trying to correct this." << endl;
|
||||
newdepth = copy.depth() - 1;
|
||||
}
|
||||
copy.pop();
|
||||
copy.pop();
|
||||
}
|
||||
// shrink cursor to a size where everything is valid, possibly
|
||||
// leaving insets
|
||||
|
||||
@ -139,7 +139,7 @@ LyXText const * DocIterator::text() const
|
||||
|
||||
Paragraph & DocIterator::paragraph()
|
||||
{
|
||||
if (!inTexted())
|
||||
if (!inTexted())
|
||||
lyxerr << *this << endl;
|
||||
BOOST_ASSERT(inTexted());
|
||||
return top().paragraph();
|
||||
@ -387,7 +387,7 @@ void DocIterator::forwardPar()
|
||||
#if 0
|
||||
DocIterator cmp(*this);
|
||||
#endif
|
||||
|
||||
|
||||
while (!empty() && (!inTexted() || pos() != 0)) {
|
||||
if (inTexted()) {
|
||||
pos_type const lastp = lastpos();
|
||||
|
||||
@ -185,7 +185,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
|
||||
else if (backend_format == format) {
|
||||
runparams.nice = true;
|
||||
buffer->makeLaTeXFile(filename, string(), runparams);
|
||||
} else if (!lyxrc.tex_allows_spaces
|
||||
} else if (!lyxrc.tex_allows_spaces
|
||||
&& contains(buffer->filePath(), ' ')) {
|
||||
Alert::error(_("File name error"),
|
||||
_("The directory path to the document cannot contain spaces."));
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
* Dialogs.[Ch] (checkStatus): new
|
||||
* LyXView.C (updateToolbars): call Dialogs::checkStatus
|
||||
|
||||
|
||||
2005-03-06 Lars Gullik Bjonnes <larsbj@gullik.net>
|
||||
|
||||
* Makefile.am (DIST_SUBDIRS): remove gnome
|
||||
|
||||
@ -98,7 +98,7 @@ void Dialogs::show(string const & name, string const & data)
|
||||
if (dialog) {
|
||||
// FIXME! Should check that the dialog is NOT an inset dialog.
|
||||
dialog->show(data);
|
||||
}
|
||||
}
|
||||
in_show_ = false;
|
||||
}
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
2005-04-11 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* ControlDocument.C (dispatchParams): update the counters if
|
||||
necessary.
|
||||
necessary.
|
||||
|
||||
2005-04-13 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
2005-03-04 John Spray <spray_john@users.sf.net>
|
||||
|
||||
* GToolbar.C: remember existing selection when update()ing
|
||||
* GToolbar.C: remember existing selection when update()ing
|
||||
the layoutbox, in order to cope with document class changes.
|
||||
|
||||
2005-01-29 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
||||
@ -99,8 +99,8 @@ FileDialog::Result const FileDialog::Private::showChooser(string const & path,
|
||||
if (!path.empty())
|
||||
fileChooser_.set_current_folder(path);
|
||||
if (!suggested.empty())
|
||||
fileChooser_.set_current_name(suggested);
|
||||
|
||||
fileChooser_.set_current_name(suggested);
|
||||
|
||||
fileChooser_.set_default_response(Gtk::RESPONSE_OK);
|
||||
Result result;
|
||||
result.first = FileDialog::Chosen;
|
||||
|
||||
@ -265,7 +265,7 @@ void GDocument::doBuild()
|
||||
xml_->get_widget("TextEncoding", box);
|
||||
box->pack_start(encodingcombo_, true, true, 0);
|
||||
box->show_all();
|
||||
|
||||
|
||||
int i = 0;
|
||||
while (encodings[i])
|
||||
encodingcombo_.append_text(encodings[i++]);
|
||||
|
||||
@ -81,7 +81,7 @@ void GGraphics::doBuild()
|
||||
xml_->get_widget("Width", widthspin_);
|
||||
xml_->get_widget("Height", heightspin_);
|
||||
xml_->get_widget("MaintainAspectRatio", aspectcheck_);
|
||||
|
||||
|
||||
Gtk::VBox * box;
|
||||
xml_->get_widget("WidthUnits", box);
|
||||
box->pack_start(widthunitscombo_, true, true, 0);
|
||||
|
||||
@ -52,7 +52,7 @@ void GVSpace::doBuild()
|
||||
xml_->get_widget("ValueUnits", box);
|
||||
box->pack_start(valueunitscombo_, true, true, 0);
|
||||
box->show_all();
|
||||
|
||||
|
||||
xml_->get_widget("Protect", protectcheck_);
|
||||
|
||||
populateUnitCombo(valueunitscombo_, false);
|
||||
@ -97,7 +97,7 @@ void GVSpace::update()
|
||||
setWidgetsFromLength(*valuespin_->get_adjustment(), valueunitscombo_, space.length().len());
|
||||
} else {
|
||||
setWidgetsFromLength(*valuespin_->get_adjustment(), valueunitscombo_, LyXLength());
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -340,9 +340,9 @@ void GWorkArea::setScrollbarParams(int height, int pos, int line_height)
|
||||
{
|
||||
if (adjusting_)
|
||||
return;
|
||||
|
||||
|
||||
adjusting_ = true;
|
||||
|
||||
|
||||
Gtk::Adjustment * adjustment = vscrollbar_.get_adjustment();
|
||||
adjustment->set_lower(0);
|
||||
int workAreaHeight = workHeight();
|
||||
@ -372,7 +372,7 @@ void GWorkArea::onScroll()
|
||||
return;
|
||||
|
||||
adjusting_ = true;
|
||||
|
||||
|
||||
double val = vscrollbar_.get_adjustment()->get_value();
|
||||
scrollDocView(static_cast<int>(val));
|
||||
adjusting_ = false;
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
2005-02-10 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* QRefDialog.C (refSelected): insert selected ref to
|
||||
* QRefDialog.C (refSelected): insert selected ref to
|
||||
text widget (this was not possible if there was only
|
||||
one entry, an empty inset was generated).
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ QBoxDialog::QBoxDialog(QBox * form)
|
||||
form, SLOT(slotApply()));
|
||||
connect(closePB, SIGNAL(clicked()),
|
||||
form, SLOT(slotClose()));
|
||||
|
||||
|
||||
heightED->setValidator(unsignedLengthValidator(heightED));
|
||||
widthED->setValidator(unsignedLengthValidator(widthED));
|
||||
}
|
||||
|
||||
@ -113,7 +113,7 @@ QDialog * QView<GUIDialog>::form() const
|
||||
{
|
||||
/* Brain dead MSVC compiler wants to know the class hierarchy at the
|
||||
definition site of the template, rather than the instantation point
|
||||
to downcast correctly. So, rather than including all dialogs to
|
||||
to downcast correctly. So, rather than including all dialogs to
|
||||
provide that, we just cast it with the ugly hammer. */
|
||||
return (QDialog *) dialog_.get();
|
||||
}
|
||||
|
||||
@ -187,10 +187,10 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
|
||||
SLOT(branchDoubleClicked(QListViewItem *)));
|
||||
connect(branchesModule->colorPB, SIGNAL(clicked()), this, SLOT(toggleBranchColor()));
|
||||
branchesModule->branchesLV->setSorting(0);
|
||||
|
||||
|
||||
textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
|
||||
textLayoutModule->lspacingLE));
|
||||
|
||||
|
||||
textLayoutModule->skipLE->setValidator(unsignedLengthValidator(
|
||||
textLayoutModule->skipLE));
|
||||
pageLayoutModule->paperheightLE->setValidator(unsignedLengthValidator(
|
||||
@ -213,19 +213,19 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
|
||||
marginsModule->footskipLE));
|
||||
|
||||
// create the numbering items, in reverse order
|
||||
numberlevel7 =
|
||||
numberlevel7 =
|
||||
new QListViewItem(numberingModule->tocLV, qt_("Subparagraph"));
|
||||
numberlevel6 =
|
||||
numberlevel6 =
|
||||
new QListViewItem(numberingModule->tocLV, qt_("Paragraph"));
|
||||
numberlevel5 =
|
||||
numberlevel5 =
|
||||
new QListViewItem(numberingModule->tocLV, qt_("Subsubsection"));
|
||||
numberlevel4 =
|
||||
numberlevel4 =
|
||||
new QListViewItem(numberingModule->tocLV, qt_("Subsection"));
|
||||
numberlevel3 =
|
||||
numberlevel3 =
|
||||
new QListViewItem(numberingModule->tocLV, qt_("Section"));
|
||||
numberlevel2 =
|
||||
numberlevel2 =
|
||||
new QListViewItem(numberingModule->tocLV, qt_("Chapter"));
|
||||
numberlevel1 =
|
||||
numberlevel1 =
|
||||
new QListViewItem(numberingModule->tocLV, qt_("Part"));
|
||||
}
|
||||
|
||||
@ -430,7 +430,7 @@ void QDocumentDialog::updateNumbering()
|
||||
int const toc = numberingModule->tocSL->value();
|
||||
|
||||
// check if the document class features chapter
|
||||
LyXTextClass const & tclass =
|
||||
LyXTextClass const & tclass =
|
||||
form_->controller().params().getLyXTextClass();
|
||||
bool const hasChapter = tclass.hasLayout("Chapter");
|
||||
|
||||
|
||||
@ -59,14 +59,14 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form)
|
||||
form, SLOT(slotRestore()));
|
||||
connect(editPB, SIGNAL(clicked()),
|
||||
this, SLOT(edit_clicked()));
|
||||
|
||||
|
||||
angle->setValidator(new QDoubleValidator(-360, 360, 2, angle));
|
||||
|
||||
lbX->setValidator(new QIntValidator(lbX));
|
||||
lbY->setValidator(new QIntValidator(lbY));
|
||||
rtX->setValidator(new QIntValidator(rtX));
|
||||
rtY->setValidator(new QIntValidator(rtY));
|
||||
|
||||
|
||||
displayscale->setValidator(new QIntValidator(displayscale));
|
||||
height->setValidator(unsignedLengthValidator(height));
|
||||
width->setValidator(unsignedLengthValidator(width));
|
||||
|
||||
@ -298,7 +298,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
|
||||
connect(screenfontsModule->screenHugerED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
||||
connect(identityModule->nameED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
||||
connect(identityModule->emailED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
||||
|
||||
|
||||
// initialize the validators
|
||||
screenfontsModule->screenTinyED->setValidator(new QDoubleValidator(
|
||||
screenfontsModule->screenTinyED));
|
||||
@ -348,7 +348,7 @@ void QPrefsDialog::updateConverters()
|
||||
// save current selection
|
||||
QString current = convertmod->converterFromCO->currentText()
|
||||
+ " -> " + convertmod->converterToCO->currentText();
|
||||
|
||||
|
||||
convertmod->converterFromCO->clear();
|
||||
convertmod->converterToCO->clear();
|
||||
|
||||
@ -699,7 +699,7 @@ void QPrefsDialog::updateFormats()
|
||||
|
||||
// save current selection
|
||||
QString current = formatmod->guiNameED->text();
|
||||
|
||||
|
||||
formatmod->formatsLB->clear();
|
||||
|
||||
Formats::const_iterator cit = form_->formats().begin();
|
||||
@ -757,7 +757,7 @@ void QPrefsDialog::updateFormatsButtons()
|
||||
|
||||
// assure that a gui name cannot be chosen twice
|
||||
bool const known_otherwise = gui_name_known && (where != sel);
|
||||
|
||||
|
||||
bool const known = !(sel < 0);
|
||||
bool const valid = (!fileformatsModule->formatED->text().isEmpty()
|
||||
&& !fileformatsModule->guiNameED->text().isEmpty());
|
||||
@ -801,7 +801,7 @@ void QPrefsDialog::new_format()
|
||||
updateFormats();
|
||||
fileformatsModule->formatsLB->setCurrentItem(form_->formats().getNumber(name));
|
||||
form_->converters().update(form_->formats());
|
||||
|
||||
|
||||
updateConverters();
|
||||
updateFormatsButtons();
|
||||
}
|
||||
@ -841,7 +841,7 @@ void QPrefsDialog::remove_format()
|
||||
form_->formats().erase(form_->formats().get(nr).name());
|
||||
updateFormats();
|
||||
form_->converters().update(form_->formats());
|
||||
|
||||
|
||||
updateConverters();
|
||||
updateFormatsButtons();
|
||||
}
|
||||
|
||||
@ -111,8 +111,8 @@ private:
|
||||
QPrefScreenFontsModule * screenfontsModule;
|
||||
QPrefColorsModule * colorsModule;
|
||||
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
|
||||
QPrefCygwinPathModule * cygwinpathModule;
|
||||
#endif
|
||||
QPrefCygwinPathModule * cygwinpathModule;
|
||||
#endif
|
||||
QPrefDisplayModule * displayModule;
|
||||
QPrefPathsModule * pathsModule;
|
||||
QPrefSpellcheckerModule * spellcheckerModule;
|
||||
|
||||
@ -47,7 +47,7 @@ QTabularDialog::QTabularDialog(QTabular * form)
|
||||
{
|
||||
connect(closePB, SIGNAL(clicked()),
|
||||
form, SLOT(slotClose()));
|
||||
|
||||
|
||||
widthED->setValidator(unsignedLengthValidator(widthED));
|
||||
}
|
||||
|
||||
|
||||
@ -167,7 +167,7 @@ Converter::Impl::Impl(string const & from_file, string const & to_file_base,
|
||||
|
||||
if (!success) {
|
||||
script_command_ =
|
||||
"sh " +
|
||||
"sh " +
|
||||
QuoteName(LibFileSearch("scripts", "convertDefault.sh")) +
|
||||
' ' +
|
||||
QuoteName(from_format + ':' + from_file) +
|
||||
|
||||
@ -33,15 +33,15 @@
|
||||
* insetwrap.C (addToToc): copy the code from InsetFloat::addToToc.
|
||||
|
||||
* insetfloat.C (addToToc): do not use the harcoded "Caption" name,
|
||||
but the SENSITIVE label type.
|
||||
but the SENSITIVE label type.
|
||||
|
||||
2005-04-18 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* ExternalSupport.[Ch] (doSubstitution): passed an extra boolean
|
||||
'use_latex_path' argument. In turn, passed to the new subst_path
|
||||
function when replacing placeholders with paths.
|
||||
|
||||
* insetexternal.C (getScreenLabel):
|
||||
|
||||
* insetexternal.C (getScreenLabel):
|
||||
* ExternalSupport.C (lots of places): change invocation of
|
||||
doSubstitution in lots of places, specifying the appropriate values
|
||||
for this 'use_latex_path' boolean.
|
||||
@ -61,7 +61,7 @@
|
||||
|
||||
2005-04-11 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* insetfloat.C (InsetFloat):
|
||||
* insetfloat.C (InsetFloat):
|
||||
* insetwrap.C (InsetWrap): do not set layout here.
|
||||
|
||||
2005-04-13 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
@ -82,7 +82,7 @@
|
||||
2005-04-05 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* insetexternal.C (validate):
|
||||
* ExternalTemplate.[Ch] (dumpFormat, readFormat): allow
|
||||
* ExternalTemplate.[Ch] (dumpFormat, readFormat): allow
|
||||
multiple Requirements in external material template
|
||||
|
||||
2005-04-03 Alfredo Braunstein <abraunst@lyx.org>
|
||||
@ -114,24 +114,24 @@
|
||||
|
||||
2005-03-21 Alfredo Braunstein <abraunst@lyx.org>
|
||||
|
||||
* insettabular.C (drawSelection): cosmetic bugfix
|
||||
* insettabular.C (drawSelection): cosmetic bugfix
|
||||
|
||||
2005-03-17 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* insettabular.C (doDispatch): get middle mouse button back again
|
||||
(partially), pass LFUN_CUT and LFUN_PASTE to insettext's dispatch
|
||||
when only a part of the cell is selected (fix bug 1799)
|
||||
|
||||
* insettabular.C: handle some more character attributes in
|
||||
M. Vermeers method (when multiple cells in tables are selected);
|
||||
disable some more senseless lfuns when multiple cells are selected
|
||||
|
||||
* insettabular.C: handle some more character attributes in
|
||||
M. Vermeers method (when multiple cells in tables are selected);
|
||||
disable some more senseless lfuns when multiple cells are selected
|
||||
(prevent crashes);
|
||||
Move to end of cell instead of beginning when coming from the cell
|
||||
behind.
|
||||
|
||||
2005-03-12 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* insettabular.C: make applying character attributes
|
||||
* insettabular.C: make applying character attributes
|
||||
possible for multiple cells in tables. Disable collapsable
|
||||
insets for multiple-cell selection in table (Jürgen S.)
|
||||
Bug reported by Helge Hafting.
|
||||
@ -169,7 +169,7 @@
|
||||
|
||||
2005-02-13 André Pönitz <poenitz@gmx.net>
|
||||
|
||||
* insettext.[Ch] (border_): new
|
||||
* insettext.[Ch] (border_): new
|
||||
* insettext.C (metrics, draw, drawFrame, clearInset, getCursorPos):
|
||||
use border_
|
||||
|
||||
|
||||
@ -123,7 +123,7 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
|
||||
|
||||
LyXFont tmpfont = pi.base.font;
|
||||
getDrawFont(pi.base.font);
|
||||
// I don't understand why the above .reduce and .realize aren't
|
||||
// I don't understand why the above .reduce and .realize aren't
|
||||
//needed, or even wanted, here. It just works. -- MV 10.04.2005
|
||||
InsetText::draw(pi, x, y);
|
||||
pi.base.font = tmpfont;
|
||||
|
||||
@ -983,7 +983,7 @@ bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd,
|
||||
case LFUN_CELL_FORWARD:
|
||||
status.enabled(true);
|
||||
return true;
|
||||
|
||||
|
||||
// disable these with multiple cells selected
|
||||
case LFUN_INSET_INSERT:
|
||||
case LFUN_INSERT_CHARSTYLE:
|
||||
|
||||
@ -185,7 +185,7 @@ private:
|
||||
|
||||
/// return the cell nearest to x, y
|
||||
idx_type getNearestCell(int x, int y) const;
|
||||
|
||||
|
||||
///
|
||||
Buffer const * buffer_;
|
||||
///
|
||||
|
||||
@ -397,7 +397,7 @@ int LyXRC::read(LyXLex & lexrc)
|
||||
tex_allows_spaces = lexrc.getBool();
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case RC_KBMAP:
|
||||
if (lexrc.next()) {
|
||||
use_kbmap = lexrc.getBool();
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#include "support/types.h"
|
||||
|
||||
/**
|
||||
* An on-screen row of text. A paragraph is broken into a
|
||||
* An on-screen row of text. A paragraph is broken into a
|
||||
* RowList for display. Each Row contains position pointers
|
||||
* into the first and last character positions of that row.
|
||||
*/
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
2005-04-09 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* math_gridinset.C (doDispatch):
|
||||
* math_nestinset.C (doDispatch): enable HOME/END keys to skip
|
||||
* math_nestinset.C (doDispatch): enable HOME/END keys to skip
|
||||
out of inset (adding cur.undispatched())
|
||||
|
||||
2005-04-09 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
2005-04-07 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* math_nestinset.C (doDispatch): Fix arrow up/down inside
|
||||
* math_nestinset.C (doDispatch): Fix arrow up/down inside
|
||||
macro crashing bug (Helge Hafting report)
|
||||
|
||||
2005-04-07 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
@ -36,7 +36,7 @@
|
||||
2005-04-06 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* math_nestinset.C (doDispatch): fix cursor positioning in
|
||||
non-grid nestinsets, and selection enclosure when inserting
|
||||
non-grid nestinsets, and selection enclosure when inserting
|
||||
font or deco insets.
|
||||
|
||||
2005-04-05 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
@ -79,7 +79,7 @@
|
||||
|
||||
2005-04-03 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* math_fontinset.[Ch] (draw): add call to setPosCache,
|
||||
* math_fontinset.[Ch] (draw): add call to setPosCache,
|
||||
fixes bug 1796
|
||||
|
||||
2005-04-01 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
@ -82,7 +82,7 @@ void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
|
||||
{
|
||||
ArrayChanger dummy(mi.base);
|
||||
MathGridInset::metrics(mi, dim);
|
||||
dim.wid += 6;
|
||||
dim.wid += 6;
|
||||
dim_ = dim;
|
||||
}
|
||||
|
||||
|
||||
@ -383,13 +383,13 @@ MathArray::size_type MathArray::x2pos(int targetx, int glue) const
|
||||
|
||||
if (abs(lastx - targetx) < abs(currx - targetx) && it != begin())
|
||||
--it;
|
||||
// The below code guarantees that in this slice, the cursor will
|
||||
// The below code guarantees that in this slice, the cursor will
|
||||
// never be on the right edge of an inset after a mouse click.
|
||||
if (it != begin())
|
||||
--it;
|
||||
if (it < end() && (*it)->getChar())
|
||||
++it;
|
||||
|
||||
|
||||
return it - begin();
|
||||
}
|
||||
|
||||
|
||||
@ -482,11 +482,11 @@ void MathGridInset::draw(PainterInfo & pi, int x, int y) const
|
||||
drawWithMargin(pi, x, y, 0, 0);
|
||||
}
|
||||
|
||||
void MathGridInset::drawWithMargin(PainterInfo & pi, int x, int y,
|
||||
void MathGridInset::drawWithMargin(PainterInfo & pi, int x, int y,
|
||||
int lmargin, int rmargin) const
|
||||
{
|
||||
for (idx_type idx = 0; idx < nargs(); ++idx)
|
||||
cell(idx).draw(pi, x + lmargin + cellXOffset(idx),
|
||||
cell(idx).draw(pi, x + lmargin + cellXOffset(idx),
|
||||
y + cellYOffset(idx));
|
||||
|
||||
for (row_type row = 0; row <= nrows(); ++row)
|
||||
@ -1142,9 +1142,9 @@ void MathGridInset::doDispatch(LCursor & cur, FuncRequest & cmd)
|
||||
else if (s == "swap-column")
|
||||
swapCol(cur.col());
|
||||
else if (s == "add-vline-left")
|
||||
colinfo_[cur.col()].lines_++;
|
||||
colinfo_[cur.col()].lines_++;
|
||||
else if (s == "add-vline-right")
|
||||
colinfo_[cur.col()+1].lines_++;
|
||||
colinfo_[cur.col()+1].lines_++;
|
||||
else if (s == "delete-vline-left")
|
||||
colinfo_[cur.col()].lines_--;
|
||||
else if (s == "delete-vline-right")
|
||||
|
||||
@ -98,7 +98,7 @@ public:
|
||||
///
|
||||
void draw(PainterInfo & pi, int x, int y) const;
|
||||
///
|
||||
void drawWithMargin(PainterInfo & pi, int x, int y,
|
||||
void drawWithMargin(PainterInfo & pi, int x, int y,
|
||||
int lmargin = 0, int rmargin = 0) const;
|
||||
///
|
||||
void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
|
||||
|
||||
@ -1122,8 +1122,8 @@ bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
|
||||
flag.enabled(false);
|
||||
return true;
|
||||
}
|
||||
if ((type_ == "simple"
|
||||
|| type_ == "equation"
|
||||
if ((type_ == "simple"
|
||||
|| type_ == "equation"
|
||||
|| type_ == "none") &&
|
||||
(s == "add-hline-above" || s == "add-hline-below")) {
|
||||
flag.message(bformat(
|
||||
@ -1132,14 +1132,14 @@ bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
|
||||
flag.enabled(false);
|
||||
return true;
|
||||
}
|
||||
if (s == "add-vline-left" || s == "add-vline-right") {
|
||||
if (s == "add-vline-left" || s == "add-vline-right") {
|
||||
flag.message(bformat(
|
||||
N_("Can't add vertical grid lines in '%1$s'"),
|
||||
type_));
|
||||
flag.enabled(false);
|
||||
return true;
|
||||
}
|
||||
if (s == "valign-top" || s == "valign-middle"
|
||||
if (s == "valign-top" || s == "valign-middle"
|
||||
|| s == "valign-bottom" || s == "align-left"
|
||||
|| s == "align-center" || s == "align-right") {
|
||||
flag.enabled(false);
|
||||
|
||||
@ -355,7 +355,7 @@ public:
|
||||
|
||||
/// return true if we allow this par to stay empty
|
||||
bool allowEmpty() const;
|
||||
///
|
||||
///
|
||||
unsigned char transformChar(unsigned char c, lyx::pos_type pos) const;
|
||||
///
|
||||
ParagraphParameters & params();
|
||||
|
||||
@ -58,8 +58,8 @@ using std::pair;
|
||||
namespace {
|
||||
|
||||
bool moveItem(Paragraph & from, Paragraph & to,
|
||||
BufferParams const & params, pos_type i, pos_type j,
|
||||
Change change = Change(Change::INSERTED));
|
||||
BufferParams const & params, pos_type i, pos_type j,
|
||||
Change change = Change(Change::INSERTED));
|
||||
|
||||
bool moveItem(Paragraph & from, Paragraph & to,
|
||||
BufferParams const & params, pos_type i, pos_type j,
|
||||
@ -214,9 +214,9 @@ void breakParagraphConservative(BufferParams const & bparams,
|
||||
if (moveItem(par, tmp, bparams, i, j - pos, change))
|
||||
++j;
|
||||
}
|
||||
// If tracking changes, set all the text that is to be
|
||||
// erased to Type::INSERTED.
|
||||
for (pos_type k = pos_end; k >= pos; --k) {
|
||||
// If tracking changes, set all the text that is to be
|
||||
// erased to Type::INSERTED.
|
||||
for (pos_type k = pos_end; k >= pos; --k) {
|
||||
if (bparams.tracking_changes)
|
||||
par.setChange(k, Change::INSERTED);
|
||||
par.erase(k);
|
||||
|
||||
@ -528,7 +528,7 @@ void RowPainter::paintFirst()
|
||||
x = width_ - leftMargin() -
|
||||
font_metrics::width(str, font);
|
||||
}
|
||||
|
||||
|
||||
pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
|
||||
} else {
|
||||
if (is_rtl) {
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
2005-04-21 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* forkedcontr.h:
|
||||
* forkedcontr.h:
|
||||
* forkedcall.h: define pid_t for MSVC.
|
||||
|
||||
* forkedcall.C (kill): work around evil MSVC max macro.
|
||||
|
||||
@ -108,7 +108,7 @@ std::string const LibScriptSearch(std::string const & command);
|
||||
* are indicated by '/', not by '\'.
|
||||
*
|
||||
* Manipulates @c path into a form suitable for inclusion in a LaTeX
|
||||
* document.
|
||||
* document.
|
||||
* If @c path contains LaTeX special characters, these are escaped.
|
||||
* Eg, '~' -> '\string~'
|
||||
* If @c path contains spaces, then the returned path is enclosed in
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
// Avoid some very annoying macros from MFC
|
||||
// Avoid some very annoying macros from MFC
|
||||
# undef max
|
||||
# undef min
|
||||
|
||||
@ -18,33 +18,33 @@
|
||||
|
||||
namespace std {
|
||||
// These overloads prevent ambiguity errors when signed and unsigned integers are compared.
|
||||
inline long min(long x, long y) {return std::min(x, y);}
|
||||
inline long min(long x, long y) {return std::min(x, y);}
|
||||
inline long max(long x, long y) {return std::max(x, y);}
|
||||
}
|
||||
|
||||
#else // defined( __SGI_STL_PORT )
|
||||
namespace std {
|
||||
// These overloads prevent ambiguity errors when int, long and unsigned int and int are compared.
|
||||
|
||||
inline int min(int x, int y) { return x < y ? x : y; }
|
||||
|
||||
inline int min(int x, int y) { return x < y ? x : y; }
|
||||
inline int max(int x, int y) { return x > y ? x : y; }
|
||||
|
||||
inline unsigned int min(unsigned int x, unsigned int y) { return x < y ? x : y; }
|
||||
inline unsigned int min(unsigned int x, unsigned int y) { return x < y ? x : y; }
|
||||
inline unsigned int max(unsigned int x, unsigned int y) { return x > y ? x : y; }
|
||||
|
||||
inline long min(long x, long y) { return x < y ? x : y; }
|
||||
inline long min(long x, long y) { return x < y ? x : y; }
|
||||
inline long max(long x, long y) { return x > y ? x : y; }
|
||||
|
||||
inline long min(int x, long y) { return x < y ? x : y; }
|
||||
inline long min(int x, long y) { return x < y ? x : y; }
|
||||
inline long max(int x, long y) { return x > y ? x : y; }
|
||||
|
||||
inline long min(long x, int y) { return x < y ? x : y; }
|
||||
inline long min(long x, int y) { return x < y ? x : y; }
|
||||
inline long max(long x, int y) { return x > y ? x : y; }
|
||||
|
||||
inline unsigned long min(unsigned long x, unsigned long y) { return x < y ? x : y; }
|
||||
inline unsigned long min(unsigned long x, unsigned long y) { return x < y ? x : y; }
|
||||
inline unsigned long max(unsigned long x, unsigned long y) { return x > y ? x : y; }
|
||||
|
||||
inline double min(double x, double y) { return x < y ? x : y; }
|
||||
inline double min(double x, double y) { return x < y ? x : y; }
|
||||
inline double max(double x, double y) { return x > y ? x : y; }
|
||||
}
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ void test_uppercase()
|
||||
cout << uppercase("AlLe") << endl;
|
||||
}
|
||||
|
||||
int main()
|
||||
int main()
|
||||
{
|
||||
test_lowercase();
|
||||
test_uppercase();
|
||||
|
||||
@ -916,7 +916,7 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row)
|
||||
|
||||
// This is special code for the chapter, since the label of this
|
||||
// layout is printed in an extra row
|
||||
if (layout->counter == "chapter"
|
||||
if (layout->counter == "chapter"
|
||||
&& !par.params().labelString().empty()) {
|
||||
labeladdon = int(font_metrics::maxHeight(labelfont)
|
||||
* layout->spacing.getValue()
|
||||
|
||||
@ -448,7 +448,7 @@ void LyXText::setFont(LCursor & cur, LyXFont const & font, bool toggleall)
|
||||
// Don't use forwardChar here as ditend might have
|
||||
// pos() == lastpos() and forwardChar would miss it.
|
||||
// Can't use forwardPos either as this descends into
|
||||
// nested insets.
|
||||
// nested insets.
|
||||
for (; dit != ditend; dit.forwardPosNoDescend()) {
|
||||
if (dit.pos() != dit.lastpos()) {
|
||||
LyXFont f = getFont(dit.paragraph(), dit.pos());
|
||||
@ -837,7 +837,7 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
|
||||
c = end - 1;
|
||||
}
|
||||
// Air gap below display inset:
|
||||
if (row.pos() < end && c >= end && par.isInset(end - 1)
|
||||
if (row.pos() < end && c >= end && par.isInset(end - 1)
|
||||
&& par.getInset(end - 1)->display()) {
|
||||
c = end - 1;
|
||||
}
|
||||
|
||||
@ -1113,7 +1113,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
|
||||
|
||||
cur.clearSelection();
|
||||
LyXFont const old_font = real_current_font;
|
||||
|
||||
|
||||
// Prevents language turds in new lyxtexts under non-english
|
||||
BufferParams const & bufparams = cur.buffer().params();
|
||||
Language const * lang = cur.paragraph().getParLanguage(bufparams);
|
||||
@ -1191,7 +1191,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
|
||||
break;
|
||||
|
||||
case LFUN_INSET_FLOAT:
|
||||
case LFUN_INSET_WIDE_FLOAT:
|
||||
case LFUN_INSET_WIDE_FLOAT:
|
||||
case LFUN_INSET_WRAP:
|
||||
doInsertInset(cur, this, cmd, true, true);
|
||||
cur.posRight();
|
||||
|
||||
@ -216,8 +216,8 @@ void RCS::undoLast()
|
||||
|
||||
void RCS::getLog(string const & tmpf)
|
||||
{
|
||||
doVCCommand("rlog " + QuoteName(OnlyFilename(owner_->fileName()))
|
||||
+ " > " + tmpf,
|
||||
doVCCommand("rlog " + QuoteName(OnlyFilename(owner_->fileName()))
|
||||
+ " > " + tmpf,
|
||||
owner_->filePath());
|
||||
}
|
||||
|
||||
@ -346,7 +346,7 @@ void CVS::undoLast()
|
||||
|
||||
void CVS::getLog(string const & tmpf)
|
||||
{
|
||||
doVCCommand("cvs log " + QuoteName(OnlyFilename(owner_->fileName()))
|
||||
doVCCommand("cvs log " + QuoteName(OnlyFilename(owner_->fileName()))
|
||||
+ " > " + tmpf,
|
||||
owner_->filePath());
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user