From d3eb89b9f5e483d6b5c4d1b847b7e2406a112950 Mon Sep 17 00:00:00 2001
From: Erwan Normand <erwan.normand@irisa.fr>
Date: Tue, 13 Aug 2024 10:11:31 +0200
Subject: [PATCH] git subrepo pull (merge) utils

subrepo:
  subdir:   "utils"
  merged:   "8efe944"
upstream:
  origin:   "https://gitlab.inria.fr/whar/packages/latex-utils"
  branch:   "main"
  commit:   "8efe944"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
---
 utils/.gitrepo     |  4 ++--
 utils/commands.tex | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/utils/.gitrepo b/utils/.gitrepo
index c6446b5..9261276 100644
--- a/utils/.gitrepo
+++ b/utils/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://gitlab.inria.fr/whar/packages/latex-utils
 	branch = main
-	commit = 46d12de021ea1b3a4a0a39b0086738691c50661c
-	parent = c4bb93d4e249dda188e0b2b3c0c8145ea9ed7209
+	commit = 8efe944a5dad0c8d2f2b844a3ca7389b9e8966f7
+	parent = d28555ffcb920d6a6148a8b484ef601f7a9a9fb2
 	method = rebase
 	cmdver = 0.4.6
diff --git a/utils/commands.tex b/utils/commands.tex
index 3ac1638..0020565 100644
--- a/utils/commands.tex
+++ b/utils/commands.tex
@@ -1,5 +1,4 @@
 %% Packages required
-\usepackage[export]{adjustbox} % For valign in subfigs
 \usepackage[caption=false]{subfig} % Good looking subfigs
 
 
@@ -62,11 +61,11 @@
     \end{figure*}%
 }
 
-\NewDocumentCommand{\subfig}{O{0.2} O{b} m o}{% #1 = width, #2 = valign, #3 = filename, #4 = caption
-    \IfValueTF{#4}{%
-        \subfloat[#4\label{fig:#3}]{\includegraphics[width=#1\linewidth,valign=#2]{#3}}%
+\NewDocumentCommand{\subfig}{O{0.2} m o}{% #1 = width, #2 = filename, #3 = caption
+    \IfValueTF{#3}{%
+        \subfloat[#3\label{fig:#2}]{\includegraphics[width=#1\linewidth]{#2}}%
     }{%
-        \subfloat{\includegraphics[width=#1\linewidth,valign=#2]{#3}}%
+        \subfloat{\includegraphics[width=#1\linewidth]{#2}}%
     }%
     \hfill%
 }
@@ -158,10 +157,10 @@
 
 
 %% References
-\renewcommand{\eqref}[1]{Eq.~\ref{\labelprefix:eq:#1}}
-\newcommand{\figref}[1]{Fig.~\ref{\labelprefix:fig:#1}}
-\newcommand{\secref}[1]{Sec.~\ref{\labelprefix:sec:#1}}
-\newcommand{\tabref}[1]{Table~\ref{\labelprefix:tab:#1}}
+\renewcommand{\eqref}[1]{Eq.~\ref{eq:#1}}
+\newcommand{\figref}[1]{Fig.~\ref{fig:#1}}
+\newcommand{\secref}[1]{Sec.~\ref{sec:#1}}
+\newcommand{\tabref}[1]{Table~\ref{tab:#1}}
 
 
 %% Structure