diff options
author | Karl Berry <karl@freefriends.org> | 2024-07-03 21:14:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-07-03 21:14:28 +0000 |
commit | a85220fff27015040fdc510d96d1f29a2164ba7e (patch) | |
tree | 5096e4f3f7dc3ca1c81ad365c67b9367a5591c3e /Master | |
parent | fb3b765b371f68ddb981a34defc17358d18b29bc (diff) |
fontawesome icon name as alt text, tex4ht r1536; + some https updates
git-svn-id: svn://tug.org/texlive/trunk@71699 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
6 files changed, 111 insertions, 58 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 958b14b4794..f98f416574d 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,7 @@ +2024-07-03 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (fontawesome5.4ht): use icon name as the alt text. + 2024-06-21 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (arydshln.4ht): fixed clash between Colortbl and diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 16387851fd8..f3617f37572 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1535 2024-06-23 20:28:31Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1536 2024-07-03 12:08:13Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2024 TeX Users Group @@ -4265,18 +4265,19 @@ icons to pictures by TeX4ht conversion. \<fontawesome5.4ht\><<< % fontawesome5.4ht (|version), generated from |jobname.tex -% Copyright 2021 TeX Users Group +% Copyright 2021-2024 TeX Users Group |<TeX4ht license text|> \NewConfigure{fontawesome}{2} \ExplSyntaxOn \cs_new_protected:Nn\temp:nn{% +\def\:fontawesomeicon{#2}% to be used in the alt text \a:fontawesome% \o:fontawesome_use_icon:nn:{#1}{#2} \b:fontawesome} \HLet\fontawesome_use_icon:nn\temp:nn \ExplSyntaxOff -\Configure{fontawesome}{\Picture+{}}{\EndPicture} +\Configure{fontawesome}{\Picture+[icon: \:fontawesomeicon]{}}{\EndPicture} \Hinput{fontawesome5} \endinput >>> \AddFile{9}{fontawesome5} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex index 35276909217..c15155fcc57 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex @@ -4,14 +4,14 @@ % 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 +% https://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". % % The Current Maintainer of this work -% is the TeX4ht Project <http://tug.org/tex4ht>. +% is the TeX4ht Project <https://tug.org/tex4ht>. % % If you modify this program, changing the % version identification would be appreciated.>>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht b/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht index 9bb9f9438bf..7f0f40d4b48 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht @@ -1,5 +1,5 @@ -% fontawesome5.4ht (2021-05-06-14:39), generated from tex4ht-4ht.tex -% Copyright 2021 TeX Users Group +% fontawesome5.4ht (2024-07-03-13:28), generated from tex4ht-4ht.tex +% Copyright 2021-2024 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -16,18 +16,19 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-05-06-14:39} +\immediate\write-1{version 2024-07-03-13:28} \NewConfigure{fontawesome}{2} \ExplSyntaxOn \cs_new_protected:Nn\temp:nn{% +\def\:fontawesomeicon{#2}% to be used in the alt text \a:fontawesome% \o:fontawesome_use_icon:nn:{#1}{#2} \b:fontawesome} \HLet\fontawesome_use_icon:nn\temp:nn \ExplSyntaxOff -\Configure{fontawesome}{\Picture+{}}{\EndPicture} +\Configure{fontawesome}{\Picture+[icon: \:fontawesomeicon]{}}{\EndPicture} \Hinput{fontawesome5} \endinput diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env index 5cea6b85ea4..fe925e59e05 100644 --- a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env +++ b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env @@ -1,4 +1,4 @@ -% tex4ht.env-unix (2023-12-11-15:24), generated from tex4ht-env.tex +% tex4ht.env (private) (2024-06-23-13:56), generated from tex4ht-env.tex % (can be used as ~/.tex4ht) % Copyright 2009-2023 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari @@ -7,14 +7,14 @@ % 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 +% https://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". % % The Current Maintainer of this work -% is the TeX4ht Project <http://tug.org/tex4ht>. +% is the TeX4ht Project <https://tug.org/tex4ht>. % % If you modify this program, changing the % version identification would be appreciated.% @@ -54,7 +54,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -tpath/tex/texmf/fonts/tfm/! +t/usr/local/teTeX/share/texmf/fonts/tfm/! +t/var/tmp/texfonts/tfm/! + t/usr/local/teTeX/texmf/fonts/vf/! % <default> i%%~/tex4ht/ht-fonts/iso8859/1/! @@ -150,12 +152,27 @@ i%%~/tex4ht/ht-fonts/alias/! % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% dvi-to-xxx % -% choose one G-script % +% Select one of the G scripts % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % dvips options % % magnification: -x mag (e.g., -x 1200) % % page size: -T x,y (e.g., -T 14in,14in) % +% gs fonts: -Pfont (e.g., -Pcmz -Pamz) % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +<convert-old> + G.png + Gdvips -E -q -Ppdf -f %%1 -pp %%2 > zz%%4.ps + Ggs -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit + Grm zz%%4.ps +G.svg +Gdvisvgm -n -p %%2 --exact -c 1.4,1.4 -o %%3 %%1 +G. +Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.ps +Ggs -sDEVICE=ppm -sOutputFile=zz%%4.ppm -r110x110 -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit +Gconvert zz%%4.ppm -crop 0x0 +page -density 110x110 -transparent '#FFFFFF' %%3 +Grm zz%%4.ps +Grm zz%%4.ppm +</convert-old> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% <netpbm> Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.ps @@ -169,24 +186,6 @@ Grm zz%%4.ppm Grm temp.ppm % Gppmtogif -interlace -transparent 1,1,1 zz%%4.ppm > %%3 </netpbm> -<convert> - G.png - Gdvips -E -q -Ppdf -f %%1 -pp %%2 > zz%%4.ps - Ggs -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit - Grm zz%%4.ps -G.svg -Gdvisvgm -n -p %%2 --exact -c 1.4,1.4 -o %%3 %%1 -G. -%echo "dbg: got to dvips to png via gs (unix dvips convert)" -Gdvips -E -q -Ppdf -f %%1 -pp %%2 > zz%%4.ps -Ggs -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit -Grm zz%%4.ps -%--------- alternative instructions for old versions of convert -% Gconvert -trim -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3 -% Gconvert -crop 0x0 +repage -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3 -% Gconvert -crop 0x0 +page -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -</convert> <dvipng> G.png %echo "dbg: got to dvi to png via (dvipng)" @@ -203,6 +202,11 @@ Gdvipng -T tight -D 144 -bg Transparent -pp %%2:%%2 %%1 -o %%3 %Grm zz%%4.ps </dvipng> + <convert> +Gdvips -E -q -Ppdf -f %%1 -pp %%2 > zz%%4.ps +Ggs -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit +Grm zz%%4.ps + </convert> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Default scripts, shifted rightward 1 pos %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -214,78 +218,121 @@ Gdvipng -T tight -D 144 -bg Transparent -pp %%2:%%2 %%1 -o %%3 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -% * Address for an automatically created bookkeeping file % -% * Ignored under kpathsea % -% * The work directory is assumed for a default % - l~/tex4ht.dir/tex4ht.fls % % t4ht -d%%2 % Mmv %%1 %%2%%3 Ccp %%1 %%2%%3 +% t4ht -e%%1 -d%%2 % +Ecp empty.png %%1%%2 % t4ht -d%%2 -m%%1 % Achmod %%1 %%2%%3 % removed protection % S* % +% * Address for an automatically created bookkeeping file % +% * The work directory is assumed for a default % +l~/tex4ht.dir/tex4ht.fls +% <javahelp> .html mv %%1.html %%1.tmp -.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp -.jhm echo "java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html" -.jhm echo "--- Warning --- Beware of leftover %%1*.html files from other compilations" -.jhm java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html +.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp +.jhm echo "java -jar ${HOME}/javahelp.dir/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html" +.jhm echo "--- Warning --- Beware of leftover %%1*.html files from other compilations" +.jhm java -jar ${HOME}/javahelp.dir/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html </javahelp> +<javahelp-prog> +.java rm -r -f %%0-java.dir +.java mkdir %%0-java.dir +.java cp *.java %%0-java.dir/. +.java javac -classpath ${HOME}/javahelp.dir/jh2.0/javahelp/lib/jh.jar %%0-java.dir/%%1.java +.java chdir %%0-java.dir; jar -cf %%1.jar *.class ; chdir .. +.java mv %%0-java.dir/%%1.jar . +.java rm -r -f %%0-java.dir +.java zip -r %%1 %%0-doc %%1.jar +</javahelp-prog> <javahelp1> -.jhm java -jar ${HOME}/jh1.1.3/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html +.jhm java -jar ${HOME}/javahelp.dir/jh1.1.3/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html </javahelp1> +<javahelp1-prog> +.java rm -r -f %%0-java.dir +.java mkdir %%0-java.dir +.java cp *.java %%0-java.dir/. +.java javac -classpath ${HOME}/javahelp.dir/jh1.1.3/javahelp/lib/jh.jar %%0-java.dir/%%1.java +.java chdir %%0-java.dir; jar -cf %%1.jar *.class ; chdir .. +.java mv %%0-java.dir/%%1.jar . +.java rm -r -f %%0-java.dir +.java zip -r %%1 %%0-doc %%1.jar +</javahelp1-prog> <emspk> .html mv %%1.html %%1.tmp -.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.html %%1.tmp +.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.html %%1.tmp +.html xmllint --noout %%1.html </emspk> <jsml> .jsml mv %%1.jsml %%1.tmp .jsml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp +.jsml xmllint --noout %%1.jsml </jsml> <docbk> .xml cp %%1.xml %%1.tmp .xml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.xml %%1.tmp +.xml xmllint --relaxng /home/4/gurari/dtd.dir/docbook.dir/docbook-5.0/rng/docbook.rng -noout -dropdtd -nonet %%0.xml </docbk> <xhtml> .html mv %%1.html %%1.tmp -.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp +.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp +.html xmllint --noout %%1.html .xht mv %%1.xht %%1.tmp -.xht java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp +.xht java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp +.xht xmllint --noout %%1.xht .xml mv %%1.xml %%1.tmp -.xml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp +.xml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp +.xml xmllint --noout %%1.xml </xhtml> <xhtmml> .html mv %%1.html %%1.tmp -.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp +.html java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp +.html xmllint --noout %%1.html .xht mv %%1.xht %%1.tmp -.xht java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp +.xht java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp +.xht xmllint --noout %%1.xht .xml mv %%1.xml %%1.tmp -.xml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp +.xml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp +.xml xmllint --noout %%1.xml </xhtmml> - + <ooxtpipes> .4oo mv %%0.4oo %%0.tmp .4oo java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp .4om mv %%1.4om %%1.tmp .4om java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.4om %%1.tmp </ooxtpipes> -% + <validatehtml> - .html xmllint --noout --valid --html %%1.html +.html xmllint --noout --valid --html %%1.html +.xml xmllint --noout --valid %%1.xml + .hs java -cp ./tex4ht.dir/texmf/tex4ht/bin/xv4ht.jar xv4ht %%1.hs ./tex4ht.dir/texmf/tex4ht/base/solaris/xv4ht.cat + .jhm java -cp ./tex4ht.dir/texmf/tex4ht/bin/xv4ht.jar xv4ht %%1.jhm ./tex4ht.dir/texmf/tex4ht/base/solaris/xv4ht.cat +.css vcss %%1.css </validatehtml> <validate> - .xml xmllint --noout --valid %%1.xml - .html xmllint --noout --valid %%1.html - .css mycssparser %%1.css +.xml xmllint --noout --valid %%1.xml +.html xmllint --noout --valid %%1.html +.css vcss %%1.css + .4om echo "rxp -V -s -e %%1.4om" + .4om rxp -V -s -e %%1.4om + .4oo xmllint --relaxng ~/dtd.dir/openoffice/relaxng.dir/OpenDocument-schema-v1.0-os.rng -noout %%0.4oo +.4oo xmllint --relaxng ~/dtd.dir/openoffice/relaxng.dir/OpenDocument-schema-v1.1.rng -noout %%0.4oo + .4oy xmllint --relaxng ~/dtd.dir/openoffice/relaxng.dir/OpenDocument-schema-v1.0-os.rng -noout %%0-styles.4oy +.4oy xmllint --relaxng ~/dtd.dir/openoffice/relaxng.dir/OpenDocument-schema-v1.1.rng -noout %%0-styles.4oy +.4om perl -pe 's/math://g' %%1.4om | perl -pe 's/xmlns:[^=]*="[^"]*"//g' | perl -pe 's/xlink:[^=]*="[^"]*"//g' > tmp.tmp ; xmllint --valid --noout --catalogs tmp.tmp </validate> + Xmake -f \HOME texmf/base/NSGMLS name=%%1 ext=%%2 %%3 % <oo> %%% openoffice % diff --git a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env index 53358dd2cec..2d3f42c3245 100644 --- a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env +++ b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env @@ -1,4 +1,4 @@ -% tex4ht.env-win32 (2023-12-11-15:24), generated from tex4ht-env.tex +% tex4ht.env-win32 (2024-06-23-13:56), generated from tex4ht-env.tex % Copyright 2009-2023 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -6,14 +6,14 @@ % 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 +% https://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". % % The Current Maintainer of this work -% is the TeX4ht Project <http://tug.org/tex4ht>. +% is the TeX4ht Project <https://tug.org/tex4ht>. % % If you modify this program, changing the % version identification would be appreciated.% |