4 files changed, 47 insertions, 35 deletions
diff --git a/Master/texmf-dist/doc/latex/bxdpx-beamer/LICENSE b/Master/texmf-dist/doc/latex/bxdpx-beamer/LICENSE
index 4acbc245013..5c4ad4f949f 100644
--- a/Master/texmf-dist/doc/latex/bxdpx-beamer/LICENSE
+++ b/Master/texmf-dist/doc/latex/bxdpx-beamer/LICENSE
@@ -6,7 +6,7 @@ This software is distributed under the MIT License.
 
 The MIT License
 
-Copyright (c) 2013 Takayuki YATO (aka. "ZR")
+Copyright (c) 2013-2016 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/bxdpx-beamer/README b/Master/texmf-dist/doc/latex/bxdpx-beamer/README.md
index e90f288cf3c..4d63f2b5d7f 100644
--- a/Master/texmf-dist/doc/latex/bxdpx-beamer/README
+++ b/Master/texmf-dist/doc/latex/bxdpx-beamer/README.md
@@ -1,7 +1,7 @@
 bxdpx-beamer Package
 ====================
 
-LaTeX: to fix some problems in use of Beamer with dvipdfmx
+LaTeX: to fix some problems in use of Beamer with dvipdfmx
 
 This packges makes the two types of links work:
   - Navigation symbols
@@ -20,10 +20,16 @@ Load this package as usual in the preamble of Beamer documents:
 
 This package does not provide any user commands.
 
+### License
+
+This package is distributed under the MIT License.
+
 Revision History
 ----------------
 
-  * Version 0.2 <2013/02/27>
+  * Version 0.3  〈2016/08/06〉
+      - The driver of geometry package is forced to be `dvipdfm`.
+  * Version 0.2  〈2013/02/27〉
       - The first public version.
 
 --------------------
diff --git a/Master/texmf-dist/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex b/Master/texmf-dist/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex
index e196174d593..03d22ca5bbf 100644
--- a/Master/texmf-dist/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex
+++ b/Master/texmf-dist/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex
@@ -1,24 +1,24 @@
-\documentclass[17pt]{beamer} % dvipdfmx needed
-\usetheme{Warsaw}
-\usepackage{bxdpx-beamer}
-% These settings make navigation symbols rendered in black.
+\documentclass[17pt,dvipdfmx]{beamer} % dvipdfmx needed
+\usetheme{Warsaw}
+\usepackage{bxdpx-beamer}
+% These settings make navigation symbols rendered in black.
 %\setbeamercolor{navigation symbols dimmed}{fg=black}
 %\setbeamercolor{navigation symbols}{fg=black}
-% This makes all links have a border.
+% This makes all links have a border.
 %\hypersetup{pdfborder={0 0 1},allbordercolors={0 0.5 0}}
-\begin{document}
-
-\section{Important but Meaningless}
-\begin{frame}{First}
-This slide \pause is \alert{meaningless}.
-\end{frame}
-\begin{frame}{Second}
-This slide \pause is also \alert{meaningless}.
-\end{frame}
-
-\section{Meaningless but Important}
-\begin{frame}{Third}
-This is yet another \alert{meaningless} slide.
-\end{frame}
-
-\end{document}
+\begin{document}
+
+\section{Important but Meaningless}
+\begin{frame}{First}
+This slide \pause is \alert{meaningless}.
+\end{frame}
+\begin{frame}{Second}
+This slide \pause is also \alert{meaningless}.
+\end{frame}
+
+\section{Meaningless but Important}
+\begin{frame}{Third}
+This is yet another \alert{meaningless} slide.
+\end{frame}
+
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/bxdpx-beamer/bxdpx-beamer.sty b/Master/texmf-dist/tex/latex/bxdpx-beamer/bxdpx-beamer.sty
index 8a427c20b14..ddb262915a0 100644
--- a/Master/texmf-dist/tex/latex/bxdpx-beamer/bxdpx-beamer.sty
+++ b/Master/texmf-dist/tex/latex/bxdpx-beamer/bxdpx-beamer.sty
@@ -1,22 +1,29 @@
 % bxdpx-beamer.sty
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxdpx-beamer}[2013/02/27 v0.2]
+\ProvidesPackage{bxdpx-beamer}[2016/08/06 v0.3]
 \def\bxqbd@pkgname{bxdpx-beamer}
-% environment check
+% if Beamer is not used, then abort with error
 \@ifclassloaded{beamer}{}{%else
   \PackageError\bxqbd@pkgname{Beamer is not in use}%
     {Package loading is aborted.}%
   \endinput}
-% if not in presentation mode, then abort silently
-\mode<presentation>{\let\bxqbd@tempa=t }
-\ifx t\bxqbd@tempa\else
-\expandafter\endinput\fi\relax
 % if PGF driver is not dvipdfmx/xetex, then abort silently
+\let\bxqbd@pgf=\relax
+\def\bxqbd@tempa{pgfsys-dvipdfmx.def}
+\ifx\pgfsysdriver\bxqbd@tempa \let\bxqbd@pgf=d \fi
+\def\bxqbd@tempa{pgfsys-xetex.def}
+\ifx\pgfsysdriver\bxqbd@tempa \let\bxqbd@pgf=x \fi
+\ifx\bxqbd@pgf\relax
+\expandafter\endinput\fi\relax
+%--------------------------------------- geometry
+% if geometry driver is not set, set it to 'dvipdfm'
+\ifx d\bxqbd@pgf \ifx\Gm@driver\@empty
+  \Gm@setdriver{dvipdfm}
+\fi\fi
+%--------------------------------------- hyperlink
+% if not in presentation mode, then abort silently
 \let\bxqbd@tempa=f
-\def\bxqbd@tempb{pgfsys-dvipdfmx.def}
-\ifx\pgfsysdriver\bxqbd@tempb \let\bxqbd@tempa=t \fi
-\def\bxqbd@tempb{pgfsys-xetex.def}
-\ifx\pgfsysdriver\bxqbd@tempb \let\bxqbd@tempa=t \fi
+\mode<presentation>{\let\bxqbd@tempa=t }
 \ifx t\bxqbd@tempa\else
 \expandafter\endinput\fi\relax
 % if ec-lmr10 is not available, then abort with warning
@@ -26,7 +33,6 @@
     hackery cannot be applied in absence of the \MessageBreak
     LM Roman font}%
   \endinput}
-%---------------------------------------
 % \bxqbd@enghost
 \newbox\bxqbd@ghost
 \font\bxqbd@font=ec-lmr10 at 1.1613pt  % 10*0.5/4.3055