GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug #455 - Text alignment in reports is broken when text contains utf8 characters

Browse source 
- Applied patch from Johannes.
- Also included extra calls to getCharLength in other parts of the code.

Signed-off-by: Paul Beckingham <paul@beckingham.net>
This commit is contained in:
Johannes Schlatow 2010-08-01 09:30:42 -04:00 • committed by Paul Beckingham
parent 3939503377
commit 6e1aa42d1a
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/Table.cpp
View file

@ -108,7 +108,7 @@ void Table::setTableDashedUnderline ()
int Table::addColumn (const std::string& col)
{
mSpecifiedWidth.push_back (minimum);
mMaxDataWidth.push_back (col == "" ? 1 : col.length ());
mMaxDataWidth.push_back (col == "" ? 1 : getCharLength (col));
mCalculatedWidth.push_back (0);
mColumnPadding.push_back (0);
@ -179,7 +179,7 @@ void Table::setRowColor (const int row, const Color& c)
////////////////////////////////////////////////////////////////////////////////
void Table::addCell (const int row, const int col, const std::string& data)
{
unsigned int length = 0;
int length = 0;
if (mCommify.find (col) != mCommify.end ())
mData.add (row, col, commify (data));
@ -193,14 +193,14 @@ void Table::addCell (const int row, const int col, const std::string& data)
std::vector <std::string> lines;
split (lines, data, "\n");
for (unsigned int i = 0; i < lines.size (); ++i)
if (lines[i].length () > length)
length = lines[i].length ();
if (getCharLength (lines[i]) > length)
length = getCharLength (lines[i]);
}
else
length = data.length ();
length = getCharLength (data);
// Automatically maintain max width.
mMaxDataWidth[col] = max (mMaxDataWidth[col], (int)length);
mMaxDataWidth[col] = max (mMaxDataWidth[col], length);
}
////////////////////////////////////////////////////////////////////////////////
@ -435,6 +435,25 @@ Table::just Table::getHeaderJustification (int col)
: left;
}
////////////////////////////////////////////////////////////////////////////////
int Table::getCharLength (const std::string& str)
{
int byteLength = str.length ();
int charLength = byteLength;
const char* data = str.data ();
// decrement the number of bytes for each byte that matches 0b10??????
// this way only the first byte of any utf8 sequence is counted
for (int i = 0; i < byteLength; i++)
{
// extract the two MSB and check whether they are 10
if ((data[i] & 0xC0) == 0x80)
charLength--;
}
return charLength;
}
////////////////////////////////////////////////////////////////////////////////
// data One Data to be rendered
// width 8 Max data width for column/specified width
@ -459,7 +478,7 @@ const std::string Table::formatHeader (
std::string data = mColumns[col];
Color c = getHeaderUnderline (col);
int gap = width - strippedLength (data);
int gap = width - strippedLength (data); // TODO Does this need Table::getCharLength too?
std::string pad = std::string (padding, ' ');
@ -542,7 +561,7 @@ void Table::formatCell (
for (size_t chunk = 0; chunk < chunks.size (); ++chunk)
{
// Place the data within the available space - justify.
int gap = width - chunks[chunk].length ();
int gap = width - getCharLength (chunks[chunk]);
preJust = "";
postJust = "";