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

[A] Added new empty style

Browse Source
This commit is contained in:
seleznevae
2019-01-01 12:59:35 +03:00
parent f08035d19c
commit a87e060b7c
8 changed files with 226 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
docs/index.md
View File

@@ -151,64 +151,64 @@ List of libfort builtin border styles:
FT_DOT_STYLE FT_EMPTY_STYLE FT_DOT_STYLE FT_EMPTY_STYLE
................................................... ................................................... Rank Title Year Rating
: Rank : Title : Year : Rating : Rank Title Year Rating : Rank : Title : Year : Rating : 1 The Shawshank Redemption 1994 9.5
:......:..........................:......:........: 1 The Shawshank Redemption 1994 9.5 :......:..........................:......:........: 2 12 Angry Men 1957 8.8
: 1 : The Shawshank Redemption : 1994 : 9.5 : 2 12 Angry Men 1957 8.8 : 1 : The Shawshank Redemption : 1994 : 9.5 : 3 It's a Wonderful Life 1946 8.6
: 2 : 12 Angry Men : 1957 : 8.8 : 3 It's a Wonderful Life 1946 8.6 : 2 : 12 Angry Men : 1957 : 8.8 :
: 3 : It's a Wonderful Life : 1946 : 8.6 : : 3 : It's a Wonderful Life : 1946 : 8.6 : 4 2001: A Space Odyssey 1968 8.5
:......:..........................:......:........: 4 2001: A Space Odyssey 1968 8.5 :......:..........................:......:........: 5 Blade Runner 1982 8.1
: 4 : 2001: A Space Odyssey : 1968 : 8.5 : 5 Blade Runner 1982 8.1 : 4 : 2001: A Space Odyssey : 1968 : 8.5 :
: 5 : Blade Runner : 1982 : 8.1 : : 5 : Blade Runner : 1982 : 8.1 :
:......:..........................:......:........: :......:..........................:......:........:
FT_SOLID_STYLE FT_SOLID_ROUND_STYLE FT_EMPTY2_STYLE FT_SOLID_STYLE
┌──────┬──────────────────────────┬──────┬────────┐ ╭──────┬──────────────────────────┬──────┬────────╮ ┌──────┬──────────────────────────┬──────┬────────┐
│ Rank │ Title │ Year │ Rating │ │ Rank │ Title │ Year │ Rating │ Rank Title Year Rating │ Rank │ Title │ Year │ Rating │
├──────┼──────────────────────────┼──────┼────────┤ ├──────┼──────────────────────────┼──────┼────────┤ 1 The Shawshank Redemption 1994 9.5 ├──────┼──────────────────────────┼──────┼────────┤
│ 1 │ The Shawshank Redemption │ 1994 │ 9.5 │ │ 1 │ The Shawshank Redemption │ 1994 │ 9.5 │ 2 12 Angry Men 1957 8.8 │ 1 │ The Shawshank Redemption │ 1994 │ 9.5 │
│ 2 │ 12 Angry Men │ 1957 │ 8.8 │ │ 2 │ 12 Angry Men │ 1957 │ 8.8 │ 3 It's a Wonderful Life 1946 8.6 │ 2 │ 12 Angry Men │ 1957 │ 8.8 │
│ 3 │ It's a Wonderful Life │ 1946 │ 8.6 │ │ 3 │ It's a Wonderful Life │ 1946 │ 8.6 │ │ 3 │ It's a Wonderful Life │ 1946 │ 8.6 │
├──────┼──────────────────────────┼──────┼────────┤ ├──────┼──────────────────────────┼──────┼────────┤ 4 2001: A Space Odyssey 1968 8.5 ├──────┼──────────────────────────┼──────┼────────┤
│ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 │ │ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 │ 5 Blade Runner 1982 8.1 │ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 │
│ 5 │ Blade Runner │ 1982 │ 8.1 │ │ 5 │ Blade Runner │ 1982 │ 8.1 │ │ 5 │ Blade Runner │ 1982 │ 8.1 │
└──────┴──────────────────────────┴──────┴────────╯ ╰──────┴──────────────────────────┴──────┴────────╯ └──────┴──────────────────────────┴──────┴────────╯
FT_NICE_STYLE FT_DOUBLE_STYLE FT_SOLID_ROUND_STYLE FT_NICE_STYLE
╔══════╦══════════════════════════╦══════╦════════╗ ╔══════╦══════════════════════════╦══════╦════════╗ ╭──────┬──────────────────────────┬──────┬────────╮ ╔══════╦══════════════════════════╦══════╦════════╗
║ Rank ║ Title ║ Year ║ Rating ║ ║ Rank ║ Title ║ Year ║ Rating ║ │ Rank │ Title │ Year │ Rating │ ║ Rank ║ Title ║ Year ║ Rating ║
╠══════╬══════════════════════════╬══════╬════════╣ ╠══════╬══════════════════════════╬══════╬════════╣ ├──────┼──────────────────────────┼──────┼────────┤ ╠══════╬══════════════════════════╬══════╬════════╣
║ 1 ║ The Shawshank Redemption ║ 1994 ║ 9.5 ║ ║ 1 ║ The Shawshank Redemption ║ 1994 ║ 9.5 ║ │ 1 │ The Shawshank Redemption │ 1994 │ 9.5 │ ║ 1 ║ The Shawshank Redemption ║ 1994 ║ 9.5 ║
║ 2 ║ 12 Angry Men ║ 1957 ║ 8.8 ║ ║ 2 ║ 12 Angry Men ║ 1957 ║ 8.8 ║ │ 2 │ 12 Angry Men │ 1957 │ 8.8 │ ║ 2 ║ 12 Angry Men ║ 1957 ║ 8.8 ║
║ 3 ║ It's a Wonderful Life ║ 1946 ║ 8.6 ║ ║ 3 ║ It's a Wonderful Life ║ 1946 ║ 8.6 ║ │ 3 │ It's a Wonderful Life │ 1946 │ 8.6 │ ║ 3 ║ It's a Wonderful Life ║ 1946 ║ 8.6 ║
╟──────╫──────────────────────────╫──────╫────────╢ ╠══════╬══════════════════════════╬══════╬════════╣ ├──────┼──────────────────────────┼──────┼────────┤ ╟──────╫──────────────────────────╫──────╫────────╢
║ 4 ║ 2001: A Space Odyssey ║ 1968 ║ 8.5 ║ ║ 4 ║ 2001: A Space Odyssey ║ 1968 ║ 8.5 ║ │ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 │ ║ 4 ║ 2001: A Space Odyssey ║ 1968 ║ 8.5 ║
║ 5 ║ Blade Runner ║ 1982 ║ 8.1 ║ ║ 5 ║ Blade Runner ║ 1982 ║ 8.1 ║ │ 5 │ Blade Runner │ 1982 │ 8.1 │ ║ 5 ║ Blade Runner ║ 1982 ║ 8.1 ║
╚══════╩══════════════════════════╩══════╩════════╝ ╚══════╩══════════════════════════╩══════╩════════╝ ╰──────┴──────────────────────────┴──────┴────────╯ ╚══════╩══════════════════════════╩══════╩════════╝
FT_DOUBLE2_STYLE FT_BOLD_STYLE FT_DOUBLE_STYLE FT_DOUBLE2_STYLE
╔══════╤══════════════════════════╤══════╤════════╗ ┏━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━┳━━━━━━━━┓ ╔══════╦══════════════════════════╦══════╦════════╗ ╔══════╤══════════════════════════╤══════╤════════╗
║ Rank │ Title │ Year │ Rating ║ ┃ Rank ┃ Title ┃ Year ┃ Rating ┃ ║ Rank ║ Title ║ Year ║ Rating ║ ║ Rank │ Title │ Year │ Rating ║
╠══════╪══════════════════════════╪══════╪════════╣ ┣━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━┫ ╠══════╬══════════════════════════╬══════╬════════╣ ╠══════╪══════════════════════════╪══════╪════════╣
║ 1 │ The Shawshank Redemption │ 1994 │ 9.5 ║ ┃ 1 ┃ The Shawshank Redemption ┃ 1994 ┃ 9.5 ┃ ║ 1 ║ The Shawshank Redemption ║ 1994 ║ 9.5 ║ ║ 1 │ The Shawshank Redemption │ 1994 │ 9.5 ║
╟──────┼──────────────────────────┼──────┼────────╢ ┃ 2 ┃ 12 Angry Men ┃ 1957 ┃ 8.8 ┃ ║ 2 ║ 12 Angry Men ║ 1957 ║ 8.8 ║ ╟──────┼──────────────────────────┼──────┼────────╢
║ 2 │ 12 Angry Men │ 1957 │ 8.8 ║ ┃ 3 ┃ It's a Wonderful Life ┃ 1946 ┃ 8.6 ┃ ║ 3 ║ It's a Wonderful Life ║ 1946 ║ 8.6 ║ ║ 2 │ 12 Angry Men │ 1957 │ 8.8 ║
╟──────┼──────────────────────────┼──────┼────────╢ ┣━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━┫ ╠══════╬══════════════════════════╬══════╬════════╣ ╟──────┼──────────────────────────┼──────┼────────╢
║ 3 │ It's a Wonderful Life │ 1946 │ 8.6 ║ ┃ 4 ┃ 2001: A Space Odyssey ┃ 1968 ┃ 8.5 ┃ ║ 4 ║ 2001: A Space Odyssey ║ 1968 ║ 8.5 ║ ║ 3 │ It's a Wonderful Life │ 1946 │ 8.6 ║
╠══════╪══════════════════════════╪══════╪════════╣ ┃ 5 ┃ Blade Runner ┃ 1982 ┃ 8.1 ┃ ║ 5 ║ Blade Runner ║ 1982 ║ 8.1 ║ ╠══════╪══════════════════════════╪══════╪════════╣
║ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 ║ ┗━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━━┻━━━━━━━━┛ ╚══════╩══════════════════════════╩══════╩════════╝ ║ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 ║
╟──────┼──────────────────────────┼──────┼────────╢ ╟──────┼──────────────────────────┼──────┼────────╢
║ 5 │ Blade Runner │ 1982 │ 8.1 ║ ║ 5 │ Blade Runner │ 1982 │ 8.1 ║
╚══════╧══════════════════════════╧══════╧════════╝ ╚══════╧══════════════════════════╧══════╧════════╝
@@ -216,23 +216,39 @@ List of libfort builtin border styles:
FT_BOLD2_STYLE FT_FRAME_STYLE FT_BOLD_STYLE FT_BOLD2_STYLE
┏━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━┯━━━━━━┯━━━━━━━━┓ ▛▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▜ ┏━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━┳━━━━━━━━┓ ┏━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━┯━━━━━━┯━━━━━━━━┓
┃ Rank │ Title │ Year │ Rating ┃ ▌ Rank ┃ Title ┃ Year ┃ Rating ▐ ┃ Rank ┃ Title ┃ Year ┃ Rating ┃ ┃ Rank │ Title │ Year │ Rating ┃
┣━━━━━━┿━━━━━━━━━━━━━━━━━━━━━━━━━━┿━━━━━━┿━━━━━━━━┫ ▌━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━▐ ┣━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━┫ ┣━━━━━━┿━━━━━━━━━━━━━━━━━━━━━━━━━━┿━━━━━━┿━━━━━━━━┫
┃ 1 │ The Shawshank Redemption │ 1994 │ 9.5 ┃ ▌ 1 ┃ The Shawshank Redemption ┃ 1994 ┃ 9.5 ▐ ┃ 1 ┃ The Shawshank Redemption ┃ 1994 ┃ 9.5 ┃ ┃ 1 │ The Shawshank Redemption │ 1994 │ 9.5 ┃
┠──────┼──────────────────────────┼──────┼────────┨ ▌ 2 ┃ 12 Angry Men ┃ 1957 ┃ 8.8 ▐ ┃ 2 ┃ 12 Angry Men ┃ 1957 ┃ 8.8 ┃ ┠──────┼──────────────────────────┼──────┼────────┨
┃ 2 │ 12 Angry Men │ 1957 │ 8.8 ┃ ▌ 3 ┃ It's a Wonderful Life ┃ 1946 ┃ 8.6 ▐ ┃ 3 ┃ It's a Wonderful Life ┃ 1946 ┃ 8.6 ┃ ┃ 2 │ 12 Angry Men │ 1957 │ 8.8 ┃
┠──────┼──────────────────────────┼──────┼────────┨ ▌━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━▐ ┣━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━┫ ┠──────┼──────────────────────────┼──────┼────────┨
┃ 3 │ It's a Wonderful Life │ 1946 │ 8.6 ┃ ▌ 4 ┃ 2001: A Space Odyssey ┃ 1968 ┃ 8.5 ▐ ┃ 4 ┃ 2001: A Space Odyssey ┃ 1968 ┃ 8.5 ┃ ┃ 3 │ It's a Wonderful Life │ 1946 │ 8.6 ┃
┣━━━━━━┿━━━━━━━━━━━━━━━━━━━━━━━━━━┿━━━━━━┿━━━━━━━━┫ ▌ 5 ┃ Blade Runner ┃ 1982 ┃ 8.1 ▐ ┃ 5 ┃ Blade Runner ┃ 1982 ┃ 8.1 ┃ ┣━━━━━━┿━━━━━━━━━━━━━━━━━━━━━━━━━━┿━━━━━━┿━━━━━━━━┫
┃ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 ┃ ▙▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▟ ┗━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━━┻━━━━━━━━┛ ┃ 4 │ 2001: A Space Odyssey │ 1968 │ 8.5 ┃
┠──────┼──────────────────────────┼──────┼────────┨ ┠──────┼──────────────────────────┼──────┼────────┨
┃ 5 │ Blade Runner │ 1982 │ 8.1 ┃ ┃ 5 │ Blade Runner │ 1982 │ 8.1 ┃
┗━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━┷━━━━━━┷━━━━━━━━┛ ┗━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━┷━━━━━━┷━━━━━━━━┛
FT_FRAME_STYLE
▛▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▜
▌ Rank ┃ Title ┃ Year ┃ Rating ▐
▌━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━▐
▌ 1 ┃ The Shawshank Redemption ┃ 1994 ┃ 9.5 ▐
▌ 2 ┃ 12 Angry Men ┃ 1957 ┃ 8.8 ▐
▌ 3 ┃ It's a Wonderful Life ┃ 1946 ┃ 8.6 ▐
▌━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━╋━━━━━━╋━━━━━━━━▐
▌ 4 ┃ 2001: A Space Odyssey ┃ 1968 ┃ 8.5 ▐
▌ 5 ┃ Blade Runner ┃ 1982 ┃ 8.1 ▐
▙▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▟
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~

16
example/main.c
View File

@@ -251,6 +251,7 @@ void print_different_border_styles()
FT_PLAIN_STYLE, FT_PLAIN_STYLE,
FT_DOT_STYLE, FT_DOT_STYLE,
FT_EMPTY_STYLE, FT_EMPTY_STYLE,
FT_EMPTY2_STYLE,
FT_SOLID_STYLE, FT_SOLID_STYLE,
FT_SOLID_ROUND_STYLE, FT_SOLID_ROUND_STYLE,
FT_NICE_STYLE, FT_NICE_STYLE,
@@ -269,6 +270,7 @@ void print_different_border_styles()
L"FT_PLAIN_STYLE", L"FT_PLAIN_STYLE",
L"FT_DOT_STYLE", L"FT_DOT_STYLE",
L"FT_EMPTY_STYLE", L"FT_EMPTY_STYLE",
L"FT_EMPTY2_STYLE",
L"FT_SOLID_STYLE", L"FT_SOLID_STYLE",
L"FT_SOLID_ROUND_STYLE", L"FT_SOLID_ROUND_STYLE",
L"FT_NICE_STYLE", L"FT_NICE_STYLE",
@@ -281,14 +283,15 @@ void print_different_border_styles()
for (size_t i = 0; i < sizeof(styles)/sizeof(styles[0]); i += 2) { for (size_t i = 0; i < sizeof(styles)/sizeof(styles[0]); i += 2) {
ft_table_t *table_tmp_1 = create_basic_wtable(styles[i]); ft_table_t *table_tmp_1 = create_basic_wtable(styles[i]);
ft_table_t *table_tmp_2 = create_basic_wtable(styles[i + 1]);
ft_wprintf(table, L" %ls \n\n%ls", style_names[i], ft_to_wstring(table_tmp_1)); ft_wprintf(table, L" %ls \n\n%ls", style_names[i], ft_to_wstring(table_tmp_1));
ft_wprintf_ln(table, L" %ls \n\n%ls", style_names[i + 1], ft_to_wstring(table_tmp_2));
ft_destroy_table(table_tmp_1); ft_destroy_table(table_tmp_1);
if (i + 1 < sizeof(styles)/sizeof(styles[0])) {
ft_table_t *table_tmp_2 = create_basic_wtable(styles[i + 1]);
ft_wprintf_ln(table, L" %ls \n\n%ls", style_names[i + 1], ft_to_wstring(table_tmp_2));
ft_destroy_table(table_tmp_2); ft_destroy_table(table_tmp_2);
} }
}
fwprintf(stderr, L"Table:\n%ls\n ", ft_to_wstring(table)); fwprintf(stderr, L"Table:\n%ls\n ", ft_to_wstring(table));
ft_destroy_table(table); ft_destroy_table(table);
#endif #endif
@@ -403,6 +406,11 @@ int main(void)
printf("Table:\n%s\n", ft_to_string(table)); printf("Table:\n%s\n", ft_to_string(table));
ft_destroy_table(table); ft_destroy_table(table);
ft_set_default_border_style(FT_EMPTY2_STYLE);
table = create_basic_table();
printf("Table:\n%s\n", ft_to_string(table));
ft_destroy_table(table);
ft_set_default_border_style(FT_SOLID_STYLE); ft_set_default_border_style(FT_SOLID_STYLE);
table = create_basic_table(); table = create_basic_table();
printf("Table:\n%s\n", ft_to_string(table)); printf("Table:\n%s\n", ft_to_string(table));

30
lib/fort.c
View File

@@ -545,6 +545,7 @@ extern struct fort_border_style FORT_SIMPLE_STYLE;
extern struct fort_border_style FORT_PLAIN_STYLE; extern struct fort_border_style FORT_PLAIN_STYLE;
extern struct fort_border_style FORT_DOT_STYLE; extern struct fort_border_style FORT_DOT_STYLE;
extern struct fort_border_style FORT_EMPTY_STYLE; extern struct fort_border_style FORT_EMPTY_STYLE;
extern struct fort_border_style FORT_EMPTY2_STYLE;
extern struct fort_border_style FORT_SOLID_STYLE; extern struct fort_border_style FORT_SOLID_STYLE;
extern struct fort_border_style FORT_SOLID_ROUND_STYLE; extern struct fort_border_style FORT_SOLID_ROUND_STYLE;
extern struct fort_border_style FORT_NICE_STYLE; extern struct fort_border_style FORT_NICE_STYLE;
@@ -1964,6 +1965,7 @@ struct ft_border_style *const FT_SIMPLE_STYLE = (struct ft_border_style *) &FORT
struct ft_border_style *const FT_PLAIN_STYLE = (struct ft_border_style *) &FORT_PLAIN_STYLE; struct ft_border_style *const FT_PLAIN_STYLE = (struct ft_border_style *) &FORT_PLAIN_STYLE;
struct ft_border_style *const FT_DOT_STYLE = (struct ft_border_style *) &FORT_DOT_STYLE; struct ft_border_style *const FT_DOT_STYLE = (struct ft_border_style *) &FORT_DOT_STYLE;
struct ft_border_style *const FT_EMPTY_STYLE = (struct ft_border_style *) &FORT_EMPTY_STYLE; struct ft_border_style *const FT_EMPTY_STYLE = (struct ft_border_style *) &FORT_EMPTY_STYLE;
struct ft_border_style *const FT_EMPTY2_STYLE = (struct ft_border_style *) &FORT_EMPTY2_STYLE;
struct ft_border_style *const FT_SOLID_STYLE = (struct ft_border_style *) &FORT_SOLID_STYLE; struct ft_border_style *const FT_SOLID_STYLE = (struct ft_border_style *) &FORT_SOLID_STYLE;
struct ft_border_style *const FT_SOLID_ROUND_STYLE = (struct ft_border_style *) &FORT_SOLID_ROUND_STYLE; struct ft_border_style *const FT_SOLID_ROUND_STYLE = (struct ft_border_style *) &FORT_SOLID_ROUND_STYLE;
struct ft_border_style *const FT_NICE_STYLE = (struct ft_border_style *) &FORT_NICE_STYLE; struct ft_border_style *const FT_NICE_STYLE = (struct ft_border_style *) &FORT_NICE_STYLE;
@@ -1983,6 +1985,7 @@ static void set_border_props_for_props(fort_table_properties_t *properties, cons
|| (const struct fort_border_style *)style == &FORT_DOT_STYLE || (const struct fort_border_style *)style == &FORT_DOT_STYLE
|| (const struct fort_border_style *)style == &FORT_PLAIN_STYLE || (const struct fort_border_style *)style == &FORT_PLAIN_STYLE
|| (const struct fort_border_style *)style == &FORT_EMPTY_STYLE || (const struct fort_border_style *)style == &FORT_EMPTY_STYLE
|| (const struct fort_border_style *)style == &FORT_EMPTY2_STYLE
|| (const struct fort_border_style *)style == &FORT_SOLID_STYLE || (const struct fort_border_style *)style == &FORT_SOLID_STYLE
|| (const struct fort_border_style *)style == &FORT_SOLID_ROUND_STYLE || (const struct fort_border_style *)style == &FORT_SOLID_ROUND_STYLE
|| (const struct fort_border_style *)style == &FORT_NICE_STYLE || (const struct fort_border_style *)style == &FORT_NICE_STYLE
@@ -3087,6 +3090,31 @@ fort_status_t set_default_cell_property(uint32_t property, int value)
} }
#define EMPTY_STYLE { \ #define EMPTY_STYLE { \
/* border_chars */ \
{ \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
}, \
/* header_border_chars */ \
{ \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
}, \
/* separator_chars */ \
{ \
"\0", " ", "\0 ", "\0", \
"\0", "\0", \
}, \
}
#define EMPTY2_STYLE { \
/* border_chars */ \ /* border_chars */ \
{ \ { \
" ", " ", " ", " ", \ " ", " ", " ", " ", \
@@ -3110,7 +3138,6 @@ fort_status_t set_default_cell_property(uint32_t property, int value)
}, \ }, \
} }
#define SOLID_STYLE { \ #define SOLID_STYLE { \
/* border_chars */ \ /* border_chars */ \
{ \ { \
@@ -3314,6 +3341,7 @@ struct fort_border_style FORT_SIMPLE_STYLE = SIMPLE_STYLE;
struct fort_border_style FORT_PLAIN_STYLE = PLAIN_STYLE; struct fort_border_style FORT_PLAIN_STYLE = PLAIN_STYLE;
struct fort_border_style FORT_DOT_STYLE = DOT_STYLE; struct fort_border_style FORT_DOT_STYLE = DOT_STYLE;
struct fort_border_style FORT_EMPTY_STYLE = EMPTY_STYLE; struct fort_border_style FORT_EMPTY_STYLE = EMPTY_STYLE;
struct fort_border_style FORT_EMPTY2_STYLE = EMPTY2_STYLE;
struct fort_border_style FORT_SOLID_STYLE = SOLID_STYLE; struct fort_border_style FORT_SOLID_STYLE = SOLID_STYLE;
struct fort_border_style FORT_SOLID_ROUND_STYLE = SOLID_ROUND_STYLE; struct fort_border_style FORT_SOLID_ROUND_STYLE = SOLID_ROUND_STYLE;
struct fort_border_style FORT_NICE_STYLE = NICE_STYLE; struct fort_border_style FORT_NICE_STYLE = NICE_STYLE;

1
lib/fort.h
View File

@@ -611,6 +611,7 @@ extern struct ft_border_style *const FT_SIMPLE_STYLE;
extern struct ft_border_style *const FT_PLAIN_STYLE; extern struct ft_border_style *const FT_PLAIN_STYLE;
extern struct ft_border_style *const FT_DOT_STYLE; extern struct ft_border_style *const FT_DOT_STYLE;
extern struct ft_border_style *const FT_EMPTY_STYLE; extern struct ft_border_style *const FT_EMPTY_STYLE;
extern struct ft_border_style *const FT_EMPTY2_STYLE;
extern struct ft_border_style *const FT_SOLID_STYLE; extern struct ft_border_style *const FT_SOLID_STYLE;
extern struct ft_border_style *const FT_SOLID_ROUND_STYLE; extern struct ft_border_style *const FT_SOLID_ROUND_STYLE;
extern struct ft_border_style *const FT_NICE_STYLE; extern struct ft_border_style *const FT_NICE_STYLE;

2
src/fort_impl.c
View File

@@ -809,6 +809,7 @@ struct ft_border_style *const FT_SIMPLE_STYLE = (struct ft_border_style *) &FORT
struct ft_border_style *const FT_PLAIN_STYLE = (struct ft_border_style *) &FORT_PLAIN_STYLE; struct ft_border_style *const FT_PLAIN_STYLE = (struct ft_border_style *) &FORT_PLAIN_STYLE;
struct ft_border_style *const FT_DOT_STYLE = (struct ft_border_style *) &FORT_DOT_STYLE; struct ft_border_style *const FT_DOT_STYLE = (struct ft_border_style *) &FORT_DOT_STYLE;
struct ft_border_style *const FT_EMPTY_STYLE = (struct ft_border_style *) &FORT_EMPTY_STYLE; struct ft_border_style *const FT_EMPTY_STYLE = (struct ft_border_style *) &FORT_EMPTY_STYLE;
struct ft_border_style *const FT_EMPTY2_STYLE = (struct ft_border_style *) &FORT_EMPTY2_STYLE;
struct ft_border_style *const FT_SOLID_STYLE = (struct ft_border_style *) &FORT_SOLID_STYLE; struct ft_border_style *const FT_SOLID_STYLE = (struct ft_border_style *) &FORT_SOLID_STYLE;
struct ft_border_style *const FT_SOLID_ROUND_STYLE = (struct ft_border_style *) &FORT_SOLID_ROUND_STYLE; struct ft_border_style *const FT_SOLID_ROUND_STYLE = (struct ft_border_style *) &FORT_SOLID_ROUND_STYLE;
struct ft_border_style *const FT_NICE_STYLE = (struct ft_border_style *) &FORT_NICE_STYLE; struct ft_border_style *const FT_NICE_STYLE = (struct ft_border_style *) &FORT_NICE_STYLE;
@@ -828,6 +829,7 @@ static void set_border_props_for_props(fort_table_properties_t *properties, cons
|| (const struct fort_border_style *)style == &FORT_DOT_STYLE || (const struct fort_border_style *)style == &FORT_DOT_STYLE
|| (const struct fort_border_style *)style == &FORT_PLAIN_STYLE || (const struct fort_border_style *)style == &FORT_PLAIN_STYLE
|| (const struct fort_border_style *)style == &FORT_EMPTY_STYLE || (const struct fort_border_style *)style == &FORT_EMPTY_STYLE
|| (const struct fort_border_style *)style == &FORT_EMPTY2_STYLE
|| (const struct fort_border_style *)style == &FORT_SOLID_STYLE || (const struct fort_border_style *)style == &FORT_SOLID_STYLE
|| (const struct fort_border_style *)style == &FORT_SOLID_ROUND_STYLE || (const struct fort_border_style *)style == &FORT_SOLID_ROUND_STYLE
|| (const struct fort_border_style *)style == &FORT_NICE_STYLE || (const struct fort_border_style *)style == &FORT_NICE_STYLE

27
src/properties.c
View File

@@ -638,6 +638,31 @@ fort_status_t set_default_cell_property(uint32_t property, int value)
} }
#define EMPTY_STYLE { \ #define EMPTY_STYLE { \
/* border_chars */ \
{ \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
}, \
/* header_border_chars */ \
{ \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
"\0", "\0", "\0", "\0", \
}, \
/* separator_chars */ \
{ \
"\0", " ", "\0 ", "\0", \
"\0", "\0", \
}, \
}
#define EMPTY2_STYLE { \
/* border_chars */ \ /* border_chars */ \
{ \ { \
" ", " ", " ", " ", \ " ", " ", " ", " ", \
@@ -661,7 +686,6 @@ fort_status_t set_default_cell_property(uint32_t property, int value)
}, \ }, \
} }
#define SOLID_STYLE { \ #define SOLID_STYLE { \
/* border_chars */ \ /* border_chars */ \
{ \ { \
@@ -865,6 +889,7 @@ struct fort_border_style FORT_SIMPLE_STYLE = SIMPLE_STYLE;
struct fort_border_style FORT_PLAIN_STYLE = PLAIN_STYLE; struct fort_border_style FORT_PLAIN_STYLE = PLAIN_STYLE;
struct fort_border_style FORT_DOT_STYLE = DOT_STYLE; struct fort_border_style FORT_DOT_STYLE = DOT_STYLE;
struct fort_border_style FORT_EMPTY_STYLE = EMPTY_STYLE; struct fort_border_style FORT_EMPTY_STYLE = EMPTY_STYLE;
struct fort_border_style FORT_EMPTY2_STYLE = EMPTY2_STYLE;
struct fort_border_style FORT_SOLID_STYLE = SOLID_STYLE; struct fort_border_style FORT_SOLID_STYLE = SOLID_STYLE;
struct fort_border_style FORT_SOLID_ROUND_STYLE = SOLID_ROUND_STYLE; struct fort_border_style FORT_SOLID_ROUND_STYLE = SOLID_ROUND_STYLE;
struct fort_border_style FORT_NICE_STYLE = NICE_STYLE; struct fort_border_style FORT_NICE_STYLE = NICE_STYLE;

1
src/properties.h
View File

@@ -160,6 +160,7 @@ extern struct fort_border_style FORT_SIMPLE_STYLE;
extern struct fort_border_style FORT_PLAIN_STYLE; extern struct fort_border_style FORT_PLAIN_STYLE;
extern struct fort_border_style FORT_DOT_STYLE; extern struct fort_border_style FORT_DOT_STYLE;
extern struct fort_border_style FORT_EMPTY_STYLE; extern struct fort_border_style FORT_EMPTY_STYLE;
extern struct fort_border_style FORT_EMPTY2_STYLE;
extern struct fort_border_style FORT_SOLID_STYLE; extern struct fort_border_style FORT_SOLID_STYLE;
extern struct fort_border_style FORT_SOLID_ROUND_STYLE; extern struct fort_border_style FORT_SOLID_ROUND_STYLE;
extern struct fort_border_style FORT_NICE_STYLE; extern struct fort_border_style FORT_NICE_STYLE;

18
tests/bb_tests/test_table_border_style.c
View File

@@ -354,6 +354,24 @@ void test_table_builtin_border_styles(void)
table_str = ft_to_string(table); table_str = ft_to_string(table);
assert_true(table_str != NULL); assert_true(table_str != NULL);
table_str_etalon =
" Rank Title Year Rating \n"
" 1 The Shawshank Redemption 1994 9.5 \n"
" 2 12 Angry Men 1957 8.8 \n"
" 3 It's a Wonderful Life 1946 8.6 \n"
" \n"
" 4 2001: A Space Odyssey 1968 8.5 \n"
" 5 Blade Runner 1982 8.1 \n";
assert_str_equal(table_str, table_str_etalon);
ft_destroy_table(table);
/* *************************************************************** */
ft_set_default_border_style(FT_EMPTY2_STYLE);
table = create_basic_table();
table_str = ft_to_string(table);
assert_true(table_str != NULL);
table_str_etalon = table_str_etalon =
" \n" " \n"
" Rank Title Year Rating \n" " Rank Title Year Rating \n"