13 files changed, 39 insertions, 135 deletions
diff --git a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf
index ab66256cb25..76cd7f6e4e6 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf
+++ b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.pdf
diff --git a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.run.xml b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.run.xml
deleted file mode 100644
index 78b121293b3..00000000000
--- a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.run.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!-- logreq request file -->
-<!-- logreq version 1.0 / dtd version 1.0 -->
-<!-- Do not edit this file! -->
-<!DOCTYPE requests [
-  <!ELEMENT requests (internal | external)*>
-  <!ELEMENT internal (generic, (provides | requires)*)>
-  <!ELEMENT external (generic, cmdline?, input?, output?, (provides | requires)*)>
-  <!ELEMENT cmdline (binary, (option | infile | outfile)*)>
-  <!ELEMENT input (file)+>
-  <!ELEMENT output (file)+>
-  <!ELEMENT provides (file)+>
-  <!ELEMENT requires (file)+>
-  <!ELEMENT generic (#PCDATA)>
-  <!ELEMENT binary (#PCDATA)>
-  <!ELEMENT option (#PCDATA)>
-  <!ELEMENT infile (#PCDATA)>
-  <!ELEMENT outfile (#PCDATA)>
-  <!ELEMENT file (#PCDATA)>
-  <!ATTLIST requests
-    version CDATA #REQUIRED
-  >
-  <!ATTLIST internal
-    package CDATA #REQUIRED
-    priority (9) #REQUIRED
-    active (0 | 1) #REQUIRED
-  >
-  <!ATTLIST external
-    package CDATA #REQUIRED
-    priority (1 | 2 | 3 | 4 | 5 | 6 | 7 | 8) #REQUIRED
-    active (0 | 1) #REQUIRED
-  >
-  <!ATTLIST provides
-    type (static | dynamic | editable) #REQUIRED
-  >
-  <!ATTLIST requires
-    type (static | dynamic | editable) #REQUIRED
-  >
-  <!ATTLIST file
-    type CDATA #IMPLIED
-  >
-]>
-<requests version="1.0">
-  <internal package="biblatex" priority="9" active="0">
-    <generic>latex</generic>
-    <provides type="dynamic">
-      <file>ArsClassica.aux</file>
-      <file>ArsClassica-blx.bib</file>
-    </provides>
-    <requires type="dynamic">
-      <file>ArsClassica.bbl</file>
-    </requires>
-    <requires type="static">
-      <file>blx-compat.def</file>
-      <file>biblatex.def</file>
-      <file>blx-natbib.def</file>
-      <file>philosophy-modern.bbx</file>
-      <file>philosophy-classic.bbx</file>
-      <file>authoryear.bbx</file>
-      <file>standard.bbx</file>
-      <file>philosophy-standard.bbx</file>
-      <file>philosophy-modern.cbx</file>
-      <file>philosophy-classic.cbx</file>
-      <file>authoryear-comp.cbx</file>
-      <file>biblatex.cfg</file>
-      <file>english-philosophy.lbx</file>
-      <file>english.lbx</file>
-      <file>italian-philosophy.lbx</file>
-      <file>italian.lbx</file>
-    </requires>
-  </internal>
-  <external package="biblatex" priority="5" active="0">
-    <generic>bibtex</generic>
-    <cmdline>
-      <binary>bibtex</binary>
-      <option>-min-crossrefs 2</option>
-      <infile>ArsClassica</infile>
-    </cmdline>
-    <input>
-      <file>ArsClassica.aux</file>
-    </input>
-    <output>
-      <file>ArsClassica.bbl</file>
-    </output>
-    <provides type="dynamic">
-      <file>ArsClassica.bbl</file>
-    </provides>
-    <requires type="dynamic">
-      <file>ArsClassica.aux</file>
-      <file>ArsClassica-blx.bib</file>
-    </requires>
-    <requires type="editable">
-      <file>Bibliography.bib</file>
-    </requires>
-    <requires type="static">
-      <file>biblatex.bst</file>
-    </requires>
-  </external>
-</requests>
diff --git a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.synctex.gz b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.synctex.gz
deleted file mode 100644
index 7a4398c731a..00000000000
--- a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.synctex.gz
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.tex b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.tex
index 6242bc0c82a..432fed31299 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.tex
+++ b/Master/texmf-dist/doc/latex/arsclassica/ArsClassica.tex
@@ -1,14 +1,14 @@
-\documentclass[11pt,a4paper,twoside,openright,titlepage,fleqn,%
+\documentclass[10pt,a4paper,twoside,openright,titlepage,fleqn,%
                headinclude,,footinclude,BCOR5mm,%
                numbers=noenddot,cleardoublepage=empty,%
                tablecaptionabove]{scrreprt}
                
-\usepackage[italian,english]{babel}
+\usepackage[italian,american]{babel}
 \usepackage[applemac]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{amsmath,amssymb,amsthm}
 \usepackage{varioref}
-\usepackage[style=philosophy-modern,hyperref,backref,square,natbib]{biblatex}
+\usepackage[style=philosophy-modern,hyperref,square,natbib]{biblatex}
 \usepackage{chngpage}
 \usepackage{calc}
 \usepackage{listings}
diff --git a/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib b/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib
index d75bde184af..7fc2dd6b23b 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib
+++ b/Master/texmf-dist/doc/latex/arsclassica/Bibliography.bib
@@ -11,8 +11,7 @@
 	author    = {Miede, Andr�},
 	title     = {A Classic Thesis style}, 
 	year      = {2011},
-	url       = {http://www.ctan.org/tex-archive/macros/latex/contrib/classicthesis/ClassicThesis.pdf},
-	note      = {in Italian}
+	url       = {http://www.ctan.org/tex-archive/macros/latex/contrib/classicthesis/ClassicThesis.pdf}
 }
 
 
@@ -20,7 +19,8 @@
 	author    = {Pantieri, Lorenzo},
 	title     = {Introduzione allo stile \classicthesis}, 
 	year      = {2011},
-	url       = {http://www.lorenzopantieri.net/LaTeX_files/ClassicThesis.pdf}
+	url       = {http://www.lorenzopantieri.net/LaTeX_files/ClassicThesis.pdf},
+    note      = {in Italian}
 }
 
 
diff --git a/Master/texmf-dist/doc/latex/arsclassica/CHANGES b/Master/texmf-dist/doc/latex/arsclassica/CHANGES
index 0f6c977148a..e9b98a0dce0 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/CHANGES
+++ b/Master/texmf-dist/doc/latex/arsclassica/CHANGES
@@ -1,6 +1,12 @@
+Changes in version 4.0.2 (February 2012)
+o Fixed some details in the documentation
+
+Changes in version 4.0.1 (February 2012)
+o Bug fix: caption package loaded via arsclassica
+o Fixed some details in the documentation
+
 Changes in version 4.0 (February 2012)
 o Added compatibility with the version 4.0 of ClassicThesis and its new text body size
-o Some minor fine tuning
 
 Changes in version 3.0 (June 2010)
 o Added compatibility with the version 3.0 of ClassicThesis
diff --git a/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex b/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex
index e09f294de5a..5c73d2e911d 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex
+++ b/Master/texmf-dist/doc/latex/arsclassica/Chapters/Code.tex
@@ -15,6 +15,7 @@ Announcement of the package and requirement for the necessary packages.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arsclassica}[2012/02/05 v4.0 Customizing ClassicThesis (LP)]
 \RequirePackage{classicthesis}
+\RequirePackage{caption}
 \end{lstlisting}
 
 
diff --git a/Master/texmf-dist/doc/latex/arsclassica/Chapters/Fundamentals.tex b/Master/texmf-dist/doc/latex/arsclassica/Chapters/Fundamentals.tex
index 3e63826f7f4..e246605bf9d 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/Chapters/Fundamentals.tex
+++ b/Master/texmf-dist/doc/latex/arsclassica/Chapters/Fundamentals.tex
@@ -3,23 +3,19 @@
 \label{chp:fundamentals}
 %************************************************
 
-This chapter introduces the (truly simple) basic notions of \arsclassica{} and presents its fundamental ideas and peculiarities.
+This chapter introduces the (truly simple) basic notions of \arsclassica{} and presents its fundamental ideas and distinctive features.
 
 
 \section{Introduction}
 
-The \arsclassica{} package changes some typographical aspects of the \classicthesis{} style, by Andr\'e Miede~\citep{miede:classicthesis,pantieri:classicthesis}. It allows to reproduce the layout of my guide \emph{The art of writing with \LaTeX}~\citep{pantieri:art} (in Italian) and of this document. The hint for this original reworking of \classicthesis{} was gave to me by Daniel Gottschlag.
+The \arsclassica{} package changes some typographical features of the \classicthesis{} style, designed by Andr\'e Miede~\citep{miede:classicthesis,pantieri:classicthesis}. It allows to reproduce the layout of the \LaTeX{} guide \emph{The Art of Writing with \LaTeX}~\citep{pantieri:art} (in Italian) and of this document. The hint for this original reworking of \classicthesis{} was given to me by Daniel Gottschlag.
 
 
 
 \section{Use of the package}
 
-The package is shaped for being executed on a \emph{complete} installation of \miktex{} or \texlive, and uses font freely available.
-
-The installation of \arsclassica{} is very simple. You can download the \texttt{arsclassica.zip} file from \href{http://www.ctan.org/tex-archive/macros/latex/contrib/arsclassica/}{\texttt{CTAN}}; then you will decompress it and install \texttt{arsclassica.sty} in the usual way.
-
-
-The package works with the \clsname{KOMA-Script} classes (\clsname{scrreprt}, \clsname{scrbook} and \clsname{scrartcl}) and requires the \pkgname{classicthesis} package, \emph{updated to the last version available (the~4.0)}; it must be loaded \emph{after} it. It can be loaded simply by
+This package is shaped to be executed on a \emph{complete} installation of \miktex{} or \texlive, and uses freely available fonts.
+It works with the \clsname{KOMA-Script} classes (\clsname{scrreprt}, \clsname{scrbook} and \clsname{scrartcl}) and requires the \pkgname{classicthesis} package, \emph{updated to the last version available (the~4.0)}. \arsclassica{} must be loaded \emph{after} \pkgname{classicthesis}:
 \begin{code}
 \documentclass[�*\meta{\dots\unkern}*�]{scrreprt} % or scrbook or scrartcl
 
@@ -31,14 +27,15 @@ The package works with the \clsname{KOMA-Script} classes (\clsname{scrreprt}, \c
 \end{document}
 \end{code}
 
-For example, this document has been obtained with the following code:
+For example, this document has been produced with the following code:
 \begin{code}
 \documentclass[10pt,a4paper,twoside,openright,titlepage,fleqn,%
-               headinclude,,footinclude,BCOR5mm,%
+               headinclude,footinclude,BCOR5mm,%
                numbers=noenddot,cleardoublepage=empty,%
                tablecaptionabove]{scrreprt}
 
 \usepackage{�*\meta{\dots\unkern}*�}
+\usepackage{subfig}
 \usepackage[eulerchapternumbers,subfig,beramono,%
             eulermath,pdfspacing]{classicthesis}
 \usepackage{arsclassica}
@@ -57,20 +54,20 @@ It is recommended, but not compulsory, to use the options \optname{beramono}, \o
 
 \section{The style}
 
-The typographical style obtained with \arsclassica{} differs from ClassicThesis for the following aspects:
+The typographical style achieved with \arsclassica{} differs from ClassicThesis in the following points:
 \begin{itemize}
-\item use of Iwona\index{Iwona} font, by Janusz M.~Nowacki, for the titles of the sectioning units of the document (chapters, sections, subsections, sub-subsections, paragraphs and subparagraphs), for the labels of description lists, for the headlines and the label of the captions (\classicthesis{} does not use any font sans serif);
+\item use of Iwona\index{Iwona} font, by Janusz M.~Nowacki, for the titles of the sectioning units of the document (chapters, sections, subsections, sub-subsections, paragraphs and subparagraphs), for the labels of description lists, for the headlines and the label of the captions (\classicthesis{} does not use any sans serif font);
 \item customized chapter numbers;
 \item semi-transparent headlines; the headlines are separated from the page number by a small rule;
-\item captions with labels in boldface (\classicthesis{} does not use boldface fonts);
-\item itemize lists with semi-transparent labels.
+\item captions with labels in boldface (\classicthesis{} does not use any boldface font);
+\item itemize lists with semi-transparent bullets.
 \end{itemize}
 
-The \arsclassica{} package is conceived  to provide to the user a ready-to-use typographical style: therefore it has no loading option and it is \emph{not} configurable or customizable in any way. If you change the previous settings, you will risk to destroy the equilibrium of the style, so it is \emph{highly recommended} to keep them unchanged.
+The \arsclassica{} package is designed  to provide a ready-to-use typographical style: therefore it has no loading option and it is \emph{not} configurable or customizable in any way. If you change the previous settings, you will risk to destroy the balance of the style, so it is \emph{highly recommended} to keep them unchanged.
 
-One of the principles of \LaTeX{} is that it allows the author to take no interest in the typographical questions, permitting him to focus only the structure and the contents of the document. This fact should always be taken in consideration: using a style written from others, the user accepts all the typographical settings chosen for him from the author of the style, and he is not forced to study typography to fix the layout of his publications. This is the case of \arsclassica{} too: if you change its settings, you will contradict this philosophy and, consequently, you must study (a lot of) typography to obtain acceptable results. 
+One of the principles of \LaTeX{} is that it allows the author to take no interest in the typographical questions, permitting him to focus only the structure and the contents of the document. This fact should always be taken in consideration: using a style written by others, the user accepts all the typographical settings chosen for him by the author of the style, and he is not forced to study typography to fix the layout of his publications. This is the case of \arsclassica{} too: if you change its settings, you will deny this philosophy and, consequently, you must study (a lot of) typography to achieve acceptable results. 
 
-The style obtained with \arsclassica{} is \emph{not} therefore configurable or customizable. The typographical style is something of very personal: if you like the package and find attractive the idea to take no interest in the problem of the style definition, then you will use \arsclassica{} with satisfaction; otherwise, if you have different needs or you are not satisfied with the layout of the package, then you should try other classes or packages, even building your own style.
+The style achieved with \arsclassica{} is \emph{not} therefore configurable or customizable. The typographical style is something of very personal: if you like the package and find attractive the idea to take no interest in the problem of the style definition, then you will use \arsclassica{} with satisfaction; otherwise, if you have different needs or you are not satisfied with the layout of the package, then you should try other classes or packages, even building your own style.
 
 
 
@@ -124,7 +121,7 @@ id, vulputate a, magna.
 \end{description}
 
 \begin{table}
-\caption[Lorem ipsum dolor.]{Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur dictum gravida mauris.}
+\caption[Lorem ipsum dolor.]{Lorem ipsum dolor sit amet.}
 \centering
 \begin{tabular}{cc}
 \toprule
diff --git a/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex b/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex
index 6564387e42b..1a74e8691c0 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex
+++ b/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex
@@ -9,16 +9,16 @@
 \let\cleardoublepage\relax
 
 \chapter*{Abstract}
-The package changes some typographical aspects of the \classicthesis{} style, by Andr\'e Miede. It allows to reproduce the look of the guide \emph{The art of writing with \LaTeX} (in Italian)~\citep{pantieri:art}.  The hint for the original modification of \classicthesis{} was gave to me by Daniel Gottschlag. The package was written for the Italian \TeX{} and \LaTeX{} User Group (\url{http://www.guit.sssup.it/}).
+This package changes some typographical features of the \classicthesis{} style, by Andr� Miede. It allows to reproduce the layout of the guide \emph{The art of writing with \LaTeX} (in Italian)~\citep{pantieri:art}.  The hint for this original reworking of \classicthesis{} was given to me by Daniel Gottschlag. This package was written for the Italian \TeX{} and \LaTeX{} User Group (\url{http://www.guitex.org/}).
 
 \vfill
 
 \selectlanguage{italian}
 \pdfbookmark[1]{Sommario}{Sommario}
 \chapter*{Sommario}
-Il pacchetto modifica alcuni aspetti tipografici dello stile \classicthesis, di Andr\'e Miede. Permette di riprodurre la veste grafica della guida \emph{L'arte di scrivere con \LaTeX}~\citep{pantieri:art}. Lo spunto per l'originale rielaborazione di \classicthesis{} mi \`e stato offerto da Daniel Gottschlag. Il pacchetto \`e stato scritto per il Gruppo Utilizzatori Italiani di \TeX{} e \LaTeX{} (\url{http://www.guit.sssup.it/}).
+Il pacchetto modifica alcuni aspetti tipografici dello stile \classicthesis, di Andr� Miede. Permette di riprodurre la veste grafica della guida \emph{L'arte di scrivere con \LaTeX}~\citep{pantieri:art}. Lo spunto per l'originale rielaborazione di \classicthesis{} mi � stato offerto da Daniel Gottschlag. Il pacchetto \`e stato scritto per il Gruppo Utilizzatori Italiani di \TeX{} e \LaTeX{} (\url{http://www.guitex.org/}).
 
-\selectlanguage{english}
+\selectlanguage{american}
 
 \endgroup			
 
diff --git a/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex b/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex
index d3d159019c8..63cc95c0504 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex
+++ b/Master/texmf-dist/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex
@@ -10,7 +10,7 @@
 
 \chapter*{Acknowledgements}
 
-I wish first of all to thank the members of the Staff of the Italian \TeX{} and \LaTeX{} User Group (\url{http://www.guit.sssup.it/}), in particular Prof. Enrico Gregorio and Andrea Tonelli, for their invaluable aid during the writing of this work, the detailed explanations, the patience and the precision in the suggestions, the supplied solutions, the competence and the kindness. Thanks also to all the people who have discussed with me on the forum of the Group, prodigal of precious observations and good advices.
+I wish first of all to thank the members of the Staff of the Italian \TeX{} and \LaTeX{} User Group, in particular Prof.~Enrico Gregorio, for their invaluable aid during the writing of this work, the detailed explanations, the patience and the precision in the suggestions, the supplied solutions, the competence and the kindness. Thanks also to all the people who have discussed with me on the forum of the Group, prodigal of precious observations and good advices.
 
 Finally, thanks to Andr\'e Miede, for his wonderful ClassicThesis style, and to Daniel Gottschlag, who has given to me the hint for this original reworking.
 
diff --git a/Master/texmf-dist/doc/latex/arsclassica/arsclassica-settings.tex b/Master/texmf-dist/doc/latex/arsclassica/arsclassica-settings.tex
index 83bcc9dae81..b45ee43e756 100644
--- a/Master/texmf-dist/doc/latex/arsclassica/arsclassica-settings.tex
+++ b/Master/texmf-dist/doc/latex/arsclassica/arsclassica-settings.tex
@@ -212,6 +212,10 @@ Bera Mono Vera Classic-Thesis suite Knuth Zapf}
   {\usebibmacro{postnote}} 
 \makeatother 
 
+\setcounter{biburlnumpenalty}{9000}
+\setcounter{biburlucpenalty}{9000}
+\setcounter{biburllcpenalty}{9000}
+
 
 % ********************************************************************
 % other commands
@@ -250,10 +254,3 @@ Bera Mono Vera Classic-Thesis suite Knuth Zapf}
 \index{texlive@\protect\TeX{}~Live}}
 
 
-% ********************************************************************
-% linespread
-% ******************************************************************** 
-
-%\linespread{1.00}
-
-
diff --git a/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty b/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty
index 75aff1dbbd9..17c257c4018 100644
--- a/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty
+++ b/Master/texmf-dist/tex/latex/arsclassica/arsclassica.sty
@@ -8,6 +8,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{arsclassica}[2012/02/05 v4.0 Customizing ClassicThesis (LP)]
 \RequirePackage{classicthesis}
+\RequirePackage{caption}
 
 %************************************************************
 % Iwona
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9228b5b1d49..27a31eaf82e 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -539,6 +539,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'mathspic',	"&MAKEflatten",
  'mathstone',	"die 'skipping, requires nonfree Stone fonts'",
  'matlab',	"die 'skipping, requires nonfree matlab'",
+ 'mattex',	"die 'skipping, requires nonfree matlab'",
  'mdwfonts',	"die 'skipping, too many tfm duplicates'",
  'mem',		"die 'skipping, experimental ca.2006'",
  'memo2',	"die 'skipping, latex 2.09'",