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 #804 - URL link and break line

Browse source 
- Addressed bug #804 by allowing rc.hyphenate to control whether hyphens are
  inserted when long lines are broken.  This may help prevent xterm from
  mis-parsing URLs in task annotations, when wrapped (thanks to Yann Davin).
- Added unit tests.
This commit is contained in:
Paul Beckingham 2011-08-17 22:39:28 -04:00
parent 08fcb5362e
commit 7dd3e081c7
20 changed files with 147 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/text.cpp
View file

@ -52,7 +52,8 @@ static void replace_positional (std::string&, const std::string&, const std::str
void wrapText (
std::vector <std::string>& lines,
const std::string& text,
const int width)
const int width,
bool hyphenate)
{
std::string copy = text;
std::string line;
@ -61,7 +62,7 @@ void wrapText (
while (copy.length ()) // Used as Boolean, therefore UTF8 safe.
{
extractLine (copy, line, modified_width);
extractLine (copy, line, modified_width, hyphenate);
lines.push_back (line);
}
}
@ -316,7 +317,11 @@ int longestLine (const std::string& input)
}
////////////////////////////////////////////////////////////////////////////////
void extractLine (std::string& text, std::string& line, int length)
void extractLine (
std::string& text,
std::string& line,
int length,
bool hyphenate)
{
size_t eol = text.find ("\n");
@ -356,8 +361,16 @@ void extractLine (std::string& text, std::string& line, int length)
{
if (length > 1)
{
line = text.substr (0, length - 1) + "-";
text = text.substr (length - 1);
if (hyphenate)
{
line = text.substr (0, length - 1) + "-";
text = text.substr (length - 1);
}
else
{
line = text.substr (0, length);
text = text.substr (length);
}
}
else
{