8 files changed, 20 insertions, 4 deletions
diff --git a/graphics/pgf/contrib/matrix-skeleton/LICENSE b/graphics/pgf/contrib/matrix-skeleton/LICENSE
index cf5d56f156..723ab98b28 100644
--- a/graphics/pgf/contrib/matrix-skeleton/LICENSE
+++ b/graphics/pgf/contrib/matrix-skeleton/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019, Nicolas Dudebout <nicolas.dudebout@gatech.edu>
+Copyright (c) 2013-2022, Nicolas Dudebout <nicolas.dudebout@gatech.edu>
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
 
diff --git a/graphics/pgf/contrib/matrix-skeleton/README.md b/graphics/pgf/contrib/matrix-skeleton/README.md
index a084f16689..c47acb6d10 100644
--- a/graphics/pgf/contrib/matrix-skeleton/README.md
+++ b/graphics/pgf/contrib/matrix-skeleton/README.md
@@ -32,3 +32,4 @@ More information and examples are available in [the manual](manual.pdf).
 
 Author: Nicolas Dudebout
 License: ISC
+Version: 1.1
diff --git a/graphics/pgf/contrib/matrix-skeleton/example.pdf b/graphics/pgf/contrib/matrix-skeleton/example.pdf
index 1bf57b0b62..c1fe53e664 100644
--- a/graphics/pgf/contrib/matrix-skeleton/example.pdf
+++ b/graphics/pgf/contrib/matrix-skeleton/example.pdf
diff --git a/graphics/pgf/contrib/matrix-skeleton/manual.pdf b/graphics/pgf/contrib/matrix-skeleton/manual.pdf
deleted file mode 100644
index 878e7af24a..0000000000
--- a/graphics/pgf/contrib/matrix-skeleton/manual.pdf
+++ /dev/null
diff --git a/graphics/pgf/contrib/matrix-skeleton/matrix.skeleton.pdf b/graphics/pgf/contrib/matrix-skeleton/matrix.skeleton.pdf
new file mode 100644
index 0000000000..66aca09bc7
--- /dev/null
+++ b/graphics/pgf/contrib/matrix-skeleton/matrix.skeleton.pdf
diff --git a/graphics/pgf/contrib/matrix-skeleton/manual.tex b/graphics/pgf/contrib/matrix-skeleton/matrix.skeleton.tex
index 14ee41c69a..52748e7583 100644
--- a/graphics/pgf/contrib/matrix-skeleton/manual.tex
+++ b/graphics/pgf/contrib/matrix-skeleton/matrix.skeleton.tex
@@ -2,6 +2,7 @@
 
 \usepackage{tikz}
 \usetikzlibrary{matrix.skeleton}
+\usetikzlibrary{positioning}
 
 \usepackage[justification=centering,labelfont={sf,bf,up},labelsep=period,font=small]{caption}
 \captionsetup[figure]{position=bottom,singlelinecheck=false}
@@ -27,7 +28,7 @@
 
 \title{\texttt{matrix.skeleton}'s Manual}
 \author{Nicolas Dudebout}
-\date{}
+\date{Version \versionnumber}
 
 \begin{document}
 
@@ -394,4 +395,8 @@ Following \href{http://tex.stackexchange.com/users/3235/percusse}{\code{@percuss
 This tiling behavior is sometimes desired.
 However, it can result in unexpected behaviors when: using a non-base \code{anchor}, using \code{row sep} or \code{column sep}, or when working on boundary nodes.
 
+\section{Acknowledgments}
+
+Onur Tolga Şehitoğlu implemented support for multiple matrices.
+
 \end{document}
diff --git a/graphics/pgf/contrib/matrix-skeleton/pgflibrarymatrix.skeleton.code.tex b/graphics/pgf/contrib/matrix-skeleton/pgflibrarymatrix.skeleton.code.tex
index b031338eb3..4dd0462e8e 100644
--- a/graphics/pgf/contrib/matrix-skeleton/pgflibrarymatrix.skeleton.code.tex
+++ b/graphics/pgf/contrib/matrix-skeleton/pgflibrarymatrix.skeleton.code.tex
@@ -1,3 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% matrix.skeleton, version 1.1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \usepgfmodule{matrix}
 
 \def\pgfmatrixlabelskeleton{
@@ -16,8 +20,10 @@
   \xdef\pgf@matrix@skel@innerxsep{\pgfkeysvalueof{/pgf/inner xsep}}%
   \xdef\pgf@matrix@skel@innerysep{\pgfkeysvalueof{/pgf/inner ysep}}%
   \pgfscope%
-    \pgfgetlastxy\ck@shift@x\ck@shift@y
-    \pgftransformshift{\pgfpoint{\ck@shift@x}{\ck@shift@y}}%
+    \pgf@process{\pgfpointanchor{\tikz@fig@name}{south west}}%
+    \pgfmathsetlength\pgf@xa{\pgf@x + \pgf@matrix@skel@innerxsep}%
+    \pgfmathsetlength\pgf@ya{\pgf@y + \pgf@matrix@skel@innerysep - \csname pgf@matrix@miny\the\pgfmatrixcurrentrow\endcsname - \pgfmatrixrowsep}%
+    \pgftransformshift{\pgfpoint{\pgf@xa}{\pgf@ya}}%
     \pgfset{inner sep=0pt}%
     \pgf@matrix@skeleton@create@cells%
     \pgf@matrix@skeleton@create@tiling@cells%
diff --git a/graphics/pgf/contrib/matrix-skeleton/tikzlibrarymatrix.skeleton.code.tex b/graphics/pgf/contrib/matrix-skeleton/tikzlibrarymatrix.skeleton.code.tex
index 8f342e8ae7..25b9df6549 100644
--- a/graphics/pgf/contrib/matrix-skeleton/tikzlibrarymatrix.skeleton.code.tex
+++ b/graphics/pgf/contrib/matrix-skeleton/tikzlibrarymatrix.skeleton.code.tex
@@ -1,3 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% matrix.skeleton, version 1.1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \usepgflibrary{matrix.skeleton}
 
 \usetikzlibrary{matrix}