next && words->next->text && words->next->text[0] == '\\')
+ ustrreplacedup(&words->text, L"
text[0] == '\\' && !words->text[1];
+ }
+}
+
#define NAMEDFRAGMENT_MAXLEN 200 /* More than enough for our usage */
/*
* Get formatted fragment name for html anchor.
@@ -995,6 +1050,8 @@ static void xhtml_do_top_file(xhtmlfile * file, paragraph * sourceform)
if (fp == NULL)
fatal(err_cantopenw, file->filename);
+ if (conf.chm_toc_file || conf.chm_ind_file) g_outputtype = OT_CHM | (g_outputtype & (OT_XHTML|OT_HTML5));
+
ustrtoa(conf.chm_toc_file, fname, 4096);
if(*fname)
{
@@ -1046,6 +1103,7 @@ static void xhtml_do_top_file(xhtmlfile * file, paragraph * sourceform)
if (p->type == para_Preamble)
{
fprintf(fp, "");
+ xhtml_hack_xhtmlify(p->words);
xhtml_para(fp, p->words);
fprintf(fp, "
\n");
}
@@ -1055,6 +1113,7 @@ static void xhtml_do_top_file(xhtmlfile * file, paragraph * sourceform)
if (p->type == para_Copyright)
{
fprintf(fp, "");
+ xhtml_hack_xhtmlify(p->words);
xhtml_para(fp, p->words);
fprintf(fp, "
\n");
}
@@ -1345,7 +1404,7 @@ static void xhtml_do_paras(FILE * fp, paragraph * p)
break;
case para_Rule:
- fprintf(fp, "\n
\n");
+ fprintf(fp, "\n%s\n", gettagtxt_hr());
break;
case para_Normal:
@@ -1426,39 +1485,51 @@ static void xhtml_do_paras(FILE * fp, paragraph * p)
}
}
+static void printoptstr(FILE * fp, const char*prefix, const wchar_t*str, const char*suffix)
+{
+ if (str)
+ {
+ fprintf(fp, "%s%ls%s", prefix ? prefix : "", str, suffix ? suffix : "");
+ }
+}
+
/*
* Output a header for this XHTML file.
*/
static void xhtml_doheader(FILE * fp, word * title)
{
- fprintf(fp,
- "\n");
- fprintf(fp,
- "\n" \
- "\n" \
- "");
+ const int xhtml = is_xhtml(), html5 = is_html5();
+ const char *xhtmldoctype = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+ const char *html4doctype = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
+ const char *xmlns = xhtml ? " xmlns=\"http://www.w3.org/1999/xhtml\"" : 0;
+ const char *voidend = xhtml ? " /" : "";
+ const wchar_t *tmpwstr;
+
+ if (xhtml && html5) fatal(err_whatever, "indeterminate format");
+ fprintf(fp, html5 ? "<!DOCTYPE html>\n" : xhtml ? xhtmldoctype : html4doctype);
+ fprintf(fp, "<html%s", xhtml ? xmlns : "");
+ //www.w3.org/International/questions/qa-html-language-declarations
+ if (*(tmpwstr = ustrdef(conf.html_lang, L"")))
+ fprintf(fp, "%s%ls%s lang=\"%ls\"", xhtml ? " xml:lang=\"" : "", xhtml ? tmpwstr : L"", xhtml ? "\"" : "", tmpwstr);
+ fprintf(fp, "><head>\n");
+ if (ustricmp(L"none", (tmpwstr = ustrdef(conf.meta_charset, L"UTF-8"))))
+ fprintf(fp, (xhtml || !html5) ? "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%ls\"%s>" : "<meta charset=\"%ls\">\n", tmpwstr, voidend);
+ printoptstr(fp, "", conf.head_start, "\n");
+ fprintf(fp, "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"%s>\n" "<title>", voidend);
if (title == NULL)
fprintf(fp, "Documentation");
else
xhtml_para(fp, title);
fprintf(fp, "\n");
- fprintf(fp,
- "\n",
- version);
+ printoptstr(fp, "", conf.head_middle, "\n");
+ fprintf(fp, "\n", version, voidend);
if (conf.author)
- fprintf(fp, "\n", conf.author);
+ fprintf(fp, "\n", conf.author, voidend);
if (conf.description)
- fprintf(fp, "\n",
- conf.description);
- if (conf.head_end)
- fprintf(fp, "%ls\n", conf.head_end);
- fprintf(fp, "\n\n");
- if (conf.body)
- fprintf(fp, "%ls\n", conf.body);
- else
- fprintf(fp, "\n");
+ fprintf(fp, "\n", conf.description, voidend);
+ printoptstr(fp, "", conf.head_end, "\n");
+ fprintf(fp, "\n");
+ fprintf(fp, "%ls\n", conf.body ? conf.body : L"");
if (conf.body_start)
fprintf(fp, "%ls\n", conf.body_start);
}
@@ -1475,7 +1546,7 @@ static void chm_doheader(FILE * fp, word * title)
*/
static void xhtml_dofooter(FILE * fp)
{
- fprintf(fp, "\n
\n\n");
+ fprintf(fp, "\n%s\n\n", gettagtxt_hr());
if (conf.body_end)
fprintf(fp, "%ls\n", conf.body_end);
if (!conf.suppress_address)
@@ -1519,7 +1590,7 @@ static void xhtml_versionid(FILE * fp, word * text, int started)
rdaddc(&t, ']'); /* FIXME: configurability */
if (started)
- fprintf(fp, "
\n");
+ fprintf(fp, "%s\n", gettagtxt_br());
fprintf(fp, "%s\n", t.text);
sfree(t.text);
}
@@ -1666,7 +1737,7 @@ static void xhtml_rdaddwc(rdstringc * rs, word * text, word * end)
if(chm_toc && *c == '.' && *(c+1) == '.')
rdaddsc(rs, c + 1);
else
- rdaddsc(rs, c);
+ rdaddsc(rs, c);
rdaddsc(rs, "\">");
sfree(c);
break;
@@ -1681,7 +1752,7 @@ static void xhtml_rdaddwc(rdstringc * rs, word * text, word * end)
rdaddsc(rs, c2);
sfree(c2);
}
- rdaddsc(rs, c);
+ rdaddsc(rs, c);
if (conf.rlink_suffix)
{
char *c2;
diff --git a/Docs/src/bin/halibut/halibut.h b/Docs/src/bin/halibut/halibut.h
index 149f4784..9872f77d 100644
--- a/Docs/src/bin/halibut/halibut.h
+++ b/Docs/src/bin/halibut/halibut.h
@@ -240,14 +240,17 @@ char *dupstr(char *s);
/*
* ustring.c
*/
+#define asciistrdef(s, d) ( (s) ? (s) : (d) )
+#define ustrdef(s, d) ( (s) ? (s) : (d) )
wchar_t *ustrdup(wchar_t * s);
+wchar_t *ustrreplacedup(wchar_t **dest, wchar_t *src);
char *ustrtoa(wchar_t * s, char *outbuf, int size);
int ustrlen(wchar_t * s);
wchar_t *uadv(wchar_t * s);
wchar_t *ustrcpy(wchar_t * dest, wchar_t * source);
wchar_t utolower(wchar_t);
-int ustrcmp(wchar_t * lhs, wchar_t * rhs);
-int ustricmp(wchar_t * lhs, wchar_t * rhs);
+int ustrcmp(const wchar_t * lhs, const wchar_t * rhs);
+int ustricmp(const wchar_t * lhs, const wchar_t * rhs);
int utoi(wchar_t *);
int utob(wchar_t *);
int uisdigit(wchar_t);
diff --git a/Docs/src/bin/halibut/ustring.c b/Docs/src/bin/halibut/ustring.c
index 9ab4ba65..0192d8b0 100644
--- a/Docs/src/bin/halibut/ustring.c
+++ b/Docs/src/bin/halibut/ustring.c
@@ -21,6 +21,12 @@ wchar_t *ustrdup(wchar_t * s)
return r;
}
+wchar_t *ustrreplacedup(wchar_t **dest, wchar_t *src)
+{
+ sfree(*dest);
+ return *dest = ustrdup(src);
+}
+
char *ustrtoa(wchar_t * s, char *outbuf, int size)
{
char *p;
@@ -62,7 +68,7 @@ wchar_t *ustrcpy(wchar_t * dest, wchar_t * source)
return ret;
}
-int ustrcmp(wchar_t * lhs, wchar_t * rhs)
+int ustrcmp(const wchar_t * lhs, const wchar_t * rhs)
{
if (!lhs && !rhs)
return 0;
@@ -89,7 +95,7 @@ wchar_t utolower(wchar_t c)
return c;
}
-int ustricmp(wchar_t * lhs, wchar_t * rhs)
+int ustricmp(const wchar_t * lhs, const wchar_t * rhs)
{
wchar_t lc, rc;
while ((lc = utolower(*lhs)) == (rc = utolower(*rhs)) && lc && rc)
diff --git a/Docs/src/bin/halibut/version.c b/Docs/src/bin/halibut/version.c
index 1b46fc8f..632bdec8 100644
--- a/Docs/src/bin/halibut/version.c
+++ b/Docs/src/bin/halibut/version.c
@@ -22,6 +22,7 @@ void initversionstring(void)
{
char scmverbuf[VERSTRSCMREVMAX+1];
int cchsvnrev = 0;
+ /* SCM trigger 20210912 */
const char*svnproprev = "$Revision$";
if ('$' == *svnproprev++)
{
diff --git a/Docs/src/config.but b/Docs/src/config.but
index 6f1e01b0..f3020639 100644
--- a/Docs/src/config.but
+++ b/Docs/src/config.but
@@ -2,6 +2,10 @@
\#{* Common config shared by all output formats *}
\#{**********************************************}
+\cfg{html-lang}{en}
+
+\cfg{html-suppress-address}{true}
+
\define{NsisCopyright} Copyright (C) 1999-2021 Contributors
\copyright \NsisCopyright
diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp
index 47609647..ac47f52c 100644
--- a/Source/ResourceEditor.cpp
+++ b/Source/ResourceEditor.cpp
@@ -867,7 +867,7 @@ bool CResourceEditor::UpdateResourceFromExternalT(const TCHAR* Type, WORD Name,
{
bool success = false;
const TCHAR *srctype, *srcname;
- LANGID srclang;
+ LANGID srclang = 0;
TCHAR *resproto = ParseResProtocolAlloc(File, srctype, srcname, srclang);
if (resproto) {
File = resproto;