Merge branch 'scols_fl_wrap' of https://github.com/ignatenkobrain/util-linux

* 'scols_fl_wrap' of https://github.com/ignatenkobrain/util-linux:
  libsmartcols: add scols_column_is_wrap to docs
  libsmartcols: don't loose colors when wrapping
  libsmartcols: wrap columns correctly with unicode
  libsmartcols: implement SCOLS_FL_WRAP

diff --cc libsmartcols/docs/libsmartcols-sections.txt
Simple merge

diff --cc libsmartcols/src/column.c
Simple merge

diff --cc libsmartcols/src/libsmartcols.h.in
index 573a6ddca02781f07b1227760b50fd57b7be380f,607086a929213a6c44124f1af06534143303d2d1..9849a2cfb93ab9b809275c5a3d56e3aac0d62d4c
--- 1/libsmartcols/src/libsmartcols.h.in
--- 2/libsmartcols/src/libsmartcols.h.in
+++ b/libsmartcols/src/libsmartcols.h.in
@@@ -84,17 -84,9 +84,18 @@@ enum 
        SCOLS_FL_STRICTWIDTH = (1 << 3),   /* don't reduce width if column is empty */
        SCOLS_FL_NOEXTREMES  = (1 << 4),   /* ignore extreme fields when count column width*/
        SCOLS_FL_HIDDEN      = (1 << 5),   /* maintain data, but don't print */
+       SCOLS_FL_WRAP        = (1 << 6),   /* wrap long cells across lines */
  };
  
 +/*
 + * Position of table's title
 + */
 +enum {
 +      SCOLS_TITLE_LEFT = 0,
 +      SCOLS_TITLE_CENTER,
 +      SCOLS_TITLE_RIGHT
 +};
 +
  extern struct libscols_iter *scols_new_iter(int direction);
  extern void scols_free_iter(struct libscols_iter *itr);
  extern void scols_reset_iter(struct libscols_iter *itr, int direction);

diff --cc libsmartcols/src/libsmartcols.sym
index 8e298eb484de5caa284ebc2762f3e6fd4e1ca672,b90cefabe7a5f41d6f7d45ba4c73ae5f36226d61..c79d87c71b07ac18d9758856bc4e7a81131d0856
--- 1/libsmartcols/src/libsmartcols.sym
--- 2/libsmartcols/src/libsmartcols.sym
+++ b/libsmartcols/src/libsmartcols.sym
@@@ -124,12 -124,8 +124,13 @@@ global
  
  SMARTCOLS_2.28 {
  global:
+       scols_column_is_wrap;
        scols_line_refer_column_data;
        scols_line_set_column_data;
 +      scols_symbols_set_title_padding;
        scols_table_enable_nowrap;
 +      scols_table_set_title;
 +      scols_table_get_title;
 +      scols_table_get_title_position;
 +      scols_table_get_title_color;
  } SMARTCOLS_2.27;

diff --cc libsmartcols/src/table_print.c
Simple merge