Removing UTF-8 demangling by the `inputenc` package for logo input.

This is a regression, but demangling just the logo paths makes little
sense and there is no practical way to handle this for all file
inclusions. If you need to load resources from non-ASCII paths, you are
advised to use a Unicode-first engine (XeTeX, LuaTeX).

Makefile

-.PHONY: all clear
+.PHONY: all clean
 all:
 	make -C fithesis3
-	make pdflatex.pdf xelatex.pdf lualatex.pdf clear
+	make pdflatex.pdf xelatex.pdf lualatex.pdf clean
 
 # This target typesets the pdfLaTeX example.
 pdflatex.pdf: pdflatex.tex
@@ -19,10 +19,10 @@ lualatex.pdf: lualatex.tex
 	lualatex $<
 
 # This target removes any auxiliary files.
-clear:
+clean:
 	rm -f *.aux *.log *.out *.toc *.lot *.lof
 
 # This target removes any auxiliary files
 # and the output PDF file.
-implode: clear
+implode: clean
 	rm -f pdflatex.pdf xelatex.pdf lualatex.pdf

fithesis3/fithesis.dtx

@@ -1211,26 +1211,6 @@
 %    \begin{macrocode}
 \ifx\thesis@pages\undefined\def\thesis@pages{??}\fi
 %    \end{macrocode}
-% \begin{macro}{\thesis@includegraphics}
-% The |\thesis@includegraphics|\oarg{options}\marg{path} macro has
-% the same syntax and semantics as the \LaTeX\ |\includegraphics|
-% command, but unlike |\includegraphics|, it expands UTF-8 paths
-% without them being mangled by the \textsf{inputenc} package.
-%    \begin{macrocode}
-\newcommand{\thesis@includegraphics}[2][]{{%
-  % Temporarily disable UTF-8 mangling
-  \def\UTFviii@two@octets##1##2{%
-    \string##1\string##2}%
-  \def\UTFviii@three@octets##1##2##3{%
-    \string##1\string##2\string##3}%
-  \def\UTFviii@four@octets##1##2##3##4{%
-    \string##1\string##2\string##3\string##4}%
-  % Expand the path
-  \edef\@argument{#2}%
-  % Include the graphics
-  \includegraphics[#1]{\@argument}}}
-%    \end{macrocode}
-% \end{macro}
 % \iffalse
 %</class>
 % ^^A Old fithesis classes

fithesis3/style/mu/base.dtx

@@ -352,12 +352,12 @@
 % \end{macro}\begin{macro}{\thesis@blocks@facultyLogo@monochrome}
 % The |\thesis@blocks@facultyLogo@monochrome|\oarg{options} private
 % macro typesets the |\thesis@logopath\thesis@facultyLogo| logo
-% with the given \textit{options} passed to
-% |\thesis@includegraphics|.
+% with the given \textit{options} passed to |\includegraphics|.
 % \begin{macrocode}
 \newcommand{\thesis@blocks@facultyLogo@monochrome}[1]%
-  [width=40mm]{\thesis@includegraphics[#1]{%
-    \thesis@logopath\thesis@facultyLogo}}
+  [width=40mm]{{%
+    \edef\@path{\thesis@logopath\thesis@facultyLogo}%
+    \includegraphics[#1]{\@path}}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@facultyLogo@color}
 % The |\thesis@blocks@facultyLogo@color|\oarg{options} private
@@ -366,22 +366,24 @@
 % is \texttt{false} or the
 % |\thesis@logopath color/\thesis@facultyLogo| logo
 % otherwise with the given \textit{options} passed to
-% |\thesis@includegraphics|.
+% |\includegraphics|.
 % \begin{macrocode}
-\newcommand{\thesis@blocks@facultyLogo@color}[1][width=40mm]{
-  \thesis@includegraphics[#1]{%
-    \thesis@logopath\ifthesis@color@ color/\fi\thesis@facultyLogo}}
+\newcommand{\thesis@blocks@facultyLogo@color}[1]%
+  [width=40mm]{{%
+    \edef\@path{\thesis@logopath\ifthesis@color@%
+      color/\fi\thesis@facultyLogo}%
+    \includegraphics[#1]{\@path}}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@universityLogo@monochrome}
 % The |\thesis@blocks@universityLogo@monochrome|\oarg{options}
 % private macro typesets the
 % |\thesis@logopath\thesis@universityLogo| logo
-% with the given \textit{options} passed to
-% |\thesis@includegraphics|.
+% with the given \textit{options} passed to |\includegraphics|.
 % \begin{macrocode}
 \newcommand{\thesis@blocks@universityLogo@monochrome}[1]%
-  [width=40mm]{\thesis@includegraphics[#1]{%
-    \thesis@logopath\thesis@universityLogo}}
+  [width=40mm]{{%
+    \edef\@path{\thesis@logopath\thesis@universityLogo}%
+    \includegraphics[#1]{\@path}}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@universityLogo@color}
 % The |\thesis@blocks@universityLogo@color|\oarg{options} private
@@ -389,13 +391,13 @@
 % logo, if the |\ifthesis|\discretionary{}{}{}|@color@| conditional
 % is \texttt{false} or the
 % |\thesis@logopath color/\thesis@universityLogo| logo otherwise
-% with the given \textit{options} passed to
-% |\thesis@includegraphics|.
+% with the given \textit{options} passed to |\includegraphics|.
 % \begin{macrocode}
-\newcommand{\thesis@blocks@universityLogo@color}[1][width=40mm]{
-  \thesis@includegraphics[#1]{%
-    \thesis@logopath\ifthesis@color@ color/\fi%
-    \thesis@universityLogo}}
+\newcommand{\thesis@blocks@universityLogo@color}[1]%
+  [width=40mm]{{%
+    \edef\@path{\thesis@logopath\ifthesis@color@%
+      color/\fi\thesis@universityLogo}%
+    \includegraphics[#1]{\@path}}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@cover}
 % The |\thesis@blocks@cover| private macro typesets the thesis