[tex4ht-commits] [SCM] tex4ht updated: r40 - trunk/lit

karl at gnu.org.ua karl at gnu.org.ua
Sat Mar 6 17:25:15 CET 2010


Author: karl
Date: 2010-03-06 18:25:14 +0200 (Sat, 06 Mar 2010)
New Revision: 40

Modified:
   trunk/lit/
   trunk/lit/.svnignore
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-env.tex
Log:
tex4ht-env.tex: license notices


Property changes on: trunk/lit
___________________________________________________________________
Name: svn:ignore
   - lm-htf.tex
tmp
work.dir
*.4ct
*.4es
*.4ht
*.4tc
*.4xt
*.aux
*.bat
*.c
*.css
*.dtd
*.dvi
*.htf
*.html
*.idv
*.java
*.lg
*.log
*.perl
*.png
*.tmp
*.trc
*.unix
*.xref

   + lm-htf.tex
tex4ht.env
tex4ht.env-unix
tex4ht.env-win32
tmp
work.dir
*.4ct
*.4es
*.4ht
*.4tc
*.4xt
*.aux
*.bat
*.c
*.css
*.dtd
*.dvi
*.htf
*.html
*.idv
*.java
*.lg
*.log
*.perl
*.png
*.tmp
*.trc
*.unix
*.xref


Modified: trunk/lit/.svnignore
===================================================================
--- trunk/lit/.svnignore	2010-03-05 19:30:47 UTC (rev 39)
+++ trunk/lit/.svnignore	2010-03-06 16:25:14 UTC (rev 40)
@@ -1,4 +1,7 @@
 lm-htf.tex
+tex4ht.env
+tex4ht.env-unix
+tex4ht.env-win32
 tmp
 work.dir
 *.4ct

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2010-03-05 19:30:47 UTC (rev 39)
+++ trunk/lit/ChangeLog	2010-03-06 16:25:14 UTC (rev 40)
@@ -1,3 +1,10 @@
+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.
@@ -3,4 +10,5 @@
 	Correct quoting of the
 	\Needs{"xhlatex tex4ht-fonts-4hf ..."} line.
+	* Makefile: start at derivations.
 
 2010-03-04  Radhakrishnan CV  <cvr at river-valley.org>

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2010-03-05 19:30:47 UTC (rev 39)
+++ trunk/lit/Makefile	2010-03-06 16:25:14 UTC (rev 40)
@@ -10,9 +10,13 @@
 common_info = $(common) common-info.tex
 derived = 
 
+derived += $(tex4ht_env_derived)
+tex4ht_env_derived = tex4ht.env-unix tex4ht.env-win32
+
 derived += $(tex4ht_fonts_noncjk_derived)
 tex4ht_fonts_noncjk_derived = SearchFonts.java cmtex.htf # and thousands more
 # also, whither lm-htf.tex?  whither tmp?  how change target dir?
+
 derived += $(tex4ht_htcmd_derived)
 tex4ht_htcmd_derived = htcmd.c
 
@@ -127,6 +131,9 @@
 # 
 all: $(derived)
 
+$(tex4ht_env_derived): tex4ht-env.tex $(common)
+	htlatex $< "xhtml,3" "" "-d./" $(tex_args)
+
 $(tex4ht_fonts_noncjk_derived): tex4ht-fonts-noncjk.tex $(common)
 	ht tex $<
 

Modified: trunk/lit/tex4ht-env.tex
===================================================================
--- trunk/lit/tex4ht-env.tex	2010-03-05 19:30:47 UTC (rev 39)
+++ trunk/lit/tex4ht-env.tex	2010-03-06 16:25:14 UTC (rev 40)
@@ -1,26 +1,11 @@
-% latex tex4ht-env   or   htlatex tex4ht-env "xhtml,3"
+% $Id$
+%      latex tex4ht-env
+% or htlatex tex4ht-env "xhtml,3"
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht-env.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  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%   
+% 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.
 
 \documentclass{article}
 
@@ -35,24 +20,8 @@
     \Configure{ProTex}{env,<<<>>>,@,title,list}
 \fi
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\input{common}
 
-\newcount\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
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 \begin{document}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -83,7 +52,7 @@
 @<xtpipes: unix oo@>%
 @<unix validate@> %
 @<unix openoffice@>%
-% end of file                                                       %
+% end of file
 >>>
 
 
@@ -106,7 +75,7 @@
 @<xtpipes: win32 oo@>%
 @<win32 validate@> %
 @<win32 openoffice@>%
-% end of file                                                       %
+% end of file
 >>>
 
 
@@ -131,7 +100,7 @@
 @<xtpipes: my oo@>
 @<my validate@> %
 @<unix openoffice@>%
-% end of file                                                       %
+% end of file
 >>>
 
 
@@ -804,7 +773,7 @@
 
 \<dvips convert (personal)\><<<
 Gdvips -E -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2  > zz%%4.ps
-G/usr/local/magick-6.2.4-6/bin/convert -trim +repage -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3
+Gconvert -trim +repage -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3
 Grm zz%%4.ps >>>
 
 \<unix dvips convert\><<<
@@ -1948,69 +1917,29 @@
 
 
 
-
-
-
-
-
-
 %%%%%%%%%%%%%%%%%%
 \section{Copyright}
 %%%%%%%%%%%%%%%%%%
 
+\input{tex4ht-cpright}
 
 
-
 \<unix copyright\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-% tex4ht.env / .tex4ht (unix)           @version %
-% Copyright (C) @CopyYear.1997.        Eitan M. Gurari        %
-@<TeX4ht copyright@>
->>>
+% tex4ht.env-unix or .tex4ht (@version), generated from @jobname.tex
+% Copyright (C) 2009, 2010 TeX Users Group.
+% Copyright (C) @CopyYear.1997. Eitan M. Gurari
+@<TeX4ht copyright@>>>>
 
-
 \<private copyright\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-% tex4ht.env / .tex4ht (private)        @version %
-% Copyright (C) @CopyYear.1997.        Eitan M. Gurari        %
-@<TeX4ht copyright@>
->>>
+% tex4ht.env or .tex4ht (private) (@version), generated from @jobname.tex
+% Copyright (C) @CopyYear.1997. Eitan M. Gurari
+@<TeX4ht copyright@>>>>
 
-
-
 \<win32 copyright\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-% tex4ht.env (ms win)                   @version %
-% Copyright (C) @CopyYear.1997.        Eitan M. Gurari        %
-@<TeX4ht copyright@>
->>>
+% tex4ht.env-win32 (@version), generated from @jobname.tex
+% Copyright (C) @CopyYear.1997. Eitan M. Gurari
+@<TeX4ht copyright@>>>>
 
-
-\<TeX4ht copyright\><<<
-%                                                        %
-% 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@@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%   >>>
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \OutputCode\<tex4ht\>
@@ -2018,14 +1947,6 @@
 \OutputCodE\<tex4ht.env-win32\>
 
 
-\Needs{"mv tex4ht.env \HOME texmf/tex4ht/base/solaris/tex4ht.env"}
+%\Needs{"mv tex4ht.env \HOME texmf/tex4ht/base/solaris/tex4ht.env"}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 \end{document}
-
-
-
-
-
-


Property changes on: trunk/lit/tex4ht-env.tex
___________________________________________________________________
Name: svn:keywords
   + Date Author Id



More information about the tex4ht-commits mailing list