diff -Nru tidy-html5-5.6.0/build/cmake/build-bins.bat tidy-html5-5.2.0/build/cmake/build-bins.bat --- tidy-html5-5.6.0/build/cmake/build-bins.bat 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/build/cmake/build-bins.bat 2016-06-08 13:15:39.000000000 +0000 @@ -1,16 +1,3 @@ @setlocal -@set TMPLOG=bldlog-p.txt -@echo Running: 'cmake --build . --config Release --target PACKAGE' out to %TMPLOG% -@echo Running: 'cmake --build . --config Release --target PACKAGE' > %TMPLOG% -cmake --build . --config Release --target PACKAGE >> %TMPLOG% -@if ERRORLEVEL 1 goto ISERR -@echo Build package done... see %TMPLOG% -@endlocal -@exit /b 0 - -:ISERR -@endlocal -@exit /b 1 - -@REM eof +cmake --build . --config Release --target PACKAGE diff -Nru tidy-html5-5.6.0/build/cmake/cmake-clean.txt tidy-html5-5.2.0/build/cmake/cmake-clean.txt --- tidy-html5-5.6.0/build/cmake/cmake-clean.txt 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/build/cmake/cmake-clean.txt 2016-06-08 13:15:39.000000000 +0000 @@ -27,4 +27,4 @@ tidy.1 _CPack_Packages tidy1.xsl -tidy.pc + diff -Nru tidy-html5-5.6.0/build/cmake/.gitignore tidy-html5-5.2.0/build/cmake/.gitignore --- tidy-html5-5.6.0/build/cmake/.gitignore 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/build/cmake/.gitignore 2016-06-08 13:15:39.000000000 +0000 @@ -30,6 +30,5 @@ tidy libtidy* tidy1.xsl -tidy.pc *.vcproj -.pkg + diff -Nru tidy-html5-5.6.0/build/win64/build-bins.bat tidy-html5-5.2.0/build/win64/build-bins.bat --- tidy-html5-5.6.0/build/win64/build-bins.bat 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/build/win64/build-bins.bat 2016-06-08 13:15:39.000000000 +0000 @@ -1,16 +1,3 @@ @setlocal -@set TMPLOG=bldlog-p.txt -@echo Running: 'cmake --build . --config Release --target PACKAGE' out to %TMPLOG% -@echo Running: 'cmake --build . --config Release --target PACKAGE' > %TMPLOG% -cmake --build . --config Release --target PACKAGE >> %TMPLOG% -@if ERRORLEVEL 1 goto ISERR -@echo Build package done... see %TMPLOG% -@endlocal -@exit /b 0 - -:ISERR -@endlocal -@exit /b 1 - -@REM eof +cmake --build . --config Release --target PACKAGE diff -Nru tidy-html5-5.6.0/build/win64/build-me.bat tidy-html5-5.2.0/build/win64/build-me.bat --- tidy-html5-5.6.0/build/win64/build-me.bat 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/build/win64/build-me.bat 2016-06-08 13:15:39.000000000 +0000 @@ -1,16 +1,11 @@ @setlocal -@REM 20170702 - Check branch -@set TMPBR=next -@REM 20161002 - Change to msvc140 build -@set VCVERS=14 -@set GENERATOR=Visual Studio %VCVERS% Win64 @REM 20160324 - Change to relative, and use choice @set TMPPRJ=tidy @echo Build %TMPPRJ% project, in 64-bits @set TMPLOG=bldlog-1.txt @set BLDDIR=%CD% @set TMPROOT=..\..\.. -@set SET_BAT=%ProgramFiles(x86)%\Microsoft Visual Studio %VCVERS%.0\VC\vcvarsall.bat +@set SET_BAT=%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat @if NOT EXIST "%SET_BAT%" goto NOBAT @REM if NOT EXIST %TMPROOT%\nul goto NOROOT @set TMPSRC=..\.. @@ -47,7 +42,7 @@ @REM ########################################## @REM set TMPINST=F:\Projects\software.x64 @set TMPOPTS=-DCMAKE_INSTALL_PREFIX=%TMPINST% -@set TMPOPTS=%TMPOPTS% -G "%GENERATOR%" +@set TMPOPTS=%TMPOPTS% -G "Visual Studio 10 Win64" @REM set TMPOPTS=%TMPOPTS% -DTIDY_CONFIG_FILE="C:\MDOS\tidy5.cfg" @REM set TMPOPTS=%TMPOPTS% -DTIDY_USER_CONFIG_FILE="C:\MDOS\tidy5.cfg" @set TMPOPTS=%TMPOPTS% -DBUILD_SHARED_LIB:BOOL=OFF @@ -64,9 +59,6 @@ :GOTCMD @call chkmsvc %TMPPRJ% -@call chkbranch %TMPBR% -@if ERRORLEVEL 1 goto BADBR -:GOTBR @echo Begin %DATE% %TIME%, output to %TMPLOG% @echo Begin %DATE% %TIME% >> %TMPLOG% @@ -181,16 +173,6 @@ @if ERRORLEVEL 1 goto ERR33 @goto DNREL -:BADBR -@call git checkout %TMPBR% -@call chkbranch %TMPBR% -@if ERRORLEVEL 1 goto BADBR2 -@goto GOTBR -:BADBR2 -@call shwbranch -@echo Not on correct branch %TMPBR% -@goto ISERR - :ISERR @endlocal @exit /b 1 diff -Nru tidy-html5-5.6.0/build/win64/.gitignore tidy-html5-5.2.0/build/win64/.gitignore --- tidy-html5-5.6.0/build/win64/.gitignore 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/build/win64/.gitignore 2016-06-08 13:15:39.000000000 +0000 @@ -20,4 +20,3 @@ *.msi _CPack_Packages/* dir -*.VC.db diff -Nru tidy-html5-5.6.0/CMakeLists.txt tidy-html5-5.2.0/CMakeLists.txt --- tidy-html5-5.6.0/CMakeLists.txt 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/CMakeLists.txt 2016-06-08 13:15:39.000000000 +0000 @@ -1,54 +1,23 @@ -############################################################################## -# @file CMakeLists.txt -# Build executables, static and dylibs, packages, build systems, etc., for -# HTML Tidy. -# -# Read this file or use cmake-gui (Windows) or ccmake (everything else) for -# guided build. -# -# @author Geoff McLane [ubuntu@geoffair.info] -# @author HTACG, et al (consult git log) -# -# @copyright -# Copyright (c) 1998-2017 HTACG -# @copyright -# See tidy.h for license. -# -# @date Consult git log. -############################################################################## - -cmake_minimum_required (VERSION 2.8.12) +# CMakeLists.txt - 20150402 - 20150130 - 20140801 - for github htacg/tidy-html5 +# Prepare for changing the name to 'tidy' +cmake_minimum_required (VERSION 2.8.7) set(LIB_NAME tidy) -set(LIBTIDY_DESCRIPTION "${LIB_NAME} - HTML syntax checker") -set(LIBTIDY_URL "http://www.html-tidy.org") project (${LIB_NAME}) - -################################################# -# Setup -################################################# - -#------------------------------------------------------------------------ -# Release Information -# Release version and date are found in `version.txt`; update *that* -# file when required. It will be read into variable `versionFile` -# (stripping any newlines or spaces). This file must be formatted into -# two lines: the dot-separated MAJOR.MINOR.POINT version, followed by -# the date separated YEAR.MONTH.DAY release date. -#------------------------------------------------------------------------ +# ### NOTE: *** Adjust version.txt when required *** +# read 'version' file into a variable (stripping any newlines or spaces) +# 20150609: Revert to supplying BOTH version and date, as we had back in Jan 2015 +# NOTE: Both version and date MUST be DOT separated, in two lines. file(READ version.txt versionFile) - if (NOT versionFile) message(FATAL_ERROR "Unable to determine libtidy version. version.txt file is missing.") endif() - string(STRIP "${versionFile}" VERSION_TEXT) string(REGEX REPLACE "(.*)[\r\n|\n](.*)" "\\1" LIBTIDY_VERSION ${VERSION_TEXT}) string(REGEX REPLACE "(.*)[\r\n|\n](.*)" "\\2" LIBTIDY_DATE ${VERSION_TEXT}) - -# Establish version number +# establish version number if (LIBTIDY_VERSION) string(REPLACE "." ";" VERSION_LIST ${LIBTIDY_VERSION}) list(GET VERSION_LIST 0 TIDY_MAJOR_VERSION) @@ -56,9 +25,8 @@ list(GET VERSION_LIST 2 TIDY_POINT_VERSION) else () message(FATAL_ERROR "*** FAILED to get a VERSION from version.txt!") -endif () - -# Establish version date +endif () +# establish version date if (LIBTIDY_DATE) string(REPLACE "." ";" DATE_LIST ${LIBTIDY_DATE}) list(GET DATE_LIST 0 tidy_YEAR) @@ -68,112 +36,30 @@ message(FATAL_ERROR "*** FAILED to get a DATE from version.txt!") endif () - -#------------------------------------------------------------------------ -# Library Types and Linking -# By default, *both* static and dynamic library types are built. The -# shared library can be turned off if not needed. The console program -# can be configured for static linking or dynamic linking. -#------------------------------------------------------------------------ +# By default, BOTH library types built, Allow turning OFF shared if not needed set( LIB_TYPE STATIC ) # set default message - -option( BUILD_SHARED_LIB "Set OFF to NOT build shared library" ON ) - +option( BUILD_SHARED_LIB "Set OFF to NOT build shared library" ON ) +option( BUILD_TAB2SPACE "Set ON to build utility app, tab2space" OFF ) +option( BUILD_SAMPLE_CODE "Set ON to build the sample code" OFF ) +if (NOT MAN_INSTALL_DIR) + set(MAN_INSTALL_DIR share/man/man1) +endif () # Issue #326 - Allow linkage choice of console app tidy option( TIDY_CONSOLE_SHARED "Set ON to link with shared(DLL) lib." OFF ) - if (TIDY_CONSOLE_SHARED) if (NOT BUILD_SHARED_LIB) message(FATAL_ERROR "Enable shared build for this tidy linkage!") endif () endif () - -#------------------------------------------------------------------------ -# Miscellaneous Options -#------------------------------------------------------------------------ -option( BUILD_TAB2SPACE "Set ON to build utility app, tab2space" OFF ) -option( BUILD_SAMPLE_CODE "Set ON to build the sample code" OFF ) -option( TIDY_COMPAT_HEADERS "Set ON to include compatibility headers" OFF ) - - -#------------------------------------------------------------------------ -# Man Page -# Allow building with non-default man page directory. -#------------------------------------------------------------------------ -if (NOT MAN_INSTALL_DIR) - set(MAN_INSTALL_DIR share/man/man1) -endif () - - -#------------------------------------------------------------------------ -# Localization -# Allow building without extra language support. -#------------------------------------------------------------------------ +# Allow building without extra language support option( SUPPORT_LOCALIZATIONS "Set OFF to build without additional languages." ON ) - if (SUPPORT_LOCALIZATIONS) - add_definitions ( -DSUPPORT_LOCALIZATIONS=1 ) +add_definitions ( -DSUPPORT_LOCALIZATIONS=1 ) else () - add_definitions ( -DSUPPORT_LOCALIZATIONS=0 ) +add_definitions ( -DSUPPORT_LOCALIZATIONS=0 ) endif () - -#------------------------------------------------------------------------ -# Console Application -# Allow building without console support, which mostly prevents -# console strings from existing in the library. Note that this will -# prevent the console application from being built, since it can't be -# linked. -#------------------------------------------------------------------------ -option( SUPPORT_CONSOLE_APP "Set OFF to build libraries only without console application support." ON ) - -if (SUPPORT_CONSOLE_APP) - add_definitions ( -DSUPPORT_CONSOLE_APP=1 ) -else () - add_definitions ( -DSUPPORT_CONSOLE_APP=0 ) -endif () - - -#------------------------------------------------------------------------ -# Diagnostics -# Enable building with logs, some memory diagnostics. -#------------------------------------------------------------------------ -option( ENABLE_DEBUG_LOG "Set ON to output debugging messages." OFF ) -option( ENABLE_ALLOC_DEBUG "Set ON to output node allocation diagnostics." OFF ) -option( ENABLE_MEMORY_DEBUG "Set ON to output some memory diagnostics." OFF ) - -if ( ENABLE_DEBUG_LOG ) - add_definitions( -DENABLE_DEBUG_LOG ) - message(STATUS "*** Debug Logging is enabled.") -else () - message(STATUS "*** Debug Logging is NOT enabled.") -endif () - -if (ENABLE_ALLOC_DEBUG) - add_definitions ( -DDEBUG_ALLOCATION ) # see lexer.c for details - message(STATUS "*** Note, lexer.c node allocation diagnostics are ON") -endif () - -if (ENABLE_MEMORY_DEBUG) - add_definitions ( -DDEBUG_MEMORY ) # see alloc.c for details - message(STATUS "*** Note, alloc.c memory diagnostics are ON") -endif () - -if (WIN32) - option( ENABLE_CRTDBG_MEMORY "Set ON to enable the Windows CRT debug library." OFF ) - - if (ENABLE_CRTDBG_MEMORY) - add_definitions ( -D_CRTDBG_MAP_ALLOC ) # see tidy.c for details - message(STATUS "*** Note, tidy.c Windows CRT memory debug is ON") - endif () -endif () - - -#------------------------------------------------------------------------ -# Complier Flags -# Setup other compiler-specific and platform-specific compiler flags. -#------------------------------------------------------------------------ if(CMAKE_COMPILER_IS_GNUCXX) set( WARNING_FLAGS -Wall ) endif(CMAKE_COMPILER_IS_GNUCXX) @@ -183,16 +69,20 @@ endif() if(WIN32 AND MSVC) - # C4996: The compiler encountered a deprecated declaration. + # turn off various warnings + set(WARNING_FLAGS "${WARNING_FLAGS} /wd4996") # C4090: 'function' : different 'const' qualifiers # C4244: '=' : conversion from '__int64' to 'uint', possible loss of data # C4267: 'function' : conversion from 'size_t' to 'uint', possible loss of data - foreach(warning 4996 4090 4244 4267) + # foreach(warning 4244 4251 4267 4275 4290 4786 4305) + foreach(warning 4090 4244 4267) set(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") endforeach() - set( MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS" ) - + # if (${MSVC_VERSION} EQUAL 1600) + # set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) + # endif (${MSVC_VERSION} EQUAL 1600) + # set( NOMINMAX 1 ) # to distinguish between debug and release lib in windows set( CMAKE_DEBUG_POSTFIX "d" ) # little effect in unix else() @@ -203,113 +93,25 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT" ) set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}" ) - -#------------------------------------------------------------------------ -# Static Windows Runtime -# Option to statically link to the Windows runtime. Maybe only -# applies to WIN32/MSVC. -#------------------------------------------------------------------------ -if (MSVC) - option( USE_STATIC_RUNTIME "Set ON to change /MD(DLL) to /MT(static)" OFF ) - if (USE_STATIC_RUNTIME) - set(CompilerFlags - CMAKE_CXX_FLAGS - CMAKE_CXX_FLAGS_DEBUG - CMAKE_CXX_FLAGS_RELEASE - CMAKE_C_FLAGS - CMAKE_C_FLAGS_DEBUG - CMAKE_C_FLAGS_RELEASE - ) - foreach(CompilerFlag ${CompilerFlags}) - string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") - endforeach() - message(STATUS "Using /MT STATIC runtime") - else () - message(STATUS "Using /MD DYNAMIC runtime") - endif () -endif () - - -#------------------------------------------------------------------------ -# Macro Values -# These additional macros are set in Tidy's source code. It is *very* -# seldom that you would ever have to change any of these in order to -# achieve a functioning build. -#------------------------------------------------------------------------ +add_definitions ( -DHAVE_CONFIG_H ) +add_definitions ( -DSUPPORT_UTF16_ENCODINGS=1 ) +add_definitions ( -DSUPPORT_ASIAN_ENCODINGS=1 ) +add_definitions ( -DSUPPORT_ACCESSIBILITY_CHECKS=1 ) add_definitions ( -DLIBTIDY_VERSION="${LIBTIDY_VERSION}" ) add_definitions ( -DRELEASE_DATE="${tidy_YEAR}/${tidy_MONTH}/${tidy_DAY}" ) +### add_definitions ( -DRC_NUMBER="MinGW" ) -# Optionally specify an extra version point for pre-release/debug versions. -if (TIDY_RC_NUMBER) - add_definitions ( -DRC_NUMBER="${TIDY_RC_NUMBER}" ) -endif () - -# If your OS doesn't have native ISO2022 support, then build with this flag. -if (NO_NATIVE_ISO2022_SUPPORT) - add_definitions ( -DNO_NATIVE_ISO2022_SUPPORT=1 ) +# Issue #188 - Support user items in platform.h +if (TIDY_CONFIG_FILE) + add_definitions( -DTIDY_CONFIG_FILE="${TIDY_CONFIG_FILE}" ) endif () - -# If your OS doesn't have library function access(), build with this flag. -if (NO_ACCESS_SUPPORT) - add_definitions ( -DNO_ACCESS_SUPPORT=1 ) +if (TIDY_USER_CONFIG_FILE) + add_definitions( -DTIDY_USER_CONFIG_FILE="${TIDY_USER_CONFIG_FILE}" ) endif () - -# Delete me? Not used in Tidy source! -add_definitions ( -DHAVE_CONFIG_H ) - - -#------------------------------------------------------------------------ -# Runtime Configuration File Support -# By default on Unix-like systems when building for the console program, -# support runtime configuration files in /etc/ and in ~/. To prevent this, -# set ENABLE_CONFIG_FILES to NO. Specify -DTIDY_CONFIG_FILE and/or -# -DTIDY_USER_CONFIG_FILE to override the default paths in tidyplatform.h. -# @note: this section refactored to support #584. -#------------------------------------------------------------------------ -if ( UNIX AND SUPPORT_CONSOLE_APP ) - - option ( ENABLE_CONFIG_FILES "Set to OFF to disable Tidy runtime configuration file support" ON ) - - # All Unixes support getpwnam(); undef'd in tidyplatform.h if necessary. - add_definitions( -DSUPPORT_GETPWNAM=1 ) - -else () - - option ( ENABLE_CONFIG_FILES "Set to ON to enable Tidy runtime configuration file support" OFF ) - - if ( SUPPORT_GETPWNAM ) +if (SUPPORT_GETPWNAM) add_definitions( -DSUPPORT_GETPWNAM=1 ) - endif () - endif () -if ( ENABLE_CONFIG_FILES ) - - message(STATUS "*** Building support for runtime configuration files.") - - add_definitions( -DTIDY_ENABLE_CONFIG_FILES ) - - # define a default here so we can pass to XSL. - if ( NOT TIDY_CONFIG_FILE ) - set( TIDY_CONFIG_FILE "/etc/tidy.conf" ) - endif () - - # define a default here so we can pass to XSL. - if ( NOT TIDY_USER_CONFIG_FILE ) - set( TIDY_USER_CONFIG_FILE "~/.tidyrc" ) - endif () - - # do *not* add these unless ENABLE_CONFIG_FILES! - add_definitions( -DTIDY_CONFIG_FILE="${TIDY_CONFIG_FILE}" ) - add_definitions( -DTIDY_USER_CONFIG_FILE="${TIDY_USER_CONFIG_FILE}" ) - -endif () - - -#------------------------------------------------------------------------ -# Shared Library -# Setup whether or not we will build the shared library. -#------------------------------------------------------------------------ if(BUILD_SHARED_LIB) set(LIB_TYPE SHARED) message(STATUS "*** Also building DLL library ${LIB_TYPE}, version ${LIBTIDY_VERSION}, date ${LIBTIDY_DATE}") @@ -317,39 +119,27 @@ message(STATUS "*** Only building static library ${LIB_TYPE}, version ${LIBTIDY_VERSION}, date ${LIBTIDY_DATE}") endif() - -################################################# -# Build -################################################# - -#------------------------------------------------------------------------ -# File Locations and File Lists -# Setup whether or not we will build the shared library. -#------------------------------------------------------------------------ include_directories ( "${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/src" ) +############################################################################## +### tidy library +# file locations set ( SRCDIR src ) set ( INCDIR include ) - +# file lists set ( CFILES ${SRCDIR}/access.c ${SRCDIR}/attrs.c ${SRCDIR}/istack.c ${SRCDIR}/parser.c ${SRCDIR}/tags.c ${SRCDIR}/entities.c - ${SRCDIR}/lexer.c ${SRCDIR}/pprint.c ${SRCDIR}/charsets.c - ${SRCDIR}/clean.c ${SRCDIR}/message.c ${SRCDIR}/config.c - ${SRCDIR}/alloc.c ${SRCDIR}/attrdict.c ${SRCDIR}/buffio.c - ${SRCDIR}/fileio.c ${SRCDIR}/streamio.c ${SRCDIR}/tagask.c - ${SRCDIR}/tmbstr.c ${SRCDIR}/utf8.c ${SRCDIR}/tidylib.c - ${SRCDIR}/mappedio.c ${SRCDIR}/gdoc.c ${SRCDIR}/language.c - ${SRCDIR}/messageobj.c ${SRCDIR}/sprtf.c ) - + ${SRCDIR}/lexer.c ${SRCDIR}/pprint.c ${SRCDIR}/charsets.c ${SRCDIR}/clean.c + ${SRCDIR}/message.c ${SRCDIR}/config.c ${SRCDIR}/alloc.c + ${SRCDIR}/attrask.c ${SRCDIR}/attrdict.c ${SRCDIR}/attrget.c + ${SRCDIR}/buffio.c ${SRCDIR}/fileio.c ${SRCDIR}/streamio.c + ${SRCDIR}/tagask.c ${SRCDIR}/tmbstr.c ${SRCDIR}/utf8.c + ${SRCDIR}/tidylib.c ${SRCDIR}/mappedio.c ${SRCDIR}/gdoc.c + ${SRCDIR}/language.c ) set ( HFILES ${INCDIR}/tidyplatform.h ${INCDIR}/tidy.h ${INCDIR}/tidyenum.h ${INCDIR}/tidybuffio.h ) - -if (TIDY_COMPAT_HEADERS) - set ( HFILES ${HFILES} ${INCDIR}/buffio.h ${INCDIR}/platform.h ) -endif () - set ( LIBHFILES ${SRCDIR}/access.h ${SRCDIR}/attrs.h ${SRCDIR}/attrdict.h ${SRCDIR}/charsets.h ${SRCDIR}/clean.h ${SRCDIR}/config.h ${SRCDIR}/entities.h @@ -358,12 +148,13 @@ ${SRCDIR}/pprint.h ${SRCDIR}/streamio.h ${SRCDIR}/tags.h ${SRCDIR}/tmbstr.h ${SRCDIR}/utf8.h ${SRCDIR}/tidy-int.h ${SRCDIR}/version.h ${SRCDIR}/gdoc.h ${SRCDIR}/language.h - ${SRCDIR}/language_en.h ${SRCDIR}/sprtf.h ) - + ${SRCDIR}/language_en.h ${SRCDIR}/win32tc.h ) +if (MSVC) + list(APPEND CFILES ${SRCDIR}/sprtf.c) + list(APPEND LIBHFILES ${SRCDIR}/sprtf.h) +endif () +####################################### -#------------------------------------------------------------------------ -# Target Locations -#------------------------------------------------------------------------ if (NOT LIB_INSTALL_DIR) set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) endif () @@ -376,15 +167,12 @@ set(INCLUDE_INSTALL_DIR include) endif () - -#------------------------------------------------------------------------ -# Static Library -# The static library always builds. -#------------------------------------------------------------------------ +# Always build the STATIC library set(name tidy-static) add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} ) set_target_properties( ${name} PROPERTIES - OUTPUT_NAME ${LIB_NAME}s ) + OUTPUT_NAME ${LIB_NAME}s + ) if (NOT TIDY_CONSOLE_SHARED) # user wants default static linkage list ( APPEND add_LIBS ${name} ) endif () @@ -394,20 +182,13 @@ LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} ) - - -#------------------------------------------------------------------------ -# Dynamic Library -# If the user option is still on. -#------------------------------------------------------------------------ +######################################## +# if user option still on if (BUILD_SHARED_LIB) set(name tidy-share) - if (UNIX AND APPLE) - set(CMAKE_MACOSX_RPATH 1) - endif () add_library ( ${name} SHARED ${CFILES} ${HFILES} ${LIBHFILES} ) set_target_properties( ${name} PROPERTIES - OUTPUT_NAME ${LIB_NAME} ) + OUTPUT_NAME ${LIB_NAME} ) set_target_properties( ${name} PROPERTIES VERSION ${LIBTIDY_VERSION} SOVERSION ${TIDY_MAJOR_VERSION} ) @@ -420,36 +201,26 @@ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) - if (TIDY_CONSOLE_SHARED) # user wants shared/dll linkage + if (TIDY_CONSOLE_SHARED) # user wants shared/dll linkage list ( APPEND add_LIBS ${name} ) endif () endif () - -#------------------------------------------------------------------------ -# Main Executable -# The main executable will be linked with either the static or the -# shared library. -#------------------------------------------------------------------------ -if (SUPPORT_CONSOLE_APP) - set(name ${LIB_NAME}) - set ( BINDIR console ) - add_executable( ${name} ${BINDIR}/tidy.c ) - target_link_libraries( ${name} ${add_LIBS} ) - if (MSVC) - set_target_properties( ${name} PROPERTIES DEBUG_POSTFIX d ) - endif () - if (NOT TIDY_CONSOLE_SHARED) - set_target_properties( ${name} PROPERTIES - COMPILE_FLAGS "-DTIDY_STATIC" ) - endif () - install (TARGETS ${name} DESTINATION bin) +########################################################## +### main executable - linked with STATIC/SHARED library +set(name ${LIB_NAME}) +set ( BINDIR console ) +add_executable( ${name} ${BINDIR}/tidy.c ) +target_link_libraries( ${name} ${add_LIBS} ) +if (MSVC) + set_target_properties( ${name} PROPERTIES DEBUG_POSTFIX d ) endif () +if (NOT TIDY_CONSOLE_SHARED) + set_target_properties( ${name} PROPERTIES + COMPILE_FLAGS "-DTIDY_STATIC" ) +endif () +install (TARGETS ${name} DESTINATION bin) - -#------------------------------------------------------------------------ -# Miscellaneous Targets -#------------------------------------------------------------------------ if (BUILD_TAB2SPACE) set(name tab2space) add_executable( ${name} ${BINDIR}/tab2space.c ) @@ -470,12 +241,10 @@ # no INSTALL of this 'local' sample endif () - -################################################# +#========================================================== # Create man pages -################################################# - -if (UNIX AND SUPPORT_CONSOLE_APP) +#========================================================== +if (UNIX) find_program( XSLTPROC_FOUND xsltproc ) if (XSLTPROC_FOUND) ## NOTE: man name must match exe ie currently `${LIB_NAME}.1` not `tidy.1` @@ -486,14 +255,12 @@ set(TIDYHELP ${CMAKE_CURRENT_BINARY_DIR}/tidy-help.xml) set(TIDYCONFIG ${CMAKE_CURRENT_BINARY_DIR}/tidy-config.xml) add_custom_target(man ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}") - - ## Populate the @VARIABLES@ in the input file. configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/man/tidy1.xsl.in ${TIDY1XSL} ) - # Run the built EXE to generate xml output . + # run built EXE to generate xml output add_custom_command( TARGET man COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-help > ${TIDYHELP} @@ -501,7 +268,7 @@ VERBATIM ) - # Run the built EXE to generate more xml output. + # run built EXE to generate more xml output add_custom_command( TARGET man COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} -xml-config > ${TIDYCONFIG} @@ -509,7 +276,7 @@ VERBATIM ) - # Run xsltproc to generate the install files. + # run xsltproc to generate the install files.. add_custom_command( TARGET man DEPENDS ${TIDYHELP} @@ -526,59 +293,30 @@ endif () endif () - -################################################# -# Create MSI,EXE, DMG, DEB/RPM -# TODO: Check each of these builds -################################################# - +########################################################## +### Create MSI,EXE, DMG, DEB/RPM +### TODO: Check each of these builds +########################################################## set(BITNESS 32) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(BITNESS 64) endif() - - -#------------------------------------------------------------------------ -# System Runtime Libraries -# Need to ensure that system DLLs get included in a binary -# distribution, but since it can miss some - seems incomplete - make -# optional. -#------------------------------------------------------------------------ -option( ADD_SYSTEM_RUNTIMES "Set ON to include system runtime DLLS in distribution" OFF ) -if (MSVC AND ADD_SYSTEM_RUNTIMES) - if (NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS) - # Visual Studio Express does include redistributable components so - # squelch the warning. - set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) - endif () - set (CMAKE_INSTALL_DEBUG_LIBRARIES OFF) - include (InstallRequiredSystemLibraries) -endif () - - -#------------------------------------------------------------------------ -# Windows -# MSI - this needs WiX Tooset installed and a path to candle.exe -# EXE - this needs NSIS tools to be in path -#------------------------------------------------------------------------ if (WIN32) + # MSI - this needs WiX Tooset installed and a path to candle.exe + # EXE - this needs NSIS tools to be in path set(CPACK_GENERATOR "NSIS;WIX;ZIP") set(CPACK_SOURCE_GENERATOR "ZIP") set(CPACK_WIX_UPGRADE_GUID "D809598A-B513-4752-B268-0BAC403B00E4") elseif ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) - set(CPACK_GENERATOR "productbuild") + set(CPACK_GENERATOR "PackageMake") set(CPACK_SOURCE_GENERATOR "TGZ") else () set(CPACK_GENERATOR "DEB;RPM") set(CPACK_SOURCE_GENERATOR "TGZ") endif () - -#------------------------------------------------------------------------ -# General -#------------------------------------------------------------------------ set(CPACK_PACKAGE_NAME "${LIB_NAME}") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${LIBTIDY_DESCRIPTION}") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${LIB_NAME} - HTML syntax checker") set(CPACK_PACKAGE_VENDOR "HTML Tidy Advocacy Community Group") set(CPACK_PACKAGE_CONTACT "maintainer@htacg.org") @@ -588,27 +326,17 @@ set(CPACK_PACKAGE_VERSION_PATCH "${TIDY_POINT_VERSION}") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README/README.html") -# use one compatible license file for all set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README/LICENSE.txt") set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README/README.html") set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/README/README.html") - -#------------------------------------------------------------------------ -# Debian -#------------------------------------------------------------------------ +## debian config set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT}) -set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${LIBTIDY_URL}) +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://www.html-tidy.org/") #set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc") set(CPACK_DEBIAN_PACKAGE_SECTION "Libraries") -set(CPACK_SOURCE_IGNORE_FILES - "${PROJECT_SOURCE_DIR}/build" - ) - -#------------------------------------------------------------------------ -# RPM config -#------------------------------------------------------------------------ +## RPM config set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/man" "/usr/share/man/man1") set(CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/test/;${CMAKE_CURRENT_SOURCE_DIR}/build/;${CMAKE_CURRENT_SOURCE_DIR}/.git/") @@ -619,18 +347,4 @@ include(CPack) -#------------------------------------------------------------------------ -# pkg-config -#------------------------------------------------------------------------ -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc" - @ONLY - ) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc" - DESTINATION "${LIB_INSTALL_DIR}/pkgconfig" - ) - # eof diff -Nru tidy-html5-5.6.0/console/tidy.c tidy-html5-5.2.0/console/tidy.c --- tidy-html5-5.6.0/console/tidy.c 2017-11-25 13:54:41.000000000 +0000 +++ tidy-html5-5.2.0/console/tidy.c 2016-06-08 13:15:39.000000000 +0000 @@ -1,70 +1,38 @@ -/***************************************************************************//** - * @file - * HTML TidyLib command line driver. - * - * This console application utilizing LibTidy in order to offer a complete - * console application offering all of the features of LibTidy. - * - * @author HTACG, et al (consult git log) - * - * @copyright - * Copyright (c) 1998-2017 World Wide Web Consortium (Massachusetts - * Institute of Technology, European Research Consortium for Informatics - * and Mathematics, Keio University) and HTACG. - * @par - * All Rights Reserved. - * @par - * See `tidy.h` for the complete license. - * - * @date Additional updates: consult git log - ******************************************************************************/ +/* + tidy.c - HTML TidyLib command line driver + + Copyright (c) 1998-2008 World Wide Web Consortium + (Massachusetts Institute of Technology, European Research + Consortium for Informatics and Mathematics, Keio University). + All Rights Reserved. + + */ #include "tidy.h" -#include "tidybuffio.h" +#include "language.h" #include "locale.h" -#include "sprtf.h" - #if defined(_WIN32) -# include /* Force console to UTF8. */ +#include /* Force console to UTF8. */ +#endif +#if !defined(NDEBUG) && defined(_MSC_VER) +#include "sprtf.h" #endif -#if defined(ENABLE_DEBUG_LOG) && defined(_MSC_VER) && defined(_CRTDBG_MAP_ALLOC) -# include -# include +#ifndef SPRTF +#define SPRTF printf #endif -/** Tidy will send errors to this file, which will be stderr later. */ -static FILE* errout = NULL; +static FILE* errout = NULL; /* set to stderr */ +/* static FILE* txtout = NULL; */ /* set to stdout */ #if defined(_WIN32) - static uint win_cp; /* original Windows code page */ -# if (defined(_MSC_VER) && (_MSC_VER < 1900)) -# define snprintf _snprintf -# endif +static uint win_cp; /* original Windows code page */ #endif - -/** @defgroup console_application Tidy Console Application - ** @copydoc tidy.c - ** @{ - */ - - -/* MARK: - Miscellaneous Utilities */ -/***************************************************************************//** - ** @defgroup utilities_misc Miscellaneous Utilities - ** This group contains general utilities used in the console application. - ******************************************************************************* - ** @{ +/** + ** Indicates whether or not two filenames are the same. */ - - -/** Indicates whether or not two filenames are the same. - ** @result Returns a Bool indicating whether the filenames are the same. - */ -static Bool samefile(ctmbstr filename1, /**< First filename */ - ctmbstr filename2 /**< Second filename */ - ) +static Bool samefile( ctmbstr filename1, ctmbstr filename2 ) { #if FILENAMES_CASE_SENSITIVE return ( strcmp( filename1, filename2 ) == 0 ); @@ -74,9 +42,10 @@ } -/** Handles exit cleanup. +/** + ** Handles exit cleanup. */ -static void tidy_cleanup( void ) +static void tidy_cleanup() { #if defined(_WIN32) /* Restore original Windows code page. */ @@ -84,8 +53,8 @@ #endif } - -/** Exits with an error in the event of an out of memory condition. +/** + ** Exits with an error in the event of an out of memory condition. */ static void outOfMemory(void) { @@ -94,50 +63,10 @@ } -/** Create a new, allocated string with a format and arguments. - ** @result Returns a new, allocated string that you must free. - */ -static tmbstr stringWithFormat(const ctmbstr fmt, /**< The format string. */ - ... /**< Variable arguments. */ - ) -{ - va_list argList; - tmbstr result = NULL; - int len = 0; - - va_start(argList, fmt); - len = vsnprintf( result, 0, fmt, argList ); - va_end(argList); - - if (!(result = malloc( len + 1) )) - outOfMemory(); - - va_start(argList, fmt); - vsnprintf( result, len + 1, fmt, argList); - va_end(argList); - - return result; -} - - -/** @} end utilities_misc group */ -/* MARK: - Output Helping Functions */ -/***************************************************************************//** - ** @defgroup utilities_output Output Helping Functions - ** This group functions that aid the formatting of output. - ******************************************************************************* - ** @{ +/** + ** Used by `print2Columns` and `print3Columns` to manage whitespace. */ - - -/** Used by `print1Column`, `print2Columns` and `print3Columns` to manage - ** wrapping text within columns. - ** @result The pointer to the next part of the string to output. - */ -static const char *cutToWhiteSpace(const char *s, /**< starting point of desired string to output */ - uint offset, /**< column width desired */ - char *sbuf /**< the buffer to output */ - ) +static const char *cutToWhiteSpace(const char *s, uint offset, char *sbuf) { if (!s) { @@ -181,13 +110,10 @@ } } - -/** Outputs one column of text. +/** + ** Outputs one column of text. */ -static void print1Column(const char* fmt, /**< The format string for formatting the output. */ - uint l1, /**< The width of the column. */ - const char *c1 /**< The content of the column. */ - ) +static void print1Column( const char* fmt, uint l1, const char *c1 ) { const char *pc1=c1; char *c1buf = (char *)malloc(l1+1); @@ -201,15 +127,11 @@ free(c1buf); } - -/** Outputs two columns of text. +/** + ** Outputs two columns of text. */ -static void print2Columns(const char* fmt, /**< The format string for formatting the output. */ - uint l1, /**< The width of column 1. */ - uint l2, /**< The width of column 2. */ - const char *c1, /**< The contents of column 1. */ - const char *c2 /**< The contents of column 2. */ -) +static void print2Columns( const char* fmt, uint l1, uint l2, + const char *c1, const char *c2 ) { const char *pc1=c1, *pc2=c2; char *c1buf = (char *)malloc(l1+1); @@ -221,24 +143,19 @@ { pc1 = cutToWhiteSpace(pc1, l1, c1buf); pc2 = cutToWhiteSpace(pc2, l2, c2buf); - printf(fmt, l1, l1, c1buf[0]!='\0'?c1buf:"", - l2, l2, c2buf[0]!='\0'?c2buf:""); + printf(fmt, + c1buf[0]!='\0'?c1buf:"", + c2buf[0]!='\0'?c2buf:""); } while (pc1 || pc2); free(c1buf); free(c2buf); } - -/** Outputs three columns of text. +/** + ** Outputs three columns of text. */ -static void print3Columns(const char* fmt, /**< The three column format string. */ - uint l1, /**< Width of column 1. */ - uint l2, /**< Width of column 2. */ - uint l3, /**< Width of column 3. */ - const char *c1, /**< Content of column 1. */ - const char *c2, /**< Content of column 2. */ - const char *c3 /**< Content of column 3. */ - ) +static void print3Columns( const char* fmt, uint l1, uint l2, uint l3, + const char *c1, const char *c2, const char *c3 ) { const char *pc1=c1, *pc2=c2, *pc3=c3; char *c1buf = (char *)malloc(l1+1); @@ -263,41 +180,17 @@ free(c3buf); } - -/** Provides the `unknown option` output to the current errout. - */ -static void unknownOption(TidyDoc tdoc, /**< The Tidy document. */ - uint c /**< The unknown option. */ - ) -{ - fprintf( errout, tidyLocalizedString( TC_STRING_UNKNOWN_OPTION ), (char)c ); - fprintf( errout, "\n"); -} - - -/** @} end utilities_output group */ -/* MARK: - CLI Options Utilities */ -/***************************************************************************//** - ** @defgroup options_cli CLI Options Utilities - ** These structures, arrays, declarations, and definitions are used throughout - ** this console application. - ******************************************************************************* - ** @{ +/** + ** Format strings and decorations used in output. */ - - -/** @name Format strings and decorations used in output. - ** @{ - */ - -static const char helpfmt[] = " %-*.*s %-*.*s\n"; +static const char helpfmt[] = " %-25.25s %-52.52s\n"; static const char helpul[] = "-----------------------------------------------------------------"; static const char fmt[] = "%-27.27s %-9.9s %-40.40s\n"; +static const char valfmt[] = "%-27.27s %-9.9s %-1.1s%-39.39s\n"; static const char ul[] = "================================================================="; -/** @} */ - -/** This enum is used to categorize the options for help output. +/** + ** This enum is used to categorize the options for help output. */ typedef enum { @@ -310,7 +203,8 @@ CmdOptCatLAST } CmdOptCategory; -/** This array contains headings that will be used in help ouput. +/** + ** This array contains headings that will be used in help ouput. */ static const struct { ctmbstr mnemonic; /**< Used in XML as a class. */ @@ -323,8 +217,9 @@ { "xml", TC_STRING_XML } }; -/** The struct and subsequent array keep the help output structured - ** because we _also_ output all of this stuff as as XML. +/** + ** The struct and subsequent array keep the help output structured + ** because we _also_ output all of this stuff as as XML. */ typedef struct { CmdOptCategory cat; /**< Category */ @@ -336,65 +231,90 @@ ctmbstr name3; /**< Name */ } CmdOptDesc; -/** All instances of %s will be substituted with localized string - ** specified by the subKey field. - */ +/* All instances of %s will be substituted with localized string + specified by the subKey field. */ static const CmdOptDesc cmdopt_defs[] = { - { CmdOptFileManip, "-output <%s>", TC_OPT_OUTPUT, TC_LABEL_FILE, "output-file: <%s>", "-o <%s>" }, - { CmdOptFileManip, "-config <%s>", TC_OPT_CONFIG, TC_LABEL_FILE, NULL }, - { CmdOptFileManip, "-file <%s>", TC_OPT_FILE, TC_LABEL_FILE, "error-file: <%s>", "-f <%s>" }, - { CmdOptFileManip, "-modify", TC_OPT_MODIFY, 0, "write-back: yes", "-m" }, - { CmdOptProcDir, "-indent", TC_OPT_INDENT, 0, "indent: auto", "-i" }, - { CmdOptProcDir, "-wrap <%s>", TC_OPT_WRAP, TC_LABEL_COL, "wrap: <%s>", "-w <%s>" }, - { CmdOptProcDir, "-upper", TC_OPT_UPPER, 0, "uppercase-tags: yes", "-u" }, - { CmdOptProcDir, "-clean", TC_OPT_CLEAN, 0, "clean: yes", "-c" }, - { CmdOptProcDir, "-bare", TC_OPT_BARE, 0, "bare: yes", "-b" }, - { CmdOptProcDir, "-gdoc", TC_OPT_GDOC, 0, "gdoc: yes", "-g" }, - { CmdOptProcDir, "-numeric", TC_OPT_NUMERIC, 0, "numeric-entities: yes", "-n" }, - { CmdOptProcDir, "-errors", TC_OPT_ERRORS, 0, "markup: no", "-e" }, - { CmdOptProcDir, "-quiet", TC_OPT_QUIET, 0, "quiet: yes", "-q" }, - { CmdOptProcDir, "-omit", TC_OPT_OMIT, 0, "omit-optional-tags: yes" }, - { CmdOptProcDir, "-xml", TC_OPT_XML, 0, "input-xml: yes" }, - { CmdOptProcDir, "-asxml", TC_OPT_ASXML, 0, "output-xhtml: yes", "-asxhtml" }, - { CmdOptProcDir, "-ashtml", TC_OPT_ASHTML, 0, "output-html: yes" }, - { CmdOptProcDir, "-access <%s>", TC_OPT_ACCESS, TC_LABEL_LEVL, "accessibility-check: <%s>" }, - { CmdOptCharEnc, "-raw", TC_OPT_RAW, 0, NULL }, - { CmdOptCharEnc, "-ascii", TC_OPT_ASCII, 0, NULL }, - { CmdOptCharEnc, "-latin0", TC_OPT_LATIN0, 0, NULL }, - { CmdOptCharEnc, "-latin1", TC_OPT_LATIN1, 0, NULL }, + { CmdOptFileManip, "-output <%s>", TC_OPT_OUTPUT, TC_LABEL_FILE, "output-file: <%s>", "-o <%s>" }, + { CmdOptFileManip, "-config <%s>", TC_OPT_CONFIG, TC_LABEL_FILE, NULL }, + { CmdOptFileManip, "-file <%s>", TC_OPT_FILE, TC_LABEL_FILE, "error-file: <%s>", "-f <%s>" }, + { CmdOptFileManip, "-modify", TC_OPT_MODIFY, 0, "write-back: yes", "-m" }, + { CmdOptProcDir, "-indent", TC_OPT_INDENT, 0, "indent: auto", "-i" }, + { CmdOptProcDir, "-wrap <%s>", TC_OPT_WRAP, TC_LABEL_COL, "wrap: <%s>", "-w <%s>" }, + { CmdOptProcDir, "-upper", TC_OPT_UPPER, 0, "uppercase-tags: yes", "-u" }, + { CmdOptProcDir, "-clean", TC_OPT_CLEAN, 0, "clean: yes", "-c" }, + { CmdOptProcDir, "-bare", TC_OPT_BARE, 0, "bare: yes", "-b" }, + { CmdOptProcDir, "-gdoc", TC_OPT_GDOC, 0, "gdoc: yes", "-g" }, + { CmdOptProcDir, "-numeric", TC_OPT_NUMERIC, 0, "numeric-entities: yes", "-n" }, + { CmdOptProcDir, "-errors", TC_OPT_ERRORS, 0, "markup: no", "-e" }, + { CmdOptProcDir, "-quiet", TC_OPT_QUIET, 0, "quiet: yes", "-q" }, + { CmdOptProcDir, "-omit", TC_OPT_OMIT, 0, "omit-optional-tags: yes" }, + { CmdOptProcDir, "-xml", TC_OPT_XML, 0, "input-xml: yes" }, + { CmdOptProcDir, "-asxml", TC_OPT_ASXML, 0, "output-xhtml: yes", "-asxhtml" }, + { CmdOptProcDir, "-ashtml", TC_OPT_ASHTML, 0, "output-html: yes" }, +#if SUPPORT_ACCESSIBILITY_CHECKS + { CmdOptProcDir, "-access <%s>", TC_OPT_ACCESS, TC_LABEL_LEVL, "accessibility-check: <%s>" }, +#endif + { CmdOptCharEnc, "-raw", TC_OPT_RAW, 0, NULL }, + { CmdOptCharEnc, "-ascii", TC_OPT_ASCII, 0, NULL }, + { CmdOptCharEnc, "-latin0", TC_OPT_LATIN0, 0, NULL }, + { CmdOptCharEnc, "-latin1", TC_OPT_LATIN1, 0, NULL }, #ifndef NO_NATIVE_ISO2022_SUPPORT - { CmdOptCharEnc, "-iso2022", TC_OPT_ISO2022, 0, NULL }, + { CmdOptCharEnc, "-iso2022", TC_OPT_ISO2022, 0, NULL }, +#endif + { CmdOptCharEnc, "-utf8", TC_OPT_UTF8, 0, NULL }, + { CmdOptCharEnc, "-mac", TC_OPT_MAC, 0, NULL }, + { CmdOptCharEnc, "-win1252", TC_OPT_WIN1252, 0, NULL }, + { CmdOptCharEnc, "-ibm858", TC_OPT_IBM858, 0, NULL }, +#if SUPPORT_UTF16_ENCODINGS + { CmdOptCharEnc, "-utf16le", TC_OPT_UTF16LE, 0, NULL }, + { CmdOptCharEnc, "-utf16be", TC_OPT_UTF16BE, 0, NULL }, + { CmdOptCharEnc, "-utf16", TC_OPT_UTF16, 0, NULL }, #endif - { CmdOptCharEnc, "-utf8", TC_OPT_UTF8, 0, NULL }, - { CmdOptCharEnc, "-mac", TC_OPT_MAC, 0, NULL }, - { CmdOptCharEnc, "-win1252", TC_OPT_WIN1252, 0, NULL }, - { CmdOptCharEnc, "-ibm858", TC_OPT_IBM858, 0, NULL }, - { CmdOptCharEnc, "-utf16le", TC_OPT_UTF16LE, 0, NULL }, - { CmdOptCharEnc, "-utf16be", TC_OPT_UTF16BE, 0, NULL }, - { CmdOptCharEnc, "-utf16", TC_OPT_UTF16, 0, NULL }, - { CmdOptCharEnc, "-big5", TC_OPT_BIG5, 0, NULL }, - { CmdOptCharEnc, "-shiftjis", TC_OPT_SHIFTJIS, 0, NULL }, - { CmdOptMisc, "-version", TC_OPT_VERSION, 0, NULL, "-v" }, - { CmdOptMisc, "-help", TC_OPT_HELP, 0, NULL, "-h", "-?" }, - { CmdOptMisc, "-help-config", TC_OPT_HELPCFG, 0, NULL }, - { CmdOptMisc, "-help-env", TC_OPT_HELPENV, 0, NULL }, - { CmdOptMisc, "-show-config", TC_OPT_SHOWCFG, 0, NULL }, - { CmdOptMisc, "-export-config", TC_OPT_EXP_CFG, 0, NULL }, - { CmdOptMisc, "-export-default-config", TC_OPT_EXP_DEF, 0, NULL }, - { CmdOptMisc, "-help-option <%s>", TC_OPT_HELPOPT, TC_LABEL_OPT, NULL }, - { CmdOptMisc, "-language <%s>", TC_OPT_LANGUAGE, TC_LABEL_LANG, "language: <%s>" }, - { CmdOptXML, "-xml-help", TC_OPT_XMLHELP, 0, NULL }, - { CmdOptXML, "-xml-config", TC_OPT_XMLCFG, 0, NULL }, - { CmdOptXML, "-xml-strings", TC_OPT_XMLSTRG, 0, NULL }, - { CmdOptXML, "-xml-error-strings", TC_OPT_XMLERRS, 0, NULL }, - { CmdOptXML, "-xml-options-strings", TC_OPT_XMLOPTS, 0, NULL }, +#if SUPPORT_ASIAN_ENCODINGS /* #431953 - RJ */ + { CmdOptCharEnc, "-big5", TC_OPT_BIG5, 0, NULL }, + { CmdOptCharEnc, "-shiftjis", TC_OPT_SHIFTJIS, 0, NULL }, +#endif + { CmdOptMisc, "-version", TC_OPT_VERSION, 0, NULL, "-v" }, + { CmdOptMisc, "-help", TC_OPT_HELP, 0, NULL, "-h", "-?" }, + { CmdOptMisc, "-help-config", TC_OPT_HELPCFG, 0, NULL }, + { CmdOptMisc, "-show-config", TC_OPT_SHOWCFG, 0, NULL }, + { CmdOptMisc, "-help-option <%s>", TC_OPT_HELPOPT, TC_LABEL_OPT, NULL }, + { CmdOptMisc, "-language <%s>", TC_OPT_LANGUAGE, TC_LABEL_LANG, "language: <%s>" }, + { CmdOptXML, "-xml-help", TC_OPT_XMLHELP, 0, NULL }, + { CmdOptXML, "-xml-config", TC_OPT_XMLCFG, 0, NULL }, + { CmdOptXML, "-xml-strings", TC_OPT_XMLSTRG, 0, NULL }, + { CmdOptXML, "-xml-error-strings", TC_OPT_XMLERRS, 0, NULL }, + { CmdOptXML, "-xml-options-strings", TC_OPT_XMLOPTS, 0, NULL }, { CmdOptMisc, NULL, 0, 0, NULL } }; +/** + ** Create a new string with a format and arguments. + */ +static tmbstr stringWithFormat( const ctmbstr fmt, ... ) +{ + va_list argList; + tmbstr result = NULL; + int len = 0; + + va_start(argList, fmt); + len = vsnprintf( result, 0, fmt, argList ); + va_end(argList); + + if (!(result = malloc( len + 1) )) + outOfMemory(); + + va_start(argList, fmt); + vsnprintf( result, len + 1, fmt, argList); + va_end(argList); + + return result; +} + -/** Option names aren't localized, but the sample fields should be localized. - ** For example, `` should be `` in Spanish. - ** @param pos A CmdOptDesc array with fields that must be localized. +/** + ** Option names aren't localized, but the sample fields + ** are, for example should be in Spanish. */ static void localize_option_names( CmdOptDesc *pos) { @@ -404,15 +324,47 @@ pos->name2 = stringWithFormat(pos->name2, fileString); if ( pos->name3 ) pos->name3 = stringWithFormat(pos->name3, fileString); - if ( pos->eqconfig ) - pos->eqconfig = stringWithFormat(pos->eqconfig, fileString); } +/** + ** Retrieve the options' names from the structure as a single + ** string. + */ +static tmbstr get_option_names( const CmdOptDesc* pos ) +{ + tmbstr name; + uint len; + CmdOptDesc localPos = *pos; + + localize_option_names( &localPos ); + + len = strlen(localPos.name1); + if (localPos.name2) + len += 2+strlen(localPos.name2); + if (localPos.name3) + len += 2+strlen(localPos.name3); + + name = (tmbstr)malloc(len+1); + if (!name) outOfMemory(); + strcpy(name, localPos.name1); + free((tmbstr)localPos.name1); + if (localPos.name2) + { + strcat(name, ", "); + strcat(name, localPos.name2); + free((tmbstr)localPos.name2); + } + if (localPos.name3) + { + strcat(name, ", "); + strcat(name, localPos.name3); + free((tmbstr)localPos.name3); + } + return name; +} -/** Escape a name for XML output. For example, `-output ` becomes - ** `-output <file>` for use in XML. - ** @param name The option name to escape. - ** @result Returns an allocated string. +/** + ** Escape a name for XML output. */ static tmbstr get_escaped_name( ctmbstr name ) { @@ -461,43 +413,160 @@ return escpName; } +/** + ** Outputs a complete help option (text) + */ +static void print_help_option( void ) +{ + CmdOptCategory cat = CmdOptCatFIRST; + const CmdOptDesc* pos = cmdopt_defs; + + for( cat=CmdOptCatFIRST; cat!=CmdOptCatLAST; ++cat) + { + ctmbstr name = tidyLocalizedString(cmdopt_catname[cat].key); + size_t len = strlen(name); + printf("%s\n", name ); + printf("%*.*s\n", (int)len, (int)len, helpul ); + for( pos=cmdopt_defs; pos->name1; ++pos) + { + tmbstr name; + if (pos->cat != cat) + continue; + name = get_option_names( pos ); + print2Columns( helpfmt, 25, 52, name, tidyLocalizedString( pos->key ) ); + free(name); + } + printf("\n"); + } +} + +/** + ** Outputs an XML element for an option. + */ +static void print_xml_help_option_element( ctmbstr element, ctmbstr name ) +{ + tmbstr escpName; + if (!name) + return; + printf(" <%s>%s\n", element, escpName = get_escaped_name(name), + element); + free(escpName); +} + +/** + ** Outputs a complete help option (XML) + */ +static void print_xml_help_option( void ) +{ + const CmdOptDesc* pos = cmdopt_defs; + + for( pos=cmdopt_defs; pos->name1; ++pos) + { + printf(" \n"); + } +} + +/** + ** Provides the -xml-help service. + */ +static void xml_help( void ) +{ + printf( "\n" + "\n", tidyLibraryVersion()); + print_xml_help_option(); + printf( "\n" ); +} + +/** + ** Returns the final name of the tidy executable. + */ +static ctmbstr get_final_name( ctmbstr prog ) +{ + ctmbstr name = prog; + int c; + size_t i, len = strlen(prog); + for (i = 0; i < len; i++) { + c = prog[i]; + if ((( c == '/' ) || ( c == '\\' )) && prog[i+1]) + name = &prog[i+1]; + } + return name; +} -/** @} end CLI Options Definitions Utilities group */ -/* MARK: - Configuration Options Utilities */ -/***************************************************************************//** - ** @defgroup utilities_cli_options Configuration Options Utilities - ** Provide utilities to manipulate configuration options for output. - ******************************************************************************* - ** @{ +/** + ** Handles the -help service. */ +static void help( ctmbstr prog ) +{ + tmbstr title_line = NULL; + + printf( tidyLocalizedString(TC_TXT_HELP_1), get_final_name(prog),tidyLibraryVersion() ); + +#ifdef PLATFORM_NAME + title_line = stringWithFormat( tidyLocalizedString(TC_TXT_HELP_2A), PLATFORM_NAME); +#else + title_line = stringWithFormat( tidyLocalizedString(TC_TXT_HELP_2B) ); +#endif + printf( "%s\n", title_line ); + printf("%*.*s\n", (int)strlen(title_line), (int)strlen(title_line), ul); + free( title_line ); + printf( "\n"); + + print_help_option(); + printf( "%s", tidyLocalizedString(TC_TXT_HELP_3) ); +} -/** Utility to determine if an option has a picklist. - ** @param topt The option to check. - ** @result Returns a Bool indicating whether the option has a picklist or not. +/** + ** Utility to determine if an option is an AutoBool. */ -static Bool hasPickList( TidyOption topt ) +static Bool isAutoBool( TidyOption topt ) { TidyIterator pos; - + ctmbstr def; + if ( tidyOptGetType( topt ) != TidyInteger) return no; - + pos = tidyOptGetPickList( topt ); - - return tidyOptGetNextPick( topt, &pos ) != NULL; + while ( pos ) + { + def = tidyOptGetNextPick( topt, &pos ); + if (0==strcmp(def,"yes")) + return yes; + } + return no; } -/** Returns the configuration category id for the specified configuration - ** category id. This will be used as an XML class attribute value. - ** @param id The TidyConfigCategory for which to lookup the category name. - ** @result Returns the configuration category, such as "diagnostics". - */ -static ctmbstr ConfigCategoryId( TidyConfigCategory id ) -{ - if (id >= TidyDiagnostics && id <= TidyInternalCategory) - return tidyErrorCodeAsKey( id ); - +/** + ** Returns the configuration category name for the + ** specified configuration category id. This will be + ** used as an XML class attribute value. + */ +static ctmbstr ConfigCategoryName( TidyConfigCategory id ) +{ + switch( id ) + { + case TidyMarkup: + return tidyLocalizedString( TC_CAT_MARKUP ); + case TidyDiagnostics: + return tidyLocalizedString( TC_CAT_DIAGNOSTICS ); + case TidyPrettyPrint: + return tidyLocalizedString( TC_CAT_PRETTYPRINT ); + case TidyEncoding: + return tidyLocalizedString( TC_CAT_ENCODING ); + case TidyMiscellaneous: + return tidyLocalizedString( TC_CAT_MISC ); + } fprintf(stderr, tidyLocalizedString(TC_STRING_FATAL_ERROR), (int)id); fprintf(stderr, "\n"); @@ -506,63 +575,74 @@ return "never_here"; /* only for the compiler warning */ } -/** Structure maintains a description of a configuration ption. +/** + ** Structure maintains a description of an option. */ typedef struct { - ctmbstr name; /**< Name */ - ctmbstr cat; /**< Category */ - uint catid; /**< Category ID */ - ctmbstr type; /**< "String, ... */ - ctmbstr vals; /**< Potential values. If NULL, use an external function */ - ctmbstr def; /**< default */ + ctmbstr name; /**< Name */ + ctmbstr cat; /**< Category */ + ctmbstr type; /**< "String, ... */ + ctmbstr vals; /**< Potential values. If NULL, use an external function */ + ctmbstr def; /**< default */ tmbchar tempdefs[80]; /**< storage for default such as integer */ - Bool haveVals; /**< if yes, vals is valid */ + Bool haveVals; /**< if yes, vals is valid */ } OptionDesc; -/** A type for a function pointer for a function used to print out options - ** descriptions. - ** @param TidyDoc The document. - ** @param TidyOption The Tidy option. - ** @param OptionDesc A pointer to the option description structure. - */ typedef void (*OptionFunc)( TidyDoc, TidyOption, OptionDesc * ); -/** Create OptionDesc "d" related to "opt" +/** + ** Create OptionDesc "d" related to "opt" */ -static void GetOption(TidyDoc tdoc, /**< The tidy document. */ - TidyOption topt, /**< The option to create a description for. */ - OptionDesc *d /**< [out] The new option description. */ - ) +static +void GetOption( TidyDoc tdoc, TidyOption topt, OptionDesc *d ) { TidyOptionId optId = tidyOptGetId( topt ); TidyOptionType optTyp = tidyOptGetType( topt ); d->name = tidyOptGetName( topt ); - d->cat = ConfigCategoryId( tidyOptGetCategory( topt ) ); - d->catid = tidyOptGetCategory( topt ); + d->cat = ConfigCategoryName( tidyOptGetCategory( topt ) ); d->vals = NULL; d->def = NULL; d->haveVals = yes; - /* Handle special cases first. */ + /* Handle special cases first. + */ switch ( optId ) { + case TidyDuplicateAttrs: + case TidySortAttributes: + case TidyNewline: + case TidyAccessibilityCheckLevel: + d->type = "enum"; + d->vals = NULL; + d->def = + optId==TidyNewline ? + "Platform dependent" + :tidyOptGetCurrPick( tdoc, optId ); + break; + + case TidyDoctype: + d->type = "DocType"; + d->vals = NULL; + { + ctmbstr sdef = NULL; + sdef = tidyOptGetCurrPick( tdoc, TidyDoctypeMode ); + if ( !sdef || *sdef == '*' ) + sdef = tidyOptGetValue( tdoc, TidyDoctype ); + d->def = sdef; + } + break; + case TidyInlineTags: case TidyBlockTags: case TidyEmptyTags: case TidyPreTags: - d->type = "Tag Names"; + d->type = "Tag names"; d->vals = "tagX, tagY, ..."; d->def = NULL; break; - case TidyPriorityAttributes: - d->type = "Attributes Names"; - d->vals = "attributeX, attributeY, ..."; - d->def = NULL; - break; - case TidyCharEncoding: case TidyInCharEncoding: case TidyOutCharEncoding: @@ -572,20 +652,22 @@ d->def = "?"; d->vals = NULL; break; - + /* General case will handle remaining */ default: switch ( optTyp ) { case TidyBoolean: d->type = "Boolean"; + d->vals = "y/n, yes/no, t/f, true/false, 1/0"; d->def = tidyOptGetCurrPick( tdoc, optId ); break; - + case TidyInteger: - if (hasPickList(topt)) + if (isAutoBool(topt)) { - d->type = "Enum"; + d->type = "AutoBool"; + d->vals = "auto, y/n, yes/no, t/f, true/false, 1/0"; d->def = tidyOptGetCurrPick( tdoc, optId ); } else @@ -596,13 +678,13 @@ d->vals = "0 (no wrapping), 1, 2, ..."; else d->vals = "0, 1, 2, ..."; - + idef = tidyOptGetInt( tdoc, optId ); sprintf(d->tempdefs, "%u", idef); d->def = d->tempdefs; } break; - + case TidyString: d->type = "String"; d->vals = NULL; @@ -613,29 +695,27 @@ } } -/** Array holding all options. Contains a trailing sentinel. +/** + ** Array holding all options. Contains a trailing sentinel. */ typedef struct { TidyOption topt[N_TIDY_OPTIONS]; } AllOption_t; -/** A simple option comparator, used for sorting the options. - ** @result Returns an integer indicating the result of the comparison. - */ -static int cmpOpt(const void* e1_, /**< Item A to compare. */ - const void *e2_ /**< Item B to compare. */ - ) +/** + ** A simple option comparator. + **/ +static int cmpOpt(const void* e1_, const void *e2_) { const TidyOption* e1 = (const TidyOption*)e1_; const TidyOption* e2 = (const TidyOption*)e2_; return strcmp(tidyOptGetName(*e1), tidyOptGetName(*e2)); } -/** Returns options sorted. - */ -static void getSortedOption(TidyDoc tdoc, /**< The Tidy document. */ - AllOption_t *tOption /**< [out] The list of options. */ - ) +/** + ** Returns options sorted. + **/ +static void getSortedOption( TidyDoc tdoc, AllOption_t *tOption ) { TidyIterator pos = tidyGetOptionList( tdoc ); uint i = 0; @@ -649,16 +729,16 @@ tOption->topt[i] = NULL; /* sentinel */ qsort(tOption->topt, - i, /* there are i items, not including the sentinal */ + /* Do not sort the sentinel: hence `-1' */ + sizeof(tOption->topt)/sizeof(tOption->topt[0])-1, sizeof(tOption->topt[0]), cmpOpt); } -/** An iterator for the sorted options. - */ -static void ForEachSortedOption(TidyDoc tdoc, /**< The Tidy document. */ - OptionFunc OptionPrint /**< The printing function to be used. */ - ) +/** + ** An iterator for the sorted options. + **/ +static void ForEachSortedOption( TidyDoc tdoc, OptionFunc OptionPrint ) { AllOption_t tOption; const TidyOption *topt; @@ -673,11 +753,10 @@ } } -/** An iterator for the unsorted options. - */ -static void ForEachOption(TidyDoc tdoc, /**< The Tidy document. */ - OptionFunc OptionPrint /**< The printing function to be used. */ -) +/** + ** An iterator for the unsorted options. + **/ +static void ForEachOption( TidyDoc tdoc, OptionFunc OptionPrint ) { TidyIterator pos = tidyGetOptionList( tdoc ); @@ -691,9 +770,9 @@ } } -/** Prints an option's allowed value as specified in its pick list. - ** @param topt The Tidy option. - */ +/** + ** Prints an option's allowed value as specified in its pick list. + **/ static void PrintAllowedValuesFromPick( TidyOption topt ) { TidyIterator pos = tidyOptGetPickList( topt ); @@ -710,11 +789,10 @@ } } -/** Prints an option's allowed values. - */ -static void PrintAllowedValues(TidyOption topt, /**< The Tidy option. */ - const OptionDesc *d /**< The OptionDesc for the option. */ - ) +/** + ** Prints an option's allowed values. + **/ +static void PrintAllowedValues( TidyOption topt, const OptionDesc *d ) { if (d->vals) printf( "%s", d->vals ); @@ -722,169 +800,122 @@ PrintAllowedValuesFromPick( topt ); } +/** + ** Prints for XML an option's . + **/ +static void printXMLDescription( TidyDoc tdoc, TidyOption topt ) +{ + ctmbstr doc = tidyOptGetDoc( tdoc, topt ); -/** @} end utilities_cli_options group */ -/* MARK: - Provide the -help Service */ -/***************************************************************************//** - ** @defgroup service_help Provide the -help Service - ******************************************************************************* - ** @{ - */ + if (doc) + printf(" %s\n", doc); + else + { + printf(" \n"); + fprintf(stderr, tidyLocalizedString(TC_STRING_OPT_NOT_DOCUMENTED), + tidyOptGetName( topt )); + fprintf(stderr, "\n"); + } +} -/** Retrieve the option's name(s) from the structure as a single string, - ** localizing the field values if application. For example, this might - ** return `-output , -o `. - ** @param pos A CmdOptDesc array item for which to get the names. - ** @result Returns the name(s) for the option as a single string. - */ -static tmbstr get_option_names( const CmdOptDesc* pos ) +/** + ** Prints for XML an option's . + **/ +static void printXMLCrossRef( TidyDoc tdoc, TidyOption topt ) { - tmbstr name; - uint len; - CmdOptDesc localPos = *pos; + TidyOption optLinked; + TidyIterator pos = tidyOptGetDocLinksList(tdoc, topt); + while( pos ) + { + optLinked = tidyOptGetNextDocLinks(tdoc, &pos ); + printf(" %s\n",tidyOptGetName(optLinked)); + } +} - localize_option_names( &localPos ); - len = strlen(localPos.name1); - if (localPos.name2) - len += 2+strlen(localPos.name2); - if (localPos.name3) - len += 2+strlen(localPos.name3); +/** + ** Prints for XML an option. + **/ +static void printXMLOption( TidyDoc tdoc, TidyOption topt, OptionDesc *d ) +{ + if ( tidyOptIsReadOnly(topt) ) + return; - name = (tmbstr)malloc(len+1); - if (!name) outOfMemory(); - strcpy(name, localPos.name1); - free((tmbstr)localPos.name1); - if (localPos.name2) + printf( " \n" ); } -/** Returns the final name of the tidy executable by eliminating the path - ** name components from the executable name. - ** @param prog The path of the current executable. - */ -static ctmbstr get_final_name( ctmbstr prog ) +/** + ** Handles the -xml-config service. + **/ +static void XMLoptionhelp( TidyDoc tdoc ) { - ctmbstr name = prog; - int c; - size_t i; - size_t len = strlen(prog); - - for (i = 0; i < len; i++) - { - c = prog[i]; - if ((( c == '/' ) || ( c == '\\' )) && prog[i+1]) - { - name = &prog[i+1]; - } - } - - return name; + printf( "\n" + "\n", tidyLibraryVersion()); + ForEachOption( tdoc, printXMLOption ); + printf( "\n" ); } -/** Outputs all of the complete help options (text). - ** @param tdoc The Tidydoc whose options are being printed. +/** + * Prints the Windows language names that Tidy recognizes, + * using the specified format string. */ -static void print_help_options( TidyDoc tdoc ) +void tidyPrintWindowsLanguageNames( ctmbstr format ) { - CmdOptCategory cat = CmdOptCatFIRST; - const CmdOptDesc* pos = cmdopt_defs; - uint col1, col2; - uint width = 78; - - for( cat=CmdOptCatFIRST; cat!=CmdOptCatLAST; ++cat) - { - ctmbstr name = tidyLocalizedString(cmdopt_catname[cat].key); - size_t len = width < strlen(name) ? width : strlen(name); - printf( "%s\n", name ); - printf( "%*.*s\n", (int)len, (int)len, helpul ); - - /* Tidy's "standard" 78-column output was always 25:52 ratio, so let's - try to preserve this approximately 1:2 ratio regardless of whatever - silly thing the user might have set for a console width, with a - maximum of 50 characters for the first column. - */ - col1 = width / 3; /* one third of the available */ - col1 = col1 < 1 ? 1 : col1; /* at least 1 */ - col1 = col1 > 35 ? 35 : col1; /* no greater than 35 */ - col2 = width - col1 - 2; /* allow two spaces */ - col2 = col2 < 1 ? 1 : col2; /* at least 1 */ + const tidyLocaleMapItem *item; + TidyIterator i = getWindowsLanguageList(); - for( pos=cmdopt_defs; pos->name1; ++pos) - { - tmbstr name; - if (pos->cat != cat) - continue; - name = get_option_names( pos ); - print2Columns( helpfmt, col1, col2, name, tidyLocalizedString( pos->key ) ); - free(name); - } - printf("\n"); + while (i) { + item = getNextWindowsLanguage(&i); + if ( format ) + printf( format, item->winName, item->POSIXName ); + else + printf( "%-20s -> %s\n", item->winName, item->POSIXName ); } } -/** Handles the -help service. + +/** + * Prints the languages the are currently built into Tidy, + * using the specified format string. */ -static void help(TidyDoc tdoc, /**< The tidy document for which help is showing. */ - ctmbstr prog /**< The path of the current executable. */ - ) +void tidyPrintTidyLanguageNames( ctmbstr format ) { - tmbstr temp_string = NULL; - uint width = 78; - - printf("\n"); - printf( tidyLocalizedString(TC_TXT_HELP_1), get_final_name(prog), tidyLibraryVersion() ); - printf("\n"); - - if ( tidyPlatform() ) - temp_string = stringWithFormat( tidyLocalizedString(TC_TXT_HELP_2A), tidyPlatform() ); - else - temp_string = stringWithFormat( tidyLocalizedString(TC_TXT_HELP_2B) ); - - width = width < strlen(temp_string) ? width : strlen(temp_string); - printf( "%s\n", temp_string ); - printf( "%*.*s\n\n", width, width, ul); - free( temp_string ); - - print_help_options( tdoc ); - + ctmbstr item; + TidyIterator i = getInstalledLanguageList(); - printf("\n"); -#if defined(TIDY_CONFIG_FILE) && defined(TIDY_USER_CONFIG_FILE) - temp_string = stringWithFormat( tidyLocalizedString(TC_TXT_HELP_3A), TIDY_CONFIG_FILE, TIDY_USER_CONFIG_FILE ); - printf( tidyLocalizedString(TC_TXT_HELP_3), temp_string ); - free( temp_string ); -#else - printf( tidyLocalizedString(TC_TXT_HELP_3), "\n" ); -#endif - printf("\n"); + while (i) { + item = getNextInstalledLanguage(&i); + if ( format ) + printf( format, item ); + else + printf( "%s\n", item ); + } } -/** @} end service_help group */ -/* MARK: - Provide the -help-config Service */ -/***************************************************************************//** - ** @defgroup service_help_config Provide the -help-config Service - ******************************************************************************* - ** @{ - */ - -/** Retrieves allowed values from an option's pick list. - ** @param topt A TidyOption for which to get the allowed values. - ** @result A string containing the allowed values. +/** + ** Retrieves allowed values from an option's pick list. */ static tmbstr GetAllowedValuesFromPick( TidyOption topt ) { @@ -922,12 +953,10 @@ return val; } -/** Retrieves allowed values for an option. - ** @result A string containing the allowed values. +/** + ** Retrieves allowed values for an option. */ -static tmbstr GetAllowedValues(TidyOption topt, /**< A TidyOption for which to get the allowed values. */ - const OptionDesc *d /**< A pointer to the OptionDesc array. */ - ) +static tmbstr GetAllowedValues( TidyOption topt, const OptionDesc *d ) { if (d->vals) { @@ -940,14 +969,13 @@ return GetAllowedValuesFromPick( topt ); } -/** Prints a single option. +/** + ** Prints a single option. */ -static void printOption(TidyDoc ARG_UNUSED(tdoc), /**< The Tidy document. */ - TidyOption topt, /**< The option to print. */ - OptionDesc *d /**< A pointer to the OptionDesc array. */ - ) +static void printOption( TidyDoc ARG_UNUSED(tdoc), TidyOption topt, + OptionDesc *d ) { - if (tidyOptGetCategory( topt ) == TidyInternalCategory ) + if ( tidyOptIsReadOnly(topt) ) return; if ( *d->name || *d->type ) @@ -969,15 +997,11 @@ } } -/** Handles the -help-config service. - ** @remark We will not support console word wrapping for the configuration - ** options table. If users really have a small console, then they - * should make it wider or output to a file. - ** @param tdoc The Tidy document. +/** + ** Handles the -help-config service. */ static void optionhelp( TidyDoc tdoc ) { - printf( "\n" ); printf( "%s", tidyLocalizedString( TC_TXT_HELP_CONFIG ) ); printf( fmt, @@ -991,57 +1015,10 @@ } -/** @} end service_help_config group */ -/* MARK: - Provide the -help-env Service */ -/***************************************************************************//** - ** @defgroup service_help_env Provide the -help-env Service - ******************************************************************************* - ** @{ - */ - - -/** Handles the -help-env service. - ** @param tdoc The Tidy document. - */ -static void helpEnv( TidyDoc tdoc ) -{ - tmbstr subst = ""; - Bool uses_env = getenv("HTML_TIDY") != NULL; - ctmbstr env_var = uses_env ? getenv("HTML_TIDY"): tidyLocalizedString( TC_TXT_HELP_ENV_1B ); - -#if defined( TIDY_CONFIG_FILE ) && defined( TIDY_USER_CONFIG_FILE ) - subst = stringWithFormat( tidyLocalizedString(TC_TXT_HELP_ENV_1A), TIDY_CONFIG_FILE, TIDY_USER_CONFIG_FILE ); -#endif - - env_var = env_var != NULL ? env_var : tidyLocalizedString( TC_TXT_HELP_ENV_1B ); - - printf( "\n" ); - printf( tidyLocalizedString( TC_TXT_HELP_ENV_1), subst, env_var ); - -#if defined( TIDY_CONFIG_FILE ) && defined( TIDY_USER_CONFIG_FILE ) - if ( uses_env ) - printf( tidyLocalizedString( TC_TXT_HELP_ENV_1C ), TIDY_USER_CONFIG_FILE ); - free( subst ); -#endif - - printf( "\n" ); -} - - - -/** @} end service_help_env group */ -/* MARK: - Provide the -help-option Service */ -/***************************************************************************//** - ** @defgroup service_help_option Provide the -help-option Service - ******************************************************************************* - ** @{ - */ - - -/** Cleans up the HTML-laden option descriptions for console output. It's - ** just a simple HTML filtering/replacement function. - ** @param description The option description. - ** @result Returns an allocated string with some HTML stripped away. +/** + ** Cleans up the HTML-laden option descriptions for console + ** output. It's just a simple HTML filtering/replacement function. + ** Will return an allocated string. */ static tmbstr cleanup_description( ctmbstr description ) { @@ -1128,18 +1105,18 @@ /* Output Setup */ tmbstr result = NULL; - int g_result = 100; /* minimum buffer grow size */ - int l_result = 0; /* buffer current size */ - int i_result = 0; /* current string position */ - int writer_len = 0; /* writer length */ + int g_result = 100; // minimum buffer grow size + int l_result = 0; // buffer current size + int i_result = 0; // current string position + int writer_len = 0; // writer length ctmbstr writer = NULL; /* Current tag name setup */ - tmbstr name = NULL; /* tag name */ - int g_name = 10; /* buffer grow size */ - int l_name = 0; /* buffer current size */ - int i_name = 0; /* current string position */ + tmbstr name = NULL; // tag name + int g_name = 10; // buffer grow size + int l_name = 0; // buffer current size + int i_name = 0; // current string position /* Pump Setup */ int i = 0; @@ -1212,7 +1189,7 @@ ensure that `writer` is NULL as a flag that we will output the current `c` */ case a_EMIT: - writer = NULL; /* flag to use c */ + writer = NULL; // flag to use c break; /* Now that we've consumed a tag, we will emit the @@ -1299,21 +1276,19 @@ } -/** Handles the -help-option service. +/** + ** Handles the -help-option service. */ -static void optionDescribe(TidyDoc tdoc, /**< The Tidy Document */ - char *option /**< The name of the option. */ - ) +static void optionDescribe( TidyDoc tdoc, char *tag ) { tmbstr result = NULL; - Bool allocated = no; - TidyOptionId topt = tidyOptGetIdForName( option ); - uint tcat = tidyOptGetCategory( tidyGetOption(tdoc, topt)); + TidyOptionId topt; - if (topt < N_TIDY_OPTIONS && tcat != TidyInternalCategory ) + topt = tidyOptGetIdForName( tag ); + + if (topt < N_TIDY_OPTIONS) { result = cleanup_description( tidyOptGetDoc( tdoc, tidyGetOption( tdoc, topt ) ) ); - allocated = yes; } else { @@ -1321,109 +1296,22 @@ } printf( "\n" ); - printf( "`--%s`\n\n", option ); - print1Column( "%-78.78s\n", 78, result ); + printf( "`--%s`\n\n", tag ); + print1Column( "%-68.68s\n", 68, result ); printf( "\n" ); - if ( allocated ) + if ( (topt < N_TIDY_OPTIONS) && ( result ) ) free ( result ); } -/** @} end service_help_option group */ -/* MARK: - Provide the -lang help Service */ -/***************************************************************************//** - ** @defgroup service_lang_help Provide the -lang help Service - ******************************************************************************* - ** @{ - */ - - -/** Prints the Windows language names that Tidy recognizes, using the specified - ** format string. - ** @param format A format string used to display the Windows language names, - ** or NULL to use the built-in default format. - */ -void tidyPrintWindowsLanguageNames( ctmbstr format ) -{ - const tidyLocaleMapItem *item; - TidyIterator i = getWindowsLanguageList(); - ctmbstr winName; - ctmbstr posixName; - - while (i) { - item = getNextWindowsLanguage(&i); - winName = TidyLangWindowsName( item ); - posixName = TidyLangPosixName( item ); - if ( format ) - printf( format, winName, posixName ); - else - printf( "%-20s -> %s\n", winName, posixName ); - } -} - - -/** Prints the languages the are currently built into Tidy, using the specified - ** format string. - ** @param format A format string used to display the Windows language names, - ** or NULL to use the built-in default format. - */ -void tidyPrintTidyLanguageNames( ctmbstr format ) -{ - ctmbstr item; - TidyIterator i = getInstalledLanguageList(); - - while (i) { - item = getNextInstalledLanguage(&i); - if ( format ) - printf( format, item ); - else - printf( "%s\n", item ); - } -} - - -/** Handles the -lang help service. - ** @remark We will not support console word wrapping for the tables. If users - ** really have a small console, then they should make it wider or - ** output to a file. - ** @param tdoc The Tidy document. - */ -static void lang_help( TidyDoc tdoc ) -{ - printf( "\n" ); - printf( "%s", tidyLocalizedString(TC_TXT_HELP_LANG_1) ); - printf( "\n" ); - tidyPrintWindowsLanguageNames(" %-20s -> %s\n"); - printf( "\n" ); - printf( "%s", tidyLocalizedString(TC_TXT_HELP_LANG_2) ); - printf( "\n" ); - tidyPrintTidyLanguageNames(" %s\n"); - printf( "\n" ); - printf( tidyLocalizedString(TC_TXT_HELP_LANG_3), tidyGetLanguage() ); - printf( "\n" ); -} - - -/** @} end service_lang_help group */ -/* MARK: - Provide the -show-config Service */ -/***************************************************************************//** - ** @defgroup service_show_config Provide the -show-config Service - ******************************************************************************* - ** @{ - */ - - -/** Prints the option value for a given option. +/** + * Prints the option value for a given option. */ -static void printOptionValues(TidyDoc ARG_UNUSED(tdoc), /**< The Tidy document. */ - TidyOption topt, /**< The option for which to show values. */ - OptionDesc *d /**< The OptionDesc array. */ - ) +static void printOptionValues( TidyDoc ARG_UNUSED(tdoc), TidyOption topt, + OptionDesc *d ) { TidyOptionId optId = tidyOptGetId( topt ); - - if ( tidyOptGetCategory(topt) == TidyInternalCategory ) - return; + ctmbstr ro = tidyOptIsReadOnly( topt ) ? "*" : "" ; switch ( optId ) { @@ -1438,13 +1326,19 @@ d->def = tidyOptGetNextDeclTag(tdoc, optId, &pos); if ( pos ) { - printf( fmt, d->name, d->type, d->def ); + if ( *d->name ) + printf( valfmt, d->name, d->type, ro, d->def ); + else + printf( fmt, d->name, d->type, d->def ); d->name = ""; d->type = ""; } } } break; + case TidyNewline: + d->def = tidyOptGetCurrPick( tdoc, optId ); + break; default: break; } @@ -1454,428 +1348,123 @@ { if ( ! d->def ) d->def = ""; - printf( fmt, d->name, d->type, d->def ); + if ( *d->name ) + printf( valfmt, d->name, d->type, ro, d->def ); + else + printf( fmt, d->name, d->type, d->def ); } } -/** Handles the -show-config service. - ** @remark We will not support console word wrapping for the table. If users - ** really have a small console, then they should make it wider or - ** output to a file. - ** @param tdoc The Tidy Document. +/** + ** Handles the -show-config service. */ static void optionvalues( TidyDoc tdoc ) { - printf( "\n%s\n", tidyLocalizedString(TC_STRING_CONF_HEADER) ); + printf( "\n%s\n\n", tidyLocalizedString(TC_STRING_CONF_HEADER) ); printf( fmt, tidyLocalizedString(TC_STRING_CONF_NAME), tidyLocalizedString(TC_STRING_CONF_TYPE), tidyLocalizedString(TC_STRING_CONF_VALUE) ); printf( fmt, ul, ul, ul ); ForEachSortedOption( tdoc, printOptionValues ); -} + printf( "\n\n%s\n\n", tidyLocalizedString(TC_STRING_CONF_NOTE) ); +} -/** @} end service_show_config group */ -/* MARK: - Provide the -export-config Services */ -/***************************************************************************//** - ** @defgroup service_export_config Provide the -export-config Services - ******************************************************************************* - ** @{ +/** + ** Handles the -version service. */ +static void version( void ) +{ +#ifdef PLATFORM_NAME + printf( tidyLocalizedString( TC_STRING_VERS_A ), PLATFORM_NAME, tidyLibraryVersion() ); +#else + printf( tidyLocalizedString( TC_STRING_VERS_B ), tidyLibraryVersion() ); +#endif + printf("\n"); +} -/** Prints the option value for a given option. - */ -static void printOptionExportValues(TidyDoc ARG_UNUSED(tdoc), /**< The Tidy document. */ - TidyOption topt, /**< The option for which to show values. */ - OptionDesc *d /**< The OptionDesc array. */ - ) +/** + ** Handles the printing of option description for + ** -xml-options-strings service. + **/ +static void printXMLOptionString( TidyDoc tdoc, TidyOption topt, OptionDesc *d ) { - TidyOptionId optId = tidyOptGetId( topt ); - - if ( tidyOptGetCategory(topt) == TidyInternalCategory ) + if ( tidyOptIsReadOnly(topt) ) return; - switch ( optId ) - { - case TidyInlineTags: - case TidyBlockTags: - case TidyEmptyTags: - case TidyPreTags: - { - TidyIterator pos = tidyOptGetDeclTagList( tdoc ); - while ( pos ) - { - d->def = tidyOptGetNextDeclTag(tdoc, optId, &pos); - if ( pos ) - { - printf( "%s: %s\n", d->name, d->def ); - d->name = ""; - d->type = ""; - } - } - } - break; - default: - break; - } - - /* fix for http://tidy.sf.net/bug/873921 */ - if ( *d->name || *d->type || (d->def && *d->def) ) - { - if ( ! d->def ) - d->def = ""; - printf( "%s: %s\n", d->name, d->def ); - } + printf( " \n" ); } -/** Handles the -export-config service. - ** @param tdoc The Tidy Document. - */ -static void exportOptionValues( TidyDoc tdoc ) +/** + ** Handles the -xml-options-strings service. + ** This service is primarily helpful to developers and localizers to test + ** that option description strings as represented on screen output are + ** correct and do not break tidy. + **/ +static void xml_options_strings( TidyDoc tdoc ) { - ForEachSortedOption( tdoc, printOptionExportValues ); + printf( "\n" + "\n", tidyLibraryVersion()); + ForEachOption( tdoc, printXMLOptionString); + printf( "\n" ); } -/** Handles the -export-default-config service. - ** @param tdoc The Tidy Document. - */ -static void exportDefaultOptionValues( TidyDoc tdoc ) + +/** + ** Handles the -xml-error-strings service. + ** This service is primarily helpful to developers who need to generate + ** an updated list of strings to expect when using `TidyReportFilter3`. + ** Included in the output is the current string associated with the error + ** symbol. + **/ +static void xml_error_strings( TidyDoc tdoc ) { - tidyOptResetAllToDefault( tdoc ); - ForEachSortedOption( tdoc, printOptionExportValues ); + const tidyErrorFilterKeyItem *item; + ctmbstr localizedString; + TidyIterator j = getErrorCodeList(); + + printf( "\n" ); + printf( "\n", tidyLibraryVersion()); + + while (j) { + item = getNextErrorCode(&j); + localizedString = tidyLocalizedString(item->value); + printf( " \n" ); + printf( " %s\n",item->key); + if ( localizedString ) + printf( " \n", tidyGetLanguage(), localizedString ); + else + printf( " NULL\n", tidyGetLanguage() ); + + printf( " \n" ); + } + + printf( "\n" ); } -/** @} end service_export_config group */ -/* MARK: - Provide the -version Service */ -/***************************************************************************//** - ** @defgroup service_version Provide the -version Service - ******************************************************************************* - ** @{ - */ -/** Handles the -version service. +/** + ** Handles the -xml-strings service. + ** This service was primarily helpful to developers and localizers to + ** compare localized strings to the built in `en` strings. It's probably + ** better to use our POT/PO workflow with your favorite tools, or simply + ** diff the language header files directly. + ** **Important:** The attribute `id` is not a specification, promise, or + ** part of an API. You must not depend on this value. */ -static void version( TidyDoc tdoc ) -{ - if ( tidyPlatform() ) - printf( tidyLocalizedString( TC_STRING_VERS_A ), tidyPlatform(), tidyLibraryVersion() ); - else - printf( tidyLocalizedString( TC_STRING_VERS_B ), tidyLibraryVersion() ); - - printf("\n"); -} - - -/** @} end service_version group */ -/* MARK: - Provide the -xml-config Service */ -/***************************************************************************//** - ** @defgroup service_xml_config Provide the -xml-config Service - ******************************************************************************* - ** @{ - */ - - -/** Prints for XML an option's . - */ -static void printXMLDescription(TidyDoc tdoc, /**< The Tidy document. */ - TidyOption topt /**< The option. */ - ) -{ - ctmbstr doc = tidyOptGetDoc( tdoc, topt ); - - if (doc) - printf(" %s\n", doc); - else - { - printf(" \n"); - fprintf(stderr, tidyLocalizedString(TC_STRING_OPT_NOT_DOCUMENTED), - tidyOptGetName( topt )); - fprintf(stderr, "\n"); - - } -} - -/** Prints for XML an option's ``. - */ -static void printXMLCrossRef(TidyDoc tdoc, /**< The Tidy document. */ - TidyOption topt /**< The option. */ - ) -{ - TidyOption optLinked; - TidyIterator pos = tidyOptGetDocLinksList(tdoc, topt); - while( pos ) - { - optLinked = tidyOptGetNextDocLinks(tdoc, &pos ); - printf(" %s\n",tidyOptGetName(optLinked)); - } -} - - -/** Prints for XML an option's ``. - */ -static void printXMLCrossRefEqConsole(TidyDoc tdoc, /**< The Tidy document. */ - TidyOption topt /**< The option. */ - ) -{ - const CmdOptDesc* pos = cmdopt_defs; - const CmdOptDesc* hit = NULL; - CmdOptDesc localHit; - enum { sizeBuffer = 50 }; /* largest config name is 27 chars so far... */ - char buffer[sizeBuffer]; - - for( pos=cmdopt_defs; pos->name1; ++pos) - { - snprintf(buffer, sizeBuffer, "%s:", tidyOptGetName( topt )); - if ( pos->eqconfig && (strncmp(buffer, pos->eqconfig, strlen(buffer)) == 0) ) - { - hit = pos; - break; - } - } - - if ( hit ) - { - tmbstr localName; - localHit = *hit; - localize_option_names( &localHit ); - printf(" %s\n", localName = get_escaped_name(localHit.name1)); - free((tmbstr)localHit.name1); - free(localName); - if ( localHit.name2 ) - { - printf(" %s\n", localName = get_escaped_name(localHit.name2)); - free((tmbstr)localHit.name2); - free(localName); - } - if ( localHit.name3 ) - { - printf(" %s\n", localName = get_escaped_name(localHit.name3)); - free((tmbstr)localHit.name3); - free(localName); - } - - } - else - printf(" %s\n", " "); -} - - -/** Prints for XML an option. - */ -static void printXMLOption(TidyDoc tdoc, /**< The Tidy document. */ - TidyOption topt, /**< The option. */ - OptionDesc *d /**< The OptionDesc for the option. */ - ) -{ - if ( tidyOptGetCategory(topt) == TidyInternalCategory ) - return; - - printf( " \n" ); -} - - -/** Handles the -xml-config service. - ** @param tdoc The Tidy document. - */ -static void XMLoptionhelp( TidyDoc tdoc ) -{ - printf( "\n" - "\n", tidyLibraryVersion()); - ForEachOption( tdoc, printXMLOption ); - printf( "\n" ); -} - - -/** @} end service_xml_config group */ -/* MARK: - Provide the -xml-error-strings Service */ -/***************************************************************************//** - ** @defgroup service_xml_error_strings Provide the -xml-error-strings Service - ******************************************************************************* - ** @{ - */ - - -/** Handles the -xml-error-strings service. - ** This service is primarily helpful to developers who need to generate an - ** updated list of strings to expect when using one of the message callbacks. - ** Included in the output is the current string associated with the error - ** symbol. - ** @param tdoc The Tidy document. - **/ -static void xml_error_strings( TidyDoc tdoc ) -{ - uint errorCode; - ctmbstr localizedString; - TidyIterator j = getErrorCodeList(); - - printf( "\n" ); - printf( "\n", tidyLibraryVersion()); - - while (j) { - errorCode = getNextErrorCode(&j); - localizedString = tidyLocalizedString(errorCode); - printf( " \n" ); - printf( " %s\n", tidyErrorCodeAsKey(errorCode)); - if ( localizedString ) - printf( " \n", tidyGetLanguage(), localizedString ); - else - printf( " NULL\n", tidyGetLanguage() ); - - printf( " \n" ); - } - - printf( "\n" ); -} - - -/** @} end service_xml_error_strings group */ -/* MARK: - Provide the -xml-help Service */ -/***************************************************************************//** - ** @defgroup service_xmlhelp Provide the -xml-help Service - ******************************************************************************* - ** @{ - */ - -/** Outputs an XML element for a CLI option, escaping special characters as - ** required. For example, it might print `-output <file>`. - */ -static void print_xml_help_option_element(ctmbstr element, /**< XML element name. */ - ctmbstr name /**< The contents of the element. */ - ) -{ - tmbstr escpName; - if (!name) - return; - - printf(" <%s>%s\n", element, escpName = get_escaped_name(name), element); - free(escpName); -} - -/** Provides the -xml-help service. - */ -static void xml_help( void ) -{ - const CmdOptDesc* pos; - CmdOptDesc localPos; - - printf( "\n" - "\n", tidyLibraryVersion()); - - for( pos=cmdopt_defs; pos->name1; ++pos) - { - localPos = *pos; - localize_option_names(&localPos); - printf(" \n"); - - if (localPos.name1) free((tmbstr)localPos.name1); - if (localPos.name2) free((tmbstr)localPos.name2); - if (localPos.name3) free((tmbstr)localPos.name3); - } - - printf( "\n" ); -} - - -/** @} end service_xmlhelp group */ -/* MARK: - Provide the -xml-options-strings Service */ -/***************************************************************************//** - ** @defgroup service_xml_opts_strings Provide the -xml-options-strings Service - ******************************************************************************* - ** @{ - */ - - -/** Handles printing of option description for -xml-options-strings service. - **/ -static void printXMLOptionString(TidyDoc tdoc, /**< The Tidy document. */ - TidyOption topt, /**< The option. */ - OptionDesc *d /**< The OptionDesc array. */ - ) -{ - if ( tidyOptGetCategory(topt) == TidyInternalCategory ) - return; - - printf( " \n" ); -} - - -/** Handles the -xml-options-strings service. - ** This service is primarily helpful to developers and localizers to test - ** that option description strings as represented on screen output are - ** correct and do not break tidy. - ** @param tdoc The Tidy document. - */ -static void xml_options_strings( TidyDoc tdoc ) -{ - printf( "\n" - "\n", tidyLibraryVersion()); - ForEachOption( tdoc, printXMLOptionString); - printf( "\n" ); -} - - -/** @} end service_xml_opts_strings group */ -/* MARK: - Provide the -xml-strings Service */ -/***************************************************************************//** - ** @defgroup service_xml_strings Provide the -xml-strings Service - ******************************************************************************* - ** @{ - */ - - -/** Handles the -xml-strings service. - ** This service was primarily helpful to developers and localizers to compare - ** localized strings to the built in `en` strings. It's probably better to use - ** our POT/PO workflow with your favorite tools, or simply diff the language - ** header files directly. - ** @note The attribute `id` is not a specification, promise, or part of an - ** API. You must not depend on this value. For strings meant for error - ** output, the `label` attribute will contain the stringified version of - ** the internal key for the string. - */ -static void xml_strings( void ) +static void xml_strings( void ) { uint i; TidyIterator j; ctmbstr current_language = tidyGetLanguage(); - ctmbstr current_label; Bool skip_current = strcmp( current_language, "en" ) == 0; Bool matches_base; @@ -1885,10 +1474,7 @@ j = getStringKeyList(); while (j) { i = getNextStringKey(&j); - current_label = tidyErrorCodeAsKey(i); - if (!strcmp(current_label, "UNDEFINED")) - current_label = ""; - printf( "\n", i, current_label ); + printf( "\n", i ); printf( " ", "en" ); printf("%s", tidyDefaultString(i)); printf( "\n" ); @@ -1905,110 +1491,54 @@ } -/** @} end service_xml_strings group */ -/* MARK: - Experimental Stuff */ -/***************************************************************************//** - ** @defgroup experimental_stuff Experimental Stuff - ** From time to time the developers might leave stuff here that you can use - ** to experiment on their own, or that they're using to experiment with. - ******************************************************************************* - ** @{ +/** + ** Handles the -lang help service. */ +static void lang_help( void ) +{ + printf( "%s", tidyLocalizedString(TC_TXT_HELP_LANG_1) ); + tidyPrintWindowsLanguageNames(" %-20s -> %s\n"); + printf( "%s", tidyLocalizedString(TC_TXT_HELP_LANG_2) ); + tidyPrintTidyLanguageNames(" %s\n"); + printf( tidyLocalizedString(TC_TXT_HELP_LANG_3), tidyGetLanguage() ); +} -/** This callback from LibTidy allows the console application to examine an - ** error message before allowing LibTidy to display it. Currently the body - ** of the function is not compiled into Tidy, but if you're interested in - ** how to use the new message API, then enable it. Possible applications in - ** future console Tidy might be to do things like: - ** - allow user-defined filtering - ** - sort the report output by line number - ** - other things that are user facing and best not put into LibTidy - ** proper. +/** + ** Provides the `unknown option` output. */ -static Bool TIDY_CALL reportCallback(TidyMessage tmessage) +static void unknownOption( uint c ) { -#if 0 - TidyIterator pos; - TidyMessageArgument arg; - TidyFormatParameterType messageType; - ctmbstr messageFormat; - - printf("FILTER: %s, %s\n", tidyGetMessageKey( tmessage ), tidyGetMessageOutput( tmessage )); - - /* loop through the arguments, if any, and print their details */ - pos = tidyGetMessageArguments( tmessage ); - while ( pos ) - { - arg = tidyGetNextMessageArgument( tmessage, &pos ); - messageType = tidyGetArgType( tmessage, &arg ); - messageFormat = tidyGetArgFormat( tmessage, &arg ); - printf( " Type = %u, Format = %s, Value = ", messageType, messageFormat ); - - switch (messageType) - { - case tidyFormatType_STRING: - printf("%s\n", tidyGetArgValueString( tmessage, &arg )); - break; - - case tidyFormatType_INT: - printf("%d\n", tidyGetArgValueInt( tmessage, &arg)); - break; - - case tidyFormatType_UINT: - printf("%u\n", tidyGetArgValueUInt( tmessage, &arg)); - break; - - case tidyFormatType_DOUBLE: - printf("%g\n", tidyGetArgValueDouble( tmessage, &arg)); - break; - - default: - printf("%s", "unknown so far\n"); - } - } - - return no; /* suppress LibTidy's own output of this message */ -#else - return yes; /* needed so Tidy will not block output of this message */ -#endif + fprintf( errout, tidyLocalizedString( TC_STRING_UNKNOWN_OPTION ), (char)c ); + fprintf( errout, "\n"); } -/** @} end experimental_stuff group */ -/* MARK: - main() */ -/***************************************************************************//** - ** @defgroup main Main - ** Let's do something here! - ******************************************************************************* - ** @{ +/** + ** MAIN -- let's do something here. */ - - int main( int argc, char** argv ) { ctmbstr prog = argv[0]; ctmbstr cfgfil = NULL, errfil = NULL, htmlfil = NULL; - TidyDoc tdoc = NULL; + TidyDoc tdoc = tidyCreate(); int status = 0; + tmbstr locale = NULL; uint contentErrors = 0; uint contentWarnings = 0; uint accessWarnings = 0; -#if defined(ENABLE_DEBUG_LOG) && defined(_MSC_VER) -# if defined(_CRTDBG_MAP_ALLOC) - _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); -# endif -#endif - - tdoc = tidyCreate(); - - tidySetMessageCallback( tdoc, reportCallback); /* experimental group */ errout = stderr; /* initialize to stderr */ /* Set an atexit handler. */ atexit( tidy_cleanup ); + + /* Set the locale for tidy's output. */ + locale = tidySystemLocale(locale); + tidySetLanguage(locale); + if ( locale ) + free( locale ); #if defined(_WIN32) /* Force Windows console to use UTF, otherwise many characters will @@ -2020,6 +1550,11 @@ SetConsoleOutputCP(CP_UTF8); #endif +#if !defined(NDEBUG) && defined(_MSC_VER) + set_log_file((char *)"temptidy.txt", 0); + // add_append_log(1); +#endif + /* * Look for default configuration files using any of * the following possibilities: @@ -2110,11 +1645,15 @@ #ifndef NO_NATIVE_ISO2022_SUPPORT strcasecmp(arg, "iso2022") == 0 || #endif +#if SUPPORT_UTF16_ENCODINGS strcasecmp(arg, "utf16le") == 0 || strcasecmp(arg, "utf16be") == 0 || strcasecmp(arg, "utf16") == 0 || +#endif +#if SUPPORT_ASIAN_ENCODINGS strcasecmp(arg, "shiftjis") == 0 || strcasecmp(arg, "big5") == 0 || +#endif strcasecmp(arg, "mac") == 0 || strcasecmp(arg, "win1252") == 0 || strcasecmp(arg, "ibm858") == 0 ) @@ -2144,7 +1683,7 @@ { if ( strcasecmp(argv[2], "help") == 0 ) { - lang_help( tdoc ); + lang_help(); exit(0); } if ( !tidySetLanguage( argv[2] ) ) @@ -2161,172 +1700,156 @@ printf( "%s\n", tidyLocalizedString(TC_STRING_LANG_MUST_SPECIFY)); } - else if ( strcasecmp(arg, "help") == 0 || - strcasecmp(arg, "-help") == 0 || - strcasecmp(arg, "h") == 0 || *arg == '?' ) - { - help( tdoc, prog ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "xml-help") == 0) - { - xml_help( ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "xml-error-strings") == 0) - { - xml_error_strings( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "xml-options-strings") == 0) - { - xml_options_strings( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "xml-strings") == 0) - { - xml_strings( ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "help-config") == 0 ) - { - optionhelp( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "help-env") == 0 ) - { - helpEnv( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "help-option") == 0 ) - { - if ( argc >= 3) + else if ( strcasecmp(arg, "help") == 0 || + strcasecmp(arg, "-help") == 0 || + strcasecmp(arg, "h") == 0 || *arg == '?' ) { - optionDescribe( tdoc, argv[2] ); + help( prog ); + tidyRelease( tdoc ); + return 0; /* success */ } - else + else if ( strcasecmp(arg, "xml-help") == 0) { - printf( "%s\n", tidyLocalizedString(TC_STRING_MUST_SPECIFY)); + xml_help( ); + tidyRelease( tdoc ); + return 0; /* success */ } - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "xml-config") == 0 ) - { - XMLoptionhelp( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "show-config") == 0 ) - { - optionvalues( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "export-config") == 0 ) - { - exportOptionValues( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "export-default-config") == 0 ) - { - exportDefaultOptionValues( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strcasecmp(arg, "config") == 0 ) - { - if ( argc >= 3 ) + else if ( strcasecmp(arg, "xml-error-strings") == 0) { - ctmbstr post; - - tidyLoadConfig( tdoc, argv[2] ); - - /* Set new error output stream if setting changed */ - post = tidyOptGetValue( tdoc, TidyErrFile ); - if ( post && (!errfil || !samefile(errfil, post)) ) + xml_error_strings( tdoc ); + tidyRelease( tdoc ); + return 0; /* success */ + } + else if ( strcasecmp(arg, "xml-options-strings") == 0) + { + xml_options_strings( tdoc ); + tidyRelease( tdoc ); + return 0; /* success */ + } + else if ( strcasecmp(arg, "xml-strings") == 0) + { + xml_strings( ); + tidyRelease( tdoc ); + return 0; /* success */ + } + else if ( strcasecmp(arg, "help-config") == 0 ) + { + optionhelp( tdoc ); + tidyRelease( tdoc ); + return 0; /* success */ + } + else if ( strcasecmp(arg, "help-option") == 0 ) + { + if ( argc >= 3) { - errfil = post; - errout = tidySetErrorFile( tdoc, post ); + optionDescribe( tdoc, argv[2] ); } - - --argc; - ++argv; + else + { + printf( "%s\n", tidyLocalizedString(TC_STRING_MUST_SPECIFY)); + } + tidyRelease( tdoc ); + return 0; /* success */ } - } - - else if ( strcasecmp(arg, "output") == 0 || - strcasecmp(arg, "-output-file") == 0 || - strcasecmp(arg, "o") == 0 ) - { - if ( argc >= 3 ) + else if ( strcasecmp(arg, "xml-config") == 0 ) { - tidyOptSetValue( tdoc, TidyOutFile, argv[2] ); - --argc; - ++argv; + XMLoptionhelp( tdoc ); + tidyRelease( tdoc ); + return 0; /* success */ } - } - else if ( strcasecmp(arg, "file") == 0 || - strcasecmp(arg, "-file") == 0 || - strcasecmp(arg, "f") == 0 ) - { - if ( argc >= 3 ) + else if ( strcasecmp(arg, "show-config") == 0 ) { - errfil = argv[2]; - errout = tidySetErrorFile( tdoc, errfil ); - --argc; - ++argv; + optionvalues( tdoc ); + tidyRelease( tdoc ); + return 0; /* success */ } - } - else if ( strcasecmp(arg, "wrap") == 0 || - strcasecmp(arg, "-wrap") == 0 || - strcasecmp(arg, "w") == 0 ) - { - if ( argc >= 3 ) + else if ( strcasecmp(arg, "config") == 0 ) { - uint wraplen = 0; - int nfields = sscanf( argv[2], "%u", &wraplen ); - tidyOptSetInt( tdoc, TidyWrapLen, wraplen ); - if (nfields > 0) + if ( argc >= 3 ) { + ctmbstr post; + + tidyLoadConfig( tdoc, argv[2] ); + + /* Set new error output stream if setting changed */ + post = tidyOptGetValue( tdoc, TidyErrFile ); + if ( post && (!errfil || !samefile(errfil, post)) ) + { + errfil = post; + errout = tidySetErrorFile( tdoc, post ); + } + --argc; ++argv; } } - } - else if ( strcasecmp(arg, "version") == 0 || - strcasecmp(arg, "-version") == 0 || - strcasecmp(arg, "v") == 0 ) - { - version( tdoc ); - tidyRelease( tdoc ); - return 0; /* success */ - } - else if ( strncmp(argv[1], "--", 2 ) == 0) - { - if ( tidyOptParseValue(tdoc, argv[1]+2, argv[2]) ) + else if ( strcasecmp(arg, "output") == 0 || + strcasecmp(arg, "-output-file") == 0 || + strcasecmp(arg, "o") == 0 ) { - /* Set new error output stream if setting changed */ - ctmbstr post = tidyOptGetValue( tdoc, TidyErrFile ); - if ( post && (!errfil || !samefile(errfil, post)) ) + if ( argc >= 3 ) { - errfil = post; - errout = tidySetErrorFile( tdoc, post ); + tidyOptSetValue( tdoc, TidyOutFile, argv[2] ); + --argc; + ++argv; + } + } + else if ( strcasecmp(arg, "file") == 0 || + strcasecmp(arg, "-file") == 0 || + strcasecmp(arg, "f") == 0 ) + { + if ( argc >= 3 ) + { + errfil = argv[2]; + errout = tidySetErrorFile( tdoc, errfil ); + --argc; + ++argv; } + } + else if ( strcasecmp(arg, "wrap") == 0 || + strcasecmp(arg, "-wrap") == 0 || + strcasecmp(arg, "w") == 0 ) + { + if ( argc >= 3 ) + { + uint wraplen = 0; + int nfields = sscanf( argv[2], "%u", &wraplen ); + tidyOptSetInt( tdoc, TidyWrapLen, wraplen ); + if (nfields > 0) + { + --argc; + ++argv; + } + } + } + else if ( strcasecmp(arg, "version") == 0 || + strcasecmp(arg, "-version") == 0 || + strcasecmp(arg, "v") == 0 ) + { + version(); + tidyRelease( tdoc ); + return 0; /* success */ - ++argv; - --argc; } - } + else if ( strncmp(argv[1], "--", 2 ) == 0) + { + if ( tidyOptParseValue(tdoc, argv[1]+2, argv[2]) ) + { + /* Set new error output stream if setting changed */ + ctmbstr post = tidyOptGetValue( tdoc, TidyErrFile ); + if ( post && (!errfil || !samefile(errfil, post)) ) + { + errfil = post; + errout = tidySetErrorFile( tdoc, post ); + } + + ++argv; + --argc; + } + } + +#if SUPPORT_ACCESSIBILITY_CHECKS else if ( strcasecmp(arg, "access") == 0 ) { if ( argc >= 3 ) @@ -2341,6 +1864,7 @@ } } } +#endif else { @@ -2357,6 +1881,12 @@ tidyOptResetToDefault( tdoc, TidyIndentSpaces ); break; + /* Usurp -o for output file. Anyone hiding end tags? + case 'o': + tidyOptSetBool( tdoc, TidyHideEndTags, yes ); + break; + */ + case 'u': tidyOptSetBool( tdoc, TidyUpperCaseTags, yes ); break; @@ -2390,7 +1920,7 @@ break; default: - unknownOption( tdoc, c ); + unknownOption( c ); break; } } @@ -2401,13 +1931,14 @@ continue; } - if ( argc > 1 ) { htmlfil = argv[1]; - DEBUG_LOG( SPRTF("Tidying '%s'\n", htmlfil) ); +#if (!defined(NDEBUG) && defined(_MSC_VER)) + SPRTF("Tidying '%s'\n", htmlfil); +#endif // DEBUG outout if ( tidyOptGetBool(tdoc, TidyEmacs) ) - tidySetEmacsFile( tdoc, htmlfil ); + tidyOptSetValue( tdoc, TidyEmacsFile, htmlfil ); status = tidyParseFile( tdoc, htmlfil ); } else @@ -2421,6 +1952,15 @@ if ( status >= 0 ) { status = tidyRunDiagnostics( tdoc ); + if ( !tidyOptGetBool(tdoc, TidyQuiet) ) { + /* NOT quiet, show DOCTYPE, if not already shown */ + if (!tidyOptGetBool(tdoc, TidyShowInfo)) { + tidyOptSetBool( tdoc, TidyShowInfo, yes ); + tidyReportDoctype( tdoc ); /* FIX20140913: like warnings, errors, ALWAYS report DOCTYPE */ + tidyOptSetBool( tdoc, TidyShowInfo, no ); + } + } + } if ( status > 1 ) /* If errors, do we want to force output? */ status = ( tidyOptGetBool(tdoc, TidyForceOutput) ? status : -1 ); @@ -2435,7 +1975,7 @@ if ( outfil ) { status = tidySaveFile( tdoc, outfil ); } else { -#ifdef ENABLE_DEBUG_LOG +#if !defined(NDEBUG) && defined(_MSC_VER) static char tmp_buf[264]; sprintf(tmp_buf,"%s.html",get_log_file()); status = tidySaveFile( tdoc, tmp_buf ); @@ -2457,18 +1997,19 @@ if ( argc <= 1 ) break; } /* read command line loop */ - - /* blank line for screen formatting */ - if ( errout == stderr && !contentErrors && !tidyOptGetBool( tdoc, TidyQuiet ) ) + + + if (!tidyOptGetBool(tdoc, TidyQuiet) && + errout == stderr && !contentErrors) fprintf(errout, "\n"); - - /* footnote printing only if errors or warnings */ - if ( contentErrors + contentWarnings > 0 ) + + if (contentErrors + contentWarnings > 0 && + !tidyOptGetBool(tdoc, TidyQuiet)) tidyErrorSummary(tdoc); - - /* prints the general info, if applicable */ - tidyGeneralInfo(tdoc); - + + if (!tidyOptGetBool(tdoc, TidyQuiet)) + tidyGeneralInfo(tdoc); + /* called to free hash tables etc. */ tidyRelease( tdoc ); @@ -2483,11 +2024,6 @@ return 0; } - -/** @} end main group */ -/** @} end console_application group */ - - /* * local variables: * mode: c diff -Nru tidy-html5-5.6.0/debian/changelog tidy-html5-5.2.0/debian/changelog --- tidy-html5-5.6.0/debian/changelog 2019-02-28 21:14:05.000000000 +0000 +++ tidy-html5-5.2.0/debian/changelog 2019-06-21 06:15:47.000000000 +0000 @@ -1,129 +1,8 @@ -tidy-html5 (2:5.6.0-10) unstable; urgency=medium +tidy-html5 (1:5.2.0-2+serp2002+ppa.1) trusty; urgency=medium - * Rebuild for Debian Buster. + * no changes. Backport to trusty - [ Boyuan Yang ] - * debian/control: - + Bump debhelper compat to v12. - + Bump Standards-Version to 4.3.0. - - [ Viktor Szépe ] - * debian/control: Fix grammar in package description. - - -- Boyuan Yang Thu, 28 Feb 2019 16:14:05 -0500 - -tidy-html5 (2:5.6.0-9) unstable; urgency=medium - - * debian/patches: - - Drop debian-specific patch to revert issue-679 patch, - libhtml-tidy-perl has made a new upload to address the - issue downstream. - + Cherry-pick upstream patch for upstream issue-697 and - issue-712 (5.7.10 and 5.7.11 fix). - * debian/symbols: - + Add a Build-Depends-Package field as suggested by lintian. - - -- Boyuan Yang Thu, 15 Nov 2018 19:58:50 -0500 - -tidy-html5 (2:5.6.0-8) unstable; urgency=medium - - * debian/patches: - + Rearrange patch series to follow upstream commit order. - + Add a patch to partially revert upstream issue-679 patch to avoid - an unnecessary breaking behaviour for css-prefix. This fixes an - autopkgtest regression in libhtml-tidy-perl. - - -- Boyuan Yang Thu, 15 Nov 2018 11:08:12 -0500 - -tidy-html5 (2:5.6.0-7) unstable; urgency=medium - - * debian/rules: - + Apply build workaround to fix FTCBFS due to man page generation. - (Closes: #875429). - * debian/control: - + Drop useless ${shlibs:Depends} substitution from libtidy-dev's - build dependency list. - * debian/patches: - + Cherry-pick several upstream trunk patches till tidy-html5 5.7.8. - (Upstream 5.7.9 changeset is implemented in Debian-specific patch) - - -- Boyuan Yang Wed, 14 Nov 2018 22:15:20 -0500 - -tidy-html5 (2:5.6.0-6) unstable; urgency=medium - - [ Ondřej Surý ] - * Fix my email in d/control - - [ Dmitry Shachnev ] - * Revert upstream commit that causes issues in python-tidylib. - - -- Ondřej Surý Sat, 27 Oct 2018 18:52:51 +0000 - -tidy-html5 (2:5.6.0-5) unstable; urgency=medium - - * Revert "Downgrade the debhelper compat level to 9" - + Bump debhelper compat to v11. - * Fix full library path (Closes: #911915) - - -- Ondřej Surý Fri, 26 Oct 2018 06:38:07 +0000 - -tidy-html5 (2:5.6.0-4) unstable; urgency=medium - - * Rebuild for all architectures on Debian Buildds. - * debian/patches: Cherry-pick some important fixes from trunk: - + Fix unsafe use of output buffer as input param (Upstream issue 655) - + Fix typo in TidyHideComments description (Upstream issue 684) - - -- Boyuan Yang Thu, 25 Oct 2018 11:13:45 -0400 - -tidy-html5 (2:5.6.0-3) unstable; urgency=medium - - * Downgrade the debhelper compat level to 9 - * Change the SONAME bump to 5deb1 - * Add Boyuan Yang to Uploaders - * [CVE-2017-17497]: Add upstream fix for segmentation fail on NULL node in loop - - -- Ondřej Surý Fri, 19 Oct 2018 08:32:17 +0000 - -tidy-html5 (2:5.6.0-1) unstable; urgency=medium - - * Take over the package as the previous maintainer upload is inactive - and last touched the package in 2016 - * Run wrap-and-sort -a over debian/ - * Improve the wording in the package descriptions - * Upload a stable tidy-html5 version back to unstable. - * Bump the epoch to fix the mess created by the 5.7.16 upload to unstable. - * Add patch to bump SONAME to libtidy.so.6 and rename the shared library - package to libtidy6 (Closes: #911130) - - -- Ondřej Surý Tue, 16 Oct 2018 07:16:23 +0000 - -tidy-html5 (1:5.6.0-0.1~exp1) experimental; urgency=medium - - * Non-maintainer upload. - * New upstream release (NMU) with approval from package maintainer. - - [ Ondřej Surý ] - * Remove all patches; they have been merged upstream - - [ Boyuan Yang ] - * New upstream version 5.6.0. - * Rename libtidy5 to libtidy5.6 due to API breakage, this starts a - transition. - * debian: - + Apply "wrap-and-sort -abst". - + Bump debhelper compat to v11. - * debian/control: - + Bump Standards-Version to 4.2.1 (no changes needed). - + Update Vcs-* fields and use git repo on Salsa Debian group. - * debian/rules: - + Modernize rules and enable full hardening. - + Use "dh_missing --fail-missing". - * debian/patches: Add patch to enable cmake GNUInstallDirs support. - * debian/install: Drop manually installed upstream changelog and - lintian override. - - -- Boyuan Yang Mon, 24 Sep 2018 11:25:48 -0400 + -- Sergei Pustovoi Fri, 21 Jun 2019 17:15:10 +1100 tidy-html5 (1:5.2.0-2) unstable; urgency=low @@ -317,7 +196,7 @@ tidy (20050415-1) unstable; urgency=low - * New upstream release + * New upstream release -- Jason Thomas Wed, 20 Apr 2005 11:22:49 +1000 @@ -343,7 +222,7 @@ tidy (20040312-2) unstable; urgency=low - * debian/libtidy0.install: add debian/tmp/usr/lib/libtidy.so symlink + * debian/libtidy0.install: add debian/tmp/usr/lib/libtidy.so symlink (closes: #247488) -- Jason Thomas Sat, 15 May 2004 14:47:54 +1000 @@ -354,19 +233,19 @@ * debian/rules: changed to use cdbs * debian/control: build depends cdbs * debian/makeclean: removed this as we now setup up the autoconf build - system before packaging. + system before packaging. -- Jason Thomas Wed, 14 Apr 2004 23:55:38 +1000 tidy (20031001-3) unstable; urgency=low - * debian/control: corrected sections for libtidy-dev and libtidy0 + * debian/control: corrected sections for libtidy-dev and libtidy0 -- Jason Thomas Wed, 10 Dec 2003 10:22:25 +1100 tidy (20031001-2) unstable; urgency=low - * FTBS, added missing build-depends, autoconf, automake, libtool, perl + * FTBS, added missing build-depends, autoconf, automake, libtool, perl (closes: #221378) * debian/rules: changed debian/automake to 'perl debian/automake' @@ -384,7 +263,7 @@ tidy (20030716-3) unstable; urgency=low - * debian/control: Suggests tidy-doc + * debian/control: Suggests tidy-doc (closes: #204069) -- Jason Thomas Mon, 25 Aug 2003 10:35:18 +1000 @@ -402,7 +281,7 @@ * Move docs to tidy-docs package. * Removed unneeded patches 03copyright.patch 04indent.patch * Updated config patch - * Added mention of tidy-doc package to man page, and README.Debian + * Added mention of tidy-doc package to man page, and README.Debian -- Jason Thomas Wed, 30 Jul 2003 11:16:18 +1000 @@ -414,7 +293,7 @@ tidy (20030208-2) unstable; urgency=low - * Added temporary patch to fix indentation problem + * Added temporary patch to fix indentation problem -- Jason Thomas Tue, 18 Feb 2003 09:58:35 +1100 diff -Nru tidy-html5-5.6.0/debian/compat tidy-html5-5.2.0/debian/compat --- tidy-html5-5.6.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ tidy-html5-5.2.0/debian/compat 2016-08-04 09:48:16.000000000 +0000 @@ -0,0 +1 @@ +9 diff -Nru tidy-html5-5.6.0/debian/control tidy-html5-5.2.0/debian/control --- tidy-html5-5.6.0/debian/control 2019-02-28 21:14:01.000000000 +0000 +++ tidy-html5-5.2.0/debian/control 2016-08-04 09:48:16.000000000 +0000 @@ -1,52 +1,40 @@ Source: tidy-html5 Section: web Priority: optional -Maintainer: Tidy HTML5 -Uploaders: Ondřej Surý , - Boyuan Yang , -Build-Depends: cmake, - debhelper-compat (= 12), - xsltproc, -Rules-Requires-Root: no -Standards-Version: 4.3.0 +Maintainer: Jason Thomas +Build-Depends: debhelper (>= 9), xsltproc, cmake +Standards-Version: 3.9.8 Homepage: http://www.html-tidy.org/ -Vcs-Git: https://salsa.debian.org/debian/tidy-html5.git -Vcs-Browser: https://salsa.debian.org/debian/tidy-html5 +Vcs-Git: https://anonscm.debian.org/git/collab-maint/tidy-html5.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/tidy-html5.git + +Package: tidy +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libtidy5 (= ${binary:Version}) +Description: HTML/XML syntax checker and reformatter + Tidy is a console application which corrects and cleans up HTML and XML + documents by fixing markup errors and upgrading legacy code to modern + standards. Tidy is a product of the World Wide Web Consortium and the HTML + Tidy Advocacy Community Group. + +Package: libtidy5 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: HTML/XML syntax checker and reformatter - library + This is a library package, used by programs which have a dependency on + libtidy5. If you want to run Tidy on the command line, please install the + 'tidy' package. If you want to build a program from source which uses + libtidy5, please install the 'libtidy-dev' package. Package: libtidy-dev Section: libdevel Architecture: any -Multi-Arch: same -Depends: libtidy5deb1 (= ${binary:Version}), - ${misc:Depends}, +Depends: libtidy5 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Suggests: libdmalloc-dev Breaks: libtidy-0.99-0 Replaces: libtidy-0.99-0 Description: HTML/XML syntax checker and reformatter - development - Tidy corrects and cleans up HTML and XML documents by fixing - markup errors and upgrading legacy code to modern standards. - . - This package contains the libtidy static library and the headers. - -Package: libtidy5deb1 -Section: libs -Architecture: any -Multi-Arch: same -Depends: ${misc:Depends}, - ${shlibs:Depends} -Description: HTML/XML syntax checker and reformatter - shared library - Tidy corrects and cleans up HTML and XML documents by fixing - markup errors and upgrading legacy code to modern standards. - . - This package contains the libtidy shared library. - -Package: tidy -Architecture: any -Depends: libtidy5deb1 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: HTML/XML syntax checker and reformatter - Tidy corrects and cleans up HTML and XML documents by fixing - markup errors and upgrading legacy code to modern standards. - . - This package contains a command line tool 'tidy'. + This is a development package, which contains header files and a static + library. It can be removed if you are not building packages from source which + rely on libtidy5. diff -Nru tidy-html5-5.6.0/debian/copyright tidy-html5-5.2.0/debian/copyright --- tidy-html5-5.6.0/debian/copyright 2019-02-28 21:12:20.000000000 +0000 +++ tidy-html5-5.2.0/debian/copyright 2016-08-04 09:55:19.000000000 +0000 @@ -1,4 +1,4 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: tidy-html5 Source: https://github.com/htacg/tidy-html5/releases @@ -32,7 +32,7 @@ but not limited to, warranties of merchantability or fitness for any particular purpose or that the use of the software or documentation will not infringe any third party patents, - copyrights, trademarks or other rights. + copyrights, trademarks or other rights. . The copyright holders and contributing author(s) will not be held liable for any direct, indirect, special or consequential damages @@ -48,7 +48,7 @@ not be misrepresented as being the original source. 3. This Copyright notice may not be removed or altered from any source or altered source distribution. - . + . The copyright holders and contributing author(s) specifically permit, without fee, and encourage the use of this source code as a component for supporting the Hypertext Markup Language in diff -Nru tidy-html5-5.6.0/debian/libtidy5deb1.install tidy-html5-5.2.0/debian/libtidy5deb1.install --- tidy-html5-5.6.0/debian/libtidy5deb1.install 2019-02-28 21:12:20.000000000 +0000 +++ tidy-html5-5.2.0/debian/libtidy5deb1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libtidy.so.* diff -Nru tidy-html5-5.6.0/debian/libtidy5deb1.symbols tidy-html5-5.2.0/debian/libtidy5deb1.symbols --- tidy-html5-5.6.0/debian/libtidy5deb1.symbols 2019-02-28 21:12:20.000000000 +0000 +++ tidy-html5-5.2.0/debian/libtidy5deb1.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,694 +0,0 @@ -libtidy.so.5deb1 libtidy5deb1 #MINVER# -* Build-Depends-Package: libtidy-dev - TidyLangPosixName@Base 1:5.6.0 - TidyLangWindowsName@Base 1:5.6.0 - formatDialogue@Base 1:5.6.0 - getErrorCodeList@Base 1:5.2.0 - getInstalledLanguageList@Base 1:5.2.0 - getNextErrorCode@Base 1:5.2.0 - getNextInstalledLanguage@Base 1:5.2.0 - getNextStringKey@Base 1:5.2.0 - getNextWindowsLanguage@Base 1:5.2.0 - getStringKeyList@Base 1:5.2.0 - getWindowsLanguageList@Base 1:5.2.0 - inRemovedInfo@Base 1:5.2.0 - prvTidyAccessibilityChecks@Base 1:5.2.0 - prvTidyAddAttribute@Base 1:5.2.0 - prvTidyAddCharToLexer@Base 1:5.2.0 - prvTidyAddGenerator@Base 1:5.2.0 - prvTidyAddStringLiteral@Base 1:5.2.0 - prvTidyAddStyleAsClass@Base 1:5.2.0 - prvTidyAddStyleProperty@Base 1:5.2.0 - prvTidyAdjustCharEncoding@Base 1:5.2.0 - prvTidyAdjustConfig@Base 1:5.6.0 - prvTidyAdjustTags@Base 1:5.2.0 - prvTidyApparentVersion@Base 1:5.2.0 - prvTidyAppendToClassAttr@Base 1:5.2.0 - prvTidyAttrGetById@Base 1:5.2.0 - prvTidyAttributeIsMismatched@Base 1:5.2.0 - prvTidyAttributeIsProprietary@Base 1:5.2.0 - prvTidyBQ2Div@Base 1:5.2.0 - prvTidyBufferInput@Base 1:5.2.0 - prvTidyBufferOutput@Base 1:5.2.0 - prvTidyBumpObject@Base 1:5.2.0 - prvTidyCharEncodingId@Base 1:5.2.0 - prvTidyCharEncodingName@Base 1:5.2.0 - prvTidyCharEncodingOptName@Base 1:5.2.0 - prvTidyCheckAttribute@Base 1:5.2.0 - prvTidyCheckAttributes@Base 1:5.2.0 - prvTidyCheckHTML5@Base 1:5.2.0 - prvTidyCheckHTMLTagsAttribsVersions@Base 1:5.2.0 - prvTidyCheckNodeIntegrity@Base 1:5.2.0 - prvTidyCheckUrl@Base 1:5.2.0 - prvTidyCleanDocument@Base 1:5.2.0 - prvTidyCleanGoogleDocument@Base 1:5.2.0 - prvTidyCleanStyle@Base 1:5.6.0 - prvTidyCleanWord2000@Base 1:5.2.0 - prvTidyCloneNode@Base 1:5.2.0 - prvTidyCoerceNode@Base 1:5.2.0 - prvTidyCombineSurrogatePair@Base 1:5.2.0 - prvTidyConfigDiffThanDefault@Base 1:5.2.0 - prvTidyConfigDiffThanSnapshot@Base 1:5.2.0 - prvTidyConstrainVersion@Base 1:5.2.0 - prvTidyConvertCDATANodes@Base 1:5.2.0 - prvTidyCopyConfig@Base 1:5.2.0 - prvTidyDeclareListItem@Base 1:5.6.0 - prvTidyDeclareUserTag@Base 1:5.6.0 - prvTidyDecodeMacRoman@Base 1:5.2.0 - prvTidyDecodeUTF8BytesToChar@Base 1:5.2.0 - prvTidyDecodeWin1252@Base 1:5.2.0 - prvTidyDeferDup@Base 1:5.2.0 - prvTidyDefineMutedMessage@Base 1:5.6.0 - prvTidyDefinePriorityAttribute@Base 1:5.6.0 - prvTidyDefineTag@Base 1:5.2.0 - prvTidyDetachAttribute@Base 1:5.2.0 - prvTidyDialogue@Base 1:5.6.0 - prvTidyDiscardElement@Base 1:5.2.0 - prvTidyDocParseStream@Base 1:5.2.0 - prvTidyDowngradeTypography@Base 1:5.2.0 - prvTidyDropAttrByName@Base 1:5.2.0 - prvTidyDropComments@Base 1:5.2.0 - prvTidyDropEmptyElements@Base 1:5.2.0 - prvTidyDropFontElements@Base 1:5.2.0 - prvTidyDropSections@Base 1:5.2.0 - prvTidyDupAttrs@Base 1:5.2.0 - prvTidyEmFromI@Base 1:5.2.0 - prvTidyEncodeCharToUTF8Bytes@Base 1:5.2.0 - prvTidyEntityInfo@Base 1:5.2.0 - prvTidyEntityName@Base 1:5.2.0 - prvTidyErrorSummary@Base 1:5.2.0 - prvTidyFileInput@Base 1:5.2.0 - prvTidyFileOutput@Base 1:5.2.0 - prvTidyFindAttribute@Base 1:5.2.0 - prvTidyFindBody@Base 1:5.2.0 - prvTidyFindContainer@Base 1:5.2.0 - prvTidyFindDocType@Base 1:5.2.0 - prvTidyFindHEAD@Base 1:5.2.0 - prvTidyFindHTML@Base 1:5.2.0 - prvTidyFindNodeById@Base 1:5.2.0 - prvTidyFindNodeWithId@Base 1:5.2.0 - prvTidyFindParser@Base 1:5.2.0 - prvTidyFindTITLE@Base 1:5.2.0 - prvTidyFindTag@Base 1:5.2.0 - prvTidyFindXmlDecl@Base 1:5.2.0 - prvTidyFixAnchors@Base 1:5.2.0 - prvTidyFixDocType@Base 1:5.2.0 - prvTidyFixLanguageInformation@Base 1:5.2.0 - prvTidyFixNodeLinks@Base 1:5.2.0 - prvTidyFixXhtmlNamespace@Base 1:5.2.0 - prvTidyFixXmlDecl@Base 1:5.2.0 - prvTidyFreeAnchors@Base 1:5.2.0 - prvTidyFreeAttrPriorityList@Base 1:5.6.0 - prvTidyFreeAttrTable@Base 1:5.2.0 - prvTidyFreeAttribute@Base 1:5.2.0 - prvTidyFreeAttrs@Base 1:5.2.0 - prvTidyFreeConfig@Base 1:5.2.0 - prvTidyFreeDeclaredTags@Base 1:5.2.0 - prvTidyFreeLexer@Base 1:5.2.0 - prvTidyFreeMutedMessageList@Base 1:5.6.0 - prvTidyFreeNode@Base 1:5.2.0 - prvTidyFreePrintBuf@Base 1:5.2.0 - prvTidyFreeStyles@Base 1:5.2.0 - prvTidyFreeTags@Base 1:5.2.0 - prvTidyGetAttrByName@Base 1:5.2.0 - prvTidyGetCharEncodingFromOptName@Base 1:5.2.0 - prvTidyGetDeclaredTagList@Base 1:5.2.0 - prvTidyGetEncodingCodePageFromId@Base 1:5.2.0 - prvTidyGetEncodingCodePageFromName@Base 1:5.2.0 - prvTidyGetEncodingIdFromCodePage@Base 1:5.2.0 - prvTidyGetEncodingIdFromName@Base 1:5.2.0 - prvTidyGetEncodingNameFromCodePage@Base 1:5.2.0 - prvTidyGetEncodingNameFromId@Base 1:5.2.0 - prvTidyGetEncodingNameFromTidyId@Base 1:5.2.0 - prvTidyGetEncodingOptNameFromTidyId@Base 1:5.2.0 - prvTidyGetNextDeclaredTag@Base 1:5.2.0 - prvTidyGetPickListLabelForPick@Base 1:5.6.0 - prvTidyGetToken@Base 1:5.2.0 - prvTidyGetUTF8@Base 1:5.2.0 - prvTidyHTMLVersion@Base 1:5.2.0 - prvTidyHTMLVersionNameFromCode@Base 1:5.2.0 - prvTidyHTMLVersionNumberFromCode@Base 1:5.6.0 - prvTidyInferredTag@Base 1:5.2.0 - prvTidyInitAttrs@Base 1:5.2.0 - prvTidyInitConfig@Base 1:5.2.0 - prvTidyInitMap@Base 1:5.2.0 - prvTidyInitPrintBuf@Base 1:5.2.0 - prvTidyInitTags@Base 1:5.2.0 - prvTidyInlineDup1@Base 1:5.2.0 - prvTidyInlineDup@Base 1:5.2.0 - prvTidyInsertAttributeAtEnd@Base 1:5.2.0 - prvTidyInsertAttributeAtStart@Base 1:5.2.0 - prvTidyInsertNodeAfterElement@Base 1:5.2.0 - prvTidyInsertNodeAtEnd@Base 1:5.2.0 - prvTidyInsertNodeAtStart@Base 1:5.2.0 - prvTidyInsertNodeBeforeElement@Base 1:5.2.0 - prvTidyInsertedToken@Base 1:5.2.0 - prvTidyIsAnchorElement@Base 1:5.2.0 - prvTidyIsBlank@Base 1:5.2.0 - prvTidyIsBoolAttribute@Base 1:5.2.0 - prvTidyIsCSS1Selector@Base 1:5.2.0 - prvTidyIsCombinedChar@Base 1:5.2.0 - prvTidyIsDigit@Base 1:5.2.0 - prvTidyIsEOF@Base 1:5.2.0 - prvTidyIsHTML5Mode@Base 1:5.6.0 - prvTidyIsHTMLSpace@Base 1:5.2.0 - prvTidyIsHighSurrogate@Base 1:5.2.0 - prvTidyIsJavaScript@Base 1:5.2.0 - prvTidyIsLetter@Base 1:5.2.0 - prvTidyIsLowSurrogate@Base 1:5.2.0 - prvTidyIsNamechar@Base 1:5.2.0 - prvTidyIsNewNode@Base 1:5.2.0 - prvTidyIsNewline@Base 1:5.2.0 - prvTidyIsPushed@Base 1:5.2.0 - prvTidyIsPushedLast@Base 1:5.2.0 - prvTidyIsScript@Base 1:5.2.0 - prvTidyIsUpper@Base 1:5.2.0 - prvTidyIsUrl@Base 1:5.2.0 - prvTidyIsValidCombinedChar@Base 1:5.2.0 - prvTidyIsValidHTMLID@Base 1:5.2.0 - prvTidyIsValidUTF16FromUCS4@Base 1:5.2.0 - prvTidyIsValidXMLID@Base 1:5.2.0 - prvTidyIsWhite@Base 1:5.2.0 - prvTidyIsWord2000@Base 1:5.2.0 - prvTidyIsXMLLetter@Base 1:5.2.0 - prvTidyIsXMLNamechar@Base 1:5.2.0 - prvTidyList2BQ@Base 1:5.2.0 - prvTidyLookupTagDef@Base 1:5.2.0 - prvTidyNestedEmphasis@Base 1:5.2.0 - prvTidyNewAttribute@Base 1:5.2.0 - prvTidyNewAttributeEx@Base 1:5.2.0 - prvTidyNewLexer@Base 1:5.2.0 - prvTidyNewLineNode@Base 1:5.2.0 - prvTidyNewLiteralTextNode@Base 1:5.2.0 - prvTidyNewNode@Base 1:5.2.0 - prvTidyNodeAttributeVersions@Base 1:5.2.0 - prvTidyNormalizeSpaces@Base 1:5.2.0 - prvTidyOptGetDocDesc@Base 1:5.2.0 - prvTidyPFlushLine@Base 1:5.2.0 - prvTidyPFlushLineSmart@Base 1:5.2.0 - prvTidyPPrintSpaces@Base 1:5.2.0 - prvTidyPPrintTabs@Base 1:5.2.0 - prvTidyPPrintTree@Base 1:5.2.0 - prvTidyPPrintXMLTree@Base 1:5.2.0 - prvTidyParseBlock@Base 1:5.2.0 - prvTidyParseBody@Base 1:5.2.0 - prvTidyParseColGroup@Base 1:5.2.0 - prvTidyParseConfigFile@Base 1:5.2.0 - prvTidyParseConfigFileEnc@Base 1:5.2.0 - prvTidyParseConfigOption@Base 1:5.2.0 - prvTidyParseConfigValue@Base 1:5.2.0 - prvTidyParseDatalist@Base 1:5.2.0 - prvTidyParseDefList@Base 1:5.2.0 - prvTidyParseDocument@Base 1:5.2.0 - prvTidyParseEmpty@Base 1:5.2.0 - prvTidyParseFrameSet@Base 1:5.2.0 - prvTidyParseHTML@Base 1:5.2.0 - prvTidyParseHead@Base 1:5.2.0 - prvTidyParseInline@Base 1:5.2.0 - prvTidyParseList@Base 1:5.2.0 - prvTidyParseNamespace@Base 1:5.2.0 - prvTidyParseNoFrames@Base 1:5.2.0 - prvTidyParseOptGroup@Base 1:5.2.0 - prvTidyParsePre@Base 1:5.2.0 - prvTidyParseRow@Base 1:5.2.0 - prvTidyParseRowGroup@Base 1:5.2.0 - prvTidyParseScript@Base 1:5.2.0 - prvTidyParseSelect@Base 1:5.2.0 - prvTidyParseTableTag@Base 1:5.2.0 - prvTidyParseText@Base 1:5.2.0 - prvTidyParseTitle@Base 1:5.2.0 - prvTidyParseXMLDocument@Base 1:5.2.0 - prvTidyPopInline@Base 1:5.2.0 - prvTidyPrintBody@Base 1:5.2.0 - prvTidyPushInline@Base 1:5.2.0 - prvTidyPutUTF8@Base 1:5.2.0 - prvTidyReadBOMEncoding@Base 1:5.2.0 - prvTidyReadChar@Base 1:5.2.0 - prvTidyReleaseDate@Base 1:5.2.0 - prvTidyReleaseStreamOut@Base 1:5.2.0 - prvTidyRemoveAnchorByNode@Base 1:5.2.0 - prvTidyRemoveAttribute@Base 1:5.2.0 - prvTidyRemoveNode@Base 1:5.2.0 - prvTidyRepairAttrValue@Base 1:5.2.0 - prvTidyRepairDuplicateAttributes@Base 1:5.2.0 - prvTidyReplacePreformattedSpaces@Base 1:5.2.0 - prvTidyReport@Base 1:5.6.0 - prvTidyReportAccessError@Base 1:5.2.0 - prvTidyReportAttrError@Base 1:5.2.0 - prvTidyReportBadArgument@Base 1:5.2.0 - prvTidyReportEncodingError@Base 1:5.2.0 - prvTidyReportEncodingWarning@Base 1:5.2.0 - prvTidyReportEntityError@Base 1:5.2.0 - prvTidyReportFileError@Base 1:5.6.0 - prvTidyReportMarkupVersion@Base 1:5.2.0 - prvTidyReportMissingAttr@Base 1:5.2.0 - prvTidyReportNumWarnings@Base 1:5.2.0 - prvTidyReportSurrogateError@Base 1:5.6.0 - prvTidyReportUnknownOption@Base 1:5.2.0 - prvTidyResetConfigToDefault@Base 1:5.2.0 - prvTidyResetConfigToSnapshot@Base 1:5.2.0 - prvTidyResetOptionToDefault@Base 1:5.2.0 - prvTidyResetTags@Base 1:5.2.0 - prvTidySaveConfigFile@Base 1:5.2.0 - prvTidySaveConfigSink@Base 1:5.2.0 - prvTidySetOptionBool@Base 1:5.2.0 - prvTidySetOptionInt@Base 1:5.2.0 - prvTidySetXHTMLDocType@Base 1:5.2.0 - prvTidySortAttributes@Base 1:5.2.0 - prvTidySplitSurrogatePair@Base 1:5.2.0 - prvTidyStdErrOutput@Base 1:5.2.0 - prvTidySwitchInline@Base 1:5.2.0 - prvTidyTakeConfigSnapshot@Base 1:5.2.0 - prvTidyTextNodeEndWithSpace@Base 1:5.2.0 - prvTidyTextToken@Base 1:5.2.0 - prvTidyTidyLangPosixName@Base 1:5.6.0 - prvTidyTidyLangWindowsName@Base 1:5.6.0 - prvTidyTidyMetaCharset@Base 1:5.6.0 - prvTidyToLower@Base 1:5.2.0 - prvTidyToUpper@Base 1:5.2.0 - prvTidyTraverseNodeTree@Base 1:5.2.0 - prvTidyTrimEmptyElement@Base 1:5.2.0 - prvTidyUngetChar@Base 1:5.2.0 - prvTidyUngetToken@Base 1:5.2.0 - prvTidyUserInput@Base 1:5.2.0 - prvTidyUserOutput@Base 1:5.2.0 - prvTidyW3CAttrsFor_A@Base 1:5.2.0 - prvTidyW3CAttrsFor_ABBR@Base 1:5.2.0 - prvTidyW3CAttrsFor_ACRONYM@Base 1:5.2.0 - prvTidyW3CAttrsFor_ADDRESS@Base 1:5.2.0 - prvTidyW3CAttrsFor_APPLET@Base 1:5.2.0 - prvTidyW3CAttrsFor_AREA@Base 1:5.2.0 - prvTidyW3CAttrsFor_ARTICLE@Base 1:5.2.0 - prvTidyW3CAttrsFor_ASIDE@Base 1:5.2.0 - prvTidyW3CAttrsFor_AUDIO@Base 1:5.2.0 - prvTidyW3CAttrsFor_B@Base 1:5.2.0 - prvTidyW3CAttrsFor_BASE@Base 1:5.2.0 - prvTidyW3CAttrsFor_BASEFONT@Base 1:5.2.0 - prvTidyW3CAttrsFor_BDI@Base 1:5.2.0 - prvTidyW3CAttrsFor_BDO@Base 1:5.2.0 - prvTidyW3CAttrsFor_BIG@Base 1:5.2.0 - prvTidyW3CAttrsFor_BLOCKQUOTE@Base 1:5.2.0 - prvTidyW3CAttrsFor_BODY@Base 1:5.2.0 - prvTidyW3CAttrsFor_BR@Base 1:5.2.0 - prvTidyW3CAttrsFor_BUTTON@Base 1:5.2.0 - prvTidyW3CAttrsFor_CANVAS@Base 1:5.2.0 - prvTidyW3CAttrsFor_CAPTION@Base 1:5.2.0 - prvTidyW3CAttrsFor_CENTER@Base 1:5.2.0 - prvTidyW3CAttrsFor_CITE@Base 1:5.2.0 - prvTidyW3CAttrsFor_CODE@Base 1:5.2.0 - prvTidyW3CAttrsFor_COL@Base 1:5.2.0 - prvTidyW3CAttrsFor_COLGROUP@Base 1:5.2.0 - prvTidyW3CAttrsFor_COMMAND@Base 1:5.2.0 - prvTidyW3CAttrsFor_DATALIST@Base 1:5.2.0 - prvTidyW3CAttrsFor_DD@Base 1:5.2.0 - prvTidyW3CAttrsFor_DEL@Base 1:5.2.0 - prvTidyW3CAttrsFor_DETAILS@Base 1:5.2.0 - prvTidyW3CAttrsFor_DFN@Base 1:5.2.0 - prvTidyW3CAttrsFor_DIALOG@Base 1:5.2.0 - prvTidyW3CAttrsFor_DIR@Base 1:5.2.0 - prvTidyW3CAttrsFor_DIV@Base 1:5.2.0 - prvTidyW3CAttrsFor_DL@Base 1:5.2.0 - prvTidyW3CAttrsFor_DT@Base 1:5.2.0 - prvTidyW3CAttrsFor_EM@Base 1:5.2.0 - prvTidyW3CAttrsFor_EMBED@Base 1:5.2.0 - prvTidyW3CAttrsFor_FIELDSET@Base 1:5.2.0 - prvTidyW3CAttrsFor_FIGCAPTION@Base 1:5.2.0 - prvTidyW3CAttrsFor_FIGURE@Base 1:5.2.0 - prvTidyW3CAttrsFor_FONT@Base 1:5.2.0 - prvTidyW3CAttrsFor_FOOTER@Base 1:5.2.0 - prvTidyW3CAttrsFor_FORM@Base 1:5.2.0 - prvTidyW3CAttrsFor_FRAME@Base 1:5.2.0 - prvTidyW3CAttrsFor_FRAMESET@Base 1:5.2.0 - prvTidyW3CAttrsFor_H1@Base 1:5.2.0 - prvTidyW3CAttrsFor_H2@Base 1:5.2.0 - prvTidyW3CAttrsFor_H3@Base 1:5.2.0 - prvTidyW3CAttrsFor_H4@Base 1:5.2.0 - prvTidyW3CAttrsFor_H5@Base 1:5.2.0 - prvTidyW3CAttrsFor_H6@Base 1:5.2.0 - prvTidyW3CAttrsFor_HEAD@Base 1:5.2.0 - prvTidyW3CAttrsFor_HEADER@Base 1:5.2.0 - prvTidyW3CAttrsFor_HGROUP@Base 1:5.2.0 - prvTidyW3CAttrsFor_HR@Base 1:5.2.0 - prvTidyW3CAttrsFor_HTML@Base 1:5.2.0 - prvTidyW3CAttrsFor_I@Base 1:5.2.0 - prvTidyW3CAttrsFor_IFRAME@Base 1:5.2.0 - prvTidyW3CAttrsFor_IMG@Base 1:5.2.0 - prvTidyW3CAttrsFor_INPUT@Base 1:5.2.0 - prvTidyW3CAttrsFor_INS@Base 1:5.2.0 - prvTidyW3CAttrsFor_ISINDEX@Base 1:5.2.0 - prvTidyW3CAttrsFor_KBD@Base 1:5.2.0 - prvTidyW3CAttrsFor_KEYGEN@Base 1:5.2.0 - prvTidyW3CAttrsFor_LABEL@Base 1:5.2.0 - prvTidyW3CAttrsFor_LEGEND@Base 1:5.2.0 - prvTidyW3CAttrsFor_LI@Base 1:5.2.0 - prvTidyW3CAttrsFor_LINK@Base 1:5.2.0 - prvTidyW3CAttrsFor_LISTING@Base 1:5.2.0 - prvTidyW3CAttrsFor_MAIN@Base 1:5.2.0 - prvTidyW3CAttrsFor_MAP@Base 1:5.2.0 - prvTidyW3CAttrsFor_MARK@Base 1:5.2.0 - prvTidyW3CAttrsFor_MATHML@Base 1:5.2.0 - prvTidyW3CAttrsFor_MENU@Base 1:5.2.0 - prvTidyW3CAttrsFor_MENUITEM@Base 1:5.2.0 - prvTidyW3CAttrsFor_META@Base 1:5.2.0 - prvTidyW3CAttrsFor_METER@Base 1:5.2.0 - prvTidyW3CAttrsFor_NAV@Base 1:5.2.0 - prvTidyW3CAttrsFor_NEXTID@Base 1:5.2.0 - prvTidyW3CAttrsFor_NOFRAMES@Base 1:5.2.0 - prvTidyW3CAttrsFor_NOSCRIPT@Base 1:5.2.0 - prvTidyW3CAttrsFor_OBJECT@Base 1:5.2.0 - prvTidyW3CAttrsFor_OL@Base 1:5.2.0 - prvTidyW3CAttrsFor_OPTGROUP@Base 1:5.2.0 - prvTidyW3CAttrsFor_OPTION@Base 1:5.2.0 - prvTidyW3CAttrsFor_OUTPUT@Base 1:5.2.0 - prvTidyW3CAttrsFor_P@Base 1:5.2.0 - prvTidyW3CAttrsFor_PARAM@Base 1:5.2.0 - prvTidyW3CAttrsFor_PICTURE@Base 1:5.2.0 - prvTidyW3CAttrsFor_PLAINTEXT@Base 1:5.2.0 - prvTidyW3CAttrsFor_PRE@Base 1:5.2.0 - prvTidyW3CAttrsFor_PROGRESS@Base 1:5.2.0 - prvTidyW3CAttrsFor_Q@Base 1:5.2.0 - prvTidyW3CAttrsFor_RB@Base 1:5.2.0 - prvTidyW3CAttrsFor_RBC@Base 1:5.2.0 - prvTidyW3CAttrsFor_RP@Base 1:5.2.0 - prvTidyW3CAttrsFor_RT@Base 1:5.2.0 - prvTidyW3CAttrsFor_RTC@Base 1:5.2.0 - prvTidyW3CAttrsFor_RUBY@Base 1:5.2.0 - prvTidyW3CAttrsFor_S@Base 1:5.2.0 - prvTidyW3CAttrsFor_SAMP@Base 1:5.2.0 - prvTidyW3CAttrsFor_SCRIPT@Base 1:5.2.0 - prvTidyW3CAttrsFor_SECTION@Base 1:5.2.0 - prvTidyW3CAttrsFor_SELECT@Base 1:5.2.0 - prvTidyW3CAttrsFor_SMALL@Base 1:5.2.0 - prvTidyW3CAttrsFor_SOURCE@Base 1:5.2.0 - prvTidyW3CAttrsFor_SPAN@Base 1:5.2.0 - prvTidyW3CAttrsFor_STRIKE@Base 1:5.2.0 - prvTidyW3CAttrsFor_STRONG@Base 1:5.2.0 - prvTidyW3CAttrsFor_STYLE@Base 1:5.2.0 - prvTidyW3CAttrsFor_SUB@Base 1:5.2.0 - prvTidyW3CAttrsFor_SUMMARY@Base 1:5.2.0 - prvTidyW3CAttrsFor_SUP@Base 1:5.2.0 - prvTidyW3CAttrsFor_SVG@Base 1:5.2.0 - prvTidyW3CAttrsFor_TABLE@Base 1:5.2.0 - prvTidyW3CAttrsFor_TBODY@Base 1:5.2.0 - prvTidyW3CAttrsFor_TD@Base 1:5.2.0 - prvTidyW3CAttrsFor_TEMPLATE@Base 1:5.2.0 - prvTidyW3CAttrsFor_TEXTAREA@Base 1:5.2.0 - prvTidyW3CAttrsFor_TFOOT@Base 1:5.2.0 - prvTidyW3CAttrsFor_TH@Base 1:5.2.0 - prvTidyW3CAttrsFor_THEAD@Base 1:5.2.0 - prvTidyW3CAttrsFor_TIME@Base 1:5.2.0 - prvTidyW3CAttrsFor_TITLE@Base 1:5.2.0 - prvTidyW3CAttrsFor_TR@Base 1:5.2.0 - prvTidyW3CAttrsFor_TRACK@Base 1:5.2.0 - prvTidyW3CAttrsFor_TT@Base 1:5.2.0 - prvTidyW3CAttrsFor_U@Base 1:5.2.0 - prvTidyW3CAttrsFor_UL@Base 1:5.2.0 - prvTidyW3CAttrsFor_VAR@Base 1:5.2.0 - prvTidyW3CAttrsFor_VIDEO@Base 1:5.2.0 - prvTidyW3CAttrsFor_WBR@Base 1:5.2.0 - prvTidyW3CAttrsFor_XMP@Base 1:5.2.0 - prvTidyWarnMissingSIInEmittedDocType@Base 1:5.2.0 - prvTidyWbrToSpace@Base 1:5.2.0 - prvTidyWriteChar@Base 1:5.2.0 - prvTidyXMLPreserveWhiteSpace@Base 1:5.2.0 - prvTidyattrIsEvent@Base 1:5.2.0 - prvTidyelementIsAutonomousCustomFormat@Base 1:5.6.0 - prvTidyfilesink_putByte@Base 1:5.2.0 - prvTidyfreeFileSource@Base 1:5.2.0 - prvTidyfreeStdIOFileSource@Base 1:5.2.0 - prvTidyfreeStreamIn@Base 1:5.2.0 - prvTidyg_default_allocator@Base 1:5.2.0 - prvTidygetArgFormat@Base 1:5.6.0 - prvTidygetArgType@Base 1:5.6.0 - prvTidygetArgValueDouble@Base 1:5.6.0 - prvTidygetArgValueInt@Base 1:5.6.0 - prvTidygetArgValueString@Base 1:5.6.0 - prvTidygetArgValueUInt@Base 1:5.6.0 - prvTidygetErrorCodeList@Base 1:5.6.0 - prvTidygetInstalledLanguageList@Base 1:5.6.0 - prvTidygetMessage@Base 1:5.6.0 - prvTidygetMessageArguments@Base 1:5.6.0 - prvTidygetMessageCode@Base 1:5.6.0 - prvTidygetMessageColumn@Base 1:5.6.0 - prvTidygetMessageDefault@Base 1:5.6.0 - prvTidygetMessageDoc@Base 1:5.6.0 - prvTidygetMessageFormat@Base 1:5.6.0 - prvTidygetMessageFormatDefault@Base 1:5.6.0 - prvTidygetMessageIsMuted@Base 1:5.6.0 - prvTidygetMessageKey@Base 1:5.6.0 - prvTidygetMessageLevel@Base 1:5.6.0 - prvTidygetMessageLine@Base 1:5.6.0 - prvTidygetMessageOutput@Base 1:5.6.0 - prvTidygetMessageOutputDefault@Base 1:5.6.0 - prvTidygetMessagePos@Base 1:5.6.0 - prvTidygetMessagePosDefault@Base 1:5.6.0 - prvTidygetMessagePrefix@Base 1:5.6.0 - prvTidygetMessagePrefixDefault@Base 1:5.6.0 - prvTidygetMutedMessageList@Base 1:5.6.0 - prvTidygetNextErrorCode@Base 1:5.6.0 - prvTidygetNextInstalledLanguage@Base 1:5.6.0 - prvTidygetNextMessageArgument@Base 1:5.6.0 - prvTidygetNextMutedMessage@Base 1:5.6.0 - prvTidygetNextOption@Base 1:5.2.0 - prvTidygetNextOptionPick@Base 1:5.2.0 - prvTidygetNextPriorityAttr@Base 1:5.6.0 - prvTidygetNextStringKey@Base 1:5.6.0 - prvTidygetNextWindowsLanguage@Base 1:5.6.0 - prvTidygetOption@Base 1:5.2.0 - prvTidygetOptionIsList@Base 1:5.6.0 - prvTidygetOptionList@Base 1:5.2.0 - prvTidygetOptionPickList@Base 1:5.2.0 - prvTidygetPriorityAttrList@Base 1:5.6.0 - prvTidygetStringKeyList@Base 1:5.6.0 - prvTidygetWindowsLanguageList@Base 1:5.6.0 - prvTidyinitFileSink@Base 1:5.2.0 - prvTidyinitFileSource@Base 1:5.2.0 - prvTidyinitStdIOFileSource@Base 1:5.2.0 - prvTidyinitStreamIn@Base 1:5.2.0 - prvTidylookupOption@Base 1:5.2.0 - prvTidynodeCMIsBlock@Base 1:5.2.0 - prvTidynodeCMIsEmpty@Base 1:5.2.0 - prvTidynodeCMIsInline@Base 1:5.2.0 - prvTidynodeHasCM@Base 1:5.2.0 - prvTidynodeHasText@Base 1:5.2.0 - prvTidynodeHeaderLevel@Base 1:5.2.0 - prvTidynodeIsAutonomousCustomFormat@Base 1:5.6.0 - prvTidynodeIsAutonomousCustomTag@Base 1:5.6.0 - prvTidynodeIsElement@Base 1:5.2.0 - prvTidynodeIsHeader@Base 1:5.2.0 - prvTidynodeIsText@Base 1:5.2.0 - prvTidyoutBOM@Base 1:5.2.0 - prvTidytidyDefaultString@Base 1:5.6.0 - prvTidytidyErrorCodeAsKey@Base 1:5.6.0 - prvTidytidyErrorCodeFromKey@Base 1:5.6.0 - prvTidytidyGetLanguage@Base 1:5.6.0 - prvTidytidyGetLanguageSetByUser@Base 1:5.6.0 - prvTidytidyLibraryVersion@Base 1:5.6.0 - prvTidytidyLocalizedString@Base 1:5.2.0 - prvTidytidyLocalizedStringN@Base 1:5.6.0 - prvTidytidyMessageCreate@Base 1:5.6.0 - prvTidytidyMessageCreateWithLexer@Base 1:5.6.0 - prvTidytidyMessageCreateWithNode@Base 1:5.6.0 - prvTidytidyMessageRelease@Base 1:5.6.0 - prvTidytidyNormalizedLocaleName@Base 1:5.6.0 - prvTidytidySetLanguage@Base 1:5.6.0 - prvTidytidySetLanguageSetByUser@Base 1:5.6.0 - prvTidytidyTestLanguage@Base 1:5.2.0 - prvTidytmbsnprintf@Base 1:5.2.0 - prvTidytmbstrcasecmp@Base 1:5.2.0 - prvTidytmbstrcat@Base 1:5.2.0 - prvTidytmbstrcmp@Base 1:5.2.0 - prvTidytmbstrcpy@Base 1:5.2.0 - prvTidytmbstrdup@Base 1:5.2.0 - prvTidytmbstrlen@Base 1:5.2.0 - prvTidytmbstrncasecmp@Base 1:5.2.0 - prvTidytmbstrncmp@Base 1:5.2.0 - prvTidytmbstrncpy@Base 1:5.2.0 - prvTidytmbstrndup@Base 1:5.2.0 - prvTidytmbstrtolower@Base 1:5.2.0 - prvTidytmbstrtoupper@Base 1:5.2.0 - prvTidytmbsubstr@Base 1:5.2.0 - prvTidytmbsubstrn@Base 1:5.2.0 - prvTidytmbvsnprintf@Base 1:5.2.0 - tidyAccessWarningCount@Base 1:5.2.0 - tidyAttrDiscard@Base 1:5.2.0 - tidyAttrFirst@Base 1:5.2.0 - tidyAttrGetById@Base 1:5.2.0 - tidyAttrGetId@Base 1:5.2.0 - tidyAttrIsEvent@Base 1:5.2.0 - tidyAttrName@Base 1:5.2.0 - tidyAttrNext@Base 1:5.2.0 - tidyAttrValue@Base 1:5.2.0 - tidyBufAlloc@Base 1:5.2.0 - tidyBufAllocWithAllocator@Base 1:5.2.0 - tidyBufAppend@Base 1:5.2.0 - tidyBufAttach@Base 1:5.2.0 - tidyBufCheckAlloc@Base 1:5.2.0 - tidyBufClear@Base 1:5.2.0 - tidyBufDetach@Base 1:5.2.0 - tidyBufEndOfInput@Base 1:5.2.0 - tidyBufFree@Base 1:5.2.0 - tidyBufGetByte@Base 1:5.2.0 - tidyBufInit@Base 1:5.2.0 - tidyBufInitWithAllocator@Base 1:5.2.0 - tidyBufPopByte@Base 1:5.2.0 - tidyBufPutByte@Base 1:5.2.0 - tidyBufUngetByte@Base 1:5.2.0 - tidyCleanAndRepair@Base 1:5.2.0 - tidyConfigErrorCount@Base 1:5.2.0 - tidyCreate@Base 1:5.2.0 - tidyCreateWithAllocator@Base 1:5.2.0 - tidyDefaultString@Base 1:5.2.0 - tidyDetectedGenericXml@Base 1:5.2.0 - tidyDetectedHtmlVersion@Base 1:5.2.0 - tidyDetectedXhtml@Base 1:5.2.0 - tidyDiscardElement@Base 1:5.2.0 - tidyErrorCodeAsKey@Base 1:5.6.0 - tidyErrorCodeFromKey@Base 1:5.6.0 - tidyErrorCount@Base 1:5.2.0 - tidyErrorSummary@Base 1:5.2.0 - tidyFileExists@Base 1:5.2.0 - tidyGeneralInfo@Base 1:5.2.0 - tidyGetAppData@Base 1:5.2.0 - tidyGetArgFormat@Base 1:5.6.0 - tidyGetArgType@Base 1:5.6.0 - tidyGetArgValueDouble@Base 1:5.6.0 - tidyGetArgValueInt@Base 1:5.6.0 - tidyGetArgValueString@Base 1:5.6.0 - tidyGetArgValueUInt@Base 1:5.6.0 - tidyGetBody@Base 1:5.2.0 - tidyGetByte@Base 1:5.2.0 - tidyGetChild@Base 1:5.2.0 - tidyGetEmacsFile@Base 1:5.6.0 - tidyGetHead@Base 1:5.2.0 - tidyGetHtml@Base 1:5.2.0 - tidyGetLanguage@Base 1:5.2.0 - tidyGetMessage@Base 1:5.6.0 - tidyGetMessageArguments@Base 1:5.6.0 - tidyGetMessageCode@Base 1:5.6.0 - tidyGetMessageColumn@Base 1:5.6.0 - tidyGetMessageDefault@Base 1:5.6.0 - tidyGetMessageDoc@Base 1:5.6.0 - tidyGetMessageFormat@Base 1:5.6.0 - tidyGetMessageFormatDefault@Base 1:5.6.0 - tidyGetMessageIsMuted@Base 1:5.6.0 - tidyGetMessageKey@Base 1:5.6.0 - tidyGetMessageLevel@Base 1:5.6.0 - tidyGetMessageLine@Base 1:5.6.0 - tidyGetMessageOutput@Base 1:5.6.0 - tidyGetMessageOutputDefault@Base 1:5.6.0 - tidyGetMessagePos@Base 1:5.6.0 - tidyGetMessagePosDefault@Base 1:5.6.0 - tidyGetMessagePrefix@Base 1:5.6.0 - tidyGetMessagePrefixDefault@Base 1:5.6.0 - tidyGetNext@Base 1:5.2.0 - tidyGetNextMessageArgument@Base 1:5.6.0 - tidyGetNextOption@Base 1:5.2.0 - tidyGetOption@Base 1:5.2.0 - tidyGetOptionByName@Base 1:5.2.0 - tidyGetOptionList@Base 1:5.2.0 - tidyGetParent@Base 1:5.2.0 - tidyGetPrev@Base 1:5.2.0 - tidyGetRoot@Base 1:5.2.0 - tidyInitInputBuffer@Base 1:5.2.0 - tidyInitOutputBuffer@Base 1:5.2.0 - tidyInitSink@Base 1:5.2.0 - tidyInitSource@Base 1:5.2.0 - tidyIsEOF@Base 1:5.2.0 - tidyLibraryVersion@Base 1:5.2.0 - tidyLoadConfig@Base 1:5.2.0 - tidyLoadConfigEnc@Base 1:5.2.0 - tidyLocalizedString@Base 1:5.2.0 - tidyLocalizedStringN@Base 1:5.2.0 - tidyNodeCMIsBlock@Base 1:5.2.0 - tidyNodeCMIsEmpty@Base 1:5.2.0 - tidyNodeCMIsInline@Base 1:5.2.0 - tidyNodeColumn@Base 1:5.2.0 - tidyNodeGetId@Base 1:5.2.0 - tidyNodeGetName@Base 1:5.2.0 - tidyNodeGetText@Base 1:5.2.0 - tidyNodeGetType@Base 1:5.2.0 - tidyNodeGetValue@Base 1:5.2.0 - tidyNodeHasText@Base 1:5.2.0 - tidyNodeIsHeader@Base 1:5.6.0 - tidyNodeIsProp@Base 1:5.2.0 - tidyNodeIsText@Base 1:5.2.0 - tidyNodeLine@Base 1:5.2.0 - tidyOptCopyConfig@Base 1:5.2.0 - tidyOptDiffThanDefault@Base 1:5.2.0 - tidyOptDiffThanSnapshot@Base 1:5.2.0 - tidyOptGetBool@Base 1:5.2.0 - tidyOptGetCategory@Base 1:5.2.0 - tidyOptGetCurrPick@Base 1:5.2.0 - tidyOptGetDeclTagList@Base 1:5.2.0 - tidyOptGetDefault@Base 1:5.2.0 - tidyOptGetDefaultBool@Base 1:5.2.0 - tidyOptGetDefaultInt@Base 1:5.2.0 - tidyOptGetDoc@Base 1:5.2.0 - tidyOptGetDocLinksList@Base 1:5.2.0 - tidyOptGetEncName@Base 1:5.2.0 - tidyOptGetId@Base 1:5.2.0 - tidyOptGetIdForName@Base 1:5.2.0 - tidyOptGetInt@Base 1:5.2.0 - tidyOptGetMutedMessageList@Base 1:5.6.0 - tidyOptGetName@Base 1:5.2.0 - tidyOptGetNextDeclTag@Base 1:5.2.0 - tidyOptGetNextDocLinks@Base 1:5.2.0 - tidyOptGetNextMutedMessage@Base 1:5.6.0 - tidyOptGetNextPick@Base 1:5.2.0 - tidyOptGetNextPriorityAttr@Base 1:5.6.0 - tidyOptGetPickList@Base 1:5.2.0 - tidyOptGetPriorityAttrList@Base 1:5.6.0 - tidyOptGetType@Base 1:5.2.0 - tidyOptGetValue@Base 1:5.2.0 - tidyOptIsReadOnly@Base 1:5.2.0 - tidyOptParseValue@Base 1:5.2.0 - tidyOptResetAllToDefault@Base 1:5.2.0 - tidyOptResetToDefault@Base 1:5.2.0 - tidyOptResetToSnapshot@Base 1:5.2.0 - tidyOptSaveFile@Base 1:5.2.0 - tidyOptSaveSink@Base 1:5.2.0 - tidyOptSetBool@Base 1:5.2.0 - tidyOptSetInt@Base 1:5.2.0 - tidyOptSetValue@Base 1:5.2.0 - tidyOptSnapshot@Base 1:5.2.0 - tidyOptionIsList@Base 1:5.6.0 - tidyParseBuffer@Base 1:5.2.0 - tidyParseFile@Base 1:5.2.0 - tidyParseSource@Base 1:5.2.0 - tidyParseStdin@Base 1:5.2.0 - tidyParseString@Base 1:5.2.0 - tidyPlatform@Base 1:5.6.0 - tidyPutByte@Base 1:5.2.0 - tidyRelease@Base 1:5.2.0 - tidyReleaseDate@Base 1:5.2.0 - tidyReportDoctype@Base 1:5.2.0 - tidyRunDiagnostics@Base 1:5.2.0 - tidySaveBuffer@Base 1:5.2.0 - tidySaveFile@Base 1:5.2.0 - tidySaveSink@Base 1:5.2.0 - tidySaveStdout@Base 1:5.2.0 - tidySaveString@Base 1:5.2.0 - tidySetAppData@Base 1:5.2.0 - tidySetCharEncoding@Base 1:5.2.0 - tidySetConfigCallback@Base 1:5.6.0 - tidySetConfigChangeCallback@Base 1:5.6.0 - tidySetEmacsFile@Base 1:5.6.0 - tidySetErrorBuffer@Base 1:5.2.0 - tidySetErrorFile@Base 1:5.2.0 - tidySetErrorSink@Base 1:5.2.0 - tidySetFreeCall@Base 1:5.2.0 - tidySetInCharEncoding@Base 1:5.2.0 - tidySetLanguage@Base 1:5.2.0 - tidySetMallocCall@Base 1:5.2.0 - tidySetMessageCallback@Base 1:5.6.0 - tidySetOptionCallback@Base 1:5.2.0 - tidySetOutCharEncoding@Base 1:5.2.0 - tidySetPanicCall@Base 1:5.2.0 - tidySetPrettyPrinterCallback@Base 1:5.2.0 - tidySetReallocCall@Base 1:5.2.0 - tidySetReportCallback@Base 1:5.6.0 - tidySetReportFilter@Base 1:5.2.0 - tidyStatus@Base 1:5.2.0 - tidyUngetByte@Base 1:5.2.0 - tidyWarningCount@Base 1:5.2.0 diff -Nru tidy-html5-5.6.0/debian/libtidy5.install tidy-html5-5.2.0/debian/libtidy5.install --- tidy-html5-5.6.0/debian/libtidy5.install 1970-01-01 00:00:00.000000000 +0000 +++ tidy-html5-5.2.0/debian/libtidy5.install 2016-08-04 09:48:16.000000000 +0000 @@ -0,0 +1,3 @@ +debian/usr/share/doc/tidy/changelog /usr/share/doc/libtidy5/ +debian/usr/share/lintian/overrides/libtidy5 /usr/share/lintian/overrides/ +usr/lib/libtidy.so.* diff -Nru tidy-html5-5.6.0/debian/libtidy5.symbols tidy-html5-5.2.0/debian/libtidy5.symbols --- tidy-html5-5.6.0/debian/libtidy5.symbols 1970-01-01 00:00:00.000000000 +0000 +++ tidy-html5-5.2.0/debian/libtidy5.symbols 2016-08-04 09:48:16.000000000 +0000 @@ -0,0 +1,770 @@ +libtidy.so.5 libtidy5 #MINVER# + getErrorCodeList@Base 5.2.0 + getInstalledLanguageList@Base 5.2.0 + getNextErrorCode@Base 5.2.0 + getNextInstalledLanguage@Base 5.2.0 + getNextStringKey@Base 5.2.0 + getNextWindowsLanguage@Base 5.2.0 + getStringKeyList@Base 5.2.0 + getWindowsLanguageList@Base 5.2.0 + inRemovedInfo@Base 5.2.0 + prvTidyAccessibilityChecks@Base 5.2.0 + prvTidyAccessibilityHelloMessage@Base 5.2.0 + prvTidyAddAttribute@Base 5.2.0 + prvTidyAddCharToLexer@Base 5.2.0 + prvTidyAddGenerator@Base 5.2.0 + prvTidyAddStringLiteral@Base 5.2.0 + prvTidyAddStyleAsClass@Base 5.2.0 + prvTidyAddStyleProperty@Base 5.2.0 + prvTidyAdjustCharEncoding@Base 5.2.0 + prvTidyAdjustTags@Base 5.2.0 + prvTidyApparentVersion@Base 5.2.0 + prvTidyAppendToClassAttr@Base 5.2.0 + prvTidyAttrGetById@Base 5.2.0 + prvTidyAttributeIsMismatched@Base 5.2.0 + prvTidyAttributeIsProprietary@Base 5.2.0 + prvTidyBQ2Div@Base 5.2.0 + prvTidyBufferInput@Base 5.2.0 + prvTidyBufferOutput@Base 5.2.0 + prvTidyBumpObject@Base 5.2.0 + prvTidyCharEncodingId@Base 5.2.0 + prvTidyCharEncodingName@Base 5.2.0 + prvTidyCharEncodingOptName@Base 5.2.0 + prvTidyCheckAttribute@Base 5.2.0 + prvTidyCheckAttributes@Base 5.2.0 + prvTidyCheckHTML5@Base 5.2.0 + prvTidyCheckHTMLTagsAttribsVersions@Base 5.2.0 + prvTidyCheckNodeIntegrity@Base 5.2.0 + prvTidyCheckUrl@Base 5.2.0 + prvTidyCleanDocument@Base 5.2.0 + prvTidyCleanGoogleDocument@Base 5.2.0 + prvTidyCleanWord2000@Base 5.2.0 + prvTidyCloneNode@Base 5.2.0 + prvTidyCoerceNode@Base 5.2.0 + prvTidyCombineSurrogatePair@Base 5.2.0 + prvTidyConfigDiffThanDefault@Base 5.2.0 + prvTidyConfigDiffThanSnapshot@Base 5.2.0 + prvTidyConstrainVersion@Base 5.2.0 + prvTidyConvertCDATANodes@Base 5.2.0 + prvTidyCopyConfig@Base 5.2.0 + prvTidyDecodeMacRoman@Base 5.2.0 + prvTidyDecodeUTF8BytesToChar@Base 5.2.0 + prvTidyDecodeWin1252@Base 5.2.0 + prvTidyDeferDup@Base 5.2.0 + prvTidyDefineTag@Base 5.2.0 + prvTidyDetachAttribute@Base 5.2.0 + prvTidyDiscardElement@Base 5.2.0 + prvTidyDisplayHTMLTableAlgorithm@Base 5.2.0 + prvTidyDocParseStream@Base 5.2.0 + prvTidyDowngradeTypography@Base 5.2.0 + prvTidyDropAttrByName@Base 5.2.0 + prvTidyDropComments@Base 5.2.0 + prvTidyDropEmptyElements@Base 5.2.0 + prvTidyDropFontElements@Base 5.2.0 + prvTidyDropSections@Base 5.2.0 + prvTidyDupAttrs@Base 5.2.0 + prvTidyEmFromI@Base 5.2.0 + prvTidyEncodeCharToUTF8Bytes@Base 5.2.0 + prvTidyEntityInfo@Base 5.2.0 + prvTidyEntityName@Base 5.2.0 + prvTidyErrorSummary@Base 5.2.0 + prvTidyFileError@Base 5.2.0 + prvTidyFileInput@Base 5.2.0 + prvTidyFileOutput@Base 5.2.0 + prvTidyFindAttribute@Base 5.2.0 + prvTidyFindBody@Base 5.2.0 + prvTidyFindContainer@Base 5.2.0 + prvTidyFindDocType@Base 5.2.0 + prvTidyFindHEAD@Base 5.2.0 + prvTidyFindHTML@Base 5.2.0 + prvTidyFindNodeById@Base 5.2.0 + prvTidyFindNodeWithId@Base 5.2.0 + prvTidyFindParser@Base 5.2.0 + prvTidyFindTITLE@Base 5.2.0 + prvTidyFindTag@Base 5.2.0 + prvTidyFindXmlDecl@Base 5.2.0 + prvTidyFixAnchors@Base 5.2.0 + prvTidyFixDocType@Base 5.2.0 + prvTidyFixLanguageInformation@Base 5.2.0 + prvTidyFixNodeLinks@Base 5.2.0 + prvTidyFixXhtmlNamespace@Base 5.2.0 + prvTidyFixXmlDecl@Base 5.2.0 + prvTidyFreeAnchors@Base 5.2.0 + prvTidyFreeAttrTable@Base 5.2.0 + prvTidyFreeAttribute@Base 5.2.0 + prvTidyFreeAttrs@Base 5.2.0 + prvTidyFreeConfig@Base 5.2.0 + prvTidyFreeDeclaredTags@Base 5.2.0 + prvTidyFreeLexer@Base 5.2.0 + prvTidyFreeNode@Base 5.2.0 + prvTidyFreePrintBuf@Base 5.2.0 + prvTidyFreeStyles@Base 5.2.0 + prvTidyFreeTags@Base 5.2.0 + prvTidyGeneralInfo@Base 5.2.0 + prvTidyGetAttrByName@Base 5.2.0 + prvTidyGetCharEncodingFromOptName@Base 5.2.0 + prvTidyGetDeclaredTagList@Base 5.2.0 + prvTidyGetEncodingCodePageFromId@Base 5.2.0 + prvTidyGetEncodingCodePageFromName@Base 5.2.0 + prvTidyGetEncodingIdFromCodePage@Base 5.2.0 + prvTidyGetEncodingIdFromName@Base 5.2.0 + prvTidyGetEncodingNameFromCodePage@Base 5.2.0 + prvTidyGetEncodingNameFromId@Base 5.2.0 + prvTidyGetEncodingNameFromTidyId@Base 5.2.0 + prvTidyGetEncodingOptNameFromTidyId@Base 5.2.0 + prvTidyGetNextDeclaredTag@Base 5.2.0 + prvTidyGetToken@Base 5.2.0 + prvTidyGetUTF8@Base 5.2.0 + prvTidyHTMLVersion@Base 5.2.0 + prvTidyHTMLVersionNameFromCode@Base 5.2.0 + prvTidyInferredTag@Base 5.2.0 + prvTidyInitAttrs@Base 5.2.0 + prvTidyInitConfig@Base 5.2.0 + prvTidyInitMap@Base 5.2.0 + prvTidyInitPrintBuf@Base 5.2.0 + prvTidyInitTags@Base 5.2.0 + prvTidyInlineDup1@Base 5.2.0 + prvTidyInlineDup@Base 5.2.0 + prvTidyInsertAttributeAtEnd@Base 5.2.0 + prvTidyInsertAttributeAtStart@Base 5.2.0 + prvTidyInsertNodeAfterElement@Base 5.2.0 + prvTidyInsertNodeAtEnd@Base 5.2.0 + prvTidyInsertNodeAtStart@Base 5.2.0 + prvTidyInsertNodeBeforeElement@Base 5.2.0 + prvTidyInsertedToken@Base 5.2.0 + prvTidyIsAnchorElement@Base 5.2.0 + prvTidyIsBlank@Base 5.2.0 + prvTidyIsBoolAttribute@Base 5.2.0 + prvTidyIsCSS1Selector@Base 5.2.0 + prvTidyIsCombinedChar@Base 5.2.0 + prvTidyIsDigit@Base 5.2.0 + prvTidyIsEOF@Base 5.2.0 + prvTidyIsHTMLSpace@Base 5.2.0 + prvTidyIsHighSurrogate@Base 5.2.0 + prvTidyIsJavaScript@Base 5.2.0 + prvTidyIsLetter@Base 5.2.0 + prvTidyIsLowSurrogate@Base 5.2.0 + prvTidyIsNamechar@Base 5.2.0 + prvTidyIsNewNode@Base 5.2.0 + prvTidyIsNewline@Base 5.2.0 + prvTidyIsPushed@Base 5.2.0 + prvTidyIsPushedLast@Base 5.2.0 + prvTidyIsScript@Base 5.2.0 + prvTidyIsUpper@Base 5.2.0 + prvTidyIsUrl@Base 5.2.0 + prvTidyIsValidCombinedChar@Base 5.2.0 + prvTidyIsValidHTMLID@Base 5.2.0 + prvTidyIsValidUTF16FromUCS4@Base 5.2.0 + prvTidyIsValidXMLID@Base 5.2.0 + prvTidyIsWhite@Base 5.2.0 + prvTidyIsWord2000@Base 5.2.0 + prvTidyIsXMLLetter@Base 5.2.0 + prvTidyIsXMLNamechar@Base 5.2.0 + prvTidyList2BQ@Base 5.2.0 + prvTidyLookupTagDef@Base 5.2.0 + prvTidyNeedsAuthorIntervention@Base 5.2.0 + prvTidyNestedEmphasis@Base 5.2.0 + prvTidyNewAttribute@Base 5.2.0 + prvTidyNewAttributeEx@Base 5.2.0 + prvTidyNewLexer@Base 5.2.0 + prvTidyNewLineNode@Base 5.2.0 + prvTidyNewLiteralTextNode@Base 5.2.0 + prvTidyNewNode@Base 5.2.0 + prvTidyNodeAttributeVersions@Base 5.2.0 + prvTidyNormalizeSpaces@Base 5.2.0 + prvTidyOptGetDocDesc@Base 5.2.0 + prvTidyPFlushLine@Base 5.2.0 + prvTidyPFlushLineSmart@Base 5.2.0 + prvTidyPPrintSpaces@Base 5.2.0 + prvTidyPPrintTabs@Base 5.2.0 + prvTidyPPrintTree@Base 5.2.0 + prvTidyPPrintXMLTree@Base 5.2.0 + prvTidyParseBlock@Base 5.2.0 + prvTidyParseBody@Base 5.2.0 + prvTidyParseColGroup@Base 5.2.0 + prvTidyParseConfigFile@Base 5.2.0 + prvTidyParseConfigFileEnc@Base 5.2.0 + prvTidyParseConfigOption@Base 5.2.0 + prvTidyParseConfigValue@Base 5.2.0 + prvTidyParseDatalist@Base 5.2.0 + prvTidyParseDefList@Base 5.2.0 + prvTidyParseDocument@Base 5.2.0 + prvTidyParseEmpty@Base 5.2.0 + prvTidyParseFrameSet@Base 5.2.0 + prvTidyParseHTML@Base 5.2.0 + prvTidyParseHead@Base 5.2.0 + prvTidyParseInline@Base 5.2.0 + prvTidyParseList@Base 5.2.0 + prvTidyParseNamespace@Base 5.2.0 + prvTidyParseNoFrames@Base 5.2.0 + prvTidyParseOptGroup@Base 5.2.0 + prvTidyParsePre@Base 5.2.0 + prvTidyParseRow@Base 5.2.0 + prvTidyParseRowGroup@Base 5.2.0 + prvTidyParseScript@Base 5.2.0 + prvTidyParseSelect@Base 5.2.0 + prvTidyParseTableTag@Base 5.2.0 + prvTidyParseText@Base 5.2.0 + prvTidyParseTitle@Base 5.2.0 + prvTidyParseXMLDocument@Base 5.2.0 + prvTidyPopInline@Base 5.2.0 + prvTidyPrintBody@Base 5.2.0 + prvTidyPushInline@Base 5.2.0 + prvTidyPutUTF8@Base 5.2.0 + prvTidyReadBOMEncoding@Base 5.2.0 + prvTidyReadChar@Base 5.2.0 + prvTidyReleaseDate@Base 5.2.0 + prvTidyReleaseStreamOut@Base 5.2.0 + prvTidyRemoveAnchorByNode@Base 5.2.0 + prvTidyRemoveAttribute@Base 5.2.0 + prvTidyRemoveNode@Base 5.2.0 + prvTidyRepairAttrValue@Base 5.2.0 + prvTidyRepairDuplicateAttributes@Base 5.2.0 + prvTidyReplacePreformattedSpaces@Base 5.2.0 + prvTidyReportAccessError@Base 5.2.0 + prvTidyReportAccessWarning@Base 5.2.0 + prvTidyReportAttrError@Base 5.2.0 + prvTidyReportBadArgument@Base 5.2.0 + prvTidyReportEncodingError@Base 5.2.0 + prvTidyReportEncodingWarning@Base 5.2.0 + prvTidyReportEntityError@Base 5.2.0 + prvTidyReportError@Base 5.2.0 + prvTidyReportFatal@Base 5.2.0 + prvTidyReportMarkupVersion@Base 5.2.0 + prvTidyReportMissingAttr@Base 5.2.0 + prvTidyReportNotice@Base 5.2.0 + prvTidyReportNumWarnings@Base 5.2.0 + prvTidyReportUnknownOption@Base 5.2.0 + prvTidyReportWarning@Base 5.2.0 + prvTidyResetConfigToDefault@Base 5.2.0 + prvTidyResetConfigToSnapshot@Base 5.2.0 + prvTidyResetOptionToDefault@Base 5.2.0 + prvTidyResetTags@Base 5.2.0 + prvTidySaveConfigFile@Base 5.2.0 + prvTidySaveConfigSink@Base 5.2.0 + prvTidySetOptionBool@Base 5.2.0 + prvTidySetOptionInt@Base 5.2.0 + prvTidySetXHTMLDocType@Base 5.2.0 + prvTidySortAttributes@Base 5.2.0 + prvTidySplitSurrogatePair@Base 5.2.0 + prvTidyStdErrOutput@Base 5.2.0 + prvTidySwitchInline@Base 5.2.0 + prvTidyTakeConfigSnapshot@Base 5.2.0 + prvTidyTextNodeEndWithSpace@Base 5.2.0 + prvTidyTextToken@Base 5.2.0 + prvTidyToLower@Base 5.2.0 + prvTidyToUpper@Base 5.2.0 + prvTidyTraverseNodeTree@Base 5.2.0 + prvTidyTrimEmptyElement@Base 5.2.0 + prvTidyUngetChar@Base 5.2.0 + prvTidyUngetToken@Base 5.2.0 + prvTidyUserInput@Base 5.2.0 + prvTidyUserOutput@Base 5.2.0 + prvTidyVerifyHTTPEquiv@Base 5.2.0 + prvTidyW3CAttrsFor_A@Base 5.2.0 + prvTidyW3CAttrsFor_ABBR@Base 5.2.0 + prvTidyW3CAttrsFor_ACRONYM@Base 5.2.0 + prvTidyW3CAttrsFor_ADDRESS@Base 5.2.0 + prvTidyW3CAttrsFor_APPLET@Base 5.2.0 + prvTidyW3CAttrsFor_AREA@Base 5.2.0 + prvTidyW3CAttrsFor_ARTICLE@Base 5.2.0 + prvTidyW3CAttrsFor_ASIDE@Base 5.2.0 + prvTidyW3CAttrsFor_AUDIO@Base 5.2.0 + prvTidyW3CAttrsFor_B@Base 5.2.0 + prvTidyW3CAttrsFor_BASE@Base 5.2.0 + prvTidyW3CAttrsFor_BASEFONT@Base 5.2.0 + prvTidyW3CAttrsFor_BDI@Base 5.2.0 + prvTidyW3CAttrsFor_BDO@Base 5.2.0 + prvTidyW3CAttrsFor_BIG@Base 5.2.0 + prvTidyW3CAttrsFor_BLOCKQUOTE@Base 5.2.0 + prvTidyW3CAttrsFor_BODY@Base 5.2.0 + prvTidyW3CAttrsFor_BR@Base 5.2.0 + prvTidyW3CAttrsFor_BUTTON@Base 5.2.0 + prvTidyW3CAttrsFor_CANVAS@Base 5.2.0 + prvTidyW3CAttrsFor_CAPTION@Base 5.2.0 + prvTidyW3CAttrsFor_CENTER@Base 5.2.0 + prvTidyW3CAttrsFor_CITE@Base 5.2.0 + prvTidyW3CAttrsFor_CODE@Base 5.2.0 + prvTidyW3CAttrsFor_COL@Base 5.2.0 + prvTidyW3CAttrsFor_COLGROUP@Base 5.2.0 + prvTidyW3CAttrsFor_COMMAND@Base 5.2.0 + prvTidyW3CAttrsFor_DATALIST@Base 5.2.0 + prvTidyW3CAttrsFor_DD@Base 5.2.0 + prvTidyW3CAttrsFor_DEL@Base 5.2.0 + prvTidyW3CAttrsFor_DETAILS@Base 5.2.0 + prvTidyW3CAttrsFor_DFN@Base 5.2.0 + prvTidyW3CAttrsFor_DIALOG@Base 5.2.0 + prvTidyW3CAttrsFor_DIR@Base 5.2.0 + prvTidyW3CAttrsFor_DIV@Base 5.2.0 + prvTidyW3CAttrsFor_DL@Base 5.2.0 + prvTidyW3CAttrsFor_DT@Base 5.2.0 + prvTidyW3CAttrsFor_EM@Base 5.2.0 + prvTidyW3CAttrsFor_EMBED@Base 5.2.0 + prvTidyW3CAttrsFor_FIELDSET@Base 5.2.0 + prvTidyW3CAttrsFor_FIGCAPTION@Base 5.2.0 + prvTidyW3CAttrsFor_FIGURE@Base 5.2.0 + prvTidyW3CAttrsFor_FONT@Base 5.2.0 + prvTidyW3CAttrsFor_FOOTER@Base 5.2.0 + prvTidyW3CAttrsFor_FORM@Base 5.2.0 + prvTidyW3CAttrsFor_FRAME@Base 5.2.0 + prvTidyW3CAttrsFor_FRAMESET@Base 5.2.0 + prvTidyW3CAttrsFor_H1@Base 5.2.0 + prvTidyW3CAttrsFor_H2@Base 5.2.0 + prvTidyW3CAttrsFor_H3@Base 5.2.0 + prvTidyW3CAttrsFor_H4@Base 5.2.0 + prvTidyW3CAttrsFor_H5@Base 5.2.0 + prvTidyW3CAttrsFor_H6@Base 5.2.0 + prvTidyW3CAttrsFor_HEAD@Base 5.2.0 + prvTidyW3CAttrsFor_HEADER@Base 5.2.0 + prvTidyW3CAttrsFor_HGROUP@Base 5.2.0 + prvTidyW3CAttrsFor_HR@Base 5.2.0 + prvTidyW3CAttrsFor_HTML@Base 5.2.0 + prvTidyW3CAttrsFor_I@Base 5.2.0 + prvTidyW3CAttrsFor_IFRAME@Base 5.2.0 + prvTidyW3CAttrsFor_IMG@Base 5.2.0 + prvTidyW3CAttrsFor_INPUT@Base 5.2.0 + prvTidyW3CAttrsFor_INS@Base 5.2.0 + prvTidyW3CAttrsFor_ISINDEX@Base 5.2.0 + prvTidyW3CAttrsFor_KBD@Base 5.2.0 + prvTidyW3CAttrsFor_KEYGEN@Base 5.2.0 + prvTidyW3CAttrsFor_LABEL@Base 5.2.0 + prvTidyW3CAttrsFor_LEGEND@Base 5.2.0 + prvTidyW3CAttrsFor_LI@Base 5.2.0 + prvTidyW3CAttrsFor_LINK@Base 5.2.0 + prvTidyW3CAttrsFor_LISTING@Base 5.2.0 + prvTidyW3CAttrsFor_MAIN@Base 5.2.0 + prvTidyW3CAttrsFor_MAP@Base 5.2.0 + prvTidyW3CAttrsFor_MARK@Base 5.2.0 + prvTidyW3CAttrsFor_MATHML@Base 5.2.0 + prvTidyW3CAttrsFor_MENU@Base 5.2.0 + prvTidyW3CAttrsFor_MENUITEM@Base 5.2.0 + prvTidyW3CAttrsFor_META@Base 5.2.0 + prvTidyW3CAttrsFor_METER@Base 5.2.0 + prvTidyW3CAttrsFor_NAV@Base 5.2.0 + prvTidyW3CAttrsFor_NEXTID@Base 5.2.0 + prvTidyW3CAttrsFor_NOFRAMES@Base 5.2.0 + prvTidyW3CAttrsFor_NOSCRIPT@Base 5.2.0 + prvTidyW3CAttrsFor_OBJECT@Base 5.2.0 + prvTidyW3CAttrsFor_OL@Base 5.2.0 + prvTidyW3CAttrsFor_OPTGROUP@Base 5.2.0 + prvTidyW3CAttrsFor_OPTION@Base 5.2.0 + prvTidyW3CAttrsFor_OUTPUT@Base 5.2.0 + prvTidyW3CAttrsFor_P@Base 5.2.0 + prvTidyW3CAttrsFor_PARAM@Base 5.2.0 + prvTidyW3CAttrsFor_PICTURE@Base 5.2.0 + prvTidyW3CAttrsFor_PLAINTEXT@Base 5.2.0 + prvTidyW3CAttrsFor_PRE@Base 5.2.0 + prvTidyW3CAttrsFor_PROGRESS@Base 5.2.0 + prvTidyW3CAttrsFor_Q@Base 5.2.0 + prvTidyW3CAttrsFor_RB@Base 5.2.0 + prvTidyW3CAttrsFor_RBC@Base 5.2.0 + prvTidyW3CAttrsFor_RP@Base 5.2.0 + prvTidyW3CAttrsFor_RT@Base 5.2.0 + prvTidyW3CAttrsFor_RTC@Base 5.2.0 + prvTidyW3CAttrsFor_RUBY@Base 5.2.0 + prvTidyW3CAttrsFor_S@Base 5.2.0 + prvTidyW3CAttrsFor_SAMP@Base 5.2.0 + prvTidyW3CAttrsFor_SCRIPT@Base 5.2.0 + prvTidyW3CAttrsFor_SECTION@Base 5.2.0 + prvTidyW3CAttrsFor_SELECT@Base 5.2.0 + prvTidyW3CAttrsFor_SMALL@Base 5.2.0 + prvTidyW3CAttrsFor_SOURCE@Base 5.2.0 + prvTidyW3CAttrsFor_SPAN@Base 5.2.0 + prvTidyW3CAttrsFor_STRIKE@Base 5.2.0 + prvTidyW3CAttrsFor_STRONG@Base 5.2.0 + prvTidyW3CAttrsFor_STYLE@Base 5.2.0 + prvTidyW3CAttrsFor_SUB@Base 5.2.0 + prvTidyW3CAttrsFor_SUMMARY@Base 5.2.0 + prvTidyW3CAttrsFor_SUP@Base 5.2.0 + prvTidyW3CAttrsFor_SVG@Base 5.2.0 + prvTidyW3CAttrsFor_TABLE@Base 5.2.0 + prvTidyW3CAttrsFor_TBODY@Base 5.2.0 + prvTidyW3CAttrsFor_TD@Base 5.2.0 + prvTidyW3CAttrsFor_TEMPLATE@Base 5.2.0 + prvTidyW3CAttrsFor_TEXTAREA@Base 5.2.0 + prvTidyW3CAttrsFor_TFOOT@Base 5.2.0 + prvTidyW3CAttrsFor_TH@Base 5.2.0 + prvTidyW3CAttrsFor_THEAD@Base 5.2.0 + prvTidyW3CAttrsFor_TIME@Base 5.2.0 + prvTidyW3CAttrsFor_TITLE@Base 5.2.0 + prvTidyW3CAttrsFor_TR@Base 5.2.0 + prvTidyW3CAttrsFor_TRACK@Base 5.2.0 + prvTidyW3CAttrsFor_TT@Base 5.2.0 + prvTidyW3CAttrsFor_U@Base 5.2.0 + prvTidyW3CAttrsFor_UL@Base 5.2.0 + prvTidyW3CAttrsFor_VAR@Base 5.2.0 + prvTidyW3CAttrsFor_VIDEO@Base 5.2.0 + prvTidyW3CAttrsFor_WBR@Base 5.2.0 + prvTidyW3CAttrsFor_XMP@Base 5.2.0 + prvTidyWarnMissingSIInEmittedDocType@Base 5.2.0 + prvTidyWbrToSpace@Base 5.2.0 + prvTidyWriteChar@Base 5.2.0 + prvTidyXMLPreserveWhiteSpace@Base 5.2.0 + prvTidyattrIsEvent@Base 5.2.0 + prvTidyfilesink_putByte@Base 5.2.0 + prvTidyfreeFileSource@Base 5.2.0 + prvTidyfreeStdIOFileSource@Base 5.2.0 + prvTidyfreeStreamIn@Base 5.2.0 + prvTidyg_default_allocator@Base 5.2.0 + prvTidygetNextOption@Base 5.2.0 + prvTidygetNextOptionPick@Base 5.2.0 + prvTidygetOption@Base 5.2.0 + prvTidygetOptionList@Base 5.2.0 + prvTidygetOptionPickList@Base 5.2.0 + prvTidyinitFileSink@Base 5.2.0 + prvTidyinitFileSource@Base 5.2.0 + prvTidyinitStdIOFileSource@Base 5.2.0 + prvTidyinitStreamIn@Base 5.2.0 + prvTidylookupOption@Base 5.2.0 + prvTidynodeCMIsBlock@Base 5.2.0 + prvTidynodeCMIsEmpty@Base 5.2.0 + prvTidynodeCMIsInline@Base 5.2.0 + prvTidynodeHasCM@Base 5.2.0 + prvTidynodeHasText@Base 5.2.0 + prvTidynodeHeaderLevel@Base 5.2.0 + prvTidynodeIsElement@Base 5.2.0 + prvTidynodeIsHeader@Base 5.2.0 + prvTidynodeIsText@Base 5.2.0 + prvTidyoutBOM@Base 5.2.0 + prvTidytidyErrorCodeListSize@Base 5.2.0 + prvTidytidyInstalledLanguageListSize@Base 5.2.0 + prvTidytidyLanguageListSize@Base 5.2.0 + prvTidytidyLocalizedString@Base 5.2.0 + prvTidytidyStringKeyListSize@Base 5.2.0 + prvTidytidyTestLanguage@Base 5.2.0 + prvTidytmbsnprintf@Base 5.2.0 + prvTidytmbstrcasecmp@Base 5.2.0 + prvTidytmbstrcat@Base 5.2.0 + prvTidytmbstrcmp@Base 5.2.0 + prvTidytmbstrcpy@Base 5.2.0 + prvTidytmbstrdup@Base 5.2.0 + prvTidytmbstrlen@Base 5.2.0 + prvTidytmbstrncasecmp@Base 5.2.0 + prvTidytmbstrncmp@Base 5.2.0 + prvTidytmbstrncpy@Base 5.2.0 + prvTidytmbstrndup@Base 5.2.0 + prvTidytmbstrtolower@Base 5.2.0 + prvTidytmbstrtoupper@Base 5.2.0 + prvTidytmbsubstr@Base 5.2.0 + prvTidytmbsubstrn@Base 5.2.0 + prvTidytmbvsnprintf@Base 5.2.0 + tidyAccessWarningCount@Base 5.2.0 + tidyAttrDiscard@Base 5.2.0 + tidyAttrFirst@Base 5.2.0 + tidyAttrGetABBR@Base 5.2.0 + tidyAttrGetALINK@Base 5.2.0 + tidyAttrGetALT@Base 5.2.0 + tidyAttrGetBGCOLOR@Base 5.2.0 + tidyAttrGetById@Base 5.2.0 + tidyAttrGetCHECKED@Base 5.2.0 + tidyAttrGetCOLSPAN@Base 5.2.0 + tidyAttrGetCONTENT@Base 5.2.0 + tidyAttrGetDATAFLD@Base 5.2.0 + tidyAttrGetFOR@Base 5.2.0 + tidyAttrGetHEIGHT@Base 5.2.0 + tidyAttrGetHREF@Base 5.2.0 + tidyAttrGetHTTP_EQUIV@Base 5.2.0 + tidyAttrGetID@Base 5.2.0 + tidyAttrGetISMAP@Base 5.2.0 + tidyAttrGetId@Base 5.2.0 + tidyAttrGetLANG@Base 5.2.0 + tidyAttrGetLANGUAGE@Base 5.2.0 + tidyAttrGetLINK@Base 5.2.0 + tidyAttrGetLONGDESC@Base 5.2.0 + tidyAttrGetNAME@Base 5.2.0 + tidyAttrGetOnBLUR@Base 5.2.0 + tidyAttrGetOnCLICK@Base 5.2.0 + tidyAttrGetOnFOCUS@Base 5.2.0 + tidyAttrGetOnKEYDOWN@Base 5.2.0 + tidyAttrGetOnKEYPRESS@Base 5.2.0 + tidyAttrGetOnKEYUP@Base 5.2.0 + tidyAttrGetOnMOUSEDOWN@Base 5.2.0 + tidyAttrGetOnMOUSEMOVE@Base 5.2.0 + tidyAttrGetOnMOUSEOUT@Base 5.2.0 + tidyAttrGetOnMOUSEOVER@Base 5.2.0 + tidyAttrGetOnMOUSEUP@Base 5.2.0 + tidyAttrGetREL@Base 5.2.0 + tidyAttrGetROWSPAN@Base 5.2.0 + tidyAttrGetSELECTED@Base 5.2.0 + tidyAttrGetSRC@Base 5.2.0 + tidyAttrGetSTYLE@Base 5.2.0 + tidyAttrGetSUMMARY@Base 5.2.0 + tidyAttrGetTARGET@Base 5.2.0 + tidyAttrGetTEXT@Base 5.2.0 + tidyAttrGetTITLE@Base 5.2.0 + tidyAttrGetTYPE@Base 5.2.0 + tidyAttrGetUSEMAP@Base 5.2.0 + tidyAttrGetVALUE@Base 5.2.0 + tidyAttrGetVLINK@Base 5.2.0 + tidyAttrGetWIDTH@Base 5.2.0 + tidyAttrGetXMLNS@Base 5.2.0 + tidyAttrIsABBR@Base 5.2.0 + tidyAttrIsALINK@Base 5.2.0 + tidyAttrIsALT@Base 5.2.0 + tidyAttrIsBGCOLOR@Base 5.2.0 + tidyAttrIsCHECKED@Base 5.2.0 + tidyAttrIsCOLSPAN@Base 5.2.0 + tidyAttrIsCONTENT@Base 5.2.0 + tidyAttrIsDATAFLD@Base 5.2.0 + tidyAttrIsEvent@Base 5.2.0 + tidyAttrIsFOR@Base 5.2.0 + tidyAttrIsHEIGHT@Base 5.2.0 + tidyAttrIsHREF@Base 5.2.0 + tidyAttrIsHTTP_EQUIV@Base 5.2.0 + tidyAttrIsID@Base 5.2.0 + tidyAttrIsISMAP@Base 5.2.0 + tidyAttrIsLANG@Base 5.2.0 + tidyAttrIsLANGUAGE@Base 5.2.0 + tidyAttrIsLINK@Base 5.2.0 + tidyAttrIsLONGDESC@Base 5.2.0 + tidyAttrIsNAME@Base 5.2.0 + tidyAttrIsOnBLUR@Base 5.2.0 + tidyAttrIsOnCLICK@Base 5.2.0 + tidyAttrIsOnFOCUS@Base 5.2.0 + tidyAttrIsOnKEYDOWN@Base 5.2.0 + tidyAttrIsOnKEYPRESS@Base 5.2.0 + tidyAttrIsOnKEYUP@Base 5.2.0 + tidyAttrIsOnMOUSEDOWN@Base 5.2.0 + tidyAttrIsOnMOUSEMOVE@Base 5.2.0 + tidyAttrIsOnMOUSEOUT@Base 5.2.0 + tidyAttrIsOnMOUSEOVER@Base 5.2.0 + tidyAttrIsOnMOUSEUP@Base 5.2.0 + tidyAttrIsProp@Base 5.2.0 + tidyAttrIsREL@Base 5.2.0 + tidyAttrIsROWSPAN@Base 5.2.0 + tidyAttrIsSELECTED@Base 5.2.0 + tidyAttrIsSRC@Base 5.2.0 + tidyAttrIsSTYLE@Base 5.2.0 + tidyAttrIsSUMMARY@Base 5.2.0 + tidyAttrIsTARGET@Base 5.2.0 + tidyAttrIsTEXT@Base 5.2.0 + tidyAttrIsTITLE@Base 5.2.0 + tidyAttrIsTYPE@Base 5.2.0 + tidyAttrIsUSEMAP@Base 5.2.0 + tidyAttrIsVALUE@Base 5.2.0 + tidyAttrIsVLINK@Base 5.2.0 + tidyAttrIsWIDTH@Base 5.2.0 + tidyAttrIsXMLNS@Base 5.2.0 + tidyAttrName@Base 5.2.0 + tidyAttrNext@Base 5.2.0 + tidyAttrValue@Base 5.2.0 + tidyBufAlloc@Base 5.2.0 + tidyBufAllocWithAllocator@Base 5.2.0 + tidyBufAppend@Base 5.2.0 + tidyBufAttach@Base 5.2.0 + tidyBufCheckAlloc@Base 5.2.0 + tidyBufClear@Base 5.2.0 + tidyBufDetach@Base 5.2.0 + tidyBufEndOfInput@Base 5.2.0 + tidyBufFree@Base 5.2.0 + tidyBufGetByte@Base 5.2.0 + tidyBufInit@Base 5.2.0 + tidyBufInitWithAllocator@Base 5.2.0 + tidyBufPopByte@Base 5.2.0 + tidyBufPutByte@Base 5.2.0 + tidyBufUngetByte@Base 5.2.0 + tidyCleanAndRepair@Base 5.2.0 + tidyConfigErrorCount@Base 5.2.0 + tidyCreate@Base 5.2.0 + tidyCreateWithAllocator@Base 5.2.0 + tidyDefaultString@Base 5.2.0 + tidyDetectedGenericXml@Base 5.2.0 + tidyDetectedHtmlVersion@Base 5.2.0 + tidyDetectedXhtml@Base 5.2.0 + tidyDiscardElement@Base 5.2.0 + tidyErrorCodeAsString@Base 5.2.0 + tidyErrorCount@Base 5.2.0 + tidyErrorSummary@Base 5.2.0 + tidyFileExists@Base 5.2.0 + tidyGeneralInfo@Base 5.2.0 + tidyGetAppData@Base 5.2.0 + tidyGetBody@Base 5.2.0 + tidyGetByte@Base 5.2.0 + tidyGetChild@Base 5.2.0 + tidyGetHead@Base 5.2.0 + tidyGetHtml@Base 5.2.0 + tidyGetLanguage@Base 5.2.0 + tidyGetNext@Base 5.2.0 + tidyGetNextOption@Base 5.2.0 + tidyGetOption@Base 5.2.0 + tidyGetOptionByName@Base 5.2.0 + tidyGetOptionList@Base 5.2.0 + tidyGetParent@Base 5.2.0 + tidyGetPrev@Base 5.2.0 + tidyGetRoot@Base 5.2.0 + tidyInitInputBuffer@Base 5.2.0 + tidyInitOutputBuffer@Base 5.2.0 + tidyInitSink@Base 5.2.0 + tidyInitSource@Base 5.2.0 + tidyIsEOF@Base 5.2.0 + tidyLibraryVersion@Base 5.2.0 + tidyLoadConfig@Base 5.2.0 + tidyLoadConfigEnc@Base 5.2.0 + tidyLocalizedString@Base 5.2.0 + tidyLocalizedStringN@Base 5.2.0 + tidyNodeCMIsBlock@Base 5.2.0 + tidyNodeCMIsEmpty@Base 5.2.0 + tidyNodeCMIsInline@Base 5.2.0 + tidyNodeColumn@Base 5.2.0 + tidyNodeGetId@Base 5.2.0 + tidyNodeGetName@Base 5.2.0 + tidyNodeGetText@Base 5.2.0 + tidyNodeGetType@Base 5.2.0 + tidyNodeGetValue@Base 5.2.0 + tidyNodeHasText@Base 5.2.0 + tidyNodeIsA@Base 5.2.0 + tidyNodeIsADDRESS@Base 5.2.0 + tidyNodeIsAPPLET@Base 5.2.0 + tidyNodeIsAREA@Base 5.2.0 + tidyNodeIsB@Base 5.2.0 + tidyNodeIsBASE@Base 5.2.0 + tidyNodeIsBASEFONT@Base 5.2.0 + tidyNodeIsBIG@Base 5.2.0 + tidyNodeIsBLINK@Base 5.2.0 + tidyNodeIsBLOCKQUOTE@Base 5.2.0 + tidyNodeIsBODY@Base 5.2.0 + tidyNodeIsBR@Base 5.2.0 + tidyNodeIsCAPTION@Base 5.2.0 + tidyNodeIsCENTER@Base 5.2.0 + tidyNodeIsCOL@Base 5.2.0 + tidyNodeIsCOLGROUP@Base 5.2.0 + tidyNodeIsDATALIST@Base 5.2.0 + tidyNodeIsDD@Base 5.2.0 + tidyNodeIsDIR@Base 5.2.0 + tidyNodeIsDIV@Base 5.2.0 + tidyNodeIsDL@Base 5.2.0 + tidyNodeIsDT@Base 5.2.0 + tidyNodeIsEM@Base 5.2.0 + tidyNodeIsEMBED@Base 5.2.0 + tidyNodeIsFONT@Base 5.2.0 + tidyNodeIsFORM@Base 5.2.0 + tidyNodeIsFRAME@Base 5.2.0 + tidyNodeIsFRAMESET@Base 5.2.0 + tidyNodeIsH1@Base 5.2.0 + tidyNodeIsH2@Base 5.2.0 + tidyNodeIsH3@Base 5.2.0 + tidyNodeIsH4@Base 5.2.0 + tidyNodeIsH5@Base 5.2.0 + tidyNodeIsH6@Base 5.2.0 + tidyNodeIsHEAD@Base 5.2.0 + tidyNodeIsHR@Base 5.2.0 + tidyNodeIsHTML@Base 5.2.0 + tidyNodeIsHeader@Base 5.2.0 + tidyNodeIsI@Base 5.2.0 + tidyNodeIsIFRAME@Base 5.2.0 + tidyNodeIsIMG@Base 5.2.0 + tidyNodeIsINPUT@Base 5.2.0 + tidyNodeIsISINDEX@Base 5.2.0 + tidyNodeIsLABEL@Base 5.2.0 + tidyNodeIsLAYER@Base 5.2.0 + tidyNodeIsLI@Base 5.2.0 + tidyNodeIsLINK@Base 5.2.0 + tidyNodeIsLISTING@Base 5.2.0 + tidyNodeIsMAP@Base 5.2.0 + tidyNodeIsMARQUEE@Base 5.2.0 + tidyNodeIsMENU@Base 5.2.0 + tidyNodeIsMETA@Base 5.2.0 + tidyNodeIsNOBR@Base 5.2.0 + tidyNodeIsNOFRAMES@Base 5.2.0 + tidyNodeIsNOSCRIPT@Base 5.2.0 + tidyNodeIsOBJECT@Base 5.2.0 + tidyNodeIsOL@Base 5.2.0 + tidyNodeIsOPTGROUP@Base 5.2.0 + tidyNodeIsOPTION@Base 5.2.0 + tidyNodeIsP@Base 5.2.0 + tidyNodeIsPARAM@Base 5.2.0 + tidyNodeIsPRE@Base 5.2.0 + tidyNodeIsProp@Base 5.2.0 + tidyNodeIsQ@Base 5.2.0 + tidyNodeIsS@Base 5.2.0 + tidyNodeIsSCRIPT@Base 5.2.0 + tidyNodeIsSELECT@Base 5.2.0 + tidyNodeIsSMALL@Base 5.2.0 + tidyNodeIsSPACER@Base 5.2.0 + tidyNodeIsSPAN@Base 5.2.0 + tidyNodeIsSTRIKE@Base 5.2.0 + tidyNodeIsSTRONG@Base 5.2.0 + tidyNodeIsSTYLE@Base 5.2.0 + tidyNodeIsTABLE@Base 5.2.0 + tidyNodeIsTD@Base 5.2.0 + tidyNodeIsTEXTAREA@Base 5.2.0 + tidyNodeIsTH@Base 5.2.0 + tidyNodeIsTITLE@Base 5.2.0 + tidyNodeIsTR@Base 5.2.0 + tidyNodeIsText@Base 5.2.0 + tidyNodeIsU@Base 5.2.0 + tidyNodeIsUL@Base 5.2.0 + tidyNodeIsWBR@Base 5.2.0 + tidyNodeIsXMP@Base 5.2.0 + tidyNodeLine@Base 5.2.0 + tidyNormalizedLocaleName@Base 5.2.0 + tidyOptCopyConfig@Base 5.2.0 + tidyOptDiffThanDefault@Base 5.2.0 + tidyOptDiffThanSnapshot@Base 5.2.0 + tidyOptGetBool@Base 5.2.0 + tidyOptGetCategory@Base 5.2.0 + tidyOptGetCurrPick@Base 5.2.0 + tidyOptGetDeclTagList@Base 5.2.0 + tidyOptGetDefault@Base 5.2.0 + tidyOptGetDefaultBool@Base 5.2.0 + tidyOptGetDefaultInt@Base 5.2.0 + tidyOptGetDoc@Base 5.2.0 + tidyOptGetDocLinksList@Base 5.2.0 + tidyOptGetEncName@Base 5.2.0 + tidyOptGetId@Base 5.2.0 + tidyOptGetIdForName@Base 5.2.0 + tidyOptGetInt@Base 5.2.0 + tidyOptGetName@Base 5.2.0 + tidyOptGetNextDeclTag@Base 5.2.0 + tidyOptGetNextDocLinks@Base 5.2.0 + tidyOptGetNextPick@Base 5.2.0 + tidyOptGetPickList@Base 5.2.0 + tidyOptGetType@Base 5.2.0 + tidyOptGetValue@Base 5.2.0 + tidyOptIsReadOnly@Base 5.2.0 + tidyOptParseValue@Base 5.2.0 + tidyOptResetAllToDefault@Base 5.2.0 + tidyOptResetToDefault@Base 5.2.0 + tidyOptResetToSnapshot@Base 5.2.0 + tidyOptSaveFile@Base 5.2.0 + tidyOptSaveSink@Base 5.2.0 + tidyOptSetBool@Base 5.2.0 + tidyOptSetInt@Base 5.2.0 + tidyOptSetValue@Base 5.2.0 + tidyOptSnapshot@Base 5.2.0 + tidyParseBuffer@Base 5.2.0 + tidyParseFile@Base 5.2.0 + tidyParseSource@Base 5.2.0 + tidyParseStdin@Base 5.2.0 + tidyParseString@Base 5.2.0 + tidyPutByte@Base 5.2.0 + tidyRelease@Base 5.2.0 + tidyReleaseDate@Base 5.2.0 + tidyReportDoctype@Base 5.2.0 + tidyRunDiagnostics@Base 5.2.0 + tidySaveBuffer@Base 5.2.0 + tidySaveFile@Base 5.2.0 + tidySaveSink@Base 5.2.0 + tidySaveStdout@Base 5.2.0 + tidySaveString@Base 5.2.0 + tidySetAppData@Base 5.2.0 + tidySetCharEncoding@Base 5.2.0 + tidySetErrorBuffer@Base 5.2.0 + tidySetErrorFile@Base 5.2.0 + tidySetErrorSink@Base 5.2.0 + tidySetFreeCall@Base 5.2.0 + tidySetInCharEncoding@Base 5.2.0 + tidySetLanguage@Base 5.2.0 + tidySetMallocCall@Base 5.2.0 + tidySetOptionCallback@Base 5.2.0 + tidySetOutCharEncoding@Base 5.2.0 + tidySetPanicCall@Base 5.2.0 + tidySetPrettyPrinterCallback@Base 5.2.0 + tidySetReallocCall@Base 5.2.0 + tidySetReportFilter2@Base 5.2.0 + tidySetReportFilter3@Base 5.2.0 + tidySetReportFilter@Base 5.2.0 + tidyStatus@Base 5.2.0 + tidySystemLocale@Base 5.2.0 + tidyUngetByte@Base 5.2.0 + tidyWarningCount@Base 5.2.0 diff -Nru tidy-html5-5.6.0/debian/libtidy-dev.install tidy-html5-5.2.0/debian/libtidy-dev.install --- tidy-html5-5.6.0/debian/libtidy-dev.install 2019-02-28 21:12:20.000000000 +0000 +++ tidy-html5-5.2.0/debian/libtidy-dev.install 2016-08-04 09:48:16.000000000 +0000 @@ -1,4 +1,4 @@ +debian/usr/share/doc/tidy/changelog /usr/share/doc/libtidy-dev/ usr/include/* /usr/include/tidy/ -usr/lib/*/libtidy.so -usr/lib/*/libtidys.a -usr/lib/*/pkgconfig/*.pc +usr/lib/libtidy.so +usr/lib/libtidys.a diff -Nru tidy-html5-5.6.0/debian/patches/0001-Add-compatibility-headers.patch tidy-html5-5.2.0/debian/patches/0001-Add-compatibility-headers.patch --- tidy-html5-5.6.0/debian/patches/0001-Add-compatibility-headers.patch 1970-01-01 00:00:00.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0001-Add-compatibility-headers.patch 2016-08-04 09:48:16.000000000 +0000 @@ -0,0 +1,59 @@ +From: Adam Majer +Date: Mon, 13 Jun 2016 11:10:16 +0200 +Subject: Add compatibility headers + +In older versions of tidy, these headers were defined. Now, they are +renamed to tidybuffio.h and tidyplatform.h. This may be more of a +consistent naming scheme, but it breaks current software. + +Re-add these headers and add compile time warning when such a header +is used. +--- + CMakeLists.txt | 6 ++++++ + include/buffio.h | 6 ++++++ + include/platform.h | 6 ++++++ + 3 files changed, 18 insertions(+) + create mode 100644 include/buffio.h + create mode 100644 include/platform.h + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8d18dc..e76dd2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,6 +140,12 @@ set ( CFILES + set ( HFILES + ${INCDIR}/tidyplatform.h ${INCDIR}/tidy.h ${INCDIR}/tidyenum.h + ${INCDIR}/tidybuffio.h ) ++ ++option (TIDY_COMPAT_HEADERS "If set to ON, compatability headers are included" OFF) ++if (TIDY_COMPAT_HEADERS) ++ set ( HFILES ${HFILES} ${INCDIR}/buffio.h ${INCDIR}/platform.h ) ++endif () ++ + set ( LIBHFILES + ${SRCDIR}/access.h ${SRCDIR}/attrs.h ${SRCDIR}/attrdict.h ${SRCDIR}/charsets.h + ${SRCDIR}/clean.h ${SRCDIR}/config.h ${SRCDIR}/entities.h +diff --git a/include/buffio.h b/include/buffio.h +new file mode 100644 +index 0000000..cfdbf75 +--- /dev/null ++++ b/include/buffio.h +@@ -0,0 +1,6 @@ ++#ifdef __GNUC__ ++#warning "FIXME: Using compatibility tidy header (buffio.h) that will go away!" ++#endif ++ ++#include "tidybuffio.h" ++ +diff --git a/include/platform.h b/include/platform.h +new file mode 100644 +index 0000000..15c60a7 +--- /dev/null ++++ b/include/platform.h +@@ -0,0 +1,6 @@ ++#ifdef __GNUC__ ++#warning "FIXME: Using compatibility tidy header (platform.h) that will go away!" ++#endif ++ ++#include "tidyplatform.h" ++ diff -Nru tidy-html5-5.6.0/debian/patches/0001-CMakeLists-Use-GNUInstallDirs-module.patch tidy-html5-5.2.0/debian/patches/0001-CMakeLists-Use-GNUInstallDirs-module.patch --- tidy-html5-5.6.0/debian/patches/0001-CMakeLists-Use-GNUInstallDirs-module.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0001-CMakeLists-Use-GNUInstallDirs-module.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From: Boyuan Yang -Date: Fri, 21 Sep 2018 11:21:35 -0400 -Subject: CMakeLists: Use GNUInstallDirs module - ---- - CMakeLists.txt | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 631f0fd..8247ff3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - # @date Consult git log. - ############################################################################## - --cmake_minimum_required (VERSION 2.8.12) -+cmake_minimum_required (VERSION 3.0.2) - - set(LIB_NAME tidy) - set(LIBTIDY_DESCRIPTION "${LIB_NAME} - HTML syntax checker") -@@ -25,6 +25,7 @@ set(LIBTIDY_URL "http://www.html-tidy.org") - - project (${LIB_NAME}) - -+include(GNUInstallDirs) - - ################################################# - # Setup -@@ -365,15 +366,15 @@ set ( LIBHFILES - # Target Locations - #------------------------------------------------------------------------ - if (NOT LIB_INSTALL_DIR) -- set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) -+ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) - endif () - - if (NOT BIN_INSTALL_DIR) -- set(BIN_INSTALL_DIR bin) -+ set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) - endif () - - if (NOT INCLUDE_INSTALL_DIR) -- set(INCLUDE_INSTALL_DIR include) -+ set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) - endif () - - diff -Nru tidy-html5-5.6.0/debian/patches/0002-Separate-source-and-shared-library-version.patch tidy-html5-5.2.0/debian/patches/0002-Separate-source-and-shared-library-version.patch --- tidy-html5-5.6.0/debian/patches/0002-Separate-source-and-shared-library-version.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0002-Separate-source-and-shared-library-version.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= -Date: Tue, 16 Oct 2018 05:46:44 +0000 -Subject: Separate source and shared library version - ---- - CMakeLists.txt | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8247ff3..65f9297 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,7 @@ if (LIBTIDY_VERSION) - else () - message(FATAL_ERROR "*** FAILED to get a VERSION from version.txt!") - endif () -- -+ - # Establish version date - if (LIBTIDY_DATE) - string(REPLACE "." ";" DATE_LIST ${LIBTIDY_DATE}) -@@ -69,6 +69,11 @@ else () - message(FATAL_ERROR "*** FAILED to get a DATE from version.txt!") - endif () - -+# Establish library version -+set(shared_LIBTIDY_VERSION_MAJOR ${TIDY_MAJOR_VERSION}deb1) -+set(shared_LIBTIDY_VERSION_MINOR ${TIDY_MINOR_VERSION}) -+set(shared_LIBTIDY_VERSION_POINT ${TIDY_POINT_VERSION}) -+set(shared_LIBTIDY_VERSION ${shared_LIBTIDY_VERSION_MAJOR}.${shared_LIBTIDY_VERSION_MINOR}.${shared_LIBTIDY_VERSION_POINT}) - - #------------------------------------------------------------------------ - # Library Types and Linking -@@ -410,8 +415,8 @@ if (BUILD_SHARED_LIB) - set_target_properties( ${name} PROPERTIES - OUTPUT_NAME ${LIB_NAME} ) - set_target_properties( ${name} PROPERTIES -- VERSION ${LIBTIDY_VERSION} -- SOVERSION ${TIDY_MAJOR_VERSION} ) -+ VERSION ${shared_LIBTIDY_VERSION} -+ SOVERSION ${shared_LIBTIDY_VERSION_MAJOR} ) - set_target_properties( ${name} PROPERTIES - COMPILE_FLAGS "-DBUILD_SHARED_LIB" ) - set_target_properties( ${name} PROPERTIES diff -Nru tidy-html5-5.6.0/debian/patches/0003-Issue-656-protect-against-NULL-node-set-in-loop.patch tidy-html5-5.2.0/debian/patches/0003-Issue-656-protect-against-NULL-node-set-in-loop.patch --- tidy-html5-5.6.0/debian/patches/0003-Issue-656-protect-against-NULL-node-set-in-loop.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0003-Issue-656-protect-against-NULL-node-set-in-loop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Geoff McLane -Date: Sat, 16 Dec 2017 20:54:29 +0100 -Subject: Issue #656 - protect against NULL node set in loop - ---- - src/clean.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/clean.c b/src/clean.c -index de4caf5..e96dd3f 100644 ---- a/src/clean.c -+++ b/src/clean.c -@@ -2211,8 +2211,10 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc) - tidyBufAppend(&charsetString, "charset=", 8); - tidyBufAppend(&charsetString, (char*)enc, TY_(tmbstrlen)(enc)); - tidyBufAppend(&charsetString, "\0", 1); /* zero terminate the buffer */ -- /* process the children of the head */ -- for (currentNode = head->content; currentNode; currentNode = currentNode->next) -+ /* process the children of the head */ -+ /* Issue #656 - guard against 'currentNode' being set NULL in loop */ -+ for (currentNode = head->content; currentNode; -+ currentNode = (currentNode ? currentNode->next : NULL)) - { - if (!nodeIsMETA(currentNode)) - continue; /* not a meta node */ diff -Nru tidy-html5-5.6.0/debian/patches/0004-Issue-655-Fix-unsafe-use-of-output-buffer-as-input-p.patch tidy-html5-5.2.0/debian/patches/0004-Issue-655-Fix-unsafe-use-of-output-buffer-as-input-p.patch --- tidy-html5-5.6.0/debian/patches/0004-Issue-655-Fix-unsafe-use-of-output-buffer-as-input-p.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0004-Issue-655-Fix-unsafe-use-of-output-buffer-as-input-p.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From: Geoff McLane -Date: Sat, 16 Dec 2017 21:10:04 +0100 -Subject: Issue #655 - Fix unsafe use of output buffer as input param - ---- - src/messageobj.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/messageobj.c b/src/messageobj.c -index 6f76152..9d9cee2 100644 ---- a/src/messageobj.c -+++ b/src/messageobj.c -@@ -158,8 +158,17 @@ static TidyMessageImpl *tidyMessageCreateInitV( TidyDocImpl *doc, - - if ( ( cfgBool(doc, TidyMuteShow) == yes ) && level <= TidyFatal ) - { -- TY_(tmbsnprintf)(result->messageOutputDefault, sizeMessageBuf, "%s (%s)", result->messageOutputDefault, TY_(tidyErrorCodeAsKey)(code) ); -- TY_(tmbsnprintf)(result->messageOutput, sizeMessageBuf, "%s (%s)", result->messageOutput, TY_(tidyErrorCodeAsKey)(code) ); -+ /*\ Issue #655 - Unsafe to use output buffer as one of the va_list -+ * input parameters in some snprintf implmentations. -+ \*/ -+ ctmbstr pc = TY_(tidyErrorCodeAsKey)(code); -+ i = TY_(tmbstrlen)(result->messageOutputDefault); -+ if (i < sizeMessageBuf) -+ TY_(tmbsnprintf)(result->messageOutputDefault + i, sizeMessageBuf - i, " (%s)", pc ); -+ i = TY_(tmbstrlen)(result->messageOutput); -+ if (i < sizeMessageBuf) -+ TY_(tmbsnprintf)(result->messageOutput + i, sizeMessageBuf - i, " (%s)", pc ); -+ i = 0; - } - - result->allowMessage = yes; diff -Nru tidy-html5-5.6.0/debian/patches/0005-Issue-663-Retain-compatibility-with-gcc-2.95.patch tidy-html5-5.2.0/debian/patches/0005-Issue-663-Retain-compatibility-with-gcc-2.95.patch --- tidy-html5-5.6.0/debian/patches/0005-Issue-663-Retain-compatibility-with-gcc-2.95.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0005-Issue-663-Retain-compatibility-with-gcc-2.95.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -From: Geoff McLane -Date: Sat, 23 Dec 2017 17:36:05 +0100 -Subject: Issue #663 - Retain compatibility with gcc 2.95 - -Applied-Upstream: https://github.com/htacg/tidy-html5/commit/1f22358a577b8dffc933afc76dde71a271044c03 ---- - include/tidyplatform.h | 19 +++++++++++++++++-- - src/language.c | 3 ++- - src/language_en_gb.h | 3 ++- - src/language_es.h | 3 ++- - src/language_es_mx.h | 3 ++- - src/language_fr.h | 3 ++- - src/language_pt_br.h | 3 ++- - src/language_zh_cn.h | 3 ++- - src/tidylib.c | 18 ++++++++++-------- - 9 files changed, 41 insertions(+), 17 deletions(-) - -diff --git a/include/tidyplatform.h b/include/tidyplatform.h -index 28de468..ca169dc 100644 ---- a/include/tidyplatform.h -+++ b/include/tidyplatform.h -@@ -315,6 +315,15 @@ extern "C" { - # endif - #endif - -+/* === Convenience defines for Haiku platforms === */ -+ -+#if defined(__HAIKU__) -+# define HAIKU -+# ifndef PLATFORM_NAME -+# define PLATFORM_NAME "Haiku" -+# endif -+#endif -+ - /* === Convenience defines for Cygwin platforms === */ - - #if defined(__CYGWIN__) -@@ -428,7 +437,7 @@ extern "C" { - #if PRESERVE_FILE_TIMES - - # ifndef HAS_FUTIME --# if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__) || defined(__GLIBC__) -+# if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__) || defined(__GLIBC__) || defined(__HAIKU__) - # define HAS_FUTIME 0 - # else - # define HAS_FUTIME 1 -@@ -456,6 +465,12 @@ extern "C" { - # include - # endif - -+#if defined(__HAIKU__) -+#ifndef va_copy -+#define va_copy(dest, src) (dest = src) -+#endif -+#endif -+ - /* MS Windows needs _ prefix for Unix file functions. - Not required by Metrowerks Standard Library (MSL). - -@@ -549,7 +564,7 @@ extern "C" { - # include - #endif - --#if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS) -+#if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS) && !defined(__HAIKU__) - # undef uint - typedef unsigned int uint; - #endif -diff --git a/src/language.c b/src/language.c -index d55938c..fd89730 100644 ---- a/src/language.c -+++ b/src/language.c -@@ -22,12 +22,13 @@ - - /** - * This structure type provides universal access to all of Tidy's strings. -+ * Note limit of 8, to be changed as more added... - */ - typedef struct { - Bool manually_set; - languageDefinition *currentLanguage; - languageDefinition *fallbackLanguage; -- languageDefinition *languages[]; -+ languageDefinition *languages[8]; - } tidyLanguagesType; - - -diff --git a/src/language_en_gb.h b/src/language_en_gb.h -index 97cc696..71c37e4 100644 ---- a/src/language_en_gb.h -+++ b/src/language_en_gb.h -@@ -1,4 +1,4 @@ --#ifndef language_en_gb_h -+#ifndef language_en_gb_h - #define language_en_gb_h - /* - * language_en_gb.h -@@ -180,3 +180,4 @@ static languageDefinition language_en_gb = { whichPluralForm_en_gb, { - - - #endif /* language_en_gb_h */ -+ -diff --git a/src/language_es.h b/src/language_es.h -index eff66e4..14f51e5 100644 ---- a/src/language_es.h -+++ b/src/language_es.h -@@ -1,4 +1,4 @@ --#ifndef language_es_h -+#ifndef language_es_h - #define language_es_h - /* - * language_es.h -@@ -131,3 +131,4 @@ static languageDefinition language_es = { whichPluralForm_es, { - - - #endif /* language_es_h */ -+ -diff --git a/src/language_es_mx.h b/src/language_es_mx.h -index 7f061b6..55b1b3a 100644 ---- a/src/language_es_mx.h -+++ b/src/language_es_mx.h -@@ -1,4 +1,4 @@ --#ifndef language_es_mx_h -+#ifndef language_es_mx_h - #define language_es_mx_h - /* - * language_es_mx.h -@@ -76,3 +76,4 @@ static languageDefinition language_es_mx = { whichPluralForm_es_mx, { - - - #endif /* language_es_mx_h */ -+ -diff --git a/src/language_fr.h b/src/language_fr.h -index c6140e9..aeaaa6f 100644 ---- a/src/language_fr.h -+++ b/src/language_fr.h -@@ -1,4 +1,4 @@ --#ifndef language_fr_h -+#ifndef language_fr_h - #define language_fr_h - /* - * language_fr.h -@@ -1172,3 +1172,4 @@ static languageDefinition language_fr = { whichPluralForm_fr, { - - - #endif /* language_fr_h */ -+ -diff --git a/src/language_pt_br.h b/src/language_pt_br.h -index 2b65d88..f64fd32 100644 ---- a/src/language_pt_br.h -+++ b/src/language_pt_br.h -@@ -1,4 +1,4 @@ --#ifndef language_pt_br_h -+#ifndef language_pt_br_h - #define language_pt_br_h - /* - * language_pt_br.h -@@ -1294,3 +1294,4 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, { - - - #endif /* language_pt_br_h */ -+ -diff --git a/src/language_zh_cn.h b/src/language_zh_cn.h -index 2321974..1919fa5 100644 ---- a/src/language_zh_cn.h -+++ b/src/language_zh_cn.h -@@ -1,4 +1,4 @@ --#ifndef language_zh_cn_h -+#ifndef language_zh_cn_h - #define language_zh_cn_h - /* - * language_zh_cn.h -@@ -78,3 +78,4 @@ static languageDefinition language_zh_cn = { whichPluralForm_zh_cn, { - - - #endif /* language_zh_cn_h */ -+ -diff --git a/src/tidylib.c b/src/tidylib.c -index 85d59e2..67d7a37 100644 ---- a/src/tidylib.c -+++ b/src/tidylib.c -@@ -1135,14 +1135,16 @@ int tidyDocParseFile( TidyDocImpl* doc, ctmbstr filnam ) - fin = fopen( filnam, "rb" ); - - #if PRESERVE_FILE_TIMES -- struct stat sbuf = {0}; -- /* get last modified time */ -- TidyClearMemory( &doc->filetimes, sizeof(doc->filetimes) ); -- if ( fin && cfgBool(doc,TidyKeepFileTimes) && -- fstat(fileno(fin), &sbuf) != -1 ) - { -- doc->filetimes.actime = sbuf.st_atime; -- doc->filetimes.modtime = sbuf.st_mtime; -+ struct stat sbuf = { 0 }; -+ /* get last modified time */ -+ TidyClearMemory(&doc->filetimes, sizeof(doc->filetimes)); -+ if (fin && cfgBool(doc, TidyKeepFileTimes) && -+ fstat(fileno(fin), &sbuf) != -1) -+ { -+ doc->filetimes.actime = sbuf.st_atime; -+ doc->filetimes.modtime = sbuf.st_mtime; -+ } - } - #endif - -@@ -1436,8 +1438,8 @@ int TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in ) - Bool xmlIn = cfgBool( doc, TidyXmlTags ); - TidyConfigChangeCallback callback = doc->pConfigChangeCallback; - -- doc->pConfigChangeCallback = NULL; - int bomEnc; -+ doc->pConfigChangeCallback = NULL; - - assert( doc != NULL && in != NULL ); - assert( doc->docIn == NULL ); diff -Nru tidy-html5-5.6.0/debian/patches/0006-Issue-684-Update-language_en.h.patch tidy-html5-5.2.0/debian/patches/0006-Issue-684-Update-language_en.h.patch --- tidy-html5-5.6.0/debian/patches/0006-Issue-684-Update-language_en.h.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0006-Issue-684-Update-language_en.h.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: =?utf-8?b?56mN5Li55bC8IERhbiBKYWNvYnNvbg==?= -Date: Sat, 3 Mar 2018 14:49:03 +0800 -Subject: Issue #684 - Update language_en.h - -Default: no means YES DO print out comments. -If set to YES, then DON'T print out comments. -(cherry picked from commit 95af5ad39aea84518e8231f9b5dae59131939dff) ---- - src/language_en.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/language_en.h b/src/language_en.h -index c84a7d8..7ec8964 100644 ---- a/src/language_en.h -+++ b/src/language_en.h -@@ -533,7 +533,7 @@ static languageDefinition language_en = { whichPluralForm_en, { - - The strings "Tidy" and "HTML Tidy" are the program name and must not - be translated. */ - TidyHideComments, 0, -- "This option specifies if Tidy should print out comments. " -+ "This option specifies if Tidy should not print out comments. " - }, - {/* Important notes for translators: - - Use only , , , , and diff -Nru tidy-html5-5.6.0/debian/patches/0007-Issue-679-Fix-invalid-output-of-export-config.patch tidy-html5-5.2.0/debian/patches/0007-Issue-679-Fix-invalid-output-of-export-config.patch --- tidy-html5-5.6.0/debian/patches/0007-Issue-679-Fix-invalid-output-of-export-config.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0007-Issue-679-Fix-invalid-output-of-export-config.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -From: Geoff McLane -Date: Mon, 19 Feb 2018 03:21:04 +0100 -Subject: Issue #679 - Fix invalid output of -export-config - -Applied-Upstream: https://github.com/htacg/tidy-html5/commit/e10c29bde822690bda7d62a0e8cfebb2499224cf ---- - console/tidy.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- - src/config.c | 3 ++ - 2 files changed, 93 insertions(+), 6 deletions(-) - -diff --git a/console/tidy.c b/console/tidy.c -index fce4d94..d6f3ec7 100644 ---- a/console/tidy.c -+++ b/console/tidy.c -@@ -1445,6 +1445,24 @@ static void printOptionValues(TidyDoc ARG_UNUSED(tdoc), /**< The Tidy document. - } - } - break; -+ case TidyPriorityAttributes: /* Is #697 - This case seems missing */ -+ { -+ TidyIterator itAttr = tidyOptGetPriorityAttrList(tdoc); -+ if (itAttr && (itAttr != (TidyIterator)-1)) -+ { -+ while (itAttr) -+ { -+ d->def = tidyOptGetNextPriorityAttr(tdoc, &itAttr); -+ if (itAttr) -+ { -+ printf(fmt, d->name, d->type, d->def); -+ d->name = ""; -+ d->type = ""; -+ } -+ } -+ } -+ } -+ break; - default: - break; - } -@@ -1484,6 +1502,33 @@ static void optionvalues( TidyDoc tdoc ) - ** @{ - */ - -+/* Is #697 - specialised service to 'invert' a buffers content -+ split on a space character */ -+static void invertBuffer(TidyBuffer *src, TidyBuffer *dst) -+{ -+ uint len = src->size; -+ char *in = (char *)src->bp; -+ char *cp; -+ if (!in) -+ return; -+ while (len) -+ { -+ unsigned char uc; -+ len--; -+ uc = in[len]; -+ if (uc == ' ') -+ { -+ in[len] = 0; -+ cp = &in[len + 1]; -+ if (dst->size) -+ tidyBufAppend(dst, " ", 1); -+ tidyBufAppend(dst, cp, strlen(cp)); -+ } -+ } -+ if (dst->size) -+ tidyBufAppend(dst, " ", 1); -+ tidyBufAppend(dst, in, strlen(in)); -+} - - /** Prints the option value for a given option. - */ -@@ -1493,6 +1538,7 @@ static void printOptionExportValues(TidyDoc ARG_UNUSED(tdoc), /**< The Tidy doc - ) - { - TidyOptionId optId = tidyOptGetId( topt ); -+ TidyBuffer buf1, buf2; - - if ( tidyOptGetCategory(topt) == TidyInternalCategory ) - return; -@@ -1505,18 +1551,56 @@ static void printOptionExportValues(TidyDoc ARG_UNUSED(tdoc), /**< The Tidy doc - case TidyPreTags: - { - TidyIterator pos = tidyOptGetDeclTagList( tdoc ); -- while ( pos ) -+ if ( pos ) /* Is #697 - one or more values */ - { -- d->def = tidyOptGetNextDeclTag(tdoc, optId, &pos); -- if ( pos ) -+ tidyBufInit(&buf1); -+ tidyBufInit(&buf2); -+ while (pos) - { -- printf( "%s: %s\n", d->name, d->def ); -- d->name = ""; -- d->type = ""; -+ d->def = tidyOptGetNextDeclTag(tdoc, optId, &pos); -+ if (d->def) -+ { -+ if (buf1.size) -+ tidyBufAppend(&buf1, " ", 1); -+ tidyBufAppend(&buf1, d->def, strlen(d->def)); -+ } - } -+ invertBuffer(&buf1, &buf2); /* Is #697 - specialised service to invert words */ -+ tidyBufAppend(&buf2, (void *)"\0", 1); /* is this really required? */ -+ printf("%s: %s\n", d->name, buf2.bp); -+ d->name = ""; -+ d->type = ""; -+ d->def = 0; -+ tidyBufFree(&buf1); -+ tidyBufFree(&buf2); - } - } - break; -+ case TidyPriorityAttributes: /* Is #697 - This case seems missing */ -+ { -+ TidyIterator itAttr = tidyOptGetPriorityAttrList(tdoc); -+ if (itAttr && (itAttr != (TidyIterator)-1)) -+ { -+ tidyBufInit(&buf1); -+ while (itAttr) -+ { -+ d->def = tidyOptGetNextPriorityAttr(tdoc, &itAttr); -+ if (d->def) -+ { -+ if (buf1.size) -+ tidyBufAppend(&buf1, " ", 1); -+ tidyBufAppend(&buf1, d->def, strlen(d->def)); -+ } -+ } -+ tidyBufAppend(&buf1, (void *)"\0", 1); /* is this really required? */ -+ printf("%s: %s\n", d->name, buf1.bp); -+ d->name = ""; -+ d->type = ""; -+ d->def = 0; -+ tidyBufFree(&buf1); -+ } -+ } -+ break; - default: - break; - } -diff --git a/src/config.c b/src/config.c -index cb53989..f2c4cb6 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -1476,9 +1476,12 @@ Bool ParseCSS1Selector( TidyDocImpl* doc, const TidyOptionImpl* option ) - return no; - } - -+ buf[i] = 0; /* Is #697 - Do *not* add '-' */ -+#if 0 /* Is #697 - Is this still required? KEEP HISTORY - DO NOT DELETE */ - buf[i++] = '-'; /* Make sure any escaped Unicode is terminated */ - buf[i] = 0; /* so valid class names are generated after */ - /* Tidy appends last digits. */ -+#endif /* Is #697 - Is this still required? */ - - SetOptionValue( doc, option->id, buf ); - return yes; diff -Nru tidy-html5-5.6.0/debian/patches/0008-Issue-686-Add-attr-COLOR-to-W3CAttrsFor_LINK.patch tidy-html5-5.2.0/debian/patches/0008-Issue-686-Add-attr-COLOR-to-W3CAttrsFor_LINK.patch --- tidy-html5-5.6.0/debian/patches/0008-Issue-686-Add-attr-COLOR-to-W3CAttrsFor_LINK.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0008-Issue-686-Add-attr-COLOR-to-W3CAttrsFor_LINK.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: Geoff McLane -Date: Thu, 8 Mar 2018 18:10:23 +0100 -Subject: Issue #686 - Add attr COLOR to W3CAttrsFor_LINK - -Applied-Upstream: https://github.com/htacg/tidy-html5/commit/0263dfb6b205c0069e8b13857c59f68d3ecbf352 ---- - src/attrdict.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/attrdict.c b/src/attrdict.c -index c9ee060..f8d58e7 100644 ---- a/src/attrdict.c -+++ b/src/attrdict.c -@@ -1955,6 +1955,7 @@ const AttrVersion TY_(W3CAttrsFor_LINK)[] = - { TidyAttr_AS, xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 }, - { TidyAttr_CHARSET, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|xxxx|xxxx }, - { TidyAttr_CLASS, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, /* CORE override */ -+ { TidyAttr_COLOR, xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 }, /* Is #686 */ - { TidyAttr_CROSSORIGIN, xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 }, - { TidyAttr_DIR, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|xxxx|HT50|XH50 }, /* CORE override */ - { TidyAttr_HREF, HT20|HT32|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, diff -Nru tidy-html5-5.6.0/debian/patches/0009-Issue-698-Minor-update-to-man-page-documentation.patch tidy-html5-5.2.0/debian/patches/0009-Issue-698-Minor-update-to-man-page-documentation.patch --- tidy-html5-5.6.0/debian/patches/0009-Issue-698-Minor-update-to-man-page-documentation.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0009-Issue-698-Minor-update-to-man-page-documentation.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Boyuan Yang -Date: Wed, 14 Nov 2018 22:09:25 -0500 -Subject: Issue #698 - Minor update to man page documentation - -Applied-Upstream: https://github.com/htacg/tidy-html5/commit/4ded90189f73441fdcd6593e5f0ddee53911f150 ---- - man/tidy1.xsl.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/man/tidy1.xsl.in b/man/tidy1.xsl.in -index 0fbae79..27186df 100644 ---- a/man/tidy1.xsl.in -+++ b/man/tidy1.xsl.in -@@ -75,8 +75,9 @@ They are listed in the first part of this section. - \fIConfiguration\fR options, on the other hand, can either be passed - on the command line, starting with two dashes \fB--\fR, - or specified in a configuration file, --using the option name without the starting dashes. --They are listed in the second part of this section. -+using the option name, followed by a colon \fB:\fR, plus the value, without -+the starting dashes. They are listed in the second part of this section, -+with a sample config file. - .LP - For \fIcommand-line\fR options that expect a numerical argument, - a default is assumed if no meaningful value can be found. diff -Nru tidy-html5-5.6.0/debian/patches/0010-Issue-700-change-script-parsing-if-in-html5-mode.patch tidy-html5-5.2.0/debian/patches/0010-Issue-700-change-script-parsing-if-in-html5-mode.patch --- tidy-html5-5.6.0/debian/patches/0010-Issue-700-change-script-parsing-if-in-html5-mode.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0010-Issue-700-change-script-parsing-if-in-html5-mode.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: Geoff McLane -Date: Fri, 23 Mar 2018 20:08:54 +0100 -Subject: Issue #700 - change script parsing if in html5 mode - ---- - src/lexer.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lexer.c b/src/lexer.c -index 3d6a489..ca66aee 100644 ---- a/src/lexer.c -+++ b/src/lexer.c -@@ -2384,7 +2384,8 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container ) - /*\ if javascript insert backslash before / - * Issue #348 - Add option, escape-scripts, to skip - \*/ -- if ((TY_(IsJavaScript)(container)) && cfgBool(doc, TidyEscapeScripts)) -+ if ((TY_(IsJavaScript)(container)) && cfgBool(doc, TidyEscapeScripts) && -+ !TY_(IsHTML5Mode)(doc) ) /* Is #700 - This only applies to legacy html4 mode */ - { - /* Issue #281 - only warn if adding the escape! */ - TY_(Report)(doc, NULL, NULL, BAD_CDATA_CONTENT); diff -Nru tidy-html5-5.6.0/debian/patches/0011-Revert-Remove-unnecessary-AdjustConfig-logic.patch tidy-html5-5.2.0/debian/patches/0011-Revert-Remove-unnecessary-AdjustConfig-logic.patch --- tidy-html5-5.6.0/debian/patches/0011-Revert-Remove-unnecessary-AdjustConfig-logic.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0011-Revert-Remove-unnecessary-AdjustConfig-logic.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From: Dmitry Shachnev -Date: Sat, 27 Oct 2018 18:48:56 +0300 -Subject: Revert "Remove unnecessary AdjustConfig logic." - -While this looks like a code cleanup, it causes issues in PHP 7+ -and python-tidylib. This is also reverted upstream in commit -67eaeb6d18563e223344b00f98d6ad42000d8285. - -This reverts commit 86e62dbb709b306ec41dc88fd55decfe6893f262. ---- - src/config.c | 4 ++++ - src/tidylib.c | 1 - - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/config.c b/src/config.c -index f2c4cb6..07a3057 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -711,6 +711,7 @@ void TY_(TakeConfigSnapshot)( TidyDocImpl* doc ) - const TidyOptionValue* value = &doc->config.value[ 0 ]; - TidyOptionValue* snap = &doc->config.snapshot[ 0 ]; - -+ TY_(AdjustConfig)( doc ); /* Make sure it's consistent */ - for ( ixVal=0; ixVal < N_TIDY_OPTIONS; ++option, ++ixVal ) - { - assert( ixVal == (uint) option->id ); -@@ -759,6 +760,7 @@ void TY_(CopyConfig)( TidyDocImpl* docTo, TidyDocImpl* docFrom ) - } - if ( needReparseTagsDecls ) - ReparseTagDecls( docTo, changedUserTags ); -+ TY_(AdjustConfig)( docTo ); /* Make sure it's consistent */ - } - } - -@@ -1052,6 +1054,8 @@ int TY_(ParseConfigFileEnc)( TidyDocImpl* doc, ctmbstr file, ctmbstr charenc ) - if ( fname != (tmbstr) file ) - TidyDocFree( doc, fname ); - -+ TY_(AdjustConfig)( doc ); -+ - /* any new config errors? If so, return warning status. */ - return (doc->optionErrors > opterrs ? 1 : 0); - } -diff --git a/src/tidylib.c b/src/tidylib.c -index 67d7a37..31754ab 100644 ---- a/src/tidylib.c -+++ b/src/tidylib.c -@@ -1447,7 +1447,6 @@ int TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in ) - - TY_(ResetTags)(doc); /* reset table to html5 mode */ - TY_(TakeConfigSnapshot)( doc ); /* Save config state */ -- TY_(AdjustConfig)( doc ); /* ensure config consistency */ - TY_(FreeAnchors)( doc ); - - TY_(FreeNode)(doc, &doc->root); diff -Nru tidy-html5-5.6.0/debian/patches/0012-Issue-697-Add-NOWRAP-to-print-of-pre-tag.patch tidy-html5-5.2.0/debian/patches/0012-Issue-697-Add-NOWRAP-to-print-of-pre-tag.patch --- tidy-html5-5.6.0/debian/patches/0012-Issue-697-Add-NOWRAP-to-print-of-pre-tag.patch 2019-02-28 21:12:21.000000000 +0000 +++ tidy-html5-5.2.0/debian/patches/0012-Issue-697-Add-NOWRAP-to-print-of-pre-tag.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Geoff McLane -Date: Tue, 20 Mar 2018 19:52:35 +0100 -Subject: Issue #697 - Add NOWRAP to print of pre tag - -Applied-Upstream: https://github.com/htacg/tidy-html5/commit/202ab98e10d1c9f0f9f0abc697f7f016c3420f77 - ---- - src/pprint.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/pprint.c b/src/pprint.c -index 57cd7b1..321045e 100644 ---- a/src/pprint.c -+++ b/src/pprint.c -@@ -2143,7 +2143,8 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node ) - TY_(PFlushLineSmart)( doc, indent ); - } - -- PPrintTag( doc, mode, indent, node ); /* add 
 or