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

karl at gnu.org.ua karl at gnu.org.ua
Thu Mar 4 20:45:49 CET 2010


Author: karl
Date: 2010-03-04 21:45:49 +0200 (Thu, 04 Mar 2010)
New Revision: 38

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-mkht.tex
Log:
changes from CVR to insert notices in generated scripts

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2010-03-04 19:25:27 UTC (rev 37)
+++ trunk/lit/ChangeLog	2010-03-04 19:45:49 UTC (rev 38)
@@ -1,3 +1,8 @@
+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.

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2010-03-04 19:25:27 UTC (rev 37)
+++ trunk/lit/Makefile	2010-03-04 19:45:49 UTC (rev 38)
@@ -176,9 +176,9 @@
 	xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)
 
 $(tex4ht_mkht_derived): tex4ht-mkht.tex $(common)
-	latex -interaction=nonstopmode $<
+	latex $(tex_args) $<
 	perl -c mk4ht.perl  # syntax check
-	latex -interaction=nonstopmode mkht-scripts.4ht
+	latex $(tex_args) mkht-scripts.4ht
 
 $(tex4ht_moz_derived): tex4ht-moz.tex $(common)
 	xhlatex $< "html,3,sections+" "" "-d./" $(tex_args)

Modified: trunk/lit/tex4ht-mkht.tex
===================================================================
--- trunk/lit/tex4ht-mkht.tex	2010-03-04 19:25:27 UTC (rev 37)
+++ trunk/lit/tex4ht-mkht.tex	2010-03-04 19:45:49 UTC (rev 38)
@@ -59,9 +59,10 @@
 
 
 \<htlatex ...\><<<
-|<unix line|>|<latex|>
+|<unix line|>|<windows line|>
         |<latex|>
         |<latex|>
+        |<latex|>
         |<base|>tex4ht |<dir ch|>|<@|>1  |<III|>
         |<base|>t4ht |<dir ch|>|<@|>1 |<IV|>
 
@@ -121,7 +122,7 @@
 
 
 \<htlatex 2e...\><<<
-|<unix line|>|<latex2e|>
+|<unix line|>|<windows line|>|<latex2e|>
         |<latex2e|>
         |<latex2e|>
         |<base|>tex4ht |<dir ch|>|<@|>1  |<III|>
@@ -147,7 +148,7 @@
 
 
 \<htlatex 209...\><<<
-|<unix line|>|<latex209|>
+|<unix line|>|<windows line|>|<latex209|>
         |<latex209|>
         |<latex209|>
         |<base|>tex4ht |<dir ch|>|<@|>1  |<III|>
@@ -192,7 +193,7 @@
 
 
 \<httex...\><<<
-|<unix line|>|<tex|>
+|<unix line|>|<windows line|>|<tex|>
         |<tex|>
         |<tex|>
         |<base|>tex4ht |<dir ch|>|<@|>1 |<III|>
@@ -240,7 +241,7 @@
 texinfo.tex file.
 
 \<httexi...\><<<
-|<unix line|>|<texinfo|>
+|<unix line|>|<windows line|>|<texinfo|>
         |<texinfo|>
         |<texinfo|>
         |<base|>tex4ht |<dir ch|>|<@|>1 |<III|>
@@ -292,7 +293,8 @@
 
 
 \<context...\><<<
-|<unix line|>|<texexec|>
+|<unix line|>|<windows line|>
+        |<texexec|>
         |<base|>tex4ht |<dir ch|>|<@|>1 |<III|>
         |<base|>t4ht |<dir ch|>|<@|>1 |<IV|>
 
@@ -338,7 +340,7 @@
 
 
 \<htxetex...\><<<
-|<unix line|>|<xetex|>
+|<unix line|>|<windows line|>|<xetex|>
         |<xetex|>
         |<xetex|>
         |<base|>tex4ht -.xdv |<dir ch|>|<@|>1 |<III|>
@@ -369,7 +371,7 @@
 
 
 \<htxelatex...\><<<
-|<unix line|>|<xelatex|>
+|<unix line|>|<windows line|>|<xelatex|>
         |<xelatex|>
         |<xelatex|>
         |<base|>tex4ht -.xdv |<dir ch|>|<@|>1  |<III|>
@@ -404,7 +406,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \<htmex...\><<<
-|<unix line|>|<mex|>
+|<unix line|>|<windows line|>|<mex|>
         |<mex|>
         |<mex|>
         |<base|>tex4ht |<dir ch|>|<@|>1 |<III|>
@@ -439,7 +441,7 @@
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % 
 % \<htmex-pl...\><<<
-%         |<unix line|>|<mex-pl|>
+%         |<unix line|>|<windows line|>|<mex-pl|>
 %         |<mex-pl|>
 %         |<mex-pl|>
 %         |<base|>tex4ht |<dir ch|>|<@|>1 |<III|>
@@ -473,7 +475,7 @@
 %%%%%%%%%%%%%
 
 
-WARNING: Do't include `-cvalidatehtml' in the htlatex script as it will
+WARNING: Don't include `-cvalidatehtml' in the htlatex script as it will
 be required by every script called with mk4ht.  For instance, `mk4ht
 dblatex file'.
 
@@ -509,7 +511,7 @@
 
 \<unix scripts\><<<-
 \<ht.unix\><<<
-|<unix line|>$1 $2 
+|<unix line|>|<windows line|>$1 $2 
         $1 $2 
         $1 $2 
         tex4ht $2 
@@ -521,6 +523,7 @@
 
 \<ms scripts\><<<-
 \<ht.bat\><<<
+|<windows line|>
         %1 %2  
         %1 %2  
         %1 %2  
@@ -988,7 +991,7 @@
 % Copyright (C) 2009, 2010 TeX Users Group.
 % Copyright (C) ?CopyYear.1997. Eitan M. Gurari
 ?<TeX4ht copyright?>
-\immediate\write-1{version \ifx \JOBNAME\UnDefined ?version\else |version\fi}
+\immediate\write-1{version ?version}
 
 \def\exit{\documentclass{article}\begin{document}\end{document}\endinput}
 \bgroup
@@ -996,13 +999,15 @@
      \immediate\write16{---------------------------- error 
         ---------------------------- 
         ^^JRequires #1ProTex.sty from 
-        http://www.cse.ohio-state.edu/\string
-       ~gurari/systems.html^^J%
+        http://tug.org/tex4ht^^J%
        ---------------------------------------------------------------}}
   \openin15=ProTex.sty \ifeof15 \missing{}\else \closein15 \fi
   \openin15=AlProTex.sty \ifeof15 \missing{Al}\else \closein15 \fi
 \egroup
 
+\let\ScriptFileName\relax
+\let\AddExtn\relax
+
 \documentclass{article}
 
 \ifx \HCode\UnDef
@@ -1017,6 +1022,13 @@
   \begin{document}
 \fi
 
+\catcode`\:=11
+\def\OutputCodE\<#1.#2\>{{\xdef\ScriptFileName{#1}
+   \:DoName\def{#1}{\<#1.#2\>}
+   \OutputCode[#2]\<#1\>}}
+\def\winextn{bat}
+\def\AddExtn{\ifx\ext\winextn .bat\fi}
+
 \tableofcontents
 
 ?<def script?>
@@ -1056,7 +1068,6 @@
 \ifx \script\UnDef \let\script=\relax \fi
 \let\base=\relax
 \let\firstln=\relax
-       
 
 \<Rem\><<<
 |Rem>>>
@@ -1087,8 +1098,14 @@
 
 \<unix line\><<<
 |firstln#!/bin/sh
-endfirstln        >>>
+endfirstln
+>>>
 
+\<windows line\><<<
+?<MYcopyrightnotice?>
+>>>
+
+
 \def\IfExt#1,#2//{\def\next{#1}%
    \ifx \next\ext \def\next{\csname iftrue\endcsname}%
    \else \ifx \next\empty \def\next{\csname iffalse\endcsname}%
@@ -1178,7 +1195,7 @@
       @immediate at write16{| \def\script{bat} }
       @immediate at write16{| % \def\script{unix} }
       @immediate at write16{|}
-      @immediate at write16{| \input mkht.4ht }
+      @immediate at write16{| \input ./mkht.4ht }
       @immediate at write16{|}
       @immediate at write16{| \one{,html,...1...}}
       @immediate at write16{| \two{-ic:/tex4ht/texmf/tex4ht/ht-fonts/#1 ...2...}    % bat }
@@ -1217,12 +1234,12 @@
 \<mkht-scripts\><<<-
 % mkht-scripts.4ht (?version), generated from ?jobname.tex
 % Copyright (C) 2009, 2010 TeX Users Group.
-% Copyright (C) ?CopyYear.200. Eitan M. Gurari
+% Copyright (C) ?CopyYear.2000. Eitan M. Gurari
 ?<TeX4ht copyright?>
 
 \ifx \JOBNAME\UnDef
    \def\JOBNAME{mkht-scripts.4ht}
-   \def\next{\input mkht.4ht  \endinput}
+   \def\next{\input ./mkht.4ht  \endinput}
    \expandafter\next
 \fi
 
@@ -1237,12 +1254,12 @@
 \Script{%                        #1 -- file    #2 -- extension
    \Needs{"sed -e 's/\#\# -d/ -d/g' < #1.#2 >  /opt/cvr/gurari/tex4ht.dir/bin/solaris/#1"}%
    \Needs{"chmod 700 /opt/cvr/gurari/tex4ht.dir/bin/solaris/#1"}%
-   \Needs{"mkdir -p  mn.dir/ht-unix"}%
+   \Needs{"mkdir -p mn.dir/ht-unix"}%
    \Needs{"cp #1.#2  mn.dir/ht-unix/#1"}%
 }}{}
 \Script{%                        #1 -- file    #2 -- extension
-   \Needs{"mkdir -p  /opt/cvr/gurari/tex4ht.dir/bin/ht"}%
-   \Needs{"mkdir -p  /opt/cvr/gurari/tex4ht.dir/bin/ht/unix"}%
+   \Needs{"mkdir -p /opt/cvr/gurari/tex4ht.dir/bin/ht"}%
+   \Needs{"mkdir -p /opt/cvr/gurari/tex4ht.dir/bin/ht/unix"}%
    \Needs{"mv #1.#2  /opt/cvr/gurari/tex4ht.dir/bin/ht/unix/#1"}%
    \Needs{"chmod 744 /opt/cvr/gurari/tex4ht.dir/bin/ht/unix/#1"}%
 }
@@ -1254,11 +1271,11 @@
 %%%%%%%%%%%%%%%%%%
 ?<ms setup?>
 \ifOption{Needs}{\Script{%
-   \Needs{"mkdir -p  mn.dir/ht-win32"}%
+   \Needs{"mkdir -p mn.dir/ht-win32"}%
    \Needs{"cp #1.#2  mn.dir/ht-win32/."}%
 }}{}
 \Script{%                        #1 -- file    #2 -- extension
-   \Needs{"mkdir -p  /opt/cvr/gurari/tex4ht.dir/bin/ht/win32"}%
+   \Needs{"mkdir -p /opt/cvr/gurari/tex4ht.dir/bin/ht/win32"}%
    \Needs{"mv #1.#2  /opt/cvr/gurari/tex4ht.dir/bin/ht/win32/#1.#2"}%
    \Needs{"chmod 744 /opt/cvr/gurari/tex4ht.dir/bin/ht/win32/#1.#2"}%
 }
@@ -1837,18 +1854,39 @@
 # 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 work has the LPPL maintenance status "maintained".
 #
 # The Current Maintainer of this work
 # is the TeX4ht Project <http://tug.org/tex4ht>.
 #
-# If you modify this file your changing the signature
+# If you modify this file, changing the
 # version identification be appreciated.
 ->>>
 
+% used in the generated scripts.
+\<MYcopyrightnotice\><<<-
+|Rem |ScriptFileName|AddExtn (?version), generated from ?jobname.tex
+|Rem Copyright (C) 2009, 2010 TeX Users Group.
+|Rem Copyright (C) ?CopyYear.2003. Eitan M. Gurari
+|Rem
+|Rem This work may be distributed and/or modified under the
+|Rem conditions of the LaTeX Project Public License, either
+|Rem version 1.3 of this license or (at your option) any
+|Rem later version. The latest version of this license is in
+|Rem   http://www.latex-project.org/lppl.txt
+|Rem and version 1.3 or later is part of all distributions
+|Rem of LaTeX version 2003/12/01 or later.
+|Rem
+|Rem This work has the LPPL maintenance status "maintained".
+|Rem
+|Rem The Current Maintainer of this work
+|Rem is the TeX4ht Project <http://tug.org/tex4ht>.
+|Rem
+|Rem If you modify this file, changing the
+|Rem version identification be appreciated.
+->>>
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \OutputCode\<mkht\>
@@ -1864,7 +1902,7 @@
 
 
 \immediate\write16{--------------------------------------------------------}
-\immediate\write16{Compile mkht-scripts.4ht with latex to get the 
+\immediate\write16{Compile mkht-scripts.4ht with latex to get the
                                                               full scripts.}
 \immediate\write16{Use the option `Needs' to automatically move the
     files to private directories.}



More information about the tex4ht-commits mailing list