From 40829d3e3496e87bc77782a1b242fee57981055d Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Tue, 29 Nov 2005 11:21:35 +0100 Subject: [PATCH] draw_frame_point(): use BORDER_* and enum border_char type, drop a TODO. --- src/document/html/tables.c | 45 ++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/src/document/html/tables.c b/src/document/html/tables.c index 762f1a30..3e7efd03 100644 --- a/src/document/html/tables.c +++ b/src/document/html/tables.c @@ -951,19 +951,42 @@ static inline void draw_frame_point(struct table *table, signed char *frame[2], int x, int y, int col, int row, struct html_context *html_context) { - /* TODO: Use /BORDER._.* / macros ! --pasky */ - static unsigned char const border_chars[81] = { - 0x00, 0xb3, 0xba, 0xc4, 0xc0, 0xd3, 0xcd, 0xd4, 0xc8, - 0xc4, 0xd9, 0xbd, 0xc4, 0xc1, 0xd0, 0xcd, 0xd4, 0xc8, - 0xcd, 0xbe, 0xbc, 0xcd, 0xbe, 0xbc, 0xcd, 0xcf, 0xca, + static enum border_char const border_chars[81] = { + BORDER_NONE, BORDER_SVLINE, BORDER_DVLINE, + BORDER_SHLINE, BORDER_SDLCORNER, BORDER_DSDLCORNER, + BORDER_DHLINE, BORDER_SDDLCORNER, BORDER_DDLCORNER, - 0xb3, 0xb3, 0xba, 0xda, 0xc3, 0xd3, 0xd5, 0xc6, 0xc8, - 0xbf, 0xb4, 0xbd, 0xc2, 0xc5, 0xd0, 0xd5, 0xc6, 0xc8, - 0xb8, 0xb5, 0xbc, 0xb8, 0xb5, 0xbc, 0xd1, 0xd8, 0xca, + BORDER_SHLINE, BORDER_SDRCORNER, BORDER_DSDRCORNER, + BORDER_SHLINE, BORDER_SUTEE, BORDER_DSUTEE, + BORDER_DHLINE, BORDER_SDDLCORNER, BORDER_DDLCORNER, - 0xba, 0xba, 0xba, 0xd6, 0xd6, 0xc7, 0xc9, 0xc9, 0xcc, - 0xb7, 0xb7, 0xb6, 0xd2, 0xd2, 0xd7, 0xc9, 0xc9, 0xcc, - 0xbb, 0xbb, 0xb9, 0xbb, 0xbb, 0xb9, 0xcb, 0xcb, 0xce, + BORDER_DHLINE, BORDER_SDDRCORNER, BORDER_DDRCORNER, + BORDER_DHLINE, BORDER_SDDRCORNER, BORDER_DDRCORNER, + BORDER_DHLINE, BORDER_SDUTEE, BORDER_DUTEE, + + BORDER_SVLINE, BORDER_SVLINE, BORDER_DVLINE, + BORDER_SULCORNER, BORDER_SRTEE, BORDER_DSDLCORNER, + BORDER_SDULCORNER, BORDER_SDRTEE, BORDER_DDLCORNER, + + BORDER_SURCORNER, BORDER_SLTEE, BORDER_DSDRCORNER, + BORDER_SDTEE, BORDER_SCROSS, BORDER_DSUTEE, + BORDER_SDULCORNER, BORDER_SDRTEE, BORDER_DDLCORNER, + + BORDER_SDURCORNER, BORDER_SDLTEE, BORDER_DDRCORNER, + BORDER_SDURCORNER, BORDER_SDLTEE, BORDER_DDRCORNER, + BORDER_SDDTEE, BORDER_SDCROSS, BORDER_DUTEE, + + BORDER_DVLINE, BORDER_DVLINE, BORDER_DVLINE, + BORDER_DSULCORNER, BORDER_DSULCORNER, BORDER_DSRTEE, + BORDER_DULCORNER, BORDER_DULCORNER, BORDER_DRTEE, + + BORDER_DSURCORNER, BORDER_DSURCORNER, BORDER_DSLTEE, + BORDER_DSDTEE, BORDER_DSDTEE, BORDER_DSCROSS, + BORDER_DULCORNER, BORDER_DULCORNER, BORDER_DRTEE, + + BORDER_DURCORNER, BORDER_DURCORNER, BORDER_DLTEE, + BORDER_DURCORNER, BORDER_DURCORNER, BORDER_DLTEE, + BORDER_DDTEE, BORDER_DDTEE, BORDER_DCROSS, }; /* Note: I have no clue wether any of these names are suitable but they * should give an idea of what is going on. --jonas */