X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=GNUmakefile.in;h=5278515dd468a8a85b5ca863ece0e445ca243a59;hb=ad7340ef630ec1bf0b95e7b25a08cc89e80804d9;hp=b7ab77f86bf6d9e21211de8e2ed0ee1e2d7acc61;hpb=c6c5c067bb9119640ff95ec5e3cd03c129b2e12d;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index b7ab77f8..5278515d 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,6 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# $Id: GNUmakefile.in,v 1.263 2017/06/01 13:22:46 ler762 Exp $ -# -# Written by and Copyright (C) 2001-2017 members of the +# Written by and Copyright (C) 2001-2018 members of the # Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -132,11 +130,20 @@ CHMOD = chmod CHOWN = chown CHGRP = chgrp GROUPS = groups -W3M_DUMP = env -u LANG LC_ALL=C @W3M@ -dump -W3M_DUMP_UTF8 = @W3M@ -dump +W3M_DUMP = @W3M@ -I ISO-8859 -O ASCII -dump +W3M_DUMP_UTF8 = @W3M@ -I ISO-8859 -O UTF-8 -dump +# docbook output is ISO-8859 (which is a superset of ascii) JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html +DB_TXT = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#print +# -d dsssl_spec +# This specifies that dsssl_spec is the system identifier of the DSSSL specification to be used. +# ldp.dsl#html : keep '&char;' strings as is +# ldp.dsl#print : convert '&char;' strings to ISO-8859 equivalent +# NOTE: '-d ldp.dsl\#whatever' _MUST_ be last and _MUST NOT_ have +# a trailing space so that '$(DB)-notoc' or '$(DB_TXT)-notoc' +# pulls in the correct dsl stylesheet DB2HTML = @DB2HTML@ MAN2HTML = @MAN2HTML@ G2H_CMD = groff -mandoc -Thtml @@ -145,7 +152,21 @@ PERL = perl DOC_DIR = doc/source DOC_TMP = $(DOC_DIR)/tmp DOC_STATUS = @DOC_STATUS@ -TIDY = tidy -modify -indent -wrap 120 --tidy-mark no +TIDY = tidy -latin1 -q -modify -indent -wrap 120 --tidy-mark no --preserve-entities yes \ + --mute MISSING_ATTRIBUTE --mute TRIM_EMPTY_ELEMENT +# -latin1 +# use ISO-8859-1 for both input and output +# docbook output is ISO-8859 and tidy assumes UTF-8 +# -q +# suppress nonessential output +# -modify +# modify the original input file +# --mute MISSING_ATTRIBUTE +# don't show lacks "alt" attribute +# or