[tex4ht-commits] [SCM] tex4ht updated: r89 - trunk/lit
karl at gnu.org.ua
karl at gnu.org.ua
Fri Jul 27 20:08:12 CEST 2012
Author: karl
Date: 2012-07-27 21:08:12 +0300 (Fri, 27 Jul 2012)
New Revision: 89
Modified:
trunk/lit/ChangeLog
trunk/lit/tex4ht-c.tex
trunk/lit/tex4ht-t4ht.tex
Log:
w32 fixes from akira/peb
Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog 2012-04-25 02:15:00 UTC (rev 88)
+++ trunk/lit/ChangeLog 2012-07-27 18:08:12 UTC (rev 89)
@@ -1,3 +1,11 @@
+2012-07-27 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Adapt to W32TeX (backport from TeX Live).
+ * tex4ht-c.tex, tex4ht-t4ht.tex [WIN32]:
+ Use binary mode for output files.
+ Pass program name string to kpse_set_program_name.
+ Must not free argv.
+
2011-09-18 Karl Berry <karl at gnu.org>
* tex4ht-unicode.tex (<double acute code>): \H{O} is 0150,
@@ -277,3 +285,282 @@
const.
This file is public domain. Started 2010, Karl Berry.
+2011-09-18 Karl Berry <karl at gnu.org>
+
+ * tex4ht-unicode.tex (<double acute code>): \H{O} is 0150,
+ not 0151; http://www.fileformat.info/info/unicode/char/150/index.htm.
+ Report from Tibor Tomacs, 18 Sep 2011 12:34:09,
+ http://puszcza.gnu.org.ua/bugs/?147.
+
+2010-12-25 Karl Berry <karl at gnu.org>
+
+ * tex4ht-c.tex (<trace context>): allow -hA to enable all tracing.
+ (<find tex4ht.env>): fatal error if we don't find it, since the
+ next thing we do is seek on the file which crashes anyway.
+ (<kpathsea tex4ht.env>): use --format=othertext so we can find
+ tex4ht.env. However, this is not enough to find the .htf files,
+ so it's still not possible to run the program as anything except
+ `tex4ht'. So it goes.
+
+2010-12-24 Karl Berry <karl at gnu.org>
+
+ * tex4ht-c.tex,
+ * tex4ht-t4ht.tex: attempt to document which files I think these
+ programs read and write. Fix a couple typos.
+
+2010-12-23 Karl Berry <karl at gnu.org>
+
+ * tex4ht-c.tex,
+ * tex4ht-t4ht.tex,
+ * tex4ht-htcmd.tex: rewrite some doc uses of "win32".
+
+ * common-info.tex (\CleanComment): lengthy comment about ultimate
+ failure trying to make the info option work with mzlatex.
+
+ * tex4ht-info-mml.tex (configure infomml tex4ht): use \Configure,
+ not the undefined \Contribution, add plain text heading
+ like the others.
+
+2010-12-16 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * tex4ht-t4ht.tex: missed <<<.
+
+2010-12-14 Karl Berry <karl at gnu.org>
+
+ * tex4ht-c.tex,
+ * tex4ht-t4ht.tex (resplit argv for windows): new section, from Akira
+ Kakuto.
+
+ * tex4ht-htcmd.tex: document that this not used.
+
+2010-11-17 Karl Berry <karl at gnu.org>
+
+ * all files: switch to ranges in copyright notices.
+
+2010-11-17 Karl Berry <karl at gnu.org>
+
+ * tex4ht-c.tex: compiler options are a comment, despite #define's.
+
+2010-11-16 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * t4ht.c (main): Initialize addr and media in order to avoid
+ compiler warnings. Use '#if 0' to skip unreachable code.
+
+2010-11-12 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * t4ht.c (filterGifScript): Avoid 'filtered_script might be used
+ uninitialized'. Use NULL_SCRIPT.
+
+2010-03-17 Karl Berry <karl at gnu.org>
+
+ * tex4ht-auto-script.tex: unused, it seems.
+
+2010-03-12 Karl Berry <karl at gnu.org>
+
+ * tex4ht-bibtex2.tex: license notices.
+ * Makefile: add derivations.
+
+2010-03-11 Karl Berry <karl at gnu.org>
+
+ * tex4ht-c.tex: license notices.
+ * Makefile: add derivations.
+
+2010-03-08 Karl Berry <karl at gnu.org>
+
+ * tex4ht-cond4ht.tex: license notices.
+ * mktex4ht.cnf: new (empty) file, needed to run cond4ht.
+ * Makefile: add derivations.
+ * tex4ht-cpright.tex: note additional copy.
+ * all files: no period ending copyright lines, I guess.
+
+2010-03-08 Karl Berry <karl at gnu.org>
+
+ * tex4ht-docbook-xtpipes.tex: license notices.
+ * Makefile: add derivations.
+
+2010-03-07 Karl Berry <karl at gnu.org>
+
+ * tex4ht-docbook.tex: license notices.
+ * Makefile: add derivations.
+
+2010-03-06 Karl Berry <karl at gnu.org>
+
+ * tex4ht-env.tex: license notices.
+ (dvips convert (personal)): do not hardcode path to convert
+ (else zztex4ht-env.ps is left behind).
+ * Makefile: add derivations.
+
+2010-03-05 Karl Berry <karl at gnu.org>
+
+ * tex4ht-fonts-noncjk.tex: start at license notices.
+ Correct quoting of the
+ \Needs{"xhlatex tex4ht-fonts-4hf ..."} line.
+ * Makefile: start at derivations.
+
+2010-03-04 Radhakrishnan CV <cvr at river-valley.org>
+
+ * tex4ht-mkht.tex (<MYcopyrightnotice): new macro; insert
+ notice in all generated scripts.
+
+2010-03-04 Karl Berry <karl at gnu.org>
+
+ * tex4ht-htcmd.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-03-03 Karl Berry <karl at gnu.org>
+
+ * tex4ht-html-speech-xtpipes.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-03-02 Karl Berry <karl at gnu.org>
+
+ * tex4ht-html-speech.tex,
+ * tex4ht-html0.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-28 Karl Berry <karl at gnu.org>
+
+ * tex4ht-html32.tex,
+ * tex4ht-html4.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-26 Karl Berry <karl at gnu.org>
+
+ * tex4ht-info-mml.tex,
+ * tex4ht-info-ooffice.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-25 Karl Berry <karl at gnu.org>
+
+ * tex4ht-info-svg.tex,
+ * tex4ht-javahelp-xtpipes.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-23 Karl Berry <karl at gnu.org>
+
+ * tex4ht-javahelp.tex,
+ * tex4ht-jsmath.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-22 Karl Berry <karl at gnu.org>
+
+ * tex4ht-jsml-xtpipes.tex,
+ * tex4ht-jsml.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-21 Karl Berry <karl at gnu.org>
+
+ * tex4ht-mathltx.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-18 Karl Berry <karl at gnu.org>
+
+ * tex4ht-mathplayer.tex: update license notices.
+ * tex4ht-mkht.tex: update some license notices, more to come.
+ * Makefile: add derivations.
+
+2010-02-17 Karl Berry <karl at gnu.org>
+
+ * tex4ht-moz.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-16 Karl Berry <karl at gnu.org>
+
+ * tex4ht-oo-xtpipes.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-15 Karl Berry <karl at gnu.org>
+
+ * tex4ht-ooffice.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-14 Karl Berry <karl at gnu.org>
+
+ * tex4ht-ooimpress.tex: update license notices.
+ Remove would-be generation of ooimpress-math and ooimpress-mml,
+ since it seems they are not actually generated.
+ * Makefile: add derivations.
+
+2010-02-13 Karl Berry <karl at gnu.org>
+
+ * common-code.tex: new file.
+ * tex4ht-unicode.tex: use it.
+
+ * tex4ht-options.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-12 Karl Berry <karl at gnu.org>
+
+ * tex4ht-sty.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-11 Karl Berry <karl at gnu.org>
+
+ * tex4ht-svg.tex: update license notices.
+ * Makefile: add derivations.
+
+ * All files so far: Put current (2010) copyright line first.
+
+2010-02-10 Karl Berry <karl at gnu.org>
+
+ * tex4ht-t4ht.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-09 Karl Berry <karl at gnu.org>
+
+ * tex4t-tei.tex: update license notices.
+ * Makefile: add derivations.
+ * tex4ht-cpright.tex: new macro |TeX4ht copywrite,
+ to output the license notice with a \write to the log file.
+
+2010-02-08 Karl Berry <karl at gnu.org>
+
+ * tex4ht-unicode.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-07 Karl Berry <karl at gnu.org>
+
+ * tex4ht-word.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-06 Karl Berry <karl at gnu.org>
+
+ * tex4ht-xhtml-xtpipes.tex: update license notices.
+ * Makefile: add derivations.
+
+ * tex4ht-xhtmml-xtpipes.tex,
+ * xtpipes.tex: \message when running the lit sources doesn't
+ seem useful. Remove it.
+
+2010-02-05 Karl Berry <karl at gnu.org>
+
+ * tex4ht-xhtmml-xtpipes.tex: update license notices.
+ * Makefile: add derivations.
+
+2010-02-03 Karl Berry <karl at gnu.org>
+
+ * wripro.tex: add license notice.
+
+2010-02-02 Karl Berry <karl at gnu.org>
+
+ * xtpipes.tex: add derivation info and copyright messages
+ to generated files.
+ * tex4ht-cpright.tex: minimize lines.
+ * Makefile: start at new file.
+
+2010-02-23 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * t4ht.c (get_env_dir) [WIN32]: Declare as static.
+
+2010-02-20 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * tex4ht.c [__MINGW32__]: #define HAVE_BOOLEAN in order to avoid
+ conflicting declaration for boolean from kpathsea/types.h.
+ Declare various param strings as const.
+
+2009-09-30 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * t4ht.c, tex4ht.c: Declare numerous param and local strings as
+ const.
+
+This file is public domain. Started 2010, Karl Berry.
Modified: trunk/lit/tex4ht-c.tex
===================================================================
--- trunk/lit/tex4ht-c.tex 2012-04-25 02:15:00 UTC (rev 88)
+++ trunk/lit/tex4ht-c.tex 2012-07-27 18:08:12 UTC (rev 89)
@@ -2,7 +2,7 @@
% tex tex4ht-c
% or ht tex tex4ht-c
-% Copyright (C) 2009-2010 TeX Users Group
+% Copyright (C) 2009-2012 TeX Users Group
% Copyright (C) 1996-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -232,7 +232,7 @@
\<tex4ht.c\><<<
/* tex4ht.c (`version), generated from `jobname.tex
- Copyright (C) 2009-2010 TeX Users Group
+ Copyright (C) 2009-2012 TeX Users Group
Copyright (C) `CopyYear.1996. Eitan M. Gurari
`<TeX4ht copyright`> */
`<tex4ht.h`>
@@ -455,10 +455,11 @@
\<h-include\><<<
#ifdef WIN32
-#include <windows.h>
#ifdef KPATHSEA
#undef CDECL
#define CDECL __cdecl
+#else
+#include <windows.h>
#endif
#else
#ifdef KPATHSEA
@@ -538,8 +539,7 @@
HANDLE hnd;
int proceed;
(IGNORED) strcpy((char *) dirname, (char *) str);
- strct(dirname, (is_forward_slash(dirname)? "/" : "\\") );
- strct(dirname, "*.*"); `% "*.*" or "*" -- seems equivalent. `%
+ strct(dirname, "/*.*"); `% "*.*" or "*" -- seems equivalent. `%
hnd = FindFirstFile(dirname, &find_file_data);
if (hnd != INVALID_HANDLE_VALUE) {
`<valid WIN32 handle`>
@@ -1106,9 +1106,6 @@
}
}
- for (i=0; i < argc; i++)
- free (argv[i]);
- free (argv);
nargv[nargc] = NULL;
argv = nargv;
argc = nargc;
@@ -1232,9 +1229,6 @@
\<KPATHSEA h-include\><<<
#ifdef KPATHSEA
-#ifdef __MINGW32__
-#define HAVE_BOOLEAN 1
-#endif /* __MINGW32__ */
#include <kpathsea/config.h>
#include <kpathsea/c-errno.h>
#include <kpathsea/c-ctype.h>
@@ -1593,11 +1587,9 @@
\<open input file\><<<
if( *in_name != '\0' ){ `<file = non-piped input file`> }
-#ifdef KPATHSEA
#ifdef KWIN32
else if (!isatty(fileno(stdin))) SET_BINARY(fileno(stdin));
#endif
-#endif
>>>
@@ -13037,10 +13029,10 @@
\<main's vars\><<<
char* tex4ht_env_file = (char *) 0;
char* dos_env_file =
-#if defined(DOS_WIN32) || defined(__MSDOS__)
+#if defined(__MSDOS__)
`<get dos env file`>;
#endif
-#if !defined(DOS_WIN32) && !defined(__MSDOS__)
+#if !defined(__MSDOS__)
(char *) 0;
#endif
@@ -13111,7 +13103,7 @@
dot_file = f_open(str,READ_TEXT_FLAGS);
} }
#endif
-#if defined(DOS_WIN32) || defined(__MSDOS__)
+#if defined(__MSDOS__)
if( !dot_file ){
if( dump_env_search ){ (IGNORED) printf("%s?\n", "C:/tex4ht.env"); }
dot_file = f_open("C:/tex4ht.env",READ_TEXT_FLAGS);
@@ -13178,7 +13170,7 @@
\<"s/tex4ht.env"\><<<
-#if defined(DOS_WIN32) || defined(__DJGPP__)
+#if defined(__DJGPP__)
is_forward_slash(HOME_DIR)? "%s/tex4ht.env" : "%s\\tex4ht.env"
#else
"%s/tex4ht.env"
@@ -13226,7 +13218,7 @@
>>>
\<functions\><<<
-#if defined(DOS_WIN32) || defined(__MSDOS__)
+#if defined(__MSDOS__)
`<get tex4ht.env in dos`>
#endif
>>>
@@ -14876,7 +14868,7 @@
\<kpathsea arg 0\><<<
#ifdef KPATHSEA
- kpse_set_program_name (argv[0], NULL);
+ kpse_set_program_name (argv[0], "tex4ht");
#endif
>>>
@@ -15448,7 +15440,7 @@
\<cat / if needed\><<<
(IGNORED) strct(str,
-#if defined(DOS_WIN32) || defined(__DJGPP__)
+#if defined(__DJGPP__)
(( dir[i-1] == '/') || ( dir[i-1] == '\\'))
? ""
: (is_forward_slash(dir)? "/" : "\\" )
@@ -15514,7 +15506,7 @@
int n;
n = (int) strlen(dir);
(IGNORED) sprintf(str,
-#if defined(DOS_WIN32) || defined(__DJGPP__)
+#if defined(__DJGPP__)
(( dir[n-1] == '/') || ( dir[n-1] == '\\'))
? "%s%s"
: (is_forward_slash(dir)? "%s/%s" : "%s\\%s" )
@@ -15554,7 +15546,7 @@
forward slash (\''/').
\<directory '/'\><<<
-#if defined(DOS_WIN32) || defined(__DJGPP__)
+#if defined(__DJGPP__)
'\\'
#else
'/'
@@ -15564,7 +15556,7 @@
\<defines\><<<
-#if defined(DOS_WIN32) || defined(__DJGPP__)
+#if defined(__DJGPP__)
#define dir_path_slash(str) (is_forward_slash(str)? '/' : '\\')
#else
#define dir_path_slash(str) '/'
@@ -15574,13 +15566,13 @@
\<header functions\><<<
-#if defined(DOS_WIN32) || defined(__DJGPP__)
+#if defined(__DJGPP__)
static BOOL is_forward_slash( ARG_I(const char*) );
#endif
>>>
\<functions\><<<
-#if defined(DOS_WIN32) || defined(__DJGPP__)
+#if defined(__DJGPP__)
`[
static BOOL is_forward_slash(str)
const char* str
@@ -17231,7 +17223,11 @@
#define READ_BIN_FLAGS "rb"
#define READ_TEXT_FLAGS "r"
#define WRITE_BIN_FLAGS "wb"
+#ifdef WIN32
+#define WRITE_TEXT_FLAGS "wb"
+#else
#define WRITE_TEXT_FLAGS "w"
+#endif
#else
#define READ_BIN_FLAGS "r"
#define READ_TEXT_FLAGS "r"
Modified: trunk/lit/tex4ht-t4ht.tex
===================================================================
--- trunk/lit/tex4ht-t4ht.tex 2012-04-25 02:15:00 UTC (rev 88)
+++ trunk/lit/tex4ht-t4ht.tex 2012-07-27 18:08:12 UTC (rev 89)
@@ -1,7 +1,7 @@
% $Id$
% tex tex4ht-t4ht or ht tex tex4ht-t4ht
%
-% Copyright 2009-2010 TeX Users Group
+% Copyright 2009-2012 TeX Users Group
% Copyright (C) 1998-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -144,7 +144,7 @@
\<t4ht.c\><<<
/* t4ht.c (`version), generated from `jobname.tex
- Copyright (C) 2009-2010 TeX Users Group
+ Copyright (C) 2009-2012 TeX Users Group
Copyright (C) `CopyYear.1998. Eitan M. Gurari
`<TeX4ht copyright`>
*/
@@ -1000,7 +1000,7 @@
\<kpathsea arg 0\><<<
#ifdef KPATHSEA
- kpse_set_program_name (argv[0], NULL);
+ kpse_set_program_name (argv[0], "tex4ht");
#endif
>>>
@@ -3554,10 +3554,10 @@
\<main's vars\><<<
Q_CHAR * tex4ht_env_file = (Q_CHAR *) 0;
Q_CHAR * dos_env_file =
-#if defined(DOS_WIN32) || defined(__MSDOS__)
+#if defined(__MSDOS__)
`<get dos env file`>;
#endif
-#if !defined(DOS_WIN32) && !defined(__MSDOS__)
+#if !defined(__MSDOS__)
(Q_CHAR *) 0;
#endif
@@ -3573,7 +3573,7 @@
>>>
\<functions\><<<
-#if defined(DOS_WIN32) || defined(__MSDOS__)
+#if defined(__MSDOS__)
`<get tex4ht.env in dos`>
#endif
>>>
@@ -3790,7 +3790,11 @@
#define READ_BIN_FLAGS "rb"
#define READ_TEXT_FLAGS "r"
#define WRITE_BIN_FLAGS "wb"
+#ifdef WIN32
+#define WRITE_TEXT_FLAGS "wb"
+#else
#define WRITE_TEXT_FLAGS "w"
+#endif
#else
#define READ_BIN_FLAGS "r"
#define READ_TEXT_FLAGS "r"
@@ -3955,9 +3959,6 @@
}
}
- for (i=0; i < argc; i++)
- free (argv[i]);
- free (argv);
nargv[nargc] = NULL;
argv = nargv;
argc = nargc;
More information about the tex4ht-commits
mailing list