mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-24 10:40:48 +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.
147 lines
2.9 KiB
C++
147 lines
2.9 KiB
C++
/**
|
|
* \file Spacing.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Lars Gullik Bjønnes
|
|
* \author Jean-Marc Lasgouttes
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "Spacing.h"
|
|
#include "support/lstrings.h"
|
|
#include "support/convert.h"
|
|
|
|
#include <ostream>
|
|
|
|
using namespace std;
|
|
|
|
namespace lyx {
|
|
|
|
|
|
string const Spacing::spacing_string[]
|
|
= {"single", "onehalf", "double", "other"};
|
|
|
|
|
|
string const Spacing::getValueAsString() const
|
|
{
|
|
switch (space) {
|
|
case Default: // nothing special should happen with this...
|
|
case Single: return "1.0";
|
|
case Onehalf: return "1.25";
|
|
case Double: return "1.667";
|
|
case Other: return value;
|
|
}
|
|
return "1.0";
|
|
}
|
|
|
|
|
|
double Spacing::getValue() const
|
|
{
|
|
return convert<double>(getValueAsString());
|
|
}
|
|
|
|
|
|
void Spacing::set(Spacing::Space sp, double val)
|
|
{
|
|
set(sp, convert<string>(val));
|
|
}
|
|
|
|
|
|
void Spacing::set(Spacing::Space sp, string const & val)
|
|
{
|
|
space = sp;
|
|
if (sp == Other) {
|
|
switch (int(convert<double>(val) * 1000 + 0.5)) {
|
|
case 1000:
|
|
space = Single;
|
|
break;
|
|
case 1250:
|
|
space = Onehalf;
|
|
break;
|
|
case 1667:
|
|
space = Double;
|
|
break;
|
|
default:
|
|
value = val;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void Spacing::writeFile(ostream & os, bool para) const
|
|
{
|
|
if (space == Default) return;
|
|
|
|
string cmd = para ? "\\paragraph_spacing " : "\\spacing ";
|
|
|
|
if (getSpace() == Spacing::Other) {
|
|
os << cmd << spacing_string[getSpace()]
|
|
<< ' ' << getValueAsString() << "\n";
|
|
} else {
|
|
os << cmd << spacing_string[getSpace()] << "\n";
|
|
}
|
|
}
|
|
|
|
|
|
namespace {
|
|
|
|
string envName(Spacing::Space space, bool useSetSpace)
|
|
{
|
|
static char const * const env_names[]
|
|
= { "SingleSpace", "OnehalfSpace", "DoubleSpace", "Spacing", ""};
|
|
string const name = env_names[space];
|
|
|
|
return useSetSpace ? name : support::ascii_lowercase(name);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
string const Spacing::writeEnvirBegin(bool useSetSpace) const
|
|
{
|
|
string const name = envName(space, useSetSpace);
|
|
if (space == Other)
|
|
return "\\begin{" + name + "}{" + getValueAsString() + '}';
|
|
else
|
|
return name.empty() ? string() : "\\begin{" + name + '}';
|
|
}
|
|
|
|
|
|
string const Spacing::writeEnvirEnd(bool useSetSpace) const
|
|
{
|
|
string const name = envName(space, useSetSpace);
|
|
return name.empty() ? string() : "\\end{" + name + '}';
|
|
}
|
|
|
|
|
|
string const Spacing::writePreamble(bool useSetSpace) const
|
|
{
|
|
string preamble;
|
|
switch (space) {
|
|
case Default:
|
|
case Single:
|
|
// we dont use setspace.sty so dont print anything
|
|
//return "\\singlespacing\n";
|
|
break;
|
|
case Onehalf:
|
|
preamble = useSetSpace ? "\\OnehalfSpacing\n"
|
|
: "\\onehalfspacing\n";
|
|
break;
|
|
case Double:
|
|
preamble = useSetSpace ? "\\DoubleSpacing\n"
|
|
: "\\doublespacing\n";
|
|
break;
|
|
case Other:
|
|
preamble = (useSetSpace ? "\\setSpacing{" : "\\setstretch{")
|
|
+ getValueAsString() + "}\n";
|
|
break;
|
|
}
|
|
return preamble;
|
|
}
|
|
|
|
} // namespace lyx
|