3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[C] Changed default alignment

Browse Source
This commit is contained in:
seleznevae 2018-05-08 20:57:49 +03:00
parent 54542b9cb6
commit a8868e7bd9
5 changed files with 81 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
README.md
View File

@ -18,20 +18,31 @@
## Example ## Example
```C ```C
ft_table_t *table = ft_create_table(); #include "fort.h"
ft_set_cell_option(table, 0, FT_ANY_COLUMN, FT_COPT_ROW_TYPE, FT_ROW_HEADER); int main(void)
ft_write_ln(table, "Rank", "Title", "Year", "Rating"); {
ft_table_t *table = ft_create_table();;
ft_set_cell_option(table, 0, FT_ANY_COLUMN, FT_COPT_ROW_TYPE, FT_ROW_HEADER);
ft_write_ln(table, "N", "Planet", "Speed, km/s");
ft_write_ln(table, "1", "The Shawshank Redemption", "1994", "9.5"); ft_write_ln(table, "1", "Mercury", "47.362");
ft_write_ln(table, "2", "12 Angry Men", "1957", "8.8"); ft_write_ln(table, "2", "Venus", "35.02");
ft_write_ln(table, "3", "2001: A Space Odyssey", "1968", "8.5"); ft_write_ln(table, "3", "Earth", "29.78");
ft_write_ln(table, "4", "Blade Runner", "1982", "8.1");
printf("%s\n", ft_to_string(table)); printf("%s\n", ft_to_string(table));
ft_destroy_table(table); ft_destroy_table(table);
}
``` ```
Output: Output:
```text
+---+---------+-------------+
| N | Planet | Speed, km/s |
+---+---------+-------------+
| 1 | Mercury | 47.362 |
| 2 | Venus | 35.02 |
| 3 | Earth | 29.78 |
+---+---------+-------------+
```
<img src="https://github.com/seleznevae/libfort/blob/master/docs/images/basic_table.png" data-canonical-src="https://github.com/seleznevae/libfort/blob/master/docs/images/basic_table.png" width="500" /> <img src="https://github.com/seleznevae/libfort/blob/master/docs/images/basic_table.png" data-canonical-src="https://github.com/seleznevae/libfort/blob/master/docs/images/basic_table.png" width="500" />

16
example/main.c
View File

@ -33,8 +33,24 @@ void print_char_str(const char *str)
} }
void base_example(void)
{
ft_table_t *table = ft_create_table();;
ft_set_cell_option(table, 0, FT_ANY_COLUMN, FT_COPT_ROW_TYPE, FT_ROW_HEADER);
ft_write_ln(table, "N", "Planet", "Speed, km/s");
ft_write_ln(table, "1", "Mercury", "47.362");
ft_write_ln(table, "2", "Venus", "35.02");
ft_write_ln(table, "3", "Earth", "29.78");
printf("%s\n", ft_to_string(table));
ft_destroy_table(table);
}
int main(void) int main(void)
{ {
base_example();
int result = 0; int result = 0;
ft_table_t *table = NULL; ft_table_t *table = NULL;

2
lib/fort.c
View File

@ -674,7 +674,7 @@ struct fort_cell_options g_default_cell_option = {
| FT_COPT_EMPTY_STR_HEIGHT, | FT_COPT_EMPTY_STR_HEIGHT,
0, /* col_min_width */ 0, /* col_min_width */
FT_ALIGNED_RIGHT, /* align */ FT_ALIGNED_LEFT, /* align */
0, /* cell_padding_top */ 0, /* cell_padding_top */
0, /* cell_padding_bottom */ 0, /* cell_padding_bottom */
1, /* cell_padding_left */ 1, /* cell_padding_left */

2
src/options.c
View File

@ -17,7 +17,7 @@ struct fort_cell_options g_default_cell_option = {
| FT_COPT_EMPTY_STR_HEIGHT, | FT_COPT_EMPTY_STR_HEIGHT,
0, /* col_min_width */ 0, /* col_min_width */
FT_ALIGNED_RIGHT, /* align */ FT_ALIGNED_LEFT, /* align */
0, /* cell_padding_top */ 0, /* cell_padding_top */
0, /* cell_padding_bottom */ 0, /* cell_padding_bottom */
1, /* cell_padding_left */ 1, /* cell_padding_left */

84
tests/bb_tests/test_table_basic.c
View File

@ -85,15 +85,15 @@ void test_table_basic(void)
const char *table_str_etalon = const char *table_str_etalon =
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| c | 234 | 3.140000 | 3 |\n" "| c | 234 | 3.140000 | 3 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 234 | 3.140000 | 3 | c |\n" "| 234 | 3.140000 | 3 | c |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n"; "+-----+----------+----------+----------+\n";
assert_str_equal(table_str, table_str_etalon); assert_str_equal(table_str, table_str_etalon);
@ -116,15 +116,15 @@ void test_table_basic(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 3 | c | 234 | 3.140000 |\n" L"| 3 | c | 234 | 3.140000 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| c | 234 | 3.140000 | 3 |\n" L"| c | 234 | 3.140000 | 3 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 234 | 3.140000 | 3 | c |\n" L"| 234 | 3.140000 | 3 | c |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n"; L"+-----+----------+----------+----------+\n";
assert_wcs_equal(table_str, table_str_etalon); assert_wcs_equal(table_str, table_str_etalon);
@ -147,11 +147,11 @@ void test_table_basic(void)
const char *table_str_etalon = const char *table_str_etalon =
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| | | 234 | 3.140000 |\n" "| | | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| c | 234 | 3.140000 | |\n" "| c | 234 | 3.140000 | |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
@ -178,11 +178,11 @@ void test_table_basic(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| | | 234 | 3.140000 |\n" L"| | | 234 | 3.140000 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| c | 234 | 3.140000 | |\n" L"| c | 234 | 3.140000 | |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
@ -279,11 +279,11 @@ void test_wcs_table_boundaries(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+-----------+---+\n" L"+-----+-----------+---+\n"
L"| | | |\n" L"| | | |\n"
L"| 3 | 12345\x8888\x8888 | c |\n" L"| 3 | 12345\x8888\x8888 | c |\n"
L"| | | |\n" L"| | | |\n"
L"+-----+-----------+---+\n" L"+-----+-----------+---+\n"
L"| | | |\n" L"| | | |\n"
L"| c | 12345678\x500 | c |\n" L"| c | 12345678\x500 | c |\n"
L"| | | |\n" L"| | | |\n"
L"+-----+-----------+---+\n" L"+-----+-----------+---+\n"
L"| | | |\n" L"| | | |\n"
@ -333,15 +333,15 @@ void test_table_write(void)
const char *table_str_etalon = const char *table_str_etalon =
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| c | 234 | 3.140000 | 3 |\n" "| c | 234 | 3.140000 | 3 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 234 | 3.140000 | 3 | c |\n" "| 234 | 3.140000 | 3 | c |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n"; "+-----+----------+----------+----------+\n";
assert_str_equal(table_str, table_str_etalon); assert_str_equal(table_str, table_str_etalon);
@ -381,15 +381,15 @@ void test_table_write(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 3 | c | 234 | 3.140000 |\n" L"| 3 | c | 234 | 3.140000 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| c | 234 | 3.140000 | 3 |\n" L"| c | 234 | 3.140000 | 3 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 234 | 3.140000 | 3 | c |\n" L"| 234 | 3.140000 | 3 | c |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n"; L"+-----+----------+----------+----------+\n";
assert_wcs_equal(table_str, table_str_etalon); assert_wcs_equal(table_str, table_str_etalon);
@ -417,15 +417,15 @@ void test_table_write(void)
const char *table_str_etalon = const char *table_str_etalon =
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| c | 234 | 3.140000 | 3 |\n" "| c | 234 | 3.140000 | 3 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 234 | 3.140000 | 3 | c |\n" "| 234 | 3.140000 | 3 | c |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n"; "+-----+----------+----------+----------+\n";
assert_str_equal(table_str, table_str_etalon); assert_str_equal(table_str, table_str_etalon);
@ -453,15 +453,15 @@ void test_table_write(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 3 | c | 234 | 3.140000 |\n" L"| 3 | c | 234 | 3.140000 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| c | 234 | 3.140000 | 3 |\n" L"| c | 234 | 3.140000 | 3 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 234 | 3.140000 | 3 | c |\n" L"| 234 | 3.140000 | 3 | c |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n"; L"+-----+----------+----------+----------+\n";
assert_wcs_equal(table_str, table_str_etalon); assert_wcs_equal(table_str, table_str_etalon);
@ -495,15 +495,15 @@ void test_table_write(void)
const char *table_str_etalon = const char *table_str_etalon =
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| c | 234 | 3.140000 | 3 |\n" "| c | 234 | 3.140000 | 3 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 234 | 3.140000 | 3 | c |\n" "| 234 | 3.140000 | 3 | c |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n"; "+-----+----------+----------+----------+\n";
assert_str_equal(table_str, table_str_etalon); assert_str_equal(table_str, table_str_etalon);
@ -536,15 +536,15 @@ void test_table_write(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 3 | c | 234 | 3.140000 |\n" L"| 3 | c | 234 | 3.140000 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| c | 234 | 3.140000 | 3 |\n" L"| c | 234 | 3.140000 | 3 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 234 | 3.140000 | 3 | c |\n" L"| 234 | 3.140000 | 3 | c |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n"; L"+-----+----------+----------+----------+\n";
assert_wcs_equal(table_str, table_str_etalon); assert_wcs_equal(table_str, table_str_etalon);
@ -570,15 +570,15 @@ void test_table_write(void)
const char *table_str_etalon = const char *table_str_etalon =
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| c | 234 | 3.140000 | 3 |\n" "| c | 234 | 3.140000 | 3 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 234 | 3.140000 | 3 | c |\n" "| 234 | 3.140000 | 3 | c |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n"; "+-----+----------+----------+----------+\n";
assert_str_equal(table_str, table_str_etalon); assert_str_equal(table_str, table_str_etalon);
@ -604,15 +604,15 @@ void test_table_write(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 3 | c | 234 | 3.140000 |\n" L"| 3 | c | 234 | 3.140000 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| c | 234 | 3.140000 | 3 |\n" L"| c | 234 | 3.140000 | 3 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 234 | 3.140000 | 3 | c |\n" L"| 234 | 3.140000 | 3 | c |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n"; L"+-----+----------+----------+----------+\n";
assert_wcs_equal(table_str, table_str_etalon); assert_wcs_equal(table_str, table_str_etalon);
@ -644,15 +644,15 @@ void test_table_write(void)
const char *table_str_etalon = const char *table_str_etalon =
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| c | 234 | 3.140000 | 3 |\n" "| c | 234 | 3.140000 | 3 |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n" "+-----+----------+----------+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 234 | 3.140000 | 3 | c |\n" "| 234 | 3.140000 | 3 | c |\n"
"| | | | |\n" "| | | | |\n"
"+-----+----------+----------+----------+\n"; "+-----+----------+----------+----------+\n";
assert_str_equal(table_str, table_str_etalon); assert_str_equal(table_str, table_str_etalon);
@ -684,15 +684,15 @@ void test_table_write(void)
const wchar_t *table_str_etalon = const wchar_t *table_str_etalon =
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 3 | c | 234 | 3.140000 |\n" L"| 3 | c | 234 | 3.140000 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| c | 234 | 3.140000 | 3 |\n" L"| c | 234 | 3.140000 | 3 |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n" L"+-----+----------+----------+----------+\n"
L"| | | | |\n" L"| | | | |\n"
L"| 234 | 3.140000 | 3 | c |\n" L"| 234 | 3.140000 | 3 | c |\n"
L"| | | | |\n" L"| | | | |\n"
L"+-----+----------+----------+----------+\n"; L"+-----+----------+----------+----------+\n";
assert_wcs_equal(table_str, table_str_etalon); assert_wcs_equal(table_str, table_str_etalon);