Merge branch 'master' into tidy_doc_cleanup

Conflicts:
	src/localize.c
This commit is contained in:
Jim Derry 2015-11-01 18:36:43 +08:00
commit 678a2a20d1
3 changed files with 9 additions and 11 deletions

View File

@ -1,10 +0,0 @@
<!-- XHTML namespace declaration required to reproduce bug.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>[676205] &lt;img src=&quot;&gt; crashes Tidy</title>
</head>
<body>
<img src=">
</body>
</html>

View File

@ -31,7 +31,10 @@
@if "%~1x" == "x" goto HELP
@if "%~2x" == "x" goto HELP
@set TMPFIL=input\in_%1.html
@set TMPFIL=input\in_%1.xhtml
@if NOT EXIST %TMPFIL% (
@set TMPFIL==input\in_%1.html
)
@set TMPCFG=input\cfg_%1.txt
@if NOT EXIST %TMPCFG% (
@set TMPCFG=input\cfg_default.txt
@ -163,6 +166,8 @@
@echo - %0 1642186 1
@if "%~1x" == "x" goto HELP2
@echo - Missing expected value. See testcases.txt for list available...
@echo Checking testcases.txt for test %1
@fa4 "%~1" testcases.txt
:HELP2
@echo.

View File

@ -67,7 +67,10 @@ if [ -z "$TMPEXIT" ]; then
exit 1
fi
TMPFIL="input/in_$TMPCASE.xhtml"
if [ ! -f "$TMPFIL" ]; then
TMPFIL="input/in_$TMPCASE.html"
fi
TMPCFG="input/cfg_$TMPCASE.txt"
if [ ! -f "$TMPCFG" ]; then
TMPCFG="input/cfg_default.txt"