esami (7may18)

git-svn-id: svn://tug.org/texlive/trunk@47639 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 45 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/latex/esami/README b/Master/texmf-dist/doc/latex/esami/README
index 360020ea51d..ccb8c241637 100644
--- a/Master/texmf-dist/doc/latex/esami/README
+++ b/Master/texmf-dist/doc/latex/esami/README
@@ -1,6 +1,6 @@
-The esami package v. 2.4
+The esami package v. 2.5
           For generation of texts and solutions  of exams in LaTeX
-2018/02/10
+2018/05/06
 
 File:       README
 Author:    Grazia Messineo and Salvatore Vassallo
diff --git a/Master/texmf-dist/doc/latex/esami/VERSION b/Master/texmf-dist/doc/latex/esami/VERSION
index 3fdb3602bbe..d7a901e88e5 100644
--- a/Master/texmf-dist/doc/latex/esami/VERSION
+++ b/Master/texmf-dist/doc/latex/esami/VERSION
@@ -1 +1 @@
-VERSION 2.4 DATE=February 10, 2018
+VERSION 2.5 DATE=May 06, 2018
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf
index 2a8a0436e4c..8c00ce718dd 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex
index b426e032f02..bb1f7f319be 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex
@@ -76,6 +76,8 @@
 \changes{Version 2.2}{2017/07/01}{Introduced the possibility to have two different seeds for the choice of exercises (\cmd{\semeex}) and for the permutations and choice of the parameters (\cmd{\seme}): by default, they are equal. Slightly modified the command \cmd{\estrai} so that it is possible to use it to extract parameters from a list. Documentation integrated.}
 \changes{Version 2.3}{2017/09/18}{Corrected a misprint in the code.}
 \changes{Version 2.4}{2018/02/10}{Documentation corrected. }
+\changes{Version 2.5}{2018/05/06}{Corrected a misprint in the code.  Improved the selection of random exercises.}
+
 %\IndexPrologue{\section*{Index} Numbers written in italic refer to the page where the item is described; underlined numebers refer to the line of code in which the item is described; other references are to the line of code where the item is used.}
 \GlossaryPrologue{\section*{Changelog}}
 \def\MacroFont{\fontencoding\encodingdefault
@@ -84,8 +86,8 @@
 	\fontshape\updefault
 	\footnotesize}
 \GetFileInfo{esami.sty}
-\def\fileversion{version 2.3}
-\def\filedate{2017/09/18}
+\def\fileversion{version 2.5}
+\def\filedate{2018/05/06}
 
 
 \title{Package esami\thanks{This document
@@ -785,7 +787,9 @@ Inside this file you should use only one command, \cmd{\def \textbackslash eserc
 	\item[Versione 2.1 (2016/07/25)] Modified \texttt{es-german.lng} and \texttt{es-spanish.lng} for an error in the input of the solutions. Introduced the macro \texttt{randestrai}. Introduced the macro \texttt{FPsignpol}. Introduced a control on the total points of the exercises. Solved the incompatibility with \pkgname{babel} for the Spanish language. Removed the incompatibility between the command  \cmd{\fillin} and the commands  \cmd{\sempli} and \cmd{\semplix}.
 	\item[Version 2.2 (2017/07/01)] Introduced the possibility to have two different seeds for the choice of exercises (\cmd{\semeex}) and for the permutations and choice of the parameters (\cmd{\seme}): by default, they are equal. Slightly modified the command \cmd{\estrai} so that it is possible to use it to extract parameters from a list. Documentation integrated.
 	\item[Version 2.3 (2017/09/18)] Corrected a misprint in the code.
-\item[Version 2.4 (2018/02/10)] Documentation corrected. 
+        \item[Version 2.4 (2018/02/10)] Documentation corrected.
+        \item[Version 2.5 (2018/05/06)] Corrected a misprint in the code.  Improved the selection of random exercises.
+
 \end{description}
 
 \bibliographystyle{plain}
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf
index 8a0a92ac43a..1233910008f 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex
index d8affd457ee..f44d3a9d5d6 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex
@@ -76,6 +76,7 @@
 \changes{Versione 2.2}{2017/07/01}{Introdotta la possibilità di avere due semi diversi per la scelta degli esercizi (\cmd{\semeex}) e per le permutazioni e scelta dei parametri (\cmd{\seme}): di default sono uguali. Leggermente modificato il comando \cmd{\estrai} così da poter essere usato per estrarre parametri numerici da una lista. Integrata la documentazione.}
 \changes{Versione 2.3}{2017/09/18}{Corretto un errore di battitura nel codice.}
 \changes{Versione 2.4}{2018/02/10}{Corretta la documentazione .}
+\changes{Versione 2.5}{2018/05/06}{Corretto un errore di battitura nel codice. Migliorata la scelta aleatoria degli esercizi.}
 
 %\IndexPrologue{\section*{Indice} I numeri scritti in italico rimandano alla pagina dove è descritto l'item; i numeri sottolineati rimandano alla riga di codice in cui l'item è descritto; le altre referenze sono alla riga di codice dove l'item è usato.}
 \GlossaryPrologue{\section*{Changelog}}
@@ -85,8 +86,8 @@
 	\fontshape\updefault
 	\footnotesize}
 \GetFileInfo{esami.sty}
-\def\fileversion{versione 2.3}
-\def\filedate{2017/09/18}
+\def\fileversion{versione 2.5}
+\def\filedate{2018/05/06}
 
 
 \title{Il pacchetto esami\thanks{Questo documento
@@ -790,6 +791,8 @@ Al suo interno si deve usare un solo comando, \cmd{\def \textbackslash esercizio
 	\item[Versione 2.2 (2017/07/01)] Introdotta la possibilità di avere due semi diversi per la scelta degli esercizi (\cmd{\semeex}) e per le permutazioni e scelta dei parametri (\cmd{\seme}): di default sono uguali. Leggermente modificato il comando \cmd{\estrai} così da poter essere usato per estrarre parametri numerici da una lista. Integrata la documentazione.
 	\item[Versione 2.3 (2017/09/18)] Corretto un errore di battitura nel codice.
 	\item[Versione 2.4 (2018/02/10)] Corretta la documentazione .
+        \item[Versione 2.5 (2018/05/06)] Corretto un errore di battitura nel codice. Migliorata la scelta aleatoria degli esercizi.
+
 
 \end{description}
 
diff --git a/Master/texmf-dist/doc/latex/esami/esami-xyz.cfg b/Master/texmf-dist/doc/latex/esami/esami-xyz.cfg
index 449bcc4802b..eb17b9b96e8 100644
--- a/Master/texmf-dist/doc/latex/esami/esami-xyz.cfg
+++ b/Master/texmf-dist/doc/latex/esami/esami-xyz.cfg
@@ -4,7 +4,7 @@
 %% This is file `esami-xyz.cfg',
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% esami-xyz.cfg,             2018-02-10                %%
+%% esami-xyz.cfg,             2018-05-06                %%
 %% Copyright (C) 2008-2018 G. Messineo e S. Vassallo    %%
 %%                                                      %%
 %% This program can be redistributed and/or modified    %%
diff --git a/Master/texmf-dist/tex/latex/esami/esami.sty b/Master/texmf-dist/tex/latex/esami/esami.sty
index 9fa8271c92b..8d1e7e445ed 100644
--- a/Master/texmf-dist/tex/latex/esami/esami.sty
+++ b/Master/texmf-dist/tex/latex/esami/esami.sty
@@ -42,9 +42,12 @@
 % Version 2.4
 % 2018/02/10
 % Documentation corrected.
+% Version 2.5
+% 2018/05/06
+%Corrected a misprint in the code. Improved the selection of random exercises.
 
 \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{esami}
-    [2018/02/10 v2.4 An Exam Construction Package]
+    [2018/05/06 v2.5 An Exam Construction Package]
 
 % +=============================+
 % |         THE OPTIONS         |
@@ -945,6 +948,7 @@
 \FPeval\restotrentasei{round(\thevers+\thenomefile+1+base\nome-trunc((\thevers+\thenomefile+base\nome)/36:0)*36:0)}}{
 \FPeval\restotrentasei{round(1+\thenomefile+1+base\nome-trunc((1+\thenomefile+base\nome)/36:0)*36:0)}
 }
+\randomi=\number\old@rando     %%% AGGIUNTO 2018/04/28 per giro sbagliato
 \ifcase\@probN\or
 \def\j@n{1}%%% just one variant
 \or%%% 2 variants
@@ -1681,6 +1685,8 @@
 \def\prendiv#1#2#3#4#5#6{\ifcase\restotrenta\or
 \scegliv{#1}{#5}{#3}{#2}{#4}{#6}\or%
 \scegliv{#2}{#3}{#5}{#1}{#4}{#6}\or%
+\scegliv{#1}{#4}{#5}{#3}{#2}{#6}\or%
+\scegliv{#5}{#3}{#1}{#4}{#2}{#6}\or%
 \scegliv{#3}{#1}{#4}{#5}{#2}{#6}\or%
 \scegliv{#4}{#2}{#3}{#5}{#1}{#6}\or%
 \scegliv{#5}{#1}{#2}{#4}{#3}{#6}\or%
@@ -1689,20 +1695,18 @@
 \scegliv{#3}{#4}{#1}{#2}{#5}{#6}\or%
 \scegliv{#4}{#5}{#1}{#3}{#2}{#6}\or%
 \scegliv{#5}{#3}{#4}{#1}{#2}{#6}\or%
+\scegliv{#3}{#1}{#4}{#2}{#5}{#6}\or%
 \scegliv{#4}{#1}{#5}{#3}{#2}{#6}\or%
 \scegliv{#1}{#4}{#3}{#2}{#5}{#6}\or%
 \scegliv{#2}{#5}{#1}{#4}{#3}{#6}\or%
 \scegliv{#5}{#2}{#4}{#1}{#3}{#6}\or%
 \scegliv{#4}{#5}{#3}{#1}{#2}{#6}\or%
-\scegliv{#3}{#4}{#2}{#5}{#1}{#6}\or%
-\scegliv{#3}{#1}{#4}{#2}{#5}{#6}\or%
 \scegliv{#1}{#5}{#2}{#3}{#4}{#6}\or%
 \scegliv{#5}{#4}{#3}{#2}{#1}{#6}\or%
-\scegliv{#1}{#4}{#5}{#3}{#2}{#6}\or%
-\scegliv{#5}{#3}{#1}{#4}{#2}{#6}\or%
-\scegliv{#1}{#2}{#4}{#3}{#5}{#6}\or%
 \scegliv{#3}{#2}{#4}{#1}{#5}{#6}\or%
+\scegliv{#1}{#2}{#4}{#3}{#5}{#6}\or%
 \scegliv{#4}{#2}{#1}{#3}{#5}{#6}\or%
+\scegliv{#3}{#4}{#2}{#5}{#1}{#6}\or%
 \scegliv{#2}{#3}{#5}{#4}{#1}{#6}\or%
 \scegliv{#3}{#1}{#2}{#5}{#4}{#6}\or%
 \scegliv{#5}{#2}{#4}{#3}{#1}{#6}\or%
@@ -1719,13 +1723,14 @@
 \sceglivi{#3}{#4}{#5}{#6}{#1}{#2}{#7}\or%
 \sceglivi{#1}{#3}{#6}{#4}{#2}{#5}{#7}\or%
 \sceglivi{#4}{#2}{#3}{#1}{#6}{#5}{#7}\or%
-\sceglivi{#3}{#1}{#4}{#5}{#6}{#2}{#7}\or%
-\sceglivi{#1}{#6}{#2}{#4}{#5}{#3}{#7}\or%
+\sceglivi{#6}{#4}{#2}{#1}{#5}{#3}{#7}\or%
+\sceglivi{#5}{#3}{#2}{#4}{#1}{#6}{#7}\or%
 \sceglivi{#2}{#5}{#4}{#1}{#3}{#6}{#7}\or%
 \sceglivi{#3}{#1}{#6}{#2}{#4}{#5}{#7}\or%
 \sceglivi{#2}{#1}{#3}{#5}{#4}{#6}{#7}\or%
-\sceglivi{#5}{#1}{#3}{#4}{#2}{#6}{#7}\or%
+\sceglivi{#5}{#2}{#3}{#4}{#1}{#6}{#7}\or%
 \sceglivi{#1}{#3}{#6}{#5}{#4}{#2}{#7}\or%
+\sceglivi{#6}{#1}{#5}{#4}{#3}{#2}{#7}\or%
 \sceglivi{#3}{#2}{#5}{#4}{#1}{#6}{#7}\or%
 \sceglivi{#1}{#4}{#3}{#2}{#6}{#5}{#7}\or%
 \sceglivi{#4}{#6}{#2}{#5}{#1}{#3}{#7}\or%
@@ -1734,8 +1739,7 @@
 \sceglivi{#4}{#1}{#2}{#6}{#3}{#5}{#7}\or%
 \sceglivi{#1}{#6}{#5}{#4}{#2}{#3}{#7}\or%
 \sceglivi{#5}{#4}{#6}{#3}{#1}{#2}{#7}\or%
-\sceglivi{#6}{#1}{#5}{#3}{#2}{#4}{#7}\or%
-\sceglivi{#6}{#1}{#5}{#4}{#3}{#2}{#7}\or%
+\sceglivi{#6}{#5}{#1}{#3}{#2}{#4}{#7}\or%
 \sceglivi{#5}{#1}{#4}{#3}{#2}{#6}{#7}\or%
 \sceglivi{#2}{#3}{#4}{#6}{#5}{#1}{#7}\or%
 \sceglivi{#4}{#2}{#6}{#1}{#3}{#5}{#7}\or%
@@ -1750,8 +1754,8 @@
 \expandafter\def\csname #8vi\endcsname{#6}\expandafter\def\csname #8vii\endcsname{#7}}
 \def\prendivii#1#2#3#4#5#6#7#8{\ifcase\restotrenta\or%
 \sceglivii{#5}{#7}{#1}{#4}{#6}{#3}{#2}{#8}\or%
-\sceglivii{#1}{#5}{#2}{#6}{#7}{#4}{#3}{#8}\or%
 \sceglivii{#6}{#3}{#4}{#2}{#1}{#5}{#7}{#8}\or%
+\sceglivii{#2}{#5}{#1}{#6}{#7}{#4}{#3}{#8}\or%
 \sceglivii{#1}{#2}{#7}{#5}{#3}{#4}{#6}{#8}\or%
 \sceglivii{#5}{#6}{#4}{#1}{#7}{#3}{#2}{#8}\or%
 \sceglivii{#6}{#4}{#1}{#5}{#3}{#2}{#7}{#8}\or%
@@ -1759,25 +1763,25 @@
 \sceglivii{#7}{#2}{#4}{#6}{#5}{#3}{#1}{#8}\or%
 \sceglivii{#3}{#4}{#7}{#2}{#6}{#1}{#5}{#8}\or%
 \sceglivii{#4}{#5}{#6}{#7}{#3}{#2}{#1}{#8}\or%
-\sceglivii{#3}{#6}{#7}{#4}{#1}{#2}{#5}{#8}\or%
 \sceglivii{#5}{#7}{#4}{#3}{#2}{#1}{#6}{#8}\or%
+\sceglivii{#3}{#6}{#7}{#4}{#1}{#2}{#5}{#8}\or%
 \sceglivii{#1}{#2}{#6}{#7}{#5}{#3}{#4}{#8}\or%
 \sceglivii{#6}{#1}{#4}{#3}{#7}{#2}{#5}{#8}\or%
 \sceglivii{#3}{#4}{#5}{#1}{#6}{#7}{#2}{#8}\or%
-\sceglivii{#5}{#1}{#4}{#3}{#2}{#6}{#7}{#8}\or%
 \sceglivii{#7}{#6}{#1}{#4}{#3}{#5}{#2}{#8}\or%
-\sceglivii{#2}{#4}{#7}{#3}{#5}{#1}{#6}{#8}\or%
+\sceglivii{#5}{#1}{#4}{#3}{#2}{#6}{#7}{#8}\or%
 \sceglivii{#6}{#5}{#2}{#1}{#3}{#7}{#4}{#8}\or%
+\sceglivii{#2}{#4}{#7}{#3}{#5}{#1}{#6}{#8}\or%
 \sceglivii{#7}{#3}{#6}{#5}{#2}{#4}{#1}{#8}\or%
 \sceglivii{#4}{#2}{#3}{#6}{#5}{#7}{#1}{#8}\or%
-\sceglivii{#1}{#3}{#4}{#2}{#7}{#6}{#5}{#8}\or%
-\sceglivii{#4}{#5}{#6}{#3}{#1}{#7}{#2}{#8}\or%
 \sceglivii{#5}{#6}{#1}{#2}{#3}{#4}{#7}{#8}\or%
+\sceglivii{#4}{#5}{#6}{#3}{#1}{#7}{#2}{#8}\or%
 \sceglivii{#1}{#3}{#5}{#4}{#2}{#7}{#6}{#8}\or%
-\sceglivii{#2}{#7}{#3}{#5}{#6}{#1}{#4}{#8}\or%
+\sceglivii{#2}{#3}{#7}{#5}{#6}{#1}{#4}{#8}\or%
 \sceglivii{#1}{#6}{#4}{#2}{#7}{#5}{#3}{#8}\or%
 \sceglivii{#7}{#5}{#2}{#4}{#1}{#3}{#6}{#8}\or%
 \sceglivii{#2}{#7}{#3}{#1}{#6}{#5}{#4}{#8}\or%
+\sceglivii{#1}{#3}{#4}{#2}{#7}{#6}{#5}{#8}\or%
 \sceglivii{#3}{#5}{#1}{#6}{#2}{#4}{#7}{#8}\fi}
 %%%  pseudorandom versions (permutations of 8 esercises)
 \def\scegliviii#1#2#3#4#5#6#7#8#9{\expandafter\def\csname #9i\endcsname{#1}\expandafter\def\csname #9ii\endcsname{#2}%%
@@ -1787,31 +1791,31 @@
 \scegliviii{#2}{#8}{#6}{#7}{#4}{#3}{#1}{#5}{#9}\or%
 \scegliviii{#8}{#5}{#1}{#3}{#7}{#6}{#4}{#2}{#9}\or%
 \scegliviii{#7}{#1}{#8}{#6}{#3}{#2}{#5}{#4}{#9}\or%
-\scegliviii{#1}{#3}{#7}{#5}{#6}{#4}{#2}{#8}{#9}\or%
+\scegliviii{#6}{#3}{#7}{#5}{#1}{#4}{#2}{#8}{#9}\or%
 \scegliviii{#4}{#1}{#2}{#3}{#5}{#7}{#8}{#6}{#9}\or%
 \scegliviii{#3}{#8}{#7}{#1}{#6}{#4}{#5}{#2}{#9}\or%
 \scegliviii{#5}{#3}{#8}{#6}{#1}{#7}{#2}{#4}{#9}\or%
 \scegliviii{#8}{#6}{#3}{#4}{#7}{#2}{#5}{#1}{#9}\or%
-\scegliviii{#6}{#3}{#8}{#7}{#5}{#1}{#4}{#2}{#9}\or%
+\scegliviii{#6}{#4}{#8}{#7}{#5}{#1}{#3}{#2}{#9}\or%
 \scegliviii{#3}{#2}{#7}{#5}{#4}{#6}{#1}{#8}{#9}\or%
 \scegliviii{#4}{#3}{#6}{#7}{#8}{#1}{#2}{#5}{#9}\or%
 \scegliviii{#3}{#7}{#5}{#2}{#4}{#8}{#6}{#1}{#9}\or%
+\scegliviii{#4}{#8}{#7}{#3}{#2}{#1}{#6}{#5}{#9}\or%
 \scegliviii{#7}{#2}{#4}{#8}{#5}{#6}{#1}{#3}{#9}\or%
 \scegliviii{#1}{#7}{#2}{#3}{#4}{#5}{#6}{#8}{#9}\or%
 \scegliviii{#7}{#1}{#8}{#5}{#2}{#4}{#3}{#6}{#9}\or%
-\scegliviii{#1}{#5}{#3}{#4}{#8}{#2}{#6}{#7}{#9}\or%
+\scegliviii{#8}{#3}{#5}{#4}{#1}{#2}{#6}{#7}{#9}\or%
 \scegliviii{#5}{#1}{#8}{#3}{#4}{#6}{#7}{#2}{#9}\or%
 \scegliviii{#4}{#7}{#2}{#5}{#1}{#8}{#6}{#3}{#9}\or%
 \scegliviii{#5}{#3}{#1}{#6}{#2}{#4}{#8}{#7}{#9}\or%
-\scegliviii{#1}{#2}{#7}{#3}{#4}{#8}{#5}{#6}{#9}\or%
+\scegliviii{#2}{#1}{#7}{#3}{#4}{#8}{#5}{#6}{#9}\or%
 \scegliviii{#1}{#8}{#6}{#4}{#5}{#2}{#3}{#7}{#9}\or%
 \scegliviii{#3}{#1}{#8}{#5}{#4}{#7}{#6}{#2}{#9}\or%
-\scegliviii{#6}{#5}{#4}{#1}{#3}{#2}{#7}{#8}{#9}\or%
 \scegliviii{#5}{#4}{#3}{#2}{#6}{#7}{#8}{#1}{#9}\or%
+\scegliviii{#6}{#5}{#4}{#1}{#3}{#2}{#7}{#8}{#9}\or%
 \scegliviii{#1}{#6}{#2}{#8}{#3}{#5}{#7}{#4}{#9}\or%
-\scegliviii{#5}{#8}{#3}{#4}{#7}{#6}{#1}{#2}{#9}\or%
 \scegliviii{#2}{#7}{#8}{#1}{#4}{#3}{#5}{#6}{#9}\or%
-\scegliviii{#4}{#8}{#7}{#3}{#2}{#1}{#6}{#5}{#9}\or%
+\scegliviii{#5}{#8}{#3}{#4}{#7}{#6}{#1}{#2}{#9}\or%
 \scegliviii{#7}{#4}{#2}{#5}{#1}{#6}{#8}{#3}{#9}\or%
 \scegliviii{#2}{#3}{#7}{#1}{#6}{#5}{#4}{#8}{#9}\fi}