From: Karel Zak <kzak@redhat.com>
Date: Mon, 25 Jan 2016 12:03:29 +0000 (+0100)
Subject: Merge branch 'scols_fl_wrap' of https://github.com/ignatenkobrain/util-linux
X-Git-Tag: v2.28-rc1~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d372bcf26e25ebe7a3264e01cbc328d3a81e7a12;p=thirdparty%2Futil-linux.git

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
---

d372bcf26e25ebe7a3264e01cbc328d3a81e7a12
diff --cc libsmartcols/src/libsmartcols.h.in
index 573a6ddca0,607086a929..9849a2cfb9
--- a/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 8e298eb484,b90cefabe7..c79d87c71b
--- a/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;