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

karl at gnu.org.ua karl at gnu.org.ua
Sat Feb 13 18:37:15 CET 2010


Author: karl
Date: 2010-02-13 19:37:14 +0200 (Sat, 13 Feb 2010)
New Revision: 19

Added:
   trunk/lit/common-code.tex
Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-options.tex
   trunk/lit/tex4ht-unicode.tex
Log:
tex4ht-options: license notices; factor out more common code

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2010-02-12 17:35:32 UTC (rev 18)
+++ trunk/lit/ChangeLog	2010-02-13 17:37:14 UTC (rev 19)
@@ -1,3 +1,11 @@
+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.

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2010-02-12 17:35:32 UTC (rev 18)
+++ trunk/lit/Makefile	2010-02-13 17:37:14 UTC (rev 19)
@@ -8,13 +8,14 @@
 common = tex4ht-cpright.tex common.tex
 derived =
 
-derived += $(tex4ht_sty_derived)
-tex4ht_sty_derived = \
-  tex4ht.sty \
+derived += $(tex4ht_options_derived)
+tex4ht_options_derived = \
+  tex4ht.4ht \
 
 derived += $(tex4ht_svg_derived)
 tex4ht_svg_derived = \
   svg.4ht \
+  html4-svg.4ht \
 
 derived += $(tex4ht_t4ht_derived)
 tex4ht_t4ht_derived = \
@@ -64,6 +65,9 @@
 # 
 all: $(derived)
 
+$(tex4ht_options_derived): tex4ht-options.tex $(common)
+	mk4ht xhlatex $<
+
 $(tex4ht_sty_derived): tex4ht-sty.tex $(common)
 	ht tex $<
 
@@ -95,26 +99,29 @@
 
 # 
 destdir = ..
+texmf_dest = $(destdir)/texmf/tex/generic/tex4ht
 update = cp -pr
 update: all
-	$(update) tex4ht.sty $(destdir)/texmf/tex/generic/tex4ht/
+	$(update) $(tex4ht_options_derived) $(texmf_dest)/
 #
-	$(update) svg.4ht html4-svg.4ht $(destdir)/texmf/tex/generic/tex4ht/
+	$(update) $(tex4ht_sty_derived) $(texmf_dest)/
 #
-	$(update) t4ht.c $(destdir)/src/
+	$(update) $(tex4ht_svg_derived) $(texmf_dest)/
 #
-	$(update) tei*.4ht $(destdir)/texmf/tex/generic/tex4ht/
+	$(update) $(tex4ht_t4ht_derived) $(destdir)/src/
 #
-	$(update) unicode.4ht $(destdir)/texmf/tex/generic/tex4ht/
+	$(update) $(tex4ht_tei_derived) $(texmf_dest)/
 #
-	$(update) htmlw.4ht $(destdir)/texmf/tex/generic/tex4ht/
+	$(update) $(tex4ht_unicode_derived) $(texmf_dest)/
 #
+	$(update) $(tex4ht_word_derived) $(texmf_dest)/
+#
 	$(update) XhtmlEmails.java $(destdir)/src/java/
 	$(update) xhtml.4xt $(destdir)/texmf/tex4ht/xtpipes/
 #
 	$(update) XhtmmlUtilities.java $(destdir)/src/java/
 	$(update) xhtmml.4xt $(destdir)/texmf/tex4ht/xtpipes/
-#
+# this has to be done last. And does anything else use $(wd)? We'll see.
 	rmdir $(wd)/bin
 	$(update) $(wd)/* $(destdir)/src/java/
 	$(update) xtpipes.dtd xtpipes-map.dtd xtpipes-default.4xt \

Added: trunk/lit/common-code.tex


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

Modified: trunk/lit/tex4ht-options.tex
===================================================================
--- trunk/lit/tex4ht-options.tex	2010-02-12 17:35:32 UTC (rev 18)
+++ trunk/lit/tex4ht-options.tex	2010-02-13 17:37:14 UTC (rev 19)
@@ -1,30 +1,10 @@
+% $Id$
 % latex tex4ht-options   or    xhlatex tex4ht-options
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht-options.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.                                    %
-%                                                        %
-% If you modify this file your changing the signature    %
-% in \message{(signature)} below will be appreciated.    %
-%                                                        %
-%                             gurari at cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\message{(signature)} 
+% Copyright (C) 2009, 2010 TeX Users Group.
+% Copyright (C) 2000--2009 Eitan M. Gurari
+% Released under LPPL 1.3c+.
+% See tex4ht-cpright.tex for license text.
 
 \ifx \HTML\UnDef
    \def\HTML{} 
@@ -34,74 +14,18 @@
    \expandafter\next
 \fi
 
-
-
 %%%%%%%%%%%%%%%%%% definitions %%%%%%%%%%%%%%%%%%%%%%%%%
 
-\let\AltxModifyShowCode=\ModifyShowCode
-\def\ModifyShowCode{%
-   \def\by{by}\def\={=}\AltxModifyShowCode}
-\let\pReModifyOutputCode=\ModifyOutputCode
-\def\ModifyOutputCode{%
-   \def\by{}\def\={}%
-   \pReModifyOutputCode}
+\input{common.tex}
+\input{common-code.tex}
+\input{tex4ht-cpright.tex}
 
-\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
-}
-
 \def\.{\string\a:mathml:\space}
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \chapter{Shared}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
-\<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.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari at cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version |version}
->>>
-
-
 \<par del\><<<
 !*?: >>>
 
@@ -125,9 +49,10 @@
   \string:RestoreCatcodes\endcsname{\catcode`\%|=\the
   \catcode`\%}\catcode`\%|=14\fi
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-% tex4ht.4ht                            |version %
-% Copyright (C) |CopyYear.1997.       Eitan M. Gurari         %
-|<TeX4ht copyright|>
+% tex4ht.4ht (|version), generated from |jobname.tex
+% Copyright (C) 2009, 2010 TeX Users Group.
+% Copyright (C) |CopyYear.1997. Eitan M. Gurari
+|<TeX4ht copywrite|>
 |<save catcodes|>
 |<note about tex4ht.usr|>
 
@@ -504,4 +429,4 @@
 
 
 \endinput
-\subsection{Accents}
\ No newline at end of file
+\subsection{Accents}


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

Modified: trunk/lit/tex4ht-unicode.tex
===================================================================
--- trunk/lit/tex4ht-unicode.tex	2010-02-12 17:35:32 UTC (rev 18)
+++ trunk/lit/tex4ht-unicode.tex	2010-02-13 17:37:14 UTC (rev 19)
@@ -15,19 +15,9 @@
 \fi
 
 \input{common.tex}
+\input{common-code.tex}
 \input{tex4ht-cpright.tex}
 
-%%%%%%%%%%%%%%%%%% definitions %%%%%%%%%%%%%%%%%%%%%%%%%
-
-\let\AltxModifyShowCode=\ModifyShowCode
-\def\ModifyShowCode{%
-   \def\by{by}\def\={=}\AltxModifyShowCode}
-\let\pReModifyOutputCode=\ModifyOutputCode
-\def\ModifyOutputCode{%
-   \def\by{}\def\={}%
-   \pReModifyOutputCode}
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \Needs{"ls -l tex4ht-*.tex > ls-links.log"}
 \openin15=ls-links.log



More information about the tex4ht-commits mailing list