[tex4ht-commits] [SCM] tex4ht updated: r255 - trunk/lit
karl at gnu.org.ua
karl at gnu.org.ua
Mon Mar 20 18:51:50 CET 2017
Author: karl
Date: 2017-03-20 19:51:50 +0200 (Mon, 20 Mar 2017)
New Revision: 255
Modified:
trunk/lit/ChangeLog
trunk/lit/Makefile
trunk/lit/tex4ht-fonts-4hf.tex
Log:
remove copyright lines from all unicode.4hf; convenience targets to diff/install unicode.4hf
Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog 2017-03-16 09:42:18 UTC (rev 254)
+++ trunk/lit/ChangeLog 2017-03-20 17:51:50 UTC (rev 255)
@@ -1,14 +1,25 @@
+2017-03-20 Karl Berry <karl at freefriends.org>
+
+ * Makefile (tex4ht_fonts_4hf): use basename instead of make features.
+ (install-unicode-4hf): new target to install all unicode.4hf files.
+ (diff-ht-fonts): new target to compare dev vs. installed ht-fonts.
+ New variables to support the above.
+ * tex4ht-fonts-4hf.tex: use \input common.
+ (TeX4ht copyright): remove, since it was only used in unicode.4hf
+ files and it turns out they don't allow comments.
+ (unicode.4hf): in all the many encodings, remove leading comments.
+
2017-03-16 Michal Hoftich <michal.h21 at gmail.com>
- * Makefile (tex4ht_fonts_4hf_derived): use dvilualatex for compilation
+ * Makefile (tex4ht_fonts_4hf_derived): use dvilualatex for compilation.
2017-03-15 Michal Hoftich <michal.h21 at gmail.com>
- * Makefile (tex4ht_fonts_4hf_derived): added support for
- tex4ht-fonts-4hf.tex
+ * Makefile (tex4ht_fonts_4hf_derived): support tex4ht-fonts-4hf.tex.
* tex4ht-fonts-4hf.tex
- (tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/charset/unicode.4hf) and others:
- request xml entity for single quote, removed xml entity for ` character
+ (tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/charset/unicode.4hf)
+ and others: request xml entity for single quote, removed xml
+ entity for ` character.
2017-03-13 Karl Berry <karl at freefriends.org>
Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile 2017-03-16 09:42:18 UTC (rev 254)
+++ trunk/lit/Makefile 2017-03-20 17:51:50 UTC (rev 255)
@@ -9,9 +9,8 @@
PATH := $(shell echo $$PATH)
# setting PATH as TeX Live 2016 (DVD) does not ship with 'xhlatex'
# and look for xmlint/vcss in ./extra-bin
-export PATH:=$(ht_bin):$(extra_bin):$(PATH)
+export PATH := $(ht_bin):$(extra_bin):$(PATH)
-
wd = work.dir
htmldir = html.dir
xtpipesdir = xtpipes.dir
@@ -48,7 +47,6 @@
usepackage.4ht usepackage-fontspec.4ht \
wrapfig.4ht \
xcolor.4ht xr.4ht xr-hyper.4ht
-
# xx and many, many more.
derived += $(tex4ht_bibtex2_derived)
@@ -92,7 +90,7 @@
tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/lm/rm-lm.htf \
tex4ht.dir/texmf/tex4ht/ht-fonts/alias/lm/rm-lmt.htf \
tex4ht.dir/texmf/tex4ht/ht-fonts/alias/lm/rm-lmvt.htf
-# xx and lots more
+# xx and many more
# whither tmp? how change target dir? what happened to cmtex.htf? etc.
# htcmd not used
@@ -100,9 +98,10 @@
#tex4ht_htcmd_derived = htcmd.c
derived += $(tex4ht_fonts_4hf)
-tex4ht_fonts_4hf = tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/charset/unicode.4hf \
- tex4ht.dir/texmf/tex4ht/ht-fonts/mozilla/charset/unicode.4hf
-# and many more
+tex4ht_fonts_4hf = \
+ tex4ht.dir/texmf/tex4ht/ht-fonts/mozilla/charset/unicode.4hf \
+ tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/charset/unicode.4hf \
+# xx and many more
derived += $(tex4ht_html_speech_derived)
tex4ht_html_speech_derived = html-speech.4ht html-speech-math.4ht emacspeak.4ht
@@ -264,10 +263,11 @@
tex4ht-fonts-noncjk.tex tex4ht-fonts-modern.tex $(common)
$(HTTEX) $< ""
+# requires more memory than configured in other tex programs.
$(tex4ht_fonts_4hf): tex4ht-fonts-4hf.tex
dvilualatex $<
- tex4ht $(<:.tex=.dvi)
- t4ht $(<:.tex=.dvi)
+ tex4ht `basename $< .tex`
+ t4ht `basename $< .tex`
$(tex4ht_htcmd_derived): tex4ht-htcmd.tex $(common)
$(HTTEX) $< ""
@@ -489,11 +489,25 @@
clean1:
rm -f $(f).[0-s]* $(f).[u-z]* $(f).trc
+
+# painful, so let's write out the commands. --20mar17
+ht_fonts_devdir = tex4ht.dir/texmf/tex4ht/ht-fonts
+ht_fonts_instdir = $(inst_dir_top)/ht-fonts
+
+install-unicode-4hf:
+ cd $(ht_fonts_devdir) && tar cf - `find . -name unicode.4hf` \
+ | (cd $(ht_fonts_instdir) && tar xf -)
+ svn diff $(ht_fonts_instdir)
+
+#
# to compare newly-built files with what's installed.
diff_files = $(derived) # lots of changes to be figured out ...
diff_files = $(tex4ht_mathml_derived) $(tex4ht_html_speech_derived) \
$(tex4ht_jsml_derived) $(tex4ht_mathltx_derived)
-inst_dir = /usr/local/texlive/dev/texmf-dist/tex/generic/tex4ht
+#texmf = /usr/local/texlive/dev/texmf-dist
+texmf = /r/tug/home/texlive/karl/Master/texmf-dist
+inst_dir_4ht = $(texmf)/tex/generic/tex4ht
+inst_dir_top = $(texmf)/tex4ht
#
diff = diff -u0 --ignore-all-space --ignore-blank-lines \
--ignore-matching-lines='write-1.version\|, generated from\|Copyright'
@@ -501,16 +515,20 @@
# the --ignore-matching-lines only works when that's the only change in
# the hunk, so ignore them all explicitly. also ignore commented changes.
diff-all:
- -for f in $(diff_files); do $(diff) $(inst_dir)/$$f .; done \
+ -for f in $(diff_files); do $(diff) $(inst_dir_4ht)/$$f .; done \
| tee /tmp/u | egrep -v '^ *[-+]%|write-1.version'
# diff one file specified as d=
diff1:
- $(diff) $(inst_dir)/$(d) .
+ $(diff) $(inst_dir_4ht)/$(d) .
+diff-ht-fonts:
+ $(diff) -r $(ht_fonts_instdir) $(ht_fonts_devdir)
+
mostlyclean:
rm -f $(derived)
+#
# ** experimental section **
# post 'make all' actions
sources = \
Modified: trunk/lit/tex4ht-fonts-4hf.tex
===================================================================
--- trunk/lit/tex4ht-fonts-4hf.tex 2017-03-16 09:42:18 UTC (rev 254)
+++ trunk/lit/tex4ht-fonts-4hf.tex 2017-03-20 17:51:50 UTC (rev 255)
@@ -47,51 +47,14 @@
\fi
}
-\newcount\tmpcnt \tmpcnt\time \divide\tmpcnt 60
-\edef\temp{\the\tmpcnt}
-\multiply\tmpcnt -60 \advance\tmpcnt \time
+\input{common}
-
-\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}
-% unicode.4hf files can't contain coments
-% %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c 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.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later. %
-% %
-% This work has the LPPL maintenance status "maintained".%
-% %
-% This Current Maintainer of this work %
-% is the TeX4ht Project <tex4ht at tug.org>. %
-% %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be %
-% appreciated. %
-% \message{signature} %
-% %
-% tex4ht at tug.org %
-% http://www.tug.org/tex4ht %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\<TeX4ht copyright\><<<
+% unicode.4hf files can't contain comments; they have the same copyright
+% and license as the rest of tex4ht; see tex4ht-cpright.tex.
>>>
@@ -122,10 +85,6 @@
eliminated.)
\<iso-8859-1\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<hexa to decimal`>
`<ascii base`>
'¡' '' '\161\' '' `% INVERTED EXCLAMATION MARK `%
@@ -277,10 +236,6 @@
\AtEndDocument{\AddFont{iso-8859-2}{iso8859/2/charset/unicode}}
\<iso-8859-2\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<ascii base`>
'Ą' '' '\161\' '' `%LATIN CAPITAL LETTER A WITH OGONEK`%
'˘' '' '\162\' '' `%BREVE`%
@@ -410,10 +365,6 @@
\<iso-8859-5\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<hexa to decimal`>
`<ascii base`>
'Ё' '' '\161\' '' `% CYRILLIC CAPITAL LETTER IO `%
@@ -583,10 +534,6 @@
\AtEndDocument{\AddFont{iso-8859-6}{iso8859/6/charset/unicode}}
\<iso-8859-6\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<ascii base`>
' ' '' '\160\' '' `%NO-BREAK SPACE`%
'¤' '' '\161\' '' `%CURRENCY SIGN`%
@@ -663,10 +610,6 @@
\AtEndDocument{\AddFont{cp1256}{cp1256/charset/unicode}}
\<cp1256\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<ascii base`>
'€' '' '\128\' '' `%EURO SIGN`%
'پ' '' '\129\' '' `%ARABIC LETTER PEH`%
@@ -808,10 +751,6 @@
\<iso-8859-7\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<hexa to decimal`>
`<ascii base`>
'‘' '' '\161\' '' `% LEFT SINGLE QUOTATION MARK `%
@@ -917,10 +856,6 @@
\<win-1251\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<hexa to decimal`>
`<ascii base`>
' ' '' '\160\' '' `% NO-BREAK SPACE `%
@@ -1107,10 +1042,6 @@
\AtEndDocument{\AddFont{koi8-r}{koi/8r/charset/unicode}}
\<koi8-r\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
'─' '' '\128\' '' `% BOX DRAWINGS LIGHT HORIZONTAL `%
'│' '' '\129\' '' `% BOX DRAWINGS LIGHT VERTICAL `%
'┌' '' '\130\' '' `% BOX DRAWINGS LIGHT DOWN AND RIGHT `%
@@ -1284,10 +1215,6 @@
\<viscii\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<ascii base`>
'Ẳ' '' '\2\' '' `%A + breve + hook above`%
'Ẵ' '' '\5\' '' `%A + breve + tilde`%
@@ -1435,10 +1362,6 @@
\<viqr\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<ascii base`>
!À! !! !A``! !!
!Á! !! !A'! !!
@@ -1586,10 +1509,6 @@
\<symbol-1251\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<ms symbol font`>
`<win-1251`>
'ff' '' 'ff' ''
@@ -1767,10 +1686,6 @@
\<mozilla\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<xml entities`>
`<undo ligatures`>
`<uni into ascii`>
@@ -1785,10 +1700,6 @@
>>>
\<mozilla-mnemonic\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<undo ligatures`>
`<uni into ascii`>
`<fraktur into letters-mnemonic`>
@@ -1803,10 +1714,6 @@
\<mozilla-native\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<xml entities`>
`<undo ligatures`>
`<uni into ascii`>
@@ -2561,10 +2468,6 @@
\<unicode\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<xml entities`>
>>>
@@ -2588,10 +2491,6 @@
\AtEndDocument{\AddFont{utf8}{utf8/charset/unicode}}
\<utf8\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<utf8-0`>
`<utf8-1`>
`<utf8-2`>
@@ -66924,10 +66823,6 @@
\AtEndDocument{\AddFont{gb2312}{gb2312/charset/unicode}}
\<gb2312\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
'¤' '' '\161\\232\' ''
'§' '' '\161\\236\' ''
'¨' '' '\161\\167\' ''
@@ -74390,10 +74285,6 @@
\AtEndDocument{\AddFont{gbk}{gbk/charset/unicode}}
\<gbk\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
'¤' '' '\161\\232\' ''
'§' '' '\161\\236\' ''
'¨' '' '\161\\167\' ''
@@ -98347,10 +98238,6 @@
\<speech\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<script math to speech`>
`<speech 00xx`>
`<speech 01xx`>
@@ -98380,10 +98267,6 @@
\<jsml\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% unicode.4hf `version %
-% Copyright (C) `CopyYear.1997. Eitan M. Gurari %
-`<TeX4ht copyright`>
`<script math to speech`>
`<speech 00xx`>
`<speech 01xx`>
@@ -101358,7 +101241,6 @@
>>>
-
%%%%%%%%%%%%%
\subsection{Ligatures}
%%%%%%%%%%%%%
More information about the tex4ht-commits
mailing list