чување c16f8bb3d502389eec28f0053bb669f7cb1f56a1
родитељ 65c8824fb8ce9ad159a22844b22741c1972c74c2
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Mon, 27 Sep 2021 19:02:42 +0200
slw2gmi.c: Adjust for current slweb
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
| M | slw2gmi.c | | | 90 | ++++++++++++++++++++++++++++++++++++++++--------------------------------------- |
измењених датотека: 1, додавања: 46(+), брисања: 44(-)
diff --git a/slw2gmi.c b/slw2gmi.c
@@ -535,7 +535,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
while (*pcsv_template)
{
- if (csv_state & ST_CS_ESCAPE)
+ if (IN(csv_state, ST_CS_ESCAPE))
{
PRINTIF("%c", *pcsv_template);
csv_state &= ~ST_CS_ESCAPE;
@@ -550,7 +550,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
pcsv_template++;
break;
case '$':
- if (csv_state & ST_CS_REGISTER)
+ if (IN(csv_state, ST_CS_REGISTER))
{
PRINTIF("%c", '$');
csv_state &= ~ST_CS_REGISTER;
@@ -560,14 +560,14 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
pcsv_template++;
break;
case '#':
- if (csv_state & ST_CS_HEADER)
+ if (IN(csv_state, ST_CS_HEADER))
{
error(1,
(u8*)"csv: Invalid header "
"register mark");
csv_state &= ~(ST_CS_REGISTER | ST_CS_HEADER);
}
- else if (csv_state & ST_CS_REGISTER)
+ else if (IN(csv_state, ST_CS_REGISTER))
{
csv_state &= ~ST_CS_REGISTER;
csv_state |= ST_CS_HEADER;
@@ -577,12 +577,12 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
pcsv_template++;
break;
case '?':
- if (csv_state & ST_CS_COND)
+ if (IN(csv_state, ST_CS_COND))
{
error(1, (u8*)"csv: Invalid conditional mark");
csv_state &= ~ST_CS_COND;
}
- else if (csv_state & ST_CS_REGISTER)
+ else if (IN(csv_state, ST_CS_REGISTER))
{
csv_state &= ~ST_CS_REGISTER;
csv_state |= ST_CS_COND;
@@ -598,7 +598,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
&= ~(ST_CS_COND | ST_CS_COND_NONEMPTY);
csv_state |= ST_CS_COND_EMPTY;
}
- else if (csv_state & ST_CS_COND)
+ else if (IN(csv_state, ST_CS_COND))
{
error(1,
(u8*)"Empty conditional "
@@ -630,19 +630,19 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
case '7':
case '8':
case '9':
- if (csv_state & ST_CS_COND)
+ if (IN(csv_state, ST_CS_COND))
{
conditional_index = *pcsv_template - '0';
csv_state &= ~ST_CS_COND;
csv_state |= ST_CS_COND_NONEMPTY;
}
- else if (csv_state & ST_CS_HEADER)
+ else if (IN(csv_state, ST_CS_HEADER))
{
num = *pcsv_template - '0';
PRINTIF("%s", csv_header[num - 1]);
csv_state &= ~ST_CS_HEADER;
}
- else if (csv_state & ST_CS_REGISTER)
+ else if (IN(csv_state, ST_CS_REGISTER))
{
num = *pcsv_template - '0';
PRINTIF("%s", csv_register[num - 1]);
@@ -653,14 +653,14 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
pcsv_template++;
break;
default:
- if (csv_state & ST_CS_HEADER)
+ if (IN(csv_state, ST_CS_HEADER))
{
error(1,
(u8*)"csv: Invalid header "
"register mark");
csv_state &= ~ST_CS_HEADER;
}
- else if (csv_state & ST_CS_REGISTER)
+ else if (IN(csv_state, ST_CS_REGISTER))
{
error(1, (u8*)"csv: Invalid register mark");
csv_state &= ~ST_CS_REGISTER;
@@ -722,7 +722,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
switch (*pbufline)
{
case '"':
- if (csv_state & ST_CS_QUOTE)
+ if (IN(csv_state, ST_CS_QUOTE))
csv_state &= ~ST_CS_QUOTE;
else
csv_state |= ST_CS_QUOTE;
@@ -730,7 +730,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
break;
case ';':
case ',':
- if (csv_state & ST_CS_QUOTE)
+ if (IN(csv_state, ST_CS_QUOTE))
CHECKCOPY(token, ptoken, token_size,
pbufline);
else
@@ -759,7 +759,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
}
break;
default:
- if (csv_state & ST_CS_QUOTE)
+ if (IN(csv_state, ST_CS_QUOTE))
CHECKCOPY(token, ptoken, token_size,
pbufline);
else
@@ -1748,7 +1748,7 @@ process_line_start(FILE* output, const u8* line, const u8* link_prefix,
{
if (!list_para)
{
- if (state & ST_LIST)
+ if (IN(state, ST_LIST))
{
state &= ~ST_LIST;
if (!read_yaml_macros_and_links)
@@ -1759,7 +1759,7 @@ process_line_start(FILE* output, const u8* line, const u8* link_prefix,
}
}
- if (state & ST_NUMLIST)
+ if (IN(state, ST_NUMLIST))
{
state &= ~ST_NUMLIST;
if (!read_yaml_macros_and_links)
@@ -1770,10 +1770,10 @@ process_line_start(FILE* output, const u8* line, const u8* link_prefix,
}
}
- if (state & ST_FOOTNOTE_TEXT)
+ if (IN(state, ST_FOOTNOTE_TEXT))
{
if (!read_yaml_macros_and_links
- && (state & ST_PARA_OPEN))
+ && (IN(state, ST_PARA_OPEN)))
{
process_para_end(output, link_prefix,
previous_line_blank);
@@ -1966,7 +1966,7 @@ end_footnotes(FILE* output, const u8* link_prefix, const BOOL add_footnote_div,
{
size_t footnote = 0;
- if (state & ST_PARA_OPEN)
+ if (IN(state, ST_PARA_OPEN))
{
output_firstcol = TRUE;
state &= ~ST_PARA_OPEN;
@@ -2110,7 +2110,7 @@ do_line:
CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2215,7 +2215,7 @@ do_line:
colno++;
}
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2337,7 +2337,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2387,7 +2387,7 @@ do_line:
break;
case '#':
- if (state & ST_HTML_TAG)
+ if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2450,7 +2450,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2522,7 +2522,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2579,7 +2579,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2769,7 +2769,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2845,7 +2845,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -2901,7 +2901,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3120,7 +3120,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3162,7 +3162,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3194,7 +3194,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3307,7 +3307,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3387,7 +3387,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3631,7 +3631,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3673,7 +3673,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3704,7 +3704,7 @@ do_line:
colno++;
break;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3802,7 +3802,7 @@ do_line:
CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
- else if (state & ST_HTML_TAG)
+ else if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -3847,7 +3847,7 @@ do_line:
break;
default:
- if (state & ST_HTML_TAG)
+ if (IN(state, ST_HTML_TAG))
{
pline++;
colno++;
@@ -4056,7 +4056,7 @@ done_line:
state &= ~ST_LIST;
}
- if (!*pbuffer && (state & ST_NUMLIST))
+ if (!*pbuffer && (IN(state, ST_NUMLIST)))
{
if (!read_yaml_macros_and_links)
{
@@ -4144,8 +4144,10 @@ done_line:
{
state &= ~ST_BLOCKQUOTE;
if (!read_yaml_macros_and_links)
+ {
process_blockquote(output, TRUE);
- output_firstcol = TRUE;
+ output_firstcol = TRUE;
+ }
}
if (ANY(state, ST_TABLE_HEADER | ST_TABLE_LINE)
@@ -4173,8 +4175,8 @@ done_line:
| ST_LINK_SECOND_ARG_END))
{
print_output(output, "%s",
- state & ST_PRE ? "\n" : (output_firstcol ? "" : " "));
- output_firstcol = (state & ST_PRE) || output_firstcol;
+ IN(state, ST_PRE) ? "\n" : (output_firstcol ? "" : " "));
+ output_firstcol = (IN(state, ST_PRE)) || output_firstcol;
}
if (!keep_token)
