mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
Bug #804 - URL link and break line
- 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:
parent
08fcb5362e
commit
7dd3e081c7
20 changed files with 147 additions and 28 deletions
|
@ -51,6 +51,8 @@ ColumnDepends::ColumnDepends ()
|
|||
_examples.push_back ("1 2 10");
|
||||
_examples.push_back ("[3]");
|
||||
_examples.push_back (context.config.get ("dependency.indicator"));
|
||||
|
||||
_hyphenate = context.config.getBoolean ("hyphenate");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -150,7 +152,7 @@ void ColumnDepends::render (
|
|||
join (combined, " ", blocking_ids);
|
||||
|
||||
std::vector <std::string> all;
|
||||
wrapText (all, combined, width);
|
||||
wrapText (all, combined, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = all.begin (); i != all.end (); ++i)
|
||||
|
|
|
@ -46,6 +46,7 @@ public:
|
|||
void render (std::vector <std::string>&, Task&, int, Color&);
|
||||
|
||||
private:
|
||||
bool _hyphenate;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -71,6 +71,8 @@ ColumnDescription::ColumnDescription ()
|
|||
+ " " + t + " " + a4);
|
||||
_examples.push_back (d.substr (0, 20) + "...");
|
||||
_examples.push_back (d + " [4]");
|
||||
|
||||
_hyphenate = context.config.getBoolean ("hyphenate");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -199,7 +201,7 @@ void ColumnDescription::render (
|
|||
}
|
||||
|
||||
std::vector <std::string> raw;
|
||||
wrapText (raw, description, width);
|
||||
wrapText (raw, description, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = raw.begin (); i != raw.end (); ++i)
|
||||
|
@ -210,7 +212,7 @@ void ColumnDescription::render (
|
|||
else if (_style == "desc")
|
||||
{
|
||||
std::vector <std::string> raw;
|
||||
wrapText (raw, description, width);
|
||||
wrapText (raw, description, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = raw.begin (); i != raw.end (); ++i)
|
||||
|
@ -237,7 +239,7 @@ void ColumnDescription::render (
|
|||
}
|
||||
|
||||
std::vector <std::string> raw;
|
||||
wrapText (raw, description, width);
|
||||
wrapText (raw, description, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = raw.begin (); i != raw.end (); ++i)
|
||||
|
@ -264,7 +266,7 @@ void ColumnDescription::render (
|
|||
description += " [" + format ((int) annos.size ()) + "]";
|
||||
|
||||
std::vector <std::string> raw;
|
||||
wrapText (raw, description, width);
|
||||
wrapText (raw, description, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = raw.begin (); i != raw.end (); ++i)
|
||||
|
|
|
@ -45,6 +45,7 @@ public:
|
|||
void render (std::vector <std::string>&, Task&, int, Color&);
|
||||
|
||||
private:
|
||||
bool _hyphenate;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -47,6 +47,8 @@ ColumnProject::ColumnProject ()
|
|||
|
||||
_examples.push_back (STRING_COLUMN_EXAMPLES_PROJ);
|
||||
_examples.push_back (STRING_COLUMN_EXAMPLES_PAR);
|
||||
|
||||
_hyphenate = context.config.getBoolean ("hyphenate");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -96,7 +98,7 @@ void ColumnProject::render (
|
|||
}
|
||||
|
||||
std::vector <std::string> raw;
|
||||
wrapText (raw, project, width);
|
||||
wrapText (raw, project, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = raw.begin (); i != raw.end (); ++i)
|
||||
|
|
|
@ -45,6 +45,7 @@ public:
|
|||
void render (std::vector <std::string>&, Task&, int, Color&);
|
||||
|
||||
private:
|
||||
bool _hyphenate;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -51,6 +51,8 @@ ColumnString::ColumnString ()
|
|||
_styles.push_back (" Hello (wrapped)");
|
||||
_styles.push_back ("Hello (no-wrap) ");
|
||||
_styles.push_back (" Hello (no-wrap)");
|
||||
|
||||
_hyphenate = context.config.getBoolean ("hyphenate");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -96,7 +98,7 @@ void ColumnString::render (
|
|||
if (_style == "default" || _style == "left")
|
||||
{
|
||||
std::vector <std::string> raw;
|
||||
wrapText (raw, value, width);
|
||||
wrapText (raw, value, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = raw.begin (); i != raw.end (); ++i)
|
||||
|
@ -105,7 +107,7 @@ void ColumnString::render (
|
|||
else if (_style == "right")
|
||||
{
|
||||
std::vector <std::string> raw;
|
||||
wrapText (raw, value, width);
|
||||
wrapText (raw, value, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = raw.begin (); i != raw.end (); ++i)
|
||||
|
|
|
@ -45,6 +45,7 @@ public:
|
|||
void render (std::vector <std::string>&, const std::string&, int, Color&);
|
||||
|
||||
private:
|
||||
bool _hyphenate;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -50,6 +50,8 @@ ColumnTags::ColumnTags ()
|
|||
_examples.push_back (STRING_COLUMN_EXAMPLES_TAGS);
|
||||
_examples.push_back (context.config.get ("tag.indicator"));
|
||||
_examples.push_back ("[2]");
|
||||
|
||||
_hyphenate = context.config.getBoolean ("hyphenate");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -136,7 +138,7 @@ void ColumnTags::render (
|
|||
{
|
||||
std::replace (tags.begin (), tags.end (), ',', ' ');
|
||||
std::vector <std::string> all;
|
||||
wrapText (all, tags, width);
|
||||
wrapText (all, tags, width, _hyphenate);
|
||||
|
||||
std::vector <std::string>::iterator i;
|
||||
for (i = all.begin (); i != all.end (); ++i)
|
||||
|
|
|
@ -46,6 +46,7 @@ public:
|
|||
void render (std::vector <std::string>&, Task&, int, Color&);
|
||||
|
||||
private:
|
||||
bool _hyphenate;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue