4 files changed, 43 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/membranecomputing/README.md b/Master/texmf-dist/doc/latex/membranecomputing/README.md
index 70a87c6b6ad..8b0bd9eb323 100644
--- a/Master/texmf-dist/doc/latex/membranecomputing/README.md
+++ b/Master/texmf-dist/doc/latex/membranecomputing/README.md
@@ -13,7 +13,7 @@ See membranecomputing.pdf for full documentation
 % Copyright and license
 % =====================
 %
-% Copyright (C) 2020 David Orellana Martín
+% Copyright (C) 2020-2022 David Orellana Martín
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.pdf b/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.pdf
index 33aa4e8c473..127e7b5c4e7 100644
--- a/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.pdf
+++ b/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.pdf
diff --git a/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.tex b/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.tex
index 8bbbb2e8bbe..6982249ef44 100644
--- a/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.tex
+++ b/Master/texmf-dist/doc/latex/membranecomputing/membranecomputing.tex
@@ -8,7 +8,7 @@
 \usepackage{amssymb}
 \usepackage{longtable}
 
-\title{Package \texttt{membranecomputing} (v0.2)}
+\title{Package \texttt{membranecomputing} (v0.2.1)}
 \author{David Orellana-Martín \\ \texttt{\href{mailto:dorellana@us.es}{dorellana@us.es}}}
 \begin{document}
 
@@ -151,6 +151,15 @@ $
 \end{array}
 $
 
+There are some command conflicts with the \texttt{complexity}
+package~\footnote{\url{https://ctan.org/pkg/complexity}}. If you need
+both packages, please load first the \texttt{complexity} package first
+and later \texttt{membranecomputing} package. If you do this, some of
+the commands defined in this section change, and
+$\verb=\AM=, \verb=\TC=, \verb=\REG=, \verb=\LIN=, \verb=\RE=$ become
+$\verb=\mcAM=, \verb=\mcTC=, \verb=\mcREG=, \verb=\mcLIN=,
+\verb=\mcRE=$, respectively.
+
 To define a new notation for a family of membrane systems, it is
 enough to make a new command as follows:
 
diff --git a/Master/texmf-dist/tex/latex/membranecomputing/membranecomputing.sty b/Master/texmf-dist/tex/latex/membranecomputing/membranecomputing.sty
index f2eae320280..d2c87cb5eeb 100644
--- a/Master/texmf-dist/tex/latex/membranecomputing/membranecomputing.sty
+++ b/Master/texmf-dist/tex/latex/membranecomputing/membranecomputing.sty
@@ -1,5 +1,5 @@
 %%
-%% Copyright 2020 David Orellana Martín
+%% Copyright 2020-2022 David Orellana Martín
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -16,7 +16,7 @@
 % This work consists of the file membranecomputing.sty.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{membranecomputing}[2021/09/23 Membrane Computing v0.2]
+\ProvidesPackage{membranecomputing}[2022/10/05 Membrane Computing v0.2.1]
 
 % Require Packages
 
@@ -146,15 +146,15 @@
   {% BEGIN CASES
     {transition}
     {% BEGIN IF TRANSITION
-      \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, (\rs{1}, \ps{1}), \dots, (\rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ps{\ifthenelse{\equal{#5}{}}{\degree}{#5}}), \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
+      \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, (\rs{1}, \ps{1}), \dots, (\rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ps{\ifthenelse{\equal{#5}{}}{\degree}{#5}}), \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
     }% END IF TRANSITION
     {activemembranes}
     {% BEGIN IF ACTIVEMEMBRANES
-      \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
+      \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
     }% END IF ACTIVEMEMBRANES
     {symportantiport}
     {% BEGIN IF SYMPORTANTIPORT
-      \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \mathcal{E}, \ifthenelse{\equal{#2}{cell}}{\ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#2}{cell}}{\rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}}{\rs}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
+      \ensuremath{\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#1}{recognizer}}{\Sigma, }{} \mathcal{E}, \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \im{1}, \dots, \im{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#2}{cell}}{\rs{1}, \dots, \rs{\ifthenelse{\equal{#5}{}}{\degree}{#5}}}{\rs}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
     }% END IF SYMPORTANTIPORT
     {spiking}
     {% BEGIN IF SPIKING
@@ -162,7 +162,7 @@
     }% END IF SPIKING
     {kernel}
     {% BEGIN IF KERNEL
-      \ensuremath{k\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#2}{cell}}{\ms, }{} \compartment{1}, \dots, \compartment{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
+      \ensuremath{k\Pi_{#4} = \left(\wa, \ifthenelse{\equal{#2}{cell}}{\labelset, \ms, }{} \compartment{1}, \dots, \compartment{\ifthenelse{\equal{#5}{}}{\degree}{#5}}, \ifthenelse{\equal{#1}{recognizer}}{\iin, }{} \iout \right)}
     }% END IF KERNEL
     {colony}
     {% BEGIN IF COLONY
@@ -420,6 +420,8 @@
 
 % Templates for P systems
 
+\newcommand{\psystemT}[1][nonrecognizer]{\psystem[#1]{cell}{transition}{}{}}
+\newcommand{\rpsystemT}{\psystemT[recognizer]}
 \newcommand{\psystemAM}[1][nonrecognizer]{\psystem[#1]{cell}{activemembranes}{}{}}
 \newcommand{\rpsystemAM}{\psystemAM[recognizer]}
 \newcommand{\psystemSA}[1][nonrecognizer]{\psystem[#1]{tissue}{symportantiport}{}{}}
@@ -575,9 +577,17 @@
 % Families of P systems
 
 \newcommand{\Pfamily}[4]{\ensuremath{\mathcal{#1}^{#2}_{#3} \IfStrEq{#4}{}{}{( #4 )}}}
+\ifcsname AM\endcsname%
+\newcommand{\mcAM}[2][]{\Pfamily{AM}{#1}{}{#2}}
+\else
 \newcommand{\AM}[2][]{\Pfamily{AM}{#1}{}{#2}}
+\fi
 \newcommand{\AMO}[1]{\Pfamily{AM}{0}{}{#1}}
+\ifcsname TC\endcsname%
+\newcommand{\mcTC}[2][]{\Pfamily{T#1C}{}{}{#2}}
+\else
 \newcommand{\TC}[2][]{\Pfamily{T#1C}{}{}{#2}}
+\fi
 \newcommand{\TDC}[1]{\TC[D]{#1}}
 \newcommand{\TSC}[1]{\TC[S]{#1}}
 \newcommand{\CC}[2][]{\Pfamily{C#1C}{}{}{#2}}
@@ -593,11 +603,23 @@
 % Terms of computability theory
 
 \newcommand{\compSet}[1]{\ensuremath{#1}}
+\ifcsname REG\endcsname%
+\newcommand{\mcREG}{\compSet{REG}}
+\else
 \newcommand{\REG}{\compSet{REG}}
+\fi
+\ifcsname LIN\endcsname%
+\newcommand{\mcLIN}{\compSet{LIN}}
+\else
 \newcommand{\LIN}{\compSet{LIN}}
+\fi
 \newcommand{\CF}{\compSet{CF}}
 \newcommand{\CS}{\compSet{CS}}
+\ifcsname RE\endcsname%
+\newcommand{\mcRE}{\compSet{RE}}
+\else
 \newcommand{\RE}{\compSet{RE}}
+\fi
 
 % Terms of computational complexity theory
 
@@ -612,6 +634,10 @@
 
 \endinput
 
+v0.2.1 05/10/2022
+  - Added label set to cell-like membrane systems
+  - Conflictive classes with package complexity solved
+
 v0.2 23/09/2021
   - Created new rules of membrane systems with evolutional comm rules