7 files changed, 120 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/latex/verifiche/README.md b/Master/texmf-dist/doc/latex/verifiche/README.md
index 75f142ca02e..1e2ef9317f7 100644
--- a/Master/texmf-dist/doc/latex/verifiche/README.md
+++ b/Master/texmf-dist/doc/latex/verifiche/README.md
@@ -30,6 +30,6 @@ Run `pdflatex verifiche-example.tex` to see some examples.
 
 
 ### To do
-- swhich into english and if "babel" is implemented use the selected language.
+- swhich into english.
 - remove the marginpar command and use only a box.
 
diff --git a/Master/texmf-dist/doc/latex/verifiche/verifiche-example.pdf b/Master/texmf-dist/doc/latex/verifiche/verifiche-example.pdf
index 82611e6104c..8200bf65e71 100644
--- a/Master/texmf-dist/doc/latex/verifiche/verifiche-example.pdf
+++ b/Master/texmf-dist/doc/latex/verifiche/verifiche-example.pdf
diff --git a/Master/texmf-dist/doc/latex/verifiche/verifiche-example.tex b/Master/texmf-dist/doc/latex/verifiche/verifiche-example.tex
index ea2446ad97a..95a86ed7798 100644
--- a/Master/texmf-dist/doc/latex/verifiche/verifiche-example.tex
+++ b/Master/texmf-dist/doc/latex/verifiche/verifiche-example.tex
@@ -1,5 +1,6 @@
 % compile 2 times
 \documentclass[a4paper]{article}
+\usepackage[italian]{babel}
 \usepackage[solutions%show/hide the solutions
 		    ]{verifiche}
 \usepackage[margin=3cm]{geometry}
@@ -18,6 +19,8 @@
 
 \pagestyle{verifiche}
 
+Nel presente documento è possibile vedere i risultati grafici delle varie tipologie di quesiti e gli altri strumenti forniti dal pacchetto \textsf{verifiche}. 
+
 \begin{esercizio}
 Risolvere il seguente problema.
 
@@ -174,12 +177,13 @@ A differenza dei numeri assoluti, la differenza tra due  \finderror{numeri razio
 \end{esercizio}
 
 
-\vfill
 \begin{center}
-\begin{tabular}{l|c|c|c}
+%\begin{tabular}{| l | c | c | c |}
+\begin{tabular}{ | l | >{\centering}p{2cm} | >{\centering}p{2cm} | >{\centering\arraybackslash}p{2cm} | }
+\hline
 Esercizio			&	\ref{es:ferropiuma}	&	\ref{es:grav}	&	\ref{es:meccanica}	\\\hline
 Punteggio totale	&	\ref{ptes@2}		&	\ref{ptes@4}	&	\ref{ptes@7}\\\hline
-Punteggio			&					&				&				\\
+Punteggio			&					&				&				\\\hline
 \end{tabular}
 \end{center}
 
diff --git a/Master/texmf-dist/doc/latex/verifiche/verifiche.pdf b/Master/texmf-dist/doc/latex/verifiche/verifiche.pdf
index 0f399271dbf..78fa0d6757c 100644
--- a/Master/texmf-dist/doc/latex/verifiche/verifiche.pdf
+++ b/Master/texmf-dist/doc/latex/verifiche/verifiche.pdf
diff --git a/Master/texmf-dist/source/latex/verifiche/verifiche.dtx b/Master/texmf-dist/source/latex/verifiche/verifiche.dtx
index dc5a4a9e7ed..a17c5361433 100644
--- a/Master/texmf-dist/source/latex/verifiche/verifiche.dtx
+++ b/Master/texmf-dist/source/latex/verifiche/verifiche.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%  Copyright (LPPL) 2020 by Francesco Raccanello
+%  Copyright (LPPL) 2020 - 2022 by Francesco Raccanello
 %
 % This file may be distributed and/or modified under the 
 % conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
 %
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{verifiche} [2021/08/18 v4.2 .dtx verifiche file]
+%<package>\ProvidesPackage{verifiche} [2022/02/10 v4.3 .dtx verifiche file]
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[utf8]{inputenc}
@@ -27,8 +27,8 @@
 	language=[LaTeX]TeX, 
 	morekeywords={\setlength, \institute, \asyear, \testtype, \instruction, \duration, \printheading, 
 				 \institutefont, \asyearfont, \testtypefont, \instructiondelimiter, \headerfont, \instrunctionfont,
-				 \durationfont, \eserciziolabel, \solutionfont, \diffsymb, \closedquestionitem,
-				 \inlinesol, \completetext, \truefalse, \openquestion, \linedopenquestion, \squaredopenquestion, \headercandidatenamelabel, \checked, \finderror, \textandimage, \partialpt, \ptprefix, \ptlabel, \partialptlabel, \partialptdelimiters, \ptdelimiters},
+				 \durationfont, \exerciselabel, \solutionfont, \solutionlabel, \diffsymb, \closedquestionitem,
+				 \inlinesol, \completetext, \truefalse, \openquestion, \linedopenquestion, \squaredopenquestion, \headercandidatenamelabel, \checked, \finderror, \textandimage, \partialpt, \ptprefix, \ptlabel, \partialptlabel, \partialptdelimiters, \ptdelimiters, \partialptprefix},
 	keywordstyle=\color{blue},
 	escapeinside={*@}{@*},
 	inputencoding=utf8,
@@ -66,7 +66,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{752}
+% \CheckSum{801}
 % \changes{v1.0}{2020/06/14}{Initial version.}
 % \changes{v2.0}{2020/06/26}{Better performance in exercise environment.}
 % \changes{v2.1}{2020/06/30}{Introduced closedquestionitem to control |item| symbol.}
@@ -75,6 +75,7 @@
 % \changes{v4.0}{2021/02/15}{Introduce comando to change the aspect of the exercise score.}
 % \changes{v4.1}{2021/02/16}{Introduce ptrulerlength to change the aspect of the exercise score.}
 % \changes{v4.2}{2021/08/18}{Solved truefalse issue in solutionsmode. Add noexercisept global option to hide the score of each exercise.}
+% \changes{v4.3}{2022/02/10}{Move |parindent{0pt}| inside the environment.}
 % \GetFileInfo{verifiche.sty}
 % \DoNotIndex{\newcommand,\newenvironment,\def,\begin,\end,\par}
 % \DoNotIndex{\DeclareOption,\ExecuteOptions,\ProcessOptions,\RequirePackage}
@@ -707,7 +708,7 @@ dell'esercizio somministrato
 %<*example>
 % \fi
 \example
-{\openquestion[type=squared]{
+{\openquestion[type=squares]{
     Prova del testo della soluzione 
     della domanda aperta
 }}
@@ -850,7 +851,7 @@ dell'esercizio somministrato
 %</example>
 %\fi
 %
-%\DescribeMacro{\headercandidatenamelabel}Quando viene composta l'intestazione principale nella prima pagina, compare una riga in cui il candidato può scrivere il proprio nome e cognome. L'etichetta di questa parte controllata dal comando |\headercandidatenamelabel|, che può essere opportunamente cambiata tramite il comando:
+%\DescribeMacro{\headercandidatenamelabel}\DescribeMacro{\headerdatelabel}Quando viene composta l'intestazione principale nella prima pagina, compare una riga in cui il candidato può scrivere il proprio nome e cognome, la data e la classe. L'etichetta della prima voce è determinata dal comando |\headercandidatenamelabel|, che può essere opportunamente cambiata tramite il comando:
 %\iffalse
 %<*example>
 %\fi
@@ -860,7 +861,7 @@ dell'esercizio somministrato
 %\iffalse
 %</example>
 %\fi
-%Allo stesso modo è possibile modificare la descrizione della classe \DescribeMacro{\headerclasslabel} e della data\DescribeMacro{\headerdatelabel}.
+%Allo stesso modo è possibile modificare la descrizione della classe \DescribeMacro{\headerclasslabel}tramite la redefinizione del comando |\headerclasslabel| e della data\DescribeMacro{\headerdatelabel} tramite comando |\headerdatelabel|.
 % Tutte queste tre voci prevedono, per ciascuna, una riga vuota ove scrivere l'informazione richiesta.\DescribeMacro{\candidatenamerulerlength}\DescribeMacro{\classrulerlength}\DescribeMacro{\daterulerlength} Le lunghezze delle tre righe possono essere modificate impostando le lunghezze desiderate 
 %\iffalse
 %<*example>
@@ -874,12 +875,12 @@ dell'esercizio somministrato
 %Attraverso questi comandi è possibile anche rimuovere una (o più) delle tre voci. Se ad esempio non si vuole visualizzare la classe d'appartenenza del candidato, sarà sufficiente ridefinire gli opportuni comandi nel seguente modo: |\renewcommand{\headerclasslabel}{}|, così da non visualizzare alcuna scritta, e |\setlength{\classrulerlength}{0pt}| per rimuovere la riga associata.
 %
 %\subsection*{Ambiente \texttt{esercizio}}
-%\DescribeMacro{\eserciziolabel}Gli esercizi vengono inseriti anteponendo al loro testo la dicitura ‘‘Quesito’’ seguito (eventualmente) da un numero. Per cambiare questa dicitura, a livello globale, ovvero per ogni esercizio, è sufficiente ridefinire il comando |\eserciziolabel|.
+%\DescribeMacro{\exerciselabel}Gli esercizi vengono inseriti anteponendo al loro testo la dicitura ‘‘Quesito’’ seguito (eventualmente) da un numero. Per cambiare questa dicitura, a livello globale, ovvero per ogni esercizio, è sufficiente ridefinire il comando |\exerciselabel|.
 %\iffalse
 %<*example>
 %\fi
 \begin{lstlisting}
-\renewcommand{\eserciziolabel}*@\marg{Preambolo dell'esercizio}@*
+\renewcommand{\exerciselabel}*@\marg{Preambolo dell'esercizio}@*
 \end{lstlisting}
 %\iffalse
 %</example>
@@ -947,6 +948,18 @@ dell'esercizio somministrato
 %</example>
 %\fi
 %
+%\subsection*{Ambiente \texttt{soluzione}}
+% Per quel che riguarda l'ambiente |soluzione| è possibile cambiare il nome dell'ambente ridefinendo il comando |\solutionlabel|\DescribeMacro{\solutionlabel}.
+%\iffalse
+%<*example>
+%\fi
+\begin{lstlisting}
+\renewcommand{\solutionlabel}*@\marg{Preambolo della soluzione}@*
+\end{lstlisting}
+%\iffalse
+%</example>
+%\fi
+%
 %
 % \StopEventually{\clearpage\PrintChanges \clearpage\PrintIndex}
 % \section{Implementation}
@@ -984,10 +997,6 @@ dell'esercizio somministrato
     separate-uncertainty
 }
 %    \end{macrocode}
-%Finally the indentation is turned off.
-%    \begin{macrocode}
-\setlength\parindent{0pt}
-%    \end{macrocode}
 %
 %\subsection{newif}
 %Some conditionals are defined and initiated:
@@ -1057,6 +1066,41 @@ dell'esercizio somministrato
 \setlength{\ptrulerlength}{1cm}
 %    \end{macrocode}
 %
+%\subsection{Labels}
+%Some labels are define as a variable in order to leave the user the possibility of customization the predefine texts.
+%    \begin{macrocode}
+\newcommand{\@durationlabeldefault}{Time:}%
+\newcommand{\@asyearlabeldefault}{School year}%
+\newcommand{\headercandidatenamelabel}{Student name}%
+\newcommand{\headerclasslabel}{Class}%
+\newcommand{\headerdatelabel}{Date}%
+\newcommand{\exerciselabel}{Exercise}%
+\newcommand{\solutionlabel}{Solution}%	
+%    \end{macrocode} 
+%If the package \textsf{babel} or \textsf{polyglossia} is loaded with the italian language specify, than the predefine labels are redefine:
+%    \begin{macrocode}
+\@ifpackageloaded{babel}{%
+  \addto\captionsitalian{%
+    \renewcommand{\@durationlabeldefault}{Tempo della prova:}%
+    \renewcommand{\@asyearlabeldefault}{Anno scolastico}%
+    \renewcommand{\headercandidatenamelabel}{Nome e Cognome}%
+    \renewcommand{\headerclasslabel}{Classe}%
+    \renewcommand{\headerdatelabel}{Data}%
+    \renewcommand{\exerciselabel}{Quesito}%
+    \renewcommand{\solutionlabel}{Soluzione}%
+  }}{%
+\@ifpackageloaded{polyglossia}{%
+  \addto\captionsitalian{%
+    \renewcommand{\@durationlabeldefault}{Tempo della prova:}%
+    \renewcommand{\@asyearlabeldefault}{Anno scolastico}%
+    \renewcommand{\headercandidatenamelabel}{Nome e Cognome}%
+    \renewcommand{\headerclasslabel}{Classe}%
+    \renewcommand{\headerdatelabel}{Data}%
+    \renewcommand{\exerciselabel}{Quesito}%
+    \renewcommand{\solutionlabel}{Soluzione}%
+  }}{}
+  }%
+%    \end{macrocode}
 %\subsection{Macro and environment}
 %\iffalse
 %%macro and environment
@@ -1068,13 +1112,13 @@ dell'esercizio somministrato
 %    \begin{macrocode}
 \newcommand{\institute}[1]{%
     \gdef\@institute{#1}}
-\newcommand{\duration}[2][Tempo della prova:]{%
+\newcommand{\duration}[2][\@durationlabeldefault]{%
     \gdef\@durationpreamble{#1}\gdef\@duration{#2}}
 \newcommand{\testtype}[1]{%
     \gdef\@testtype{#1}}
 \newcommand{\instruction}[1]{%
     \gdef\@instruction{#1}}
-\newcommand{\asyear}[2][Anno scolastico]{%
+\newcommand{\asyear}[2][\@asyearlabeldefault]{%
     \gdef\@asyearpreamble{#1}\gdef\@asyear{#2}}
 %    \end{macrocode}
 %
@@ -1112,10 +1156,7 @@ dell'esercizio somministrato
     \hspace*{\fill}\@durationpreamble\space\bfseries #1\hspace*{\fill}}
 %    \end{macrocode}
 %    \begin{macrocode}
-\newcommand{\headercandidatenamelabel}{Nome e Cognome}
-\newcommand{\headerclasslabel}{Classe}
-\newcommand{\headerdatelabel}{Data}
-\newcommand{\@header@candidatename}{\headercandidatenamelabel\space\underline{\hspace{\candidatenamerulerlength}}}
+\newcommand{\@header@candidatename}{\noindent\headercandidatenamelabel\space\underline{\hspace{\candidatenamerulerlength}}}
 \newcommand{\@header@class}{\headerclasslabel\space\underline{\hspace{\classrulerlength}}}
 \newcommand{\@header@date}{\headerdatelabel\space\underline{\hspace{\daterulerlength}}}
 \newcommand{\@header}{\@header@candidatename\hfill\@header@class\hfill\@header@date}
@@ -1258,7 +1299,7 @@ dell'esercizio somministrato
 %%ambiente esercizio
 %\fi
 %    \begin{macrocode}
-\define@key{esercizio}{label}[Quesito]{%
+\define@key{esercizio}{label}[\exerciselabel]{%
     \def\tempeserciziolabel{#1}}%
 \define@key{esercizio}{diff}[none]{
     \def\diffstar{\hfill\foreach \i in {1,..., #1}{\diffsymb}}%
@@ -1282,7 +1323,7 @@ dell'esercizio somministrato
 %    \begin{macrocode}
 \newcommand{\exercisetitle}{%
     \ifdefined\tempeserciziolabel\tempeserciziolabel%
-    \else \eserciziolabel\fi%
+    \else \exerciselabel\fi%
 }
 %    \end{macrocode}
 %
@@ -1326,7 +1367,8 @@ dell'esercizio somministrato
     {\noindent\bfseries\exercisetitle\ifexercisesnumbered\space\theexercisenumber\fi}%
     \ifshowmarginexercise\exercisemargin\fi%
     \par% newline after label
-    \nobreak\noindent\ignorespaces#2%body of the environment
+    \setlength\parindent{0pt}%no parindent
+    \nobreak\ignorespaces#2%body of the environment
 }{% 
    \par%
    \ignorespacesafterend%
@@ -1345,7 +1387,8 @@ dell'esercizio somministrato
     \par\addvspace{\baselineskip}{\noindent\bfseries\exercisetitle}%
     \ifshowmarginexercise\exercisemargin\fi%
     \par% newline after label
-    \nobreak\noindent\ignorespaces#2% body of the environment
+    \setlength\parindent{0pt}%no parindent
+    \nobreak\ignorespaces#2% body of the environment
 }{%
     \par%
     \ignorespacesafterend
@@ -1371,8 +1414,9 @@ dell'esercizio somministrato
 \NewDocumentEnvironment{soluzione}{+b}{%
     \ifsol%
         \par\addvspace{\baselineskip}%
-        {\noindent\bfseries Soluzione}%
+        {\noindent\bfseries \solutionlabel}%
         \par\nobreak\noindent\ignorespaces%
+        \setlength\parindent{0pt}%no parindent
         \solutionfont #1%
     \fi%
 }{%
diff --git a/Master/texmf-dist/source/latex/verifiche/verifiche.ins b/Master/texmf-dist/source/latex/verifiche/verifiche.ins
index de63841f732..9d72f914f23 100644
--- a/Master/texmf-dist/source/latex/verifiche/verifiche.ins
+++ b/Master/texmf-dist/source/latex/verifiche/verifiche.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2020 i by Francesco Raccanello
+%% Copyright (C) 2020 - 2022 i by Francesco Raccanello
 %%
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
 \usedir{tex/latex/verifiche}
 \preamble
 This is a generated file.
-Copyright (C) 2021 by Francesco Raccanello
+Copyright (C) 2020 - 2022 by Francesco Raccanello
 This file may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3 of this license or (at your option) any later
diff --git a/Master/texmf-dist/tex/latex/verifiche/verifiche.sty b/Master/texmf-dist/tex/latex/verifiche/verifiche.sty
index 74a05432184..dd6f1d5212a 100644
--- a/Master/texmf-dist/tex/latex/verifiche/verifiche.sty
+++ b/Master/texmf-dist/tex/latex/verifiche/verifiche.sty
@@ -6,7 +6,7 @@
 %%
 %% verifiche.dtx  (with options: `package')
 %% This is a generated file.
-%% Copyright (C) 2021 by Francesco Raccanello
+%% Copyright (C) 2020 - 2022 by Francesco Raccanello
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
 %% version 1.3 of this license or (at your option) any later
@@ -15,7 +15,7 @@
 %% and version 1.3 or later is part of all distributions of
 %% LaTeX version 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{verifiche} [2021/08/18 v4.2 .dtx verifiche file]
+\ProvidesPackage{verifiche} [2022/02/10 v4.3 .dtx verifiche file]
 \RequirePackage{xparse}
 \RequirePackage{xkeyval} 
 \RequirePackage{amsmath}
@@ -37,7 +37,6 @@
     per-mode=symbol-or-fraction,
     separate-uncertainty
 }
-\setlength\parindent{0pt}
 %%newif
 \newif\ifsol
 \newif\ifinstitute\institutetrue
@@ -80,17 +79,45 @@
 \setlength{\classrulerlength}{.1\textwidth}
 \setlength{\daterulerlength}{.15\textwidth}
 \setlength{\ptrulerlength}{1cm}
+\newcommand{\@durationlabeldefault}{Time:}%
+\newcommand{\@asyearlabeldefault}{School year}%
+\newcommand{\headercandidatenamelabel}{Student name}%
+\newcommand{\headerclasslabel}{Class}%
+\newcommand{\headerdatelabel}{Date}%
+\newcommand{\exerciselabel}{Exercise}%
+\newcommand{\solutionlabel}{Solution}% 
+\@ifpackageloaded{babel}{%
+  \addto\captionsitalian{%
+    \renewcommand{\@durationlabeldefault}{Tempo della prova:}%
+    \renewcommand{\@asyearlabeldefault}{Anno scolastico}%
+    \renewcommand{\headercandidatenamelabel}{Nome e Cognome}%
+    \renewcommand{\headerclasslabel}{Classe}%
+    \renewcommand{\headerdatelabel}{Data}%
+    \renewcommand{\exerciselabel}{Quesito}%
+    \renewcommand{\solutionlabel}{Soluzione}%
+  }}{%
+\@ifpackageloaded{polyglossia}{%
+  \addto\captionsitalian{%
+    \renewcommand{\@durationlabeldefault}{Tempo della prova:}%
+    \renewcommand{\@asyearlabeldefault}{Anno scolastico}%
+    \renewcommand{\headercandidatenamelabel}{Nome e Cognome}%
+    \renewcommand{\headerclasslabel}{Classe}%
+    \renewcommand{\headerdatelabel}{Data}%
+    \renewcommand{\exerciselabel}{Quesito}%
+    \renewcommand{\solutionlabel}{Soluzione}%
+  }}{}
+  }%
 %%macro and environment
 %%global variable
 \newcommand{\institute}[1]{%
     \gdef\@institute{#1}}
-\newcommand{\duration}[2][Tempo della prova:]{%
+\newcommand{\duration}[2][\@durationlabeldefault]{%
     \gdef\@durationpreamble{#1}\gdef\@duration{#2}}
 \newcommand{\testtype}[1]{%
     \gdef\@testtype{#1}}
 \newcommand{\instruction}[1]{%
     \gdef\@instruction{#1}}
-\newcommand{\asyear}[2][Anno scolastico]{%
+\newcommand{\asyear}[2][\@asyearlabeldefault]{%
     \gdef\@asyearpreamble{#1}\gdef\@asyear{#2}}
 %%fonts and aspects
 \newcommand{\headerfont}[1]{%
@@ -107,10 +134,7 @@
     \sffamily#1}
 \newcommand{\durationfont}[1]{%
     \hspace*{\fill}\@durationpreamble\space\bfseries #1\hspace*{\fill}}
-\newcommand{\headercandidatenamelabel}{Nome e Cognome}
-\newcommand{\headerclasslabel}{Classe}
-\newcommand{\headerdatelabel}{Data}
-\newcommand{\@header@candidatename}{\headercandidatenamelabel\space\underline{\hspace{\candidatenamerulerlength}}}
+\newcommand{\@header@candidatename}{\noindent\headercandidatenamelabel\space\underline{\hspace{\candidatenamerulerlength}}}
 \newcommand{\@header@class}{\headerclasslabel\space\underline{\hspace{\classrulerlength}}}
 \newcommand{\@header@date}{\headerdatelabel\space\underline{\hspace{\daterulerlength}}}
 \newcommand{\@header}{\@header@candidatename\hfill\@header@class\hfill\@header@date}
@@ -199,7 +223,7 @@
 }
 
 %%ambiente esercizio
-\define@key{esercizio}{label}[Quesito]{%
+\define@key{esercizio}{label}[\exerciselabel]{%
     \def\tempeserciziolabel{#1}}%
 \define@key{esercizio}{diff}[none]{
     \def\diffstar{\hfill\foreach \i in {1,..., #1}{\diffsymb}}%
@@ -218,7 +242,7 @@
     \fi}%
 \newcommand{\exercisetitle}{%
     \ifdefined\tempeserciziolabel\tempeserciziolabel%
-    \else \eserciziolabel\fi%
+    \else \exerciselabel\fi%
 }
 \newsavebox{\box@marginexercise}
 \newcommand{\exercisemargin}{%
@@ -246,7 +270,8 @@
     {\noindent\bfseries\exercisetitle\ifexercisesnumbered\space\theexercisenumber\fi}%
     \ifshowmarginexercise\exercisemargin\fi%
     \par% newline after label
-    \nobreak\noindent\ignorespaces#2%body of the environment
+    \setlength\parindent{0pt}%no parindent
+    \nobreak\ignorespaces#2%body of the environment
 }{%
    \par%
    \ignorespacesafterend%
@@ -258,7 +283,8 @@
     \par\addvspace{\baselineskip}{\noindent\bfseries\exercisetitle}%
     \ifshowmarginexercise\exercisemargin\fi%
     \par% newline after label
-    \nobreak\noindent\ignorespaces#2% body of the environment
+    \setlength\parindent{0pt}%no parindent
+    \nobreak\ignorespaces#2% body of the environment
 }{%
     \par%
     \ignorespacesafterend
@@ -273,8 +299,9 @@
 \NewDocumentEnvironment{soluzione}{+b}{%
     \ifsol%
         \par\addvspace{\baselineskip}%
-        {\noindent\bfseries Soluzione}%
+        {\noindent\bfseries \solutionlabel}%
         \par\nobreak\noindent\ignorespaces%
+        \setlength\parindent{0pt}%no parindent
         \solutionfont #1%
     \fi%
 }{%