diff --git a/build/cmake/.gitignore b/build/cmake/.gitignore index 3eb82da..71cd39a 100644 --- a/build/cmake/.gitignore +++ b/build/cmake/.gitignore @@ -12,4 +12,8 @@ cmake_install.cmake temp* *.opensdf ipch/* +Makefile +libtidy-static.a +tab2space +tidy5 diff --git a/build/cmake/build-me.sh b/build/cmake/build-me.sh new file mode 100755 index 0000000..a977c2d --- /dev/null +++ b/build/cmake/build-me.sh @@ -0,0 +1,40 @@ +#!/bin/sh +#< build-me.sh - 20140804 +BN=`basename $0` + +TMPSRC="../.." +BLDLOG="bldlog-1.txt" + +if [ -f "$BLDLOG" ]; then + rm -f $BLDLOG +fi + +############################################## +### ***** NOTE THIS INSTALL LOCATION ***** ### +### Change to suit your taste, environment ### +############################################## +TMPOPTS="-DCMAKE_INSTALL_PREFIX=$HOME" +############################################# + +echo "$BN: Doing: 'cmake $TMPSRC $TMPOPTS' to $BLDLOG" +cmake $TMPSRC $TMPOPTS >> $BLDLOG 2>&1 +if [ ! "$?" = "0" ]; then + echo "$BN: cmake confiuration, generation error" + exit 1 +fi + +echo "$BN: Doing: 'make' to $BLDLOG" +make >> $BLDLOG 2>&1 +if [ ! "$?" = "0" ]; then + echo "$BN: make error - see $BLDLOG for details" + exit 1 +fi + +echo "" +echo "$BN: appears a successful build... see $BLDLOG for details" + +echo "$BN: Time for 'make install' IFF desired... to $HOME/bin, unless changed..." +echo "" + +# eof + diff --git a/build/cmake/cmake-clean.txt b/build/cmake/cmake-clean.txt index f222242..f8f6596 100644 --- a/build/cmake/cmake-clean.txt +++ b/build/cmake/cmake-clean.txt @@ -1 +1,5 @@ bldlog-1.txt +libtidy-static.a +tab2space +tidy5 + diff --git a/src/tidylib.c b/src/tidylib.c index baca069..b8dbb6b 100644 --- a/src/tidylib.c +++ b/src/tidylib.c @@ -1261,12 +1261,12 @@ Bool inRemovedInfo( uint tid ) void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node ) { - Lexer* lexer = doc->lexer; + /* Lexer* lexer = doc->lexer; */ while (node) { if (TY_(nodeIsElement)(node)) { if (node->tag) { - if ((!node->tag->versions & VERS_HTML5)||(inRemovedInfo(node->tag->id))) { + if ((!(node->tag->versions & VERS_HTML5))||(inRemovedInfo(node->tag->id))) { /* issue warning */ TY_(ReportWarning)(doc, node, node, REMOVED_HTML5); }