bxtexlogo (31mar18)

git-svn-id: svn://tug.org/texlive/trunk@47230 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 46 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/bxtexlogo/LICENSE b/Master/texmf-dist/doc/latex/bxtexlogo/LICENSE
index 8ada757fbc8..dc60f9a70ef 100644
--- a/Master/texmf-dist/doc/latex/bxtexlogo/LICENSE
+++ b/Master/texmf-dist/doc/latex/bxtexlogo/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+Copyright (c) 2017, 2018 Takayuki YATO (aka. "ZR")
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/latex/bxtexlogo/README.md b/Master/texmf-dist/doc/latex/bxtexlogo/README.md
index 1b7db4af149..f5fe16408ee 100644
--- a/Master/texmf-dist/doc/latex/bxtexlogo/README.md
+++ b/Master/texmf-dist/doc/latex/bxtexlogo/README.md
@@ -74,7 +74,7 @@ All the options are passed to hologo.
 
 ### Avaiable logo names
 
-The logo names supported by this package are divides into two classes:
+The logo names supported by this package are divided into two classes:
 “primary” (popular software) and “secondary” (all others).
 
 #### Primary logos
@@ -134,6 +134,7 @@ You can bulk-import the secondary logos with `\bxtexlogoimport{**}`.
 
 (Logos provided by this package)
 
+  * `ApTeX`
   * `HeVeA`
   * `JBibTeX`
   * `JLaTeX`
@@ -169,6 +170,10 @@ You can bulk-import the secondary logos with `\bxtexlogoimport{**}`.
 Revision History
 ----------------
 
+  * Version 0.4 ‹2018/03/11›
+      - More logos: ApTeX, DVIPDFMx.
+      - Add `\bxtexlogoItalicOrSlant`.
+
   * Version 0.3 ‹2017/11/11›
       - More logos.
 
diff --git a/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.pdf b/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.pdf
index 9756975afdc..23ecfce8f9a 100644
--- a/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.pdf
+++ b/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.tex b/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.tex
index aeb343d1ecb..2e66a85b333 100644
--- a/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.tex
+++ b/Master/texmf-dist/doc/latex/bxtexlogo/bxtexlogo-sample.tex
@@ -2,8 +2,8 @@
 \usepackage[scale=0.75]{geometry}
 \usepackage[T1]{fontenc}
 \usepackage{lmodern}
-\newcommand{\PkgVersion}{0.3}
-\newcommand{\PkgDate}{2017/11/11}
+\newcommand{\PkgVersion}{0.4}
+\newcommand{\PkgDate}{2018/03/31}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \usepackage{graphicx,bxtexlogo}
 \bxtexlogoimport{*,**}
@@ -118,9 +118,11 @@ You can use these commands after invoking
 \LSEntry{\TeXonLaTeX}
 \LSEntry{\OneTeX}
 \LSEntry{\SuyahTeX}
+\LSEntry{\SATySFi}
+\LSEntry{\ApTeX}
+\LSEntry{\DVIPDFMx}
 % software yet unavailable
 %\LSEntry{\YukidarumaTeX}
-%\LSEntry{\SATySFi}
 \end{LogoSamples}
 
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/bxtexlogo/bxtexlogo.sty b/Master/texmf-dist/tex/latex/bxtexlogo/bxtexlogo.sty
index 8b1105150de..3038eb90397 100644
--- a/Master/texmf-dist/tex/latex/bxtexlogo/bxtexlogo.sty
+++ b/Master/texmf-dist/tex/latex/bxtexlogo/bxtexlogo.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxtexlogo.sty'.
 %%
-%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2017, 2018 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxtexlogo}[2017/11/11 v0.3]
+\ProvidesPackage{bxtexlogo}[2018/03/31 v0.4]
 
 %% preparation
 \def\bxlg@pkgname{bxtexlogo}
@@ -160,7 +160,8 @@
   \leavevmode\lower.5ex\hbox{J}\bxlg@akern{-.15}\hologo{BibTeX}}
 \bxtexlogoDeclare{primary}{pBibTeX}[]{p\hologo{BibTeX}}
 \bxtexlogoDeclare{primary}{upBibTeX}[]{up\hologo{BibTeX}}
-\bxtexlogoDeclare{primary}{TikZ}{Ti\textit{k}Z\bxlg@nonuc}
+\bxtexlogoDeclare{primary}{TikZ}{%
+  Ti\bxtexlogoItalicOrSlant{k}Z\bxlg@nonuc}
 
 %% old or not-so-famous
 \bxtexlogoDeclare{secondary}{JTeX}{%
@@ -203,6 +204,9 @@
     \vbox to\ht\z@{\kern.05em \hbox{\bxlg@smaller{A}}\vss}%
   \endgroup
   \kern-.23em \TeX}
+\bxtexlogoDeclare{secondary}{ApTeX}{A\kern-.08em \bxlg@logo@@pTeX}
+\bxtexlogoDeclare{secondary}{DVIPDFMx}{% obsolete logo
+  DVI\-PDFM\bxtexlogoItalicOrSlant{x}}
 
 %% fancy things (Not!)
 \bxtexlogoDeclare{secondary}{BaSiX}{%
@@ -462,6 +466,7 @@
 
 %% variables
 \let\bxlg@slant@val\relax
+\newdimen\bxlg@g@height
 
 %%<+> \bxtexlogoFontSlant
 % Uses the slant value of the current font.
@@ -482,6 +487,7 @@
   \aftergroup\bxlg@slant@c}
 \def\bxlg@slant@c{%
     \leavevmode
+    \global\bxlg@g@height\ht\z@
     \ifdim\bxlg@slant@val\p@=\z@ \box\z@
     \else
       \@tempdima\wd\z@ \wd\z@\z@
@@ -503,18 +509,23 @@
 \def\bxlg@implement@slant{%
   \begingroup
   \chardef\bxlg@tmpb=0
-  \def\bxlg@tmpa{\special{ps: currentpoint grestore moveto}}
+  \def\bxlg@tmpa{\special{ps: currentpoint grestore moveto}}%
   \ifx\bxlg@tmpa\Grot@end \chardef\bxlg@tmpb=1 \fi
-  \def\bxlg@tmpa{\special{pdf:etrans}}
+  \def\bxlg@tmpa{\special{pdf:etrans}}%
   \ifx\bxlg@tmpa\Grot@end \chardef\bxlg@tmpb=2 \fi
-  \def\bxlg@tmpa{\pdfrestore}
+  \def\bxlg@tmpa{\pdfrestore}%
   \ifx\bxlg@tmpa\Grot@end \chardef\bxlg@tmpb=3 \fi
-  \def\bxlg@tmpa{\pdfextension restore\relax}
+  \def\bxlg@tmpa{\pdfextension restore\relax}%
   \ifx\bxlg@tmpa\Grot@end \chardef\bxlg@tmpb=4 \fi
+  \def\bxlg@tmpa{dvipdfmx.def}%
+  \ifx\bxlg@tmpa\Gin@driver \chardef\bxlg@tmpb=2 \fi
+  \def\bxlg@tmpa{xetex.def}%
+  \ifx\bxlg@tmpa\Gin@driver \chardef\bxlg@tmpb=2 \fi
   \bxDebug{[gdriver=\the\bxlg@tmpb]}%
   \ifcase\bxlg@tmpb
     % unknown, then leave unimplmented
   \or % dvips
+    % TODO: implement
   \or % dvipdfmx
     \gdef\bxlg@slant@start{\special{%
       pdf:btrans matrix 1 0 \bxlg@slant@val\space 1 0 0}}
@@ -533,6 +544,22 @@
   \endgroup}
 \AtBeginDocument{\bxlg@implement@slant}
 
+%% \bxlg@fallback@slant
+\def\bxlg@fallback@slant{0.167}
+
+%%<+> \bxtexlogoItalicOrSlant
+% Uses the slant value of the current font.
+\newcommand*\bxtexlogoItalicOrSlant[1]{%
+  \textit{%
+    \@tempdima\fontdimen\@ne\font
+    \ifdim\@tempdima>\z@
+      #1%
+    \else
+      \bxtexlogoSlant\bxlg@fallback@slant{#1}%
+      \@tempdima\bxlg@fallback@slant\bxlg@g@height
+      \kern.75\@tempdima
+    \fi}}
+
 %--------------------------------------- small-caps
 
 %% constants