shithub: riscv

Info  •  Files  •  Log  •  Branches

html2ms: bold table headings, remove wrong tag space handling

--- a/sys/src/cmd/html2ms.c

+++ b/sys/src/cmd/html2ms.c

@@ -33,7 +33,6 @@

 	int	pos;

 	int	space;

 	int	output;

-	int	aftertag;

 	char	*bp;

 	char	*wp;

@@ -327,8 +326,6 @@

 typedef struct Table Table;

 struct Table

 {

-	char	*fmt;

-

 	char	*bp;

 	int	nb;

@@ -337,6 +334,8 @@

 	int	enclose;

 	int	brk;

+	char	fmt[4];

+

 	Text	save;

 };

@@ -414,7 +413,7 @@

 		if(t->brk){

 			while(i < cols){

 				s = mallocz(sizeof(Table), 1);

-				s->fmt = "L";

+				strcpy(s->fmt, "L");

 				s->brk = t->brk;

 				t->brk = 0;

 				s->next = t->next;

@@ -497,9 +496,11 @@

 			t->enclose = 1;

 		}

 		if(gotstyle(tag, "text-align", "center") || gotstyle(tt, "text-align", "center"))

-			t->fmt = "c";

+			strcpy(t->fmt, "C");

 		else

-			t->fmt = "L";

+			strcpy(t->fmt, "L");

+		if(strcmp(tag->tag, "th") == 0)

+			strcpy(t->fmt+1, "B");

 		t->prev = tt->aux;

 		tt->aux = t;

 		*text = t->save;

@@ -884,7 +885,6 @@

 			if(c == '<'){

 				memset(&t, 0, sizeof(t));

 				if(parsetag(&t)){

-					text->aftertag = 1;

 					if(t.opening){

 						t.up = tag;

 						parsetext(text, &t);

@@ -912,8 +912,6 @@

 			switch(r){

 			case '\n':

 			case '\r':

-				if(text->pre == 0 && text->aftertag)

-					break;

 			case ' ':

 			case '\t':

 				if(text->pre == 0){

@@ -934,7 +932,6 @@

 				if(r == 0xA0)

 					r = ' ';

 				emitrune(text, r);

-				text->aftertag = 0;

 				text->space = 0;

 			}

 		}