[tex4ht-commits] [SCM] tex4ht updated: r43 - trunk/lit
karl at gnu.org.ua
karl at gnu.org.ua
Tue Mar 9 17:41:17 CET 2010
Author: karl
Date: 2010-03-09 18:41:17 +0200 (Tue, 09 Mar 2010)
New Revision: 43
Modified:
trunk/lit/ChangeLog
trunk/lit/Makefile
trunk/lit/tex4ht-cond4ht.tex
trunk/lit/tex4ht-cpright.tex
Log:
tex4ht-cond4ht.tex: license notices; all files: no period ending copyright lines
Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog 2010-03-08 17:12:09 UTC (rev 42)
+++ trunk/lit/ChangeLog 2010-03-09 16:41:17 UTC (rev 43)
@@ -1,5 +1,12 @@
2010-03-08 Karl Berry <karl at gnu.org>
+ * tex4ht-cond4ht.tex: license notices.
+ * 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.
Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile 2010-03-08 17:12:09 UTC (rev 42)
+++ trunk/lit/Makefile 2010-03-09 16:41:17 UTC (rev 43)
@@ -1,8 +1,11 @@
# $Id$
# This file is public domain. Originally written 2010, Karl Berry.
+#
+# todo: ohio-state url in tex4ht-cond4ht.tex
wd = work.dir
-tex_args = "--interaction=nonstopmode --file-line-error"
+tex_opts = --interaction=nonstopmode --file-line-error
+tex_1opt = "$(tex_opts)"
default: all
@@ -10,6 +13,9 @@
common_info = $(common) common-info.tex
derived =
+derived += $(tex4ht_cond4ht_derived)
+tex4ht_cond4ht_derived = cond4ht.4ht mktex4ht.4ht
+
derived += $(tex4ht_docbook_xtpipes_derived)
tex4ht_docbook_xtpipes_derived = docbook.4xt DbUtilities.java
@@ -137,14 +143,18 @@
#
all: $(derived)
+$(tex4ht_cond4ht_derived): tex4ht-cond4ht.tex $(common)
+ tex $(tex_opts) $<
+ tex $(tex_opts) cond4ht.4ht
+
$(tex4ht_docbook_xtpipes_derived): tex4ht-docbook-xtpipes.tex $(common)
- xhlatex $< "html,3" "" "-d./" $(tex_args)
+ xhlatex $< "html,3" "" "-d./" $(tex_1opt)
$(tex4ht_docbook_derived): tex4ht-docbook.tex $(common)
- xhlatex $< "html,3" "" "-d./" $(tex_args)
+ xhlatex $< "html,3" "" "-d./" $(tex_1opt)
$(tex4ht_env_derived): tex4ht-env.tex $(common)
- htlatex $< "xhtml,3" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,3" "" "-d./" $(tex_1opt)
$(tex4ht_fonts_noncjk_derived): tex4ht-fonts-noncjk.tex $(common)
ht tex $<
@@ -153,69 +163,69 @@
ht tex $<
$(tex4ht_html_speech_xtpipes_derived): tex4ht-html-speech-xtpipes.tex $(common)
- htlatex $< "html,next,3" "" "-d./" $(tex_args)
+ htlatex $< "html,next,3" "" "-d./" $(tex_1opt)
$(tex4ht_html_speech_derived): tex4ht-html-speech.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_html0_derived): tex4ht-html0.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_html32_derived): tex4ht-html32.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_html4_derived): tex4ht-html4.tex $(common)
- htlatex $< "html,sections+" "" "-d./" $(tex_args)
+ htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_info_mml_derived): tex4ht-info-mml.tex $(common_info)
- htlatex $< "html,sections+" "" "-d./" $(tex_args)
+ htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_info_ooffice_derived): tex4ht-info-ooffice.tex $(common_info)
- htlatex $< "html,sections+" "" "-d./" $(tex_args)
+ htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_info_svg_derived): tex4ht-info-svg.tex $(common_info)
- htlatex $< "html,sections+" "" "-d./" $(tex_args)
+ htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_info_derived): tex4ht-info.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_javahelp_xtpipes_derived): tex4ht-javahelp-xtpipes.tex $(common)
- htlatex $< "xhtml,next,3" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,next,3" "" "-d./" $(tex_1opt)
$(tex4ht_javahelp_derived): tex4ht-javahelp.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_jsmath_derived): tex4ht-jsmath.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_jsml_xtpipes_derived): tex4ht-jsml-xtpipes.tex $(common)
- htlatex $< "xhtml,next,3" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,next,3" "" "-d./" $(tex_1opt)
$(tex4ht_jsml_derived): tex4ht-jsml.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_mathltx_derived): tex4ht-mathltx.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_mathplayer_derived): tex4ht-mathplayer.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_mkht_derived): tex4ht-mkht.tex $(common)
- latex $(tex_args) $<
+ latex $(tex_opts) $<
perl -c mk4ht.perl # syntax check
- latex $(tex_args) mkht-scripts.4ht
+ latex $(tex_opts) mkht-scripts.4ht
$(tex4ht_moz_derived): tex4ht-moz.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_oo_xtpipes_derived): tex4ht-oo-xtpipes.tex $(common)
- htlatex $< "xhtml,next,3" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,next,3" "" "-d./" $(tex_1opt)
$(tex4ht_ooffice_derived): tex4ht-ooffice.tex $(common)
- htlatex $< "xhtml,4,sections+" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,4,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_ooimpress_derived): tex4ht-ooimpress.tex $(common)
- htlatex $< "xhtml,4,sections+" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,4,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_options_derived): tex4ht-options.tex $(common)
mk4ht xhlatex $<
@@ -224,28 +234,28 @@
ht tex $<
$(tex4ht_svg_derived): tex4ht-svg.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_t4ht_derived): tex4ht-t4ht.tex $(common)
ht tex $<
$(tex4ht_tei_derived): tex4ht-tei.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_unicode_derived): tex4ht-unicode.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_word_derived): tex4ht-word.tex $(common)
- xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
+ xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
$(tex4ht_xhtml_xtpipes_derived): tex4ht-xhtml-xtpipes.tex $(common)
- htlatex $< "xhtml,3,next" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,3,next" "" "-d./" $(tex_1opt)
$(tex4ht_xhtmml_xtpipes_derived): tex4ht-xhtmml-xtpipes.tex $(common)
- htlatex $< "xhtml,3,next" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,3,next" "" "-d./" $(tex_1opt)
$(xtpipes_derived): xtpipes.tex $(common)
- htlatex $< "xhtml,3,next" "" "-d./" $(tex_args)
+ htlatex $< "xhtml,3,next" "" "-d./" $(tex_1opt)
# Derived files are generated in . and $(wd).
# (corresponds to src/java for xtpipes.tex)
@@ -261,6 +271,8 @@
mkdir = install -d
#
update: all
+ $(update) $(tex4ht_cond4ht_derived) $(dest_texmf)/
+#
$(update) docbook.4xt $(dest_xtpipes)/
$(update) DbUtilities.java $(dest_java)/
#
Modified: trunk/lit/tex4ht-cond4ht.tex
===================================================================
--- trunk/lit/tex4ht-cond4ht.tex 2010-03-08 17:12:09 UTC (rev 42)
+++ trunk/lit/tex4ht-cond4ht.tex 2010-03-09 16:41:17 UTC (rev 43)
@@ -1,60 +1,26 @@
+% $Id$
% (1) tex tex4ht-cond4ht or xhtex tex4ht-cond4ht
% (2) tex cond4ht.4ht
+%
+% Copyright (C) 2009, 2010 TeX Users Group
+% Copyright (C) 1997--2009 Eitan M. Gurari
+% Released under LPPL 1.3c+.
+% See tex4ht-cpright.tex for license text.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht-cond4ht.tex %
-% Copyright (C) 1997-- Eitan M. Gurari %
-% %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3 of this license or (at your option) any %
-% later version. The latest version of this license is %
-% in %
-% http://www.latex-project.org/lppl.txt %
-% and version 1.3 or later is part of all distributions %
-% of LaTeX version 2003/12/01 or later. %
-% %
-% This work has the LPPL maintenance status "maintained".%
-% %
-% This Current Maintainer of this work %
-% is Eitan M. Gurari. %
-% %
-% gurari at cse.ohio-state.edu %
-% http://www.cse.ohio-state.edu/~gurari %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
\csname tex4ht\endcsname
-
\input ProTex.sty
\def\CodeDel{{<<<<}{>>>>}}
\AlProTex{sty,<<<>>>,?,title,list,[],ClearCode}
+\input common
-\csname newcount\endcsname\tmpcnt \tmpcnt\time \divide\tmpcnt 60
-\edef\temp{\the\tmpcnt}
-\multiply\tmpcnt -60 \advance\tmpcnt \time
-
-\edef\version{\the\year-\ifnum \month<10 0\fi
- \the\month-\ifnum \day<10 0\fi\the\day
- -\ifnum \temp<10 0\fi \temp
- :\ifnum \tmpcnt<10 0\fi\the\tmpcnt}
-
-\def\CopyYear.#1.{%
- \ifnum #1=\year #1\space\space\space\space\space\space
- \else #1--\the\year\fi
-}
-
-
-
-
\<cond4ht.4ht\><<<<
%Needs: tex cond4ht.4ht
\def\ConfigFiles{\input mktex4ht.cnf} % Please,modify the bodies of the
\def\mkfilename{mktex4ht.4ht} % first four macros.
-\def\author{Eitan M. Gurari} % The input file should consist
-\def\firstdate{1999} % of records \AddFile{i}{name}
+ % The input file should consist
+ % of records \AddFile{i}{name}
% where i stands for a priority number
% in the range 0--9, and name stands for
% for a sty/cls file name. For instance,
@@ -62,12 +28,12 @@
% \AddFile{1}{latex} \AddFile{2}{article}
% \AddFile{5}{amsmath} \AddFile{2}{report} ...
-% cond4ht.4ht ?version %
-% Copyright (C) ?CopyYear.2001. Eitan M. Gurari %
-% %
-?<TeX4ht copyright?>
+% cond4ht.4ht (?version), generated from ?jobname.tex
+% Copyright (C) 2009, 2010 TeX Users Group
+% Copyright (C) ?CopyYear.2001. Eitan M. Gurari
+?<TeX4ht copywrite?>
-\ifx \CopyYear\UnDef
+\ifx \BREAK\UnDef
\csname newcount\endcsname\tmpcnt \tmpcnt\time \divide\tmpcnt 60
\edef\temp{\the\tmpcnt}
@@ -82,6 +48,7 @@
\ifnum #1=\year #1\space\space\space\space\space\space
\else #1--\the\year\fi
}
+
\def\BREAK{^^J}
\fi
@@ -470,27 +437,26 @@
tex4ht-4ht, e.g., for adding cases to {\tt\string\exit:ifnot}.
+\input tex4ht-cpright % needed for this generation:
+
\<\mkfilename\><<<
% \def\HTML{...} \def\CONFIG{...} \def\MAKETITLE{...} \def\EXIST{...}
% \def\OPTIONS{...} \def\PREAMBLE{...}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% Compile this file with the command `xhlatex |mkfilename', %
-% and read the instructions at mktex4ht.html => index %
-% => mktex4ht. %
-% %
-% The compilation needs the files ProTex.sty & AlProTex.sty %
-% from %
-% http://www.cse.ohio-state.edu/~gurari/systems.html %
-% %
-% This file is designed for machines--not human beings! You %
-% are strognly advised not to look at the code which follows %
-% the copyright notice. %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% |mkfilename |version %
-% Copyright (C) |CopyYear.|firstdate. |author %
-|<TeX4ht copyright|>
+%
+% Compile this file with the command `xhlatex |mkfilename',
+% and read the instructions at mktex4ht.html => index => mktex4ht.
+%
+% The compilation needs the files ProTex.sty & AlProTex.sty from
+% http://www.cse.ohio-state.edu/~gurari/systems.html
+%
+% This file is designed for machines--not human beings! You
+% are strongly advised not to look at the code which follows
+% the copyright notice.
+%
+% |mkfilename (|version), generated from |jobname.4ht
+% Copyright (C) 2009, 2010 TeX Users Group
+% Copyright (C) 1999--2009 Eitan M. Gurari
+|<TeX4ht copywrite|>
|<list of info files|>
@@ -754,7 +720,7 @@
>>>>
-\<TeX4ht copyright\><<<<
+\<TeX4ht copywrite\><<<<
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% This work may be distributed and/or modified under the %
@@ -782,7 +748,6 @@
\immediate\write-1{version ?version}
>>>>
-
\<par del\><<<<
!*??: >>>>
@@ -793,4 +758,4 @@
\immediate\write16{--- needs --- tex cond4ht.4ht ---}
\immediate\write16{---------------------------------}
-\bye
\ No newline at end of file
+\bye
Property changes on: trunk/lit/tex4ht-cond4ht.tex
___________________________________________________________________
Name: svn:keywords
+ Date Author Id
Modified: trunk/lit/tex4ht-cpright.tex
===================================================================
--- trunk/lit/tex4ht-cpright.tex 2010-03-08 17:12:09 UTC (rev 42)
+++ trunk/lit/tex4ht-cpright.tex 2010-03-09 16:41:17 UTC (rev 43)
@@ -19,8 +19,7 @@
% License text + \write to log file.
\<TeX4ht copywrite\><<<
-|<TeX4ht copyright|>
-\immediate\write-1{version |version}
+|<TeX4ht copyright|>\immediate\write-1{version |version}
>>>
-% There are two copies of this in tex4ht-mktex.tex.
+% Two additional copies in tex4ht-mktex.tex.
More information about the tex4ht-commits
mailing list