anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Typos and style.

Browse Source
This commit is contained in:
Richard Heck 2014-03-29 18:52:36 -04:00
parent 8b00b355ca
commit 0a6ff99f28
13 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Buffer.cpp
View File

@ -929,7 +929,7 @@ bool Buffer::readDocument(Lexer & lex)
readHeader(lex);
if (params().outputChanges) {
if (params().output_changes) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
LaTeXFeatures::isAvailable("xcolor");

14
src/BufferParams.cpp
View File

@ -371,8 +371,8 @@ BufferParams::BufferParams()
biblio_style = "plain";
use_bibtopic = false;
use_indices = false;
trackChanges = false;
outputChanges = false;
track_changes = false;
output_changes = false;
use_default_options = true;
maintain_unincluded_children = false;
secnumdepth = 3;
@ -752,9 +752,9 @@ string BufferParams::readToken(Lexer & lex, string const & token,
} else if (token == "\\use_indices") {
lex >> use_indices;
} else if (token == "\\tracking_changes") {
lex >> trackChanges;
lex >> track_changes;
} else if (token == "\\output_changes") {
lex >> outputChanges;
lex >> output_changes;
} else if (token == "\\branch") {
lex.eatLine();
docstring branch = lex.getDocString();
@ -1178,8 +1178,8 @@ void BufferParams::writeFile(ostream & os) const
}
}
os << "\\tracking_changes " << convert<string>(trackChanges) << '\n'
<< "\\output_changes " << convert<string>(outputChanges) << '\n'
os << "\\tracking_changes " << convert<string>(track_changes) << '\n'
<< "\\output_changes " << convert<string>(output_changes) << '\n'
<< "\\html_math_output " << html_math_output << '\n'
<< "\\html_css_as_file " << html_css_as_file << '\n'
<< "\\html_be_strict " << convert<string>(html_be_strict) << '\n';
@ -1202,7 +1202,7 @@ void BufferParams::validate(LaTeXFeatures & features) const
if (columns > 1 && language->rightToLeft())
features.require("rtloutputdblcol");
if (outputChanges) {
if (output_changes) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
LaTeXFeatures::isAvailable("xcolor");

6
src/BufferParams.h
View File

@ -120,7 +120,7 @@ public:
/// Set the LyX layout file this document is using.
/// NOTE: This does not call makeDocumentClass() to update the local
/// DocumentClass. That needs to be done manually.
/// \param filename the name of the layout file
/// \param classname: the name of the layout file
bool setBaseClass(std::string const & classname);
/// Adds the module information to the baseClass information to
/// create our local DocumentClass.
@ -369,12 +369,12 @@ public:
/// Split the index?
bool use_indices;
/// revision tracking for this buffer ?
bool trackChanges;
bool track_changes;
/** This param decides whether change tracking marks should be used
* in output (irrespective of how these marks are actually defined;
* for instance, they may differ for DVI and PDF generation)
*/
bool outputChanges;
bool output_changes;
///
bool compressed;

10
src/BufferView.cpp
View File

@ -1108,12 +1108,12 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
case LFUN_CHANGES_TRACK:
flag.setEnabled(true);
flag.setOnOff(buffer_.params().trackChanges);
flag.setOnOff(buffer_.params().track_changes);
break;
case LFUN_CHANGES_OUTPUT:
flag.setEnabled(true);
flag.setOnOff(buffer_.params().outputChanges);
flag.setOnOff(buffer_.params().output_changes);
break;
case LFUN_CHANGES_MERGE:
@ -1430,12 +1430,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
}
case LFUN_CHANGES_TRACK:
buffer_.params().trackChanges = !buffer_.params().trackChanges;
buffer_.params().track_changes = !buffer_.params().track_changes;
break;
case LFUN_CHANGES_OUTPUT:
buffer_.params().outputChanges = !buffer_.params().outputChanges;
if (buffer_.params().outputChanges) {
buffer_.params().output_changes = !buffer_.params().output_changes;
if (buffer_.params().output_changes) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
LaTeXFeatures::isAvailable("xcolor");

2
src/Changes.cpp
View File

@ -389,7 +389,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
Change const & oldChange, Change const & change,
OutputParams const & runparams)
{
if (!bparams.outputChanges || oldChange == change)
if (!bparams.output_changes || oldChange == change)
return 0;
int column = 0;

14
src/CutAndPaste.cpp
View File

@ -221,7 +221,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
tmpbuf->eraseChar(i--, false);
}
tmpbuf->setChange(Change(buffer.params().trackChanges ?
tmpbuf->setChange(Change(buffer.params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
}
@ -423,7 +423,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
pars[last_paste].makeSameLayout(pars[last_paste + 1]);
mergeParagraph(buffer.params(), pars, last_paste);
} else {
pars[last_paste + 1].stripLeadingSpaces(buffer.params().trackChanges);
pars[last_paste + 1].stripLeadingSpaces(buffer.params().track_changes);
++last_paste;
}
}
@ -444,17 +444,17 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
// Start and end is inside same paragraph
if (endpit == pit_type(pars.size()) || startpit == endpit) {
endpos -= pars[startpit].eraseChars(startpos, endpos, params.trackChanges);
endpos -= pars[startpit].eraseChars(startpos, endpos, params.track_changes);
return PitPosPair(endpit, endpos);
}
for (pit_type pit = startpit; pit != endpit + 1;) {
pos_type const left = (pit == startpit ? startpos : 0);
pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1);
bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges);
bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.track_changes);
// Logically erase only, including the end-of-paragraph character
pars[pit].eraseChars(left, right, params.trackChanges);
pars[pit].eraseChars(left, right, params.track_changes);
// Separate handling of paragraph break:
if (merge && pit != endpit &&
@ -857,7 +857,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
// sometimes necessary
if (doclear
&& text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges))
&& text->paragraphs()[begpit].stripLeadingSpaces(bp.track_changes))
cur.fixIfBroken();
// need a valid cursor. (Lgb)
@ -1223,7 +1223,7 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str)
docstring::const_iterator cit = str.begin();
docstring::const_iterator end = str.end();
for (; cit != end; ++cit, ++pos)
par.insertChar(pos, *cit, font, cur.buffer()->params().trackChanges);
par.insertChar(pos, *cit, font, cur.buffer()->params().track_changes);
// Cut the selection
cutSelection(cur, true, false);

8
src/Paragraph.cpp
View File

@ -2475,7 +2475,7 @@ void Paragraph::latex(BufferParams const & bparams,
Change const & change = runparams.inDeletedInset
? runparams.changeOfDeletedInset : lookupChange(i);
if (bparams.outputChanges && runningChange != change) {
if (bparams.output_changes && runningChange != change) {
if (open_font) {
column += running_font.latexWriteEndChanges(
os, bparams, runparams, basefont, basefont);
@ -2491,7 +2491,7 @@ void Paragraph::latex(BufferParams const & bparams,
// do not output text which is marked deleted
// if change tracking output is disabled
if (!bparams.outputChanges && change.deleted()) {
if (!bparams.output_changes && change.deleted()) {
continue;
}
@ -3566,7 +3566,7 @@ int Paragraph::fixBiblio(Buffer const & buffer)
if (d->layout_->labeltype != LABEL_BIBLIO)
return 0;
bool const track_changes = buffer.params().trackChanges;
bool const track_changes = buffer.params().track_changes;
int bibitem_pos = d->insetlist_.find(BIBITEM_CODE);
bool const hasbibitem0 = bibitem_pos == 0;
@ -3674,7 +3674,7 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
// changes within sequences can occur.
vector<pair<char_type, Font> > changes;
bool const trackChanges = bparams.trackChanges;
bool const trackChanges = bparams.track_changes;
bool capitalize = true;

2
src/ParagraphMetrics.cpp
View File

@ -92,7 +92,7 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
for (pos_type i = row.pos(); i < row.endpos(); ++i) {
char_type const b[] = { par_->getChar(i) };
crc.process_bytes(b, sizeof(char_type));
if (bparams.trackChanges) {
if (bparams.track_changes) {
Change change = par_->lookupChange(i);
char_type const b[] = { static_cast<char_type>(change.type) };
// 1 byte is enough to encode Change::Type

36
src/Text.cpp
View File

@ -157,7 +157,7 @@ void breakParagraphConservative(BufferParams const & bparams,
}
// Move over the end-of-par change information
tmp.setChange(tmp.size(), par.lookupChange(par.size()));
par.setChange(par.size(), Change(bparams.trackChanges ?
par.setChange(par.size(), Change(bparams.track_changes ?
Change::INSERTED : Change::UNCHANGED));
}
}
@ -691,7 +691,7 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
// Move over the end-of-par change information
tmp->setChange(tmp->size(), par.lookupChange(par.size()));
par.setChange(par.size(), Change(bparams.trackChanges ?
par.setChange(par.size(), Change(bparams.track_changes ?
Change::INSERTED : Change::UNCHANGED));
if (pos) {
@ -749,7 +749,7 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
// Always break behind a space
// It is better to erase the space (Dekel)
if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
cpar.eraseChar(cur.pos(), cur.buffer()->params().track_changes);
// What should the layout for the new paragraph be?
bool keep_layout = layout.isEnvironment()
@ -784,7 +784,7 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
}
while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) {
if (!pars_[next_par].eraseChar(0, cur.buffer()->params().trackChanges))
if (!pars_[next_par].eraseChar(0, cur.buffer()->params().track_changes))
break; // the character couldn't be deleted physically due to change tracking
}
@ -831,11 +831,11 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
} else if (*cit == '\t') {
if (!par.isFreeSpacing()) {
// tabs are like spaces here
par.insertChar(pos, ' ', font, bparams.trackChanges);
par.insertChar(pos, ' ', font, bparams.track_changes);
++pos;
space_inserted = true;
} else {
par.insertChar(pos, *cit, font, bparams.trackChanges);
par.insertChar(pos, *cit, font, bparams.track_changes);
++pos;
space_inserted = true;
}
@ -844,7 +844,7 @@ void Text::insertStringAsLines(Cursor & cur, docstring const & str,
continue;
} else {
// just insert the character
par.insertChar(pos, *cit, font, bparams.trackChanges);
par.insertChar(pos, *cit, font, bparams.track_changes);
++pos;
space_inserted = (*cit == ' ');
}
@ -1016,7 +1016,7 @@ void Text::insertChar(Cursor & cur, char_type c)
}
par.insertChar(cur.pos(), c, cur.current_font,
cur.buffer()->params().trackChanges);
cur.buffer()->params().track_changes);
cur.checkBufferStructure();
// cur.screenUpdateFlags(Update::Force);
@ -1366,7 +1366,7 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
// finally, invoke the DEPM
deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().trackChanges);
deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().track_changes);
//
@ -1382,7 +1382,7 @@ void Text::acceptChanges()
{
BufferParams const & bparams = owner_->buffer().params();
lyx::acceptChanges(pars_, bparams);
deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.trackChanges);
deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.track_changes);
}
@ -1418,7 +1418,7 @@ void Text::rejectChanges()
}
// finally, invoke the DEPM
deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.trackChanges);
deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.track_changes);
}
@ -1548,7 +1548,7 @@ bool Text::erase(Cursor & cur)
// any paragraphs
cur.recordUndo(DELETE_UNDO);
bool const was_inset = cur.paragraph().isInset(cur.pos());
if(!par.eraseChar(cur.pos(), cur.buffer()->params().trackChanges))
if(!par.eraseChar(cur.pos(), cur.buffer()->params().track_changes))
// the character has been logically deleted only => skip it
cur.top().forwardPos();
@ -1561,7 +1561,7 @@ bool Text::erase(Cursor & cur)
if (cur.pit() == cur.lastpit())
return dissolveInset(cur);
if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos();
needsUpdate = true;
@ -1648,7 +1648,7 @@ bool Text::backspace(Cursor & cur)
Cursor prev_cur = cur;
--prev_cur.pit();
if (!prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
if (!prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
cur.recordUndo(ATOMIC_UNDO, prev_cur.pit(), prev_cur.pit());
prev_cur.paragraph().setChange(prev_cur.lastpos(), Change(Change::DELETED));
setCursorIntern(cur, prev_cur.pit(), prev_cur.lastpos());
@ -1669,7 +1669,7 @@ bool Text::backspace(Cursor & cur)
setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
bool const was_inset = cur.paragraph().isInset(cur.pos());
cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().track_changes);
if (was_inset)
cur.forceBufferUpdate();
else
@ -1711,7 +1711,7 @@ bool Text::dissolveInset(Cursor & cur)
spos += cur.pos();
spit += cur.pit();
Buffer & b = *cur.buffer();
cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
cur.paragraph().eraseChar(cur.pos(), b.params().track_changes);
if (!plist.empty()) {
// see bug 7319
@ -1846,7 +1846,7 @@ docstring Text::currentState(Cursor const & cur) const
Paragraph const & par = cur.paragraph();
odocstringstream os;
if (buf.params().trackChanges)
if (buf.params().track_changes)
os << _("[Change Tracking] ");
Change change = par.lookupChange(cur.pos());
@ -2067,7 +2067,7 @@ void Text::charsTranspose(Cursor & cur)
// And finally, we are ready to perform the transposition.
// Track the changes if Change Tracking is enabled.
bool const trackChanges = cur.buffer()->params().trackChanges;
bool const trackChanges = cur.buffer()->params().track_changes;
cur.recordUndo();

6
src/Text2.cpp
View File

@ -539,7 +539,7 @@ void Text::insertInset(Cursor & cur, Inset * inset)
LBUFERR(this == cur.text());
LBUFERR(inset);
cur.paragraph().insertInset(cur.pos(), inset, cur.current_font,
Change(cur.buffer()->params().trackChanges
Change(cur.buffer()->params().track_changes
? Change::INSERTED : Change::UNCHANGED));
}
@ -855,7 +855,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
&& oldpar.isLineSeparator(old.pos() - 1)
&& !oldpar.isDeleted(old.pos() - 1)
&& !oldpar.isDeleted(old.pos())) {
oldpar.eraseChar(old.pos() - 1, cur.buffer()->params().trackChanges);
oldpar.eraseChar(old.pos() - 1, cur.buffer()->params().track_changes);
// FIXME: This will not work anymore when we have multiple views of the same buffer
// In this case, we will have to correct also the cursors held by
// other bufferviews. It will probably be easier to do that in a more
@ -910,7 +910,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
return true;
}
if (oldpar.stripLeadingSpaces(cur.buffer()->params().trackChanges)) {
if (oldpar.stripLeadingSpaces(cur.buffer()->params().track_changes)) {
need_anchor_change = true;
// We return true here because the Paragraph contents changed and
// we need a redraw before further action is processed.

4
src/Text3.cpp
View File

@ -946,7 +946,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
pit_type const pit_end = cur.selEnd().pit();
for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) {
pars_[pit].insertChar(0, '\t',
bv->buffer().params().trackChanges);
bv->buffer().params().track_changes);
// Update the selection pos to make sure the selection does not
// change as the inserted tab will increase the logical pos.
if (cur.realAnchor().pit() == pit)
@ -965,7 +965,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
}
case LFUN_TAB_DELETE: {
bool const tc = bv->buffer().params().trackChanges;
bool const tc = bv->buffer().params().track_changes;
if (cur.selection()) {
// If there is a selection, a tab (if present) is removed from
// the beginning of each paragraph.

22
src/insets/InsetTabular.cpp
View File

@ -748,7 +748,7 @@ void Tabular::insertRow(row_type const row, bool copy)
for (col_type c = 0; c < ncols(); ++c) {
cell_info[row + 1].insert(cell_info[row + 1].begin() + c,
copy ? CellData(cell_info[row][c]) : CellData(buffer_));
if (buffer().params().trackChanges)
if (buffer().params().track_changes)
cell_info[row + 1][c].inset->setChange(Change(Change::INSERTED));
if (cell_info[row][c].multirow == CELL_BEGIN_OF_MULTIROW)
cell_info[row + 1][c].multirow = CELL_PART_OF_MULTIROW;
@ -769,7 +769,7 @@ void Tabular::insertRow(row_type const row, bool copy)
setBottomLine(j, false);
}
// mark track changes
if (buffer().params().trackChanges)
if (buffer().params().track_changes)
cellInfo(i).inset->setChange(Change(Change::INSERTED));
}
}
@ -790,7 +790,7 @@ void Tabular::moveColumn(col_type col, ColDirection direction)
// FIXME track changes is broken for tabular features (#8469)
idx_type const i = cellIndex(r, col);
idx_type const j = cellIndex(r, col + 1);
if (buffer().params().trackChanges) {
if (buffer().params().track_changes) {
cellInfo(i).inset->setChange(Change(Change::INSERTED));
cellInfo(j).inset->setChange(Change(Change::INSERTED));
}
@ -814,7 +814,7 @@ void Tabular::moveRow(row_type row, RowDirection direction)
// FIXME track changes is broken for tabular features (#8469)
idx_type const i = cellIndex(row, c);
idx_type const j = cellIndex(row + 1, c);
if (buffer().params().trackChanges) {
if (buffer().params().track_changes) {
cellInfo(i).inset->setChange(Change(Change::INSERTED));
cellInfo(j).inset->setChange(Change(Change::INSERTED));
}
@ -863,7 +863,7 @@ void Tabular::insertColumn(col_type const col, bool copy)
for (row_type r = 0; r < nrows(); ++r) {
cell_info[r].insert(cell_info[r].begin() + col + 1,
copy ? CellData(cell_info[r][col]) : CellData(buffer_));
if (bp.trackChanges)
if (bp.track_changes)
cell_info[r][col + 1].inset->setChange(Change(Change::INSERTED));
if (cell_info[r][col].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
cell_info[r][col + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
@ -880,7 +880,7 @@ void Tabular::insertColumn(col_type const col, bool copy)
setRightLine(i, true);
setRightLine(j, false);
}
if (buffer().params().trackChanges)
if (buffer().params().track_changes)
cellInfo(i).inset->setChange(Change(Change::INSERTED));
}
}
@ -6097,7 +6097,7 @@ bool InsetTabular::pasteClipboard(Cursor & cur)
tabular.cellInset(r2, c2)->setBuffer(tabular.buffer());
// FIXME: change tracking (MG)
inset->setChange(Change(buffer().params().trackChanges ?
inset->setChange(Change(buffer().params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
cur.pos() = 0;
}
@ -6118,7 +6118,7 @@ void InsetTabular::cutSelection(Cursor & cur)
for (col_type c = cs; c <= ce; ++c) {
shared_ptr<InsetTableCell> t
= cell(tabular.cellIndex(r, c));
if (buffer().params().trackChanges)
if (buffer().params().track_changes)
// FIXME: Change tracking (MG)
t->setChange(Change(Change::DELETED));
else
@ -6288,7 +6288,7 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
Font const font = bv.textMetrics(&inset->text()).
displayFont(0, 0);
inset->setText(buf.substr(op, p - op), font,
buffer().params().trackChanges);
buffer().params().track_changes);
++cols;
++cell;
}
@ -6300,7 +6300,7 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
Font const font = bv.textMetrics(&inset->text()).
displayFont(0, 0);
inset->setText(buf.substr(op, p - op), font,
buffer().params().trackChanges);
buffer().params().track_changes);
}
cols = ocol;
++row;
@ -6316,7 +6316,7 @@ bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
shared_ptr<InsetTableCell> inset = loctab->cellInset(cell);
Font const font = bv.textMetrics(&inset->text()).displayFont(0, 0);
inset->setText(buf.substr(op, len - op), font,
buffer().params().trackChanges);
buffer().params().track_changes);
}
return true;
}

4
src/lyxfind.cpp
View File

@ -182,9 +182,9 @@ int replaceAll(BufferView * bv,
cur.recordUndo();
int striked = ssize -
cur.paragraph().eraseChars(pos, pos + match_len,
buf.params().trackChanges);
buf.params().track_changes);
cur.paragraph().insert(pos, replacestr, font,
Change(buf.params().trackChanges
Change(buf.params().track_changes
? Change::INSERTED
: Change::UNCHANGED));
for (int i = 0; i < rsize + striked; ++i)