mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-16 16:18:22 +00:00
e30f3d76d2
This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.
385 lines
8.4 KiB
C++
385 lines
8.4 KiB
C++
/**
|
|
* \file InsetNote.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Angus Leeming
|
|
* \author Martin Vermeer
|
|
* \author Jürgen Spitzmüller
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "InsetNote.h"
|
|
|
|
#include "Buffer.h"
|
|
#include "BufferParams.h"
|
|
#include "BufferView.h"
|
|
#include "BufferParams.h"
|
|
#include "ColorSet.h"
|
|
#include "Counters.h"
|
|
#include "Cursor.h"
|
|
#include "DispatchResult.h"
|
|
#include "Exporter.h"
|
|
#include "FuncRequest.h"
|
|
#include "FuncStatus.h"
|
|
#include "InsetIterator.h"
|
|
#include "LaTeXFeatures.h"
|
|
#include "Lexer.h"
|
|
#include "LyXRC.h"
|
|
#include "OutputParams.h"
|
|
#include "ParIterator.h"
|
|
#include "TextClass.h"
|
|
#include "TocBackend.h"
|
|
|
|
#include "support/debug.h"
|
|
#include "support/docstream.h"
|
|
#include "support/gettext.h"
|
|
#include "support/lstrings.h"
|
|
#include "support/Translator.h"
|
|
|
|
#include "frontends/Application.h"
|
|
|
|
#include <algorithm>
|
|
#include <sstream>
|
|
|
|
using namespace std;
|
|
|
|
namespace lyx {
|
|
|
|
namespace {
|
|
|
|
typedef Translator<string, InsetNoteParams::Type> NoteTranslator;
|
|
|
|
NoteTranslator const init_notetranslator()
|
|
{
|
|
NoteTranslator translator("Note", InsetNoteParams::Note);
|
|
translator.addPair("Comment", InsetNoteParams::Comment);
|
|
translator.addPair("Greyedout", InsetNoteParams::Greyedout);
|
|
return translator;
|
|
}
|
|
|
|
|
|
NoteTranslator const & notetranslator()
|
|
{
|
|
static NoteTranslator const translator = init_notetranslator();
|
|
return translator;
|
|
}
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
InsetNoteParams::InsetNoteParams()
|
|
: type(Note)
|
|
{}
|
|
|
|
|
|
void InsetNoteParams::write(ostream & os) const
|
|
{
|
|
string const label = notetranslator().find(type);
|
|
os << "Note " << label << "\n";
|
|
}
|
|
|
|
|
|
void InsetNoteParams::read(Lexer & lex)
|
|
{
|
|
string label;
|
|
lex >> label;
|
|
if (lex)
|
|
type = notetranslator().find(label);
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
//
|
|
// InsetNote
|
|
//
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
InsetNote::InsetNote(Buffer * buf, string const & label)
|
|
: InsetCollapsable(buf)
|
|
{
|
|
params_.type = notetranslator().find(label);
|
|
}
|
|
|
|
|
|
InsetNote::~InsetNote()
|
|
{
|
|
hideDialogs("note", this);
|
|
}
|
|
|
|
|
|
docstring InsetNote::layoutName() const
|
|
{
|
|
return from_ascii("Note:" + notetranslator().find(params_.type));
|
|
}
|
|
|
|
|
|
Inset::DisplayType InsetNote::display() const
|
|
{
|
|
return Inline;
|
|
}
|
|
|
|
|
|
void InsetNote::write(ostream & os) const
|
|
{
|
|
params_.write(os);
|
|
InsetCollapsable::write(os);
|
|
}
|
|
|
|
|
|
void InsetNote::read(Lexer & lex)
|
|
{
|
|
params_.read(lex);
|
|
InsetCollapsable::read(lex);
|
|
}
|
|
|
|
|
|
bool InsetNote::showInsetDialog(BufferView * bv) const
|
|
{
|
|
bv->showDialog("note", params2string(params()),
|
|
const_cast<InsetNote *>(this));
|
|
return true;
|
|
}
|
|
|
|
|
|
void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
|
|
{
|
|
switch (cmd.action()) {
|
|
|
|
case LFUN_INSET_MODIFY: {
|
|
// Do not do anything if converting to the same type of Note.
|
|
// A quick break here is done instead of disabling the LFUN
|
|
// because disabling the LFUN would lead to a greyed out
|
|
// entry, which might confuse users.
|
|
// In the future, we might want to have a radio button for
|
|
// switching between notes.
|
|
InsetNoteParams params;
|
|
string2params(to_utf8(cmd.argument()), params);
|
|
if (params_.type == params.type)
|
|
break;
|
|
|
|
cur.recordUndoInset(this);
|
|
string2params(to_utf8(cmd.argument()), params_);
|
|
setButtonLabel();
|
|
// what we really want here is a TOC update, but that means
|
|
// a full buffer update
|
|
cur.forceBufferUpdate();
|
|
break;
|
|
}
|
|
|
|
case LFUN_INSET_DIALOG_UPDATE:
|
|
cur.bv().updateDialog("note", params2string(params()));
|
|
break;
|
|
|
|
default:
|
|
InsetCollapsable::doDispatch(cur, cmd);
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
|
|
FuncStatus & flag) const
|
|
{
|
|
switch (cmd.action()) {
|
|
|
|
case LFUN_INSET_MODIFY:
|
|
// disallow comment and greyed out in commands
|
|
flag.setEnabled(!cur.paragraph().layout().isCommand() ||
|
|
cmd.getArg(2) == "Note");
|
|
if (cmd.getArg(0) == "note") {
|
|
InsetNoteParams params;
|
|
string2params(to_utf8(cmd.argument()), params);
|
|
flag.setOnOff(params_.type == params.type);
|
|
}
|
|
return true;
|
|
|
|
case LFUN_INSET_DIALOG_UPDATE:
|
|
flag.setEnabled(true);
|
|
return true;
|
|
|
|
default:
|
|
return InsetCollapsable::getStatus(cur, cmd, flag);
|
|
}
|
|
}
|
|
|
|
|
|
bool InsetNote::isMacroScope() const
|
|
{
|
|
// LyX note has no latex output
|
|
if (params_.type == InsetNoteParams::Note)
|
|
return true;
|
|
|
|
return InsetCollapsable::isMacroScope();
|
|
}
|
|
|
|
|
|
void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
|
|
{
|
|
if (params_.type == InsetNoteParams::Note)
|
|
return;
|
|
|
|
OutputParams runparams(runparams_in);
|
|
if (params_.type == InsetNoteParams::Comment) {
|
|
runparams.inComment = true;
|
|
// Ignore files that are exported inside a comment
|
|
runparams.exportdata.reset(new ExportData);
|
|
}
|
|
|
|
// the space after the comment in 'a[comment] b' will be eaten by the
|
|
// comment environment since the space before b is ignored with the
|
|
// following latex output:
|
|
//
|
|
// a%
|
|
// \begin{comment}
|
|
// comment
|
|
// \end{comment}
|
|
// b
|
|
//
|
|
// Adding {} before ' b' fixes this.
|
|
// The {} will be automatically added, but only if needed, for all
|
|
// insets whose InsetLayout Display tag is false. This is achieved
|
|
// by telling otexstream to protect an immediately following space
|
|
// and is done for both comment and greyedout insets.
|
|
InsetCollapsable::latex(os, runparams);
|
|
|
|
runparams_in.encoding = runparams.encoding;
|
|
}
|
|
|
|
|
|
int InsetNote::plaintext(odocstringstream & os,
|
|
OutputParams const & runparams_in, size_t max_length) const
|
|
{
|
|
if (params_.type == InsetNoteParams::Note)
|
|
return 0;
|
|
|
|
OutputParams runparams(runparams_in);
|
|
if (params_.type == InsetNoteParams::Comment) {
|
|
runparams.inComment = true;
|
|
// Ignore files that are exported inside a comment
|
|
runparams.exportdata.reset(new ExportData);
|
|
}
|
|
os << '[' << buffer().B_("note") << ":\n";
|
|
InsetText::plaintext(os, runparams, max_length);
|
|
os << "\n]";
|
|
|
|
return PLAINTEXT_NEWLINE + 1; // one char on a separate line
|
|
}
|
|
|
|
|
|
int InsetNote::docbook(odocstream & os, OutputParams const & runparams_in) const
|
|
{
|
|
if (params_.type == InsetNoteParams::Note)
|
|
return 0;
|
|
|
|
OutputParams runparams(runparams_in);
|
|
if (params_.type == InsetNoteParams::Comment) {
|
|
os << "<remark>\n";
|
|
runparams.inComment = true;
|
|
// Ignore files that are exported inside a comment
|
|
runparams.exportdata.reset(new ExportData);
|
|
}
|
|
|
|
int const n = InsetText::docbook(os, runparams);
|
|
|
|
if (params_.type == InsetNoteParams::Comment)
|
|
os << "\n</remark>\n";
|
|
|
|
// Return how many newlines we issued.
|
|
//return int(count(str.begin(), str.end(), '\n'));
|
|
return n + 1 + 2;
|
|
}
|
|
|
|
|
|
docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const
|
|
{
|
|
if (params_.type == InsetNoteParams::Note)
|
|
return docstring();
|
|
|
|
return InsetCollapsable::xhtml(xs, rp);
|
|
}
|
|
|
|
|
|
void InsetNote::validate(LaTeXFeatures & features) const
|
|
{
|
|
switch (params_.type) {
|
|
case InsetNoteParams::Comment:
|
|
if (features.runparams().flavor == OutputParams::HTML)
|
|
// we do output this but set display to "none" by default,
|
|
// but people might want to use it.
|
|
InsetCollapsable::validate(features);
|
|
else
|
|
// Only do the requires
|
|
features.useInsetLayout(getLayout());
|
|
break;
|
|
case InsetNoteParams::Greyedout:
|
|
InsetCollapsable::validate(features);
|
|
break;
|
|
case InsetNoteParams::Note:
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
string InsetNote::contextMenuName() const
|
|
{
|
|
return "context-note";
|
|
}
|
|
|
|
bool InsetNote::allowSpellCheck() const
|
|
{
|
|
return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes);
|
|
}
|
|
|
|
FontInfo InsetNote::getFont() const
|
|
{
|
|
FontInfo font = getLayout().font();
|
|
// FIXME: This hardcoded color is a hack!
|
|
if (params_.type == InsetNoteParams::Greyedout
|
|
&& buffer().params().notefontcolor != lyx::rgbFromHexName("#cccccc")) {
|
|
ColorCode c = lcolor.getFromLyXName("notefontcolor");
|
|
if (c != Color_none)
|
|
font.setColor(c);
|
|
}
|
|
return font;
|
|
}
|
|
|
|
|
|
string InsetNote::params2string(InsetNoteParams const & params)
|
|
{
|
|
ostringstream data;
|
|
data << "note" << ' ';
|
|
params.write(data);
|
|
return data.str();
|
|
}
|
|
|
|
|
|
void InsetNote::string2params(string const & in, InsetNoteParams & params)
|
|
{
|
|
params = InsetNoteParams();
|
|
|
|
if (in.empty())
|
|
return;
|
|
|
|
istringstream data(in);
|
|
Lexer lex;
|
|
lex.setStream(data);
|
|
lex.setContext("InsetNote::string2params");
|
|
lex >> "note";
|
|
// There are cases, such as when we are called via getStatus() from
|
|
// Dialog::canApply(), where we are just called with "note" rather
|
|
// than a full "note Note TYPE".
|
|
if (!lex.isOK())
|
|
return;
|
|
lex >> "Note";
|
|
|
|
params.read(lex);
|
|
}
|
|
|
|
|
|
} // namespace lyx
|