summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-22 23:57:13 +0000
committerKarl Berry <karl@freefriends.org>2014-02-22 23:57:13 +0000
commit3b5627e676138d40dd96cfbb0bc82376ffc94683 (patch)
treed76010150f56e378a5e2bd87b211b0eae1c1d4be
parentb9dd0af36714a136f0b9bf795fe2461e5c92ce1b (diff)
babel-italian (22feb14)
git-svn-id: svn://tug.org/texlive/trunk@33027 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-italian/italian.pdfbin373285 -> 372368 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-italian/italian.dtx245
-rw-r--r--Master/texmf-dist/source/generic/babel-italian/italian.ins12
-rw-r--r--Master/texmf-dist/tex/generic/babel-italian/italian.ldf32
4 files changed, 166 insertions, 123 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-italian/italian.pdf b/Master/texmf-dist/doc/generic/babel-italian/italian.pdf
index 569413d7ea2..b0a3a45608c 100644
--- a/Master/texmf-dist/doc/generic/babel-italian/italian.pdf
+++ b/Master/texmf-dist/doc/generic/babel-italian/italian.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/babel-italian/italian.dtx b/Master/texmf-dist/source/generic/babel-italian/italian.dtx
index 3d3db846e3f..55497c71bfb 100644
--- a/Master/texmf-dist/source/generic/babel-italian/italian.dtx
+++ b/Master/texmf-dist/source/generic/babel-italian/italian.dtx
@@ -22,7 +22,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{723}
+% \CheckSum{731}
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
@@ -33,7 +33,7 @@
%</filedriver>
%<code>\ProvidesLanguage{italian}
%<*code>
- [2014/02/16 v1.3i Italian support from the babel system]
+ [2014/02/22 v1.3j Italian support from the babel system]
%</code>
%%
%% Please report errors to: claudio dot beccari at gmail dot com
@@ -105,7 +105,16 @@
% \changes{italian-1.3-d}{2013/11/11}{Corrected the \string" behaviour for
% etymological hyphenation}
% \changes{italian-1.3f}{2013/11/22}{Deleted extra \cs{selectlanguage}\{italian\}}
-% \changes{italian-1.3g}{2014/02/16}{Corrected "/}
+% \changes{italian-1.3g}{2014/02/16}{Corrected the \string"/ shorthand}
+% \changes{italian-1.3g}{2014/02/16}{Italian shorthandss are now optional as
+% well as the intelligent comma facility}
+% \changes{italian-i.3i}{2014/02/17}{Updated documentation}
+% \changes{italian-1.3i}{2014/02/17}{Modified the \string"- shorthand}
+% \changes{italian-1.3j}{2014/02/22}{\string\setactivedoublequote\ does work
+% but it must be delayed until \string\begin\{document\}; with babel 3.9g
+% the main language is set before this point, therefore it is necessary
+% to select again the Italian language if this is the main one}
+%
% \section{The Italian language}
%
% \textbf{Important notice:} This language description file relies on
@@ -119,13 +128,14 @@
%
% The file \file{\filename}\footnote{The file described in this
% section has version number \fileversion\ and was last revised on
-% \filedate. The original author is Maurizio Codogno,
-% (\texttt{mau@beatles.cselt.stet.it}). It was initially revised
+% \filedate. The original author is Maurizio Codogno.
+% It was initially revised
% by Johannes Braams and then completely rewritten by Claudio Beccari}
-% defines all the language-specific macros for the Italian language.
+% defines all the required and some optional language-specific
+% macros for the Italian language.
%
% \begin{table}[htb]\centering
-% \begin{tabular}{cp{80mm}}
+% \begin{tabular}{cp{90mm}}
% |"| & inserts a compound word mark where hyphenation is legal;
% it allows etymological hyphenation which is recommended
% for technical terms, chemical names and the like; it
@@ -136,13 +146,13 @@
% characters represented with control sequences or accented
% ones.\\
% |""| & inserts open quotes ``.\\ %^^A'' emacs matching
-% |"<| & inserts open guillemets.\\
-% |">| & inserts closed guillemets.\\
-% |"/| & allows hyphenation of both word before and after the slash.\\
-% |"-| & allows hyphenation in both words connected with a short dash
+% |"<| & inserts open guillemets without trailing space.\\
+% |">| & inserts closed guillemets without leading space.\\
+% |"/| & allows hyphenation of both words connected with slash.\\
+% |"-| & allows hyphenation of both words connected with a short dash
% (\emph{trattino copulativo}, in Italian)
% \end{tabular}
-% \caption{Shortcuts for the Italian language. These shortcut are
+% \caption{shorthands for the Italian language. These shorthand are
% available only if command \texttt{\string\setactivedoublequote} is given
% after loading \babel\ and before \texttt{\string\begin\{document\}}.}
% \label{t:itshrtct}
@@ -166,7 +176,10 @@
% |\finalhyphendemerits| is set to such a high value that
% hyphenation is strongly discouraged between the last two lines
% of a paragraph.
-% \item Some language specific shortcuts have been defined so as to
+%^^A
+%^^A Qui ci si potrebbero mettere le indicazioni per gli attributi e modificatori
+%^^A
+% \item Some language specific shorthands have been defined so as to
% allow etymological hyphenation, specifically |"| inserts a
% break point at any word boundary that the typesetter chooses,
% provided it is not followed by an accented letter (very unlikely
@@ -174,18 +187,18 @@
% ending vowel of a word, but it may take place with compound words
% that include foreign roots), and \verb="|= when the desired break
% point falls before an accented letter. As you can read in
-% table~\ref{t:itshrtct}, these shortcuts are available only if
+% table~\ref{t:itshrtct}, these shorthands are available only if
% they get activated with command |\setactivedoublequote| after
-% loading \babel\ but before the |\end{docuemnt}| statement. This
-% is done in order to preseserve the user form package conflicts:
+% loading \babel\ but before the |\begin{docuemnt}| statement. This
+% is done in order to preserve the user from package conflicts:
% if s/he wants to use these facilities s/he must remember that
% conflicts may arise unless active characters are deactivated;
-% this can be sono with the \babel\ command |\shorthadsoff{"}|
+% this can be done with the \babel\ command |\shorthadsoff{"}|
% (and reactivated with |\shorthandson{"}|) when its wise to do
% so; conflicts have been reported with package \file{xypic} and
% with \texttt{TikZ}, but the latter has its own library to
-% deactivate all active characters, non just the double quote,
-% the only Italian language activatable character.
+% deactivate all active characters, not just the double quotes,
+% the only Italian language possibly active character.
% \item some Italian compound words have a connecting short dash (a
% hyphen sign) between them without any space between the component
% words and the short dash; in this situation standard \LaTeX\ allows
@@ -193,24 +206,24 @@
% paragraphs with protruding lines or with ugly looking wide inter
% word spaces. If a break point is desired in the second word, one
% may use a |"| sign just after the short dash; but if a line break
-% is required in the first word, them the |"-| shortcut comes in handy;
+% is required in the first word, them the |"-| shorthand comes in handy;
% pay attention though, that if you use an en-dash or an em-dash (both
% should not be used in Italian as compound words connectors, but\...)
-% then the |"-| shortcut might impeach the |--| or |---| ligatures, thus
+% then the |"-| shorthand might impeach the |--| or |---| ligatures, thus
% producing an unacceptable appearance.
-% \item The shortcut |""| introduces the raised (English) opening
-% double quotes; this shortcut proves its usefulness when one
+% \item The shorthand |""| introduces the raised (English) opening
+% double quotes; this shorthand proves its usefulness when one
% reminds that the Italian keyboard misses the backtick key, and
% the backtick on a Windows based platform may be obtained only by
% pressing the \texttt{Alt} key while keying the numerical code
% 0096 in the numeric keypad; very, very annoying!
-% \item The shortcuts |"<| and |">| insert the guillemets sometimes
+% \item The shorthands |"<| and |">| insert the guillemets sometimes
% used also in Italian typography; with the T1 font encoding
% the ligatures |<<| and |>>| should insert such signs directly,
% but not all the virtual fonts that claim to follow the T1 font
% encoding actually contain the guillemets; with the OT1 encoding
% the guillemets are not available and must be faked in some
-% way. By using the |"<| and |">| shortcuts (even with the T1
+% way. By using the |"<| and |">| shorthands (even with the T1
% encoding) the necessary tests are performed and in case the
% guillemets are faked by means of the special LaTeX math symbols.
% At the same time if OpenType fonts are being used with XeLaTeX
@@ -231,13 +244,16 @@
% have already been defined by other packages, such as |units.sty|
% or |siunitx.sty|. In particular command |\unit| is deactivated by
% default; the user can activate it by entering the command
-% |\SetISOcompliance| after loading the \babel\ package and before the
-% |\begin{document}| statement. The above checks will enter into
-% action even if this ISO complance is set, in order to avoid conflicts
-% with the above named packages. The |\ap| and |\ped| commands remain
-% available because up to now no specific conflicts have been reported.
+% |\SetISOcompliance| after loading the \babel\ package and before the
+% |\begin{document}| statement. The above checks will enter into
+% action even if this ISO compliance is set, in order to avoid conflicts
+% with the above named packages. The |\ap| and |\ped| commands remain
+% available because up to now no specific conflicts have been reported.
% \item Since in all languages different from English the decimal separator
-% according to the ISO regulations \emph{must} be a comma, and since
+% according to the ISO regulations \emph{must} be a comma actually
+% the Bureau International des Pois et Mésures allows also the point
+% as a decimal separator without mentioning any language, but recommends
+% to follow th national typographical traditions; since
% no language description file nor the \babel\ package itself provides
% for this functionality, a not so simple intelligent comma definition is
% provided such that at least in mathematics it behaves correctly.
@@ -246,7 +262,7 @@
% than that provided by both those packages; but, since this
% functionality may be turned on or off at the user will, those
% packages may still be used. By default this functionality is turned
-% off, therefore the user should turn it on by means of the
+% \emph{off}, therefore the user should turn it on by means of the
% |\IntelligentComma| command; it can turn it off by means of
% |\NoIntelligentComma|. Please, read subsection~\ref{ssec:comma}
% to see the various situations where a mathematical comma may be
@@ -261,13 +277,13 @@
% between 21- and 26-letter tagging.
% \end{enumerate}
%
-% For this language a few shortcuts have been defined,
+% For this language a few shorthands have been defined,
% table~\ref{t:itshrtct}, some of which are introduced to overcome
% certain limitations of the Italian keyboard; in
% section~\ref{s:itkbd} there are other comments and hints in order
% to overcome some other keyboard limitations.
%
-%\subsection{Acknowlegements}
+% \subsection*{Acknowlegements}
% It is my pleasure to acknowledge the contributions of Giovanni Dore,
% Davide Liessi, Grazia Messineo, Giuseppe Toscano, who spotted some bugs
% or conflicts with other packages, mainly |amsmath| and |icomma|, and
@@ -286,7 +302,7 @@
% vol.~18, n.~1, pp.~39-48 (1997).
% \end{thebibliography}}
%
-%\subsection{The commented code}
+%\subsection*{The commented code}
% The macro |\LdfInit| takes care of preventing that this file is
% loaded more than once, checking the category code of the
% \texttt{@} sign, etc.
@@ -435,12 +451,13 @@
% \end{macro}
% \end{macro}
%
+% \subsection*{Traditionally labelled enumerate environment}
% \changes{italian-1.2v}{2010/01/02}{Support for traditional Italian}
% In some traditional texts, especially of legal nature, enumerations labelled
% with lower or upper case letters use the reduced Latin alphabet that omits
% the so called ``non Italian letters'': j, k, w, x, and y.
%
-% \changes{italian-1.2w}{20101/01/03}{Added switching mechanism between normal
+% \changes{italian-1.2w}{2011/01/03}{Added switching mechanism between normal
% and traditional enumeration labelling}
% \changes{italian-1.3}{2013/09/27}{The |traditional| language attribute has
% been dropped while the commands to switch back and forth from 21- to
@@ -513,7 +530,7 @@
% \changes{italian-1.2m}{2000/01/05}{Support for etymological
% hyphenation}
%
-% \subsection{Support for etymological hyphenation}
+% \subsection*{Support for etymological hyphenation}
% In Italian such etymological hyphenation is desirable with
% technical terms, chemical names, and the like.
@@ -535,7 +552,7 @@
% languages, that \babel\ from the very beginning developed
% the tradition of making the |"| character active so as to perform
% several actions that turned useful with every language.
-% One of these actions consisted in defining the shortcut \verb="|=,
+% One of these actions consisted in defining the shorthand \verb="|=,
% that was extensively used in German and in many other languages,
% in order to insert a discretionary hyphen such that hyphenation
% would not be precluded in the rest of the word as it happens with
@@ -560,7 +577,7 @@
% files of any language. Beccari modified his pattern file
% \file{ithyph.tex v4.8b} for Italian so as to contain five new
% patterns that involve |^^W|, and he tried to give the
-% \babel\ active character |"| a new shortcut definition,
+% \babel\ active character |"| a new shorthand definition,
% so as to allow the insertion of the ``compound word mark'' in the
% proper place within any word where two semantic fragments join
% up. With such facility for marking the compound word boundaries,
@@ -580,19 +597,20 @@
% \changes{italian-1.3g}{2014/01/22}{The active double straight
% quote conflicts with other packages; set as an optional facility.}
% Instead of a boolean switch we use a private counter so as to check
-% at |\begin{document}| if this facility ha to be activated. The fdeault
+% at |\begin{document}| if this facility has to be activated. The default
% value is zero; anything different from zero means that the facility
-% has to be activates; this is done with a command to be issued
-% before |\begin{document}|
+% has to be activated; this is done with command |\setactivedoublequote|
+% to be issued before |\begin{document}|
%
% \begin{macrocode}
\newcount\it@doublequoteactive \it@doublequoteactive=\z@
\def\setactivedoublequote{\it@doublequoteactive=\@ne}
{\catcode`"=12 \global\let\it@doublequote"}
{\catcode`"=13 \global\let\it@@dqactive"}
-\AtBeginDocument{\unless\ifnum\it@doublequoteactive=\z@
-\initiate@active@char{"}%
-\addto\extrasitalian{\bbl@activate{"}\languageshorthands{italian}}%
+\AtBeginDocument{%
+ \unless\ifnum\it@doublequoteactive=\z@
+ \initiate@active@char{"}%
+ \addto\extrasitalian{\bbl@activate{"}\languageshorthands{italian}}%
% \end{macrocode}
% \begin{macro}{\it@cwm}
% The active character |"| is now defined for language |italian| so
@@ -602,39 +620,69 @@
% macro |\it@next| is defined so as to defer any further action
% until the next token category code has been tested.
% \begin{macrocode}
-\declare@shorthand{italian}{"}{%
-\ifmmode
- \def\it@next{''}%
-\else
- \def\it@next{\futurelet\it@temp\it@cwm}%
+ \declare@shorthand{italian}{"}{%
+ \ifmmode
+ \def\it@next{''}%
+ \else
+ \def\it@next{\futurelet\it@temp\it@cwm}%
+ \fi
+ \it@next
+ }%
\fi
-\it@next
-}\fi}%
+% \end{macrocode}
+% The following statement must be conditionally executed after the above
+% modification of the |\extraasitalian| list; in facts at the ``begin
+% document'' execution the main language has already been set without
+% the above modifications; therefore nothing takes place unless the
+% Italian main language is selected again with the explicit command
+% |\selectlanguage| without this trick the active double quotes would
+% remain inactive; of course |\languagename| contains the string |italian|
+% if this language was the main one; by testing this string, the suitable
+% command may be issued again with the new settings and the double quotes
+% become really active. Thanks to Davide Liessi for reporting this bug.
+% \begin{macrocode}
+\ifdefstring{\languagename}{italian}{\selectlanguage{italian}}{\relax}
+}%
% \end{macrocode}
% \begin{macro}{\it@cwm}
% The \cs{it@next} service control sequence is such that upon its
% execution a temporary variable \cs{it@temp} is made equivalent to
-% the next token in the input list without actually removing
-% it. Such temporary token is then tested by the macro \cs{it@cwm}
-% and if it is found to be a letter token (cathode=11), then it introduces a
-% compound word separator control sequence \cs{it@allowhyphens}
-% whose expansion introduces a discretionary hyphen and an
-% unbreakable null space; in case the token is not a letter, then it is
-% tested against \verb=|=$_{12}$: if so a compound word separator
-% is inserted and the \verb=|= token is removed, otherwise another
-% test is performed so as to see if another double quote sign
-% follows: in this case a double open quote mark is inserted;
-% otherwise two other tests are performed so as to see if
-% guillemets have to be inserted, otherwise nothing is done.
-% The double quote shortcut for inserting a double open quote sign
+% the next token in the input list without actually removing it.
+% Such temporary token is then tested by the macro \cs{it@cwm}
+% and if it is found to be a letter token (cathode=11), then it
+% introduces a compound word separator control sequence
+% \cs{it@allowhyphens} whose expansion introduces a discretionary
+% hyphen and an unbreakable zero space;
+% otherwise the token is not a letter; then it is therefore
+% tested against \verb=|=$_{12}$: if so a compound word separator
+% is inserted and the \verb=|= token is removed;
+% otherwise two other tests are performed to see if guillemets
+% have to be inserted, and in case a suitable intelligent
+% guillemet macro is introduced that gobbles unwanted leading
+% or trailing spaces;
+% otherwise a test is made to see if the next char is a slash
+% character, and in case a special discretionary break is inserted
+% such as to maintain the slash while allowing the hyphenation
+% of both words before and after the slash;
+% otherwise another test is performed to see if another
+% double quote sign follows: in this case a double open quote
+% mark is inserted;
+% otherwise another test is made to see if a connecting hyphen char
+% follows, and in this case the hyphen char is substituted with
+% a discretionary break that allows hyphenation of both words
+% before and after the hyphen char;
+% otherwise nothing is done.
+%
+% The double quote shorthand for inserting a double open quote sign
% is useful for people who are inputting Italian text by means of
-% an Italian keyboard that unfortunately misses the grave or
+% an Italian keyboard which unfortunately misses the grave or
% backtick key.
-% By this shortcut |""| becomes equivalent to |``| for inserting
+% The shorthand |""| becomes equivalent to |``| for inserting
% raised open high double quotes.
% \begin{macrocode}
\def\it@@cwm{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}%
\def\it@@slash{\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}%
+\def\it@@trattino{\bbl@allowhyphens\discretionary{-}{}{-}\bbl@allowhyphens}%
\def\it@@ocap#1{\it@ocap}\def\it@@ccap#1{\it@ccap}%
\DeclareRobustCommand*{\it@cwm}{\let\it@@next\it@doublequote
\ifcat\noexpand\it@temp a%
@@ -656,8 +704,7 @@
\def\it@@next{``\@gobble}%
\else
\if\noexpand\it@temp\string-%
- \def\it@@next{\bbl@allowhyphens-\bbl@allowhyphens
- \@gobble}%
+ \def\it@@next{\it@@trattino\@gobble}%
\fi
\fi
\fi
@@ -681,15 +728,15 @@
% is breakable as \textsf{des-clor-fe-nir-ami-na-clo-ri-dra-to}
% instead of \textsf{de-sclor-fe-ni-ra-mi-na-\dots}
%
-% In other language description files a shortcut is defined so as
+% In other language description files a shorthand is defined so as
% to allow a break point without actually inserting any hyphen
% sign; examples are given such as \mbox{entrada/salida}; actually
% if one wants to allow a breakpoint after the slash, it is much
% clearer to type |\slash| instead of |/| and \LaTeX\ does
-% everything by itself; here the shortcut |"/| was introduced to
+% everything by itself; here the shorthand |"/| was introduced to
% stand for |\slash| so that one can type |input"/output| and allow
% a line break after the slash.
-% This shortcut works only for the slash, since in Italian such
+% This shorthand works only for the slash, since in Italian such
% constructs are extremely rare.
% \end{sloppypar}
%
@@ -717,7 +764,7 @@
% \changes{italian-1.2l}{1999/04/05}{Added useful macros for
% fulfilling ISO 31/XI regulations}
%
-% \subsection{Facilities required by the ISO 31/XI regulations}
+% \subsection*{Facilities required by the ISO 31/XI regulations}
% The ISO 31/XI regulations require that units of measure are
% typeset in upright font in both math and text, and
% that in text mode they are separated from the numerical
@@ -806,7 +853,7 @@
% \end{macro}
% \end{macro}
%
-% \subsection{Intelligent comma}\label{ssec:comma}
+% \subsection*{Intelligent comma}\label{ssec:comma}
%
% \begin{macro}{\IntelligentComma}
% \begin{macro}{\NoINtellgentComma}
@@ -861,10 +908,10 @@
% character in math is the exadecimal value |"8000|. But we have
% to set this value only when the current language is not English
% or one of its varieties. We avoid to do anything if at the end of
-% the preamble is is found that the |icomma| package has been loaded.
-% There is a conflict; so we assume that if the user wants to use the
-% |icomma| package, he wants to do it, and does not want to make use
-% of the functionality of this language description file.
+% the preamble is is found that the |icomma| package has been loaded.
+% There is a conflict; so we assume that if the user wants to use the
+% |icomma| package, he wants to do it, and does not want to make use
+% of the functionality of this language description file.
% \begin{macrocode}
\AtEndOfPackage{%
\AtEndPreamble{\@ifpackageloaded{icomma}{\relax}{%
@@ -878,7 +925,7 @@
}%
}}
% \end{macrocode}
-% \changes{italian-1.3a}{2013/10/02}{Repaired the bug of the intelligent
+% \changes{italian-1.3a}{2013/10/02}{Corrected the bug of the intelligent
% comma when used within the AMS alignment environments}
%
% Math comma activation is done only after the preamble has
@@ -941,20 +988,20 @@
% Notice that if the token is a macro, we do not test if it is defined
% to be a single digit or a string made up of more digits and/or other
% charters. If the macro represents one digit the test is correct,
-% otherwise funny results may tale place. For this reason it is alway
-% better prefix a space before any macro, whatever its definition might
+% otherwise funny results may take place. For this reason it is always
+% better to prefix any macro with a space, whatever its definition might
% be; if the macro represents a parameter defined to have a variable
-% value in the range 0--9, then it may represent the fraction part of
-% a (short) decimal value, and is correct to avoid prefixing it with a
+% value in the range 0--9, then it may represent the fractional part of
+% a (short) decimal value, and it is correct to avoid prefixing it with a
% space; but the user is warned not to make use of numeric strings in
% the definition of parameters, unless he knows what he is doing.
-% It may rather use a balanced brace comma grout |{,}| in the input file
+% The user may rather use a balanced brace comma grout |{,}| in the input file
% so that the macro will not be considered by the expansion of the
% active comma. For example if |\x| is defined to be the numerical
-% string |89|, the source input |$2{,}\c$| wil be correctly typeset
+% string |89|, the source input |$2{,}\c$| will be correctly typeset
% as 2,89; the input \verb*!$2, \c$! will be typeset as 2,\,89 (with
% an unbreakable thin space after the comma) while |$2,\c$| will be
-% typeset as 29,89, obviously incorrectly.
+% typeset as 29,89, obviously wrong.
%
% So first we test if the comma must act intelligently; if the counter
% |\Virgola| contains zero, we assume that the comma must always perform
@@ -980,7 +1027,7 @@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
- \fi{% it is a macro macro
+ \fi{% it is a macro
\@@math@@comma
}{% it is something else.
\virgola
@@ -1042,8 +1089,8 @@
% give enough bits of information to this `intelligence' in just one case:
% when the comma plays the r\^ole of a serial separator in expressions
% such as $i=1, 2, 3,\dots,\infty$, entered as
-% \verb*?$i=1, 2, 3,\dots,\infty$?. In this case and only in this
-% case the comma must be followed by an explicit space; should this space
+% \verb*?$i=1, 2, 3,\dots,\infty$?. Only in this case the comma must
+% be followed by an explicit space; should this space
% be absent the macro takes the following non blank token as a digit,
% and since it actually is a digit, it would use the decimal comma, which
% would be wrong. The control sequences |\dots| and |\infty| are
@@ -1078,13 +1125,13 @@
% \end{macro}
% \end{macro}
%
-% \subsection{Accents}\label{s:itkbd}
+% \subsection*{Accents}\label{s:itkbd}
% Most of the other language description files introduce a number
-% of shortcuts for inserting accents and other language specific
+% of shorthands for inserting accents and other language specific
% diacritical marks in a more comfortable way compared with the
% lengthy standard \TeX\ conventions. When an Italian keyboard is
% being used on a Windows based platform, it exhibits such
-% limitations that up to now no convenient shortcuts have been
+% limitations that up to now no convenient shorthands have been
% developed; the reason lies in the fact that the Italian keyboard
% lacks the grave accent (also known as ``backtick''), which is
% compulsory on all accented vowels, but, on the
@@ -1093,7 +1140,7 @@
% the curly braces require pressing three keys simultaneously.
%
% The best solution Italians have found so far is to use a smart
-% editor that accepts shortcut definitions such that, for example,
+% editor that accepts shorthand definitions such that, for example,
% by striking |"(| one gets directly |{| on the screen and the same
% sign is saved into the \file{.tex} file; the same smart editor
% should be capable of translating the accented characters into the
@@ -1108,8 +1155,10 @@
%
% For what concerns the missing backtick key,
% which is used also for inputting the open quotes, it must be
-% noticed that the shortcut |""| described above completely solves
-% the problem for \textit{double} raised open quotes; according to
+% noticed that the shorthand |""| described above completely solves
+% the problem for \textit{double} raised open quotes; besides this,
+% a single open raised quote may be input whit the little known
+% \LaTeX\ kernel command |\lq|; according to
% the traditions of particular publishing houses, since there are
% no compulsory regulations on the matter, the guillemets
% may be used; in this case the T1 font encoding solves the problem
@@ -1118,7 +1167,7 @@
% LuaLaTeX, provided they are loaded with the option
% \texttt{Ligatures = TeX}. But\dots
%
-% \subsection{\emph{Caporali} or French double quotes}
+% \subsection*{\emph{Caporali} or French double quotes}
% Although the T1 font encoding ligatures solve the problem, there
% are some circumstances where even the T1 font encoding cannot be
% used, either because the author\slash typesetter wants to use the
@@ -1187,7 +1236,7 @@
% First the macro |\LtxSymvCaporali| is defined so as to assign a
% default definition of the faked guillemets: each one of these macro sets
% actually redefines the control sequences |\it@ocap| and |\it@ccap| that
-% are the ones effectively activated by the shortcuts |"<| and |">|.
+% are the ones effectively activated by the shorthands |"<| and |">|.
% By default the caporali glyphs are taken from T1-encoded fonts; at
% the end of the preamble some tests are performed to control if the
% default fonts contain such glyphs, and in case a different font is chosen.
@@ -1300,7 +1349,7 @@
% \end{macro}
% \end{macro}
%
-% \subsection{Finishing commands}
+% \subsection*{Finishing commands}
% The macro |\ldf@finish| takes care of looking for a
% configuration file, setting the main language to be switched on
% at |\begin{document}| and resetting the category code of
diff --git a/Master/texmf-dist/source/generic/babel-italian/italian.ins b/Master/texmf-dist/source/generic/babel-italian/italian.ins
index 9e098015557..6ae5783eb48 100644
--- a/Master/texmf-dist/source/generic/babel-italian/italian.ins
+++ b/Master/texmf-dist/source/generic/babel-italian/italian.ins
@@ -3,16 +3,6 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2000 Johannes L. Braams and any individual authors
-%% listed elsewhere in this file. All rights reserved.
-%%
-%% This file is part of the Babel system, release 3.7.
-%% ---------------------------------------------------
-%%
-%% It may be distributed under the terms of the LaTeX Project Public
-%% License, as described in lppl.txt in the base LaTeX distribution.
-%% Either version 1.1 or, at your option, any later version.
-%%
%% --------------- start of docstrip commands ------------------
%%
\def\filedate{2013/09/27}
@@ -53,7 +43,7 @@ This is a generated file.
Copyright (C) Claudio Beccari.
-This file is part of the babel-italian bundle release 1.3.
+This file is part of the babel-italian bundle relea.
--------------------------------------------------
It may be distributed under the terms of the LaTeX Project Public
diff --git a/Master/texmf-dist/tex/generic/babel-italian/italian.ldf b/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
index 1edc2de9536..8594a86efc0 100644
--- a/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
@@ -17,7 +17,7 @@
%% License, as described in lppl.txt in the base LaTeX distribution.
%% Either version 1.3 or, at your option, any later version.
\ProvidesLanguage{italian}
- [2014/02/16 v1.3i Italian support from the babel system]
+ [2014/02/22 v1.3j Italian support from the babel system]
%%
%% Please report errors to: claudio dot beccari at gmail dot com
%%
@@ -99,19 +99,24 @@
\def\setactivedoublequote{\it@doublequoteactive=\@ne}
{\catcode`"=12 \global\let\it@doublequote"}
{\catcode`"=13 \global\let\it@@dqactive"}
-\AtBeginDocument{\unless\ifnum\it@doublequoteactive=\z@
-\initiate@active@char{"}%
-\addto\extrasitalian{\bbl@activate{"}\languageshorthands{italian}}%
-\declare@shorthand{italian}{"}{%
-\ifmmode
- \def\it@next{''}%
-\else
- \def\it@next{\futurelet\it@temp\it@cwm}%
+\AtBeginDocument{%
+ \unless\ifnum\it@doublequoteactive=\z@
+ \initiate@active@char{"}%
+ \addto\extrasitalian{\bbl@activate{"}\languageshorthands{italian}}%
+ \declare@shorthand{italian}{"}{%
+ \ifmmode
+ \def\it@next{''}%
+ \else
+ \def\it@next{\futurelet\it@temp\it@cwm}%
+ \fi
+ \it@next
+ }%
\fi
-\it@next
-}\fi}%
+\ifdefstring{\languagename}{italian}{\selectlanguage{italian}}{\relax}
+}%
\def\it@@cwm{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}%
\def\it@@slash{\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}%
+\def\it@@trattino{\bbl@allowhyphens\discretionary{-}{}{-}\bbl@allowhyphens}%
\def\it@@ocap#1{\it@ocap}\def\it@@ccap#1{\it@ccap}%
\DeclareRobustCommand*{\it@cwm}{\let\it@@next\it@doublequote
\ifcat\noexpand\it@temp a%
@@ -133,8 +138,7 @@
\def\it@@next{``\@gobble}%
\else
\if\noexpand\it@temp\string-%
- \def\it@@next{\bbl@allowhyphens-\bbl@allowhyphens
- \@gobble}%
+ \def\it@@next{\it@@trattino\@gobble}%
\fi
\fi
\fi
@@ -197,7 +201,7 @@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
- \fi{% it is a macro macro
+ \fi{% it is a macro
\@@math@@comma
}{% it is something else.
\virgola