Merge branch '2.3.0' into 2.4.0

CMakeLists.txt

@@ -18,6 +18,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (LINUX true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set (DARWIN true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
+  set (KFREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
   set (FREEBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
@@ -26,9 +28,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
   set (NETBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
   set (SOLARIS true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "GNU/kFreeBSD")
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
-  set (KFREEBSD true)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "GNU/Hurd")
   set (GNUHURD true)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (UNKNOWN true)
@@ -170,5 +170,6 @@ set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSo
                                 "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
                                 "test" "package-config" "misc/*" "src/task$" "src/libtask.a"
                                 "src/columns/libcolumns.a" "src/commands/libcommands.a"
-                                "src/shell/tasksh$" "auto.h$" "/\\.gitignore" "/\\.git/" "swp$")
+                                "src/shell/tasksh$" "src/shell/libtasksh.a" "auto.h$"
+                                "/\\.gitignore" "/\\.git/" "swp$")
 include (CPack)

ChangeLog

@@ -107,6 +107,9 @@ Bugs
  + #1414 Client does not verify SSL certificates (thanks to Scott Kroll).
  + #1415 Client should not require a SSL certificate if the server has a trusted
    certificate (thanks to Scott Kroll).
+ + #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
+ + #1477 Pre-compiled static library (*.a) in source tarball (thanks to Jakub
+   Wilk);
  + Fixed bug so that 'limit:page' now considers footnote messages.
  + Fixed bug where specifying an ID of 0 yielded all completed/deleted tasks
    (thanks to greenskeleton).

src/Path.cpp

@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <limits.h>
+#include <Directory.h>
 #include <Path.h>
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -248,17 +249,13 @@ std::string Path::expand (const std::string& in)
   else if (in.length () > 2 &&
            in.substr (0, 2) == "./")
   {
-    char buf[PATH_MAX];
+    copy = Directory::cwd () + "/" + in.substr (2);
-    getcwd (buf, PATH_MAX - 1);
-    copy = std::string (buf) + "/" + in.substr (2);
   }
   else if (in.length () > 1 &&
            in[0] != '.' &&
            in[0] != '/')
   {
-    char buf[PATH_MAX];
+    copy = Directory::cwd () + "/" + in;
-    getcwd (buf, PATH_MAX - 1);
-    copy = std::string (buf) + "/" + in;
   }
 
   return copy;

src/columns/ColDepends.cpp

@@ -30,6 +30,7 @@
 #include <Context.h>
 #include <ColDepends.h>
 #include <text.h>
+#include <utf8.h>
 #include <i18n.h>
 #include <main.h>
 
@@ -83,7 +84,7 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
   std::vector <Task> blocking;
   dependencyGetBlocking (task, blocking);
 
-       if (_style == "indicator") minimum = maximum = context.config.get ("dependency.indicator").length ();
+       if (_style == "indicator") minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
   else if (_style == "count")     minimum = maximum = 2 + format ((int) blocking.size ()).length ();
   else if (_style == "default" ||
            _style == "list")

src/columns/ColRecur.cpp

@@ -30,6 +30,7 @@
 #include <OldDuration.h>
 #include <ColRecur.h>
 #include <text.h>
+#include <utf8.h>
 #include <i18n.h>
 
 extern Context context;
@@ -87,7 +88,7 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
   else if (_style == "indicator")
   {
     if (task.has (_name))
-      minimum = maximum = context.config.get ("recurrence.indicator").length ();
+      minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
   }
   else
     throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);

src/columns/ColStart.cpp

@@ -29,6 +29,7 @@
 #include <Context.h>
 #include <ColStart.h>
 #include <text.h>
+#include <utf8.h>
 #include <i18n.h>
 
 extern Context context;
@@ -77,7 +78,7 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
     if (_style == "active")
     {
       if (! task.has ("end"))
-        minimum = maximum = context.config.get ("active.indicator").length ();
+        minimum = maximum = utf8_width (context.config.get ("active.indicator"));
     }
     else
       ColumnDate::measure (task, minimum, maximum);