summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-22 23:05:41 +0000
committerKarl Berry <karl@freefriends.org>2013-11-22 23:05:41 +0000
commit83470ceeb76cf871b770463e5b2a7c4b2d0b2ac3 (patch)
tree28184ec7e46c8db798d00603e3f174732189bad5
parentceb5cab24f76ddccfaca698332238bb0fca4d2fc (diff)
babel-italian (22nov13)
git-svn-id: svn://tug.org/texlive/trunk@32213 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-italian/italian.pdfbin368626 -> 369747 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-italian/italian.dtx84
-rw-r--r--Master/texmf-dist/tex/generic/babel-italian/italian.ldf15
3 files changed, 61 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-italian/italian.pdf b/Master/texmf-dist/doc/generic/babel-italian/italian.pdf
index 666e5154c50..065b4984691 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 508d32c31f3..5336e6a9281 100644
--- a/Master/texmf-dist/source/generic/babel-italian/italian.dtx
+++ b/Master/texmf-dist/source/generic/babel-italian/italian.dtx
@@ -22,22 +22,22 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{668}
+% \CheckSum{677}
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
-%<*dtx>
-\ProvidesFile{italian.dtx}
-%</dtx>
-%<code>\ProvidesLanguage{italian}
%\fi
-%\ProvidesFile{italian.dtx}
- [2013/11/11 v1.3d Italian support from the babel system]
%\iffalse
-%% Italian support for the babel package
-%% Copyright (C) 2013 by Claudio Beccari
+%<*filedriver>
+\ProvidesFile{italian.dtx}
+%</filedriver>
+%<code>\ProvidesLanguage{italian}
+%<*code>
+ [2013/11/22 v1.3f Italian support from the babel system]
+%</code>
%%
%% Please report errors to: claudio dot beccari at gmail dot com
+%%
%
% This file is part of the babel system, it provides the source
% code for the Italian language definition file.
@@ -104,6 +104,7 @@
% package}
% \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\}}
% \section{The Italian language}
%
% \textbf{Important notice:} This language description file relies on
@@ -136,7 +137,9 @@
% |""| & inserts open quotes ``.\\ %^^A'' emacs matching
% |"<| & inserts open guillemets.\\
% |">| & inserts closed guillemets.\\
-% |"/| & equivalent to |\slash|
+% |"/| & equivalent to |\slash|\\
+% |"-| & allows hyphenation in both words connected with a short dash
+% (\emph{trattino copulativo}, in Italian)
% \end{tabular}
% \caption{Shortcuts for the Italian language}\label{t:itshrtct}
% \end{table}
@@ -161,12 +164,24 @@
% of a paragraph.
% \item Some language specific shortcuts have been defined so as to
% allow etymological hyphenation, specifically |"| inserts a
-% break point in any word boundary that the typesetter chooses,
+% break point at any word boundary that the typesetter chooses,
% provided it is not followed by an accented letter (very unlikely
% in Italian, where compulsory accents fall only on the last and
% 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.
+% \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
+% a line break only just after the short dash; this may lead to
+% 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;
+% 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
+% producing an unacceptable appearance.
% \item The shortcut |""| introduces the raised (English) opening
% double quotes; this shortcut proves its usefulness when one
% reminds that the Italian keyboard misses the backtick key, and
@@ -195,9 +210,9 @@
% \item Three new specific commands |\unit|, |\ped|, and |\ap| are
% introduced so as to enable the correct composition of technical
% mathematics according to the ISO~31/XI recommendations.
-% The definition of |\unit| takes place only at ``begin document"
-% so that it is possible to verify if some other similar functionalites
-% have already been defined by other packages, such as |unit.sty|
+% The definition of |\unit| takes place only at ``begin document''
+% so that it is possible to verify if some other similar functionalities
+% have already been defined by other packages, such as |units.sty|
% or |siunitx.sty|.
% \item Since in all languages different from English the decimal separator
% according to the ISO regulations \emph{must} be a comma, and since
@@ -603,7 +618,11 @@
\def\it@next{\slash\@gobble}%
\else
\ifx\it@temp"%
- \def\it@@next{``\@gobble}%
+ \else
+ \if\noexpand\it@temp\string-%
+ \def\it@@next{\bbl@allowhyphens-\bbl@allowhyphens
+ \@gobble}%
+ \fi
\fi
\fi
\fi
@@ -669,25 +688,25 @@
% indication of the measure with an unbreakable (thin) space.
% The command |\unit| that was defined for achieving this
% goal happened to conflict with the homonymous command defined by the
-% \texttt{units.sty}; we therefore need to test if that package
+% |units.sty| package; we therefore need to test if that package
% has already been loaded so as to avoid conflicts; we assume that
% if the user loads that package, s/he wants to use that package
% facilities and command syntax.
%
% Actually there are around several packages that help to typeset
-% units of measure in the proper way; besides |units.sty| there is also
-% |siunitx.sty| that nowadays offers the best performances in this
-% domain. Therefore we keep controlling the possibility that
-% |units.sty| has been loaded just for backwards compatibility, but
-% we must do the same with |siunitx.sty|. In order to avoid the
-% necessity o loading packages in a certain order, we delay the test
-% until |\begin{document}|.
+% units of measure in the proper way; besides |units.sty| there are also
+% |SIunits| and |siunitx.sty|; the latter nowadays offers the best
+% performances in this domain. Therefore we keep controlling the
+% possibility that |units.sty| has been loaded just for backwards
+% compatibility, but we must do the same with |SIunits| and |siunitx.sty|.
+% In order to avoid the necessity o loading packages in a certain order,
+% we delay the test until |\begin{document}|.
%
% The same ISO regulations require also that super and subscripts
% (apices and pedices) are in upright font, \emph{not in math
% italics}, when they represent ``adjectives'' or appositions to
% mathematical or physical variables that do not represent
-% countable or measurable entities such as, for example,
+% countable or measurable entities: for example,
% $V_{\mathrm{max}}$ or $V_{\mathrm{rms}}$ for a maximum or a root
% mean square voltage, compared to $V_i$ or $V_T$ as the $i$-th
% voltage in a set, or a voltage that depends on the thermodynamic
@@ -718,8 +737,8 @@
\@ifpackageloaded{units}{}{\@ifpackageloaded{siunitx}{}{%
\@ifpackageloaded{SIunits}{}{%
\activate@it@unit\addto\extrasitalian{%
- \babel@save\unit\let\unit\bbl@it@unit}\selectlanguage{italian}%
- }}}%
+ \babel@save\unit\let\unit\bbl@it@unit}%
+ }}}\ifcsstring{bbl@main@language}{italian}{\selectlanguage{italian}}{}%
}
\DeclareRobustCommand*{\bbl@it@ap}[1]{%
\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}%
@@ -747,7 +766,7 @@
% \begin{macro}{\NoINtellgentComma}
% This feature is optional, in the sense that it is necessary to issue
% a specific command to activate it; actually it sets a switch and according
-% to this switch the functionality is activated or dismissed.
+% to this switch the functionality is activated or dismissed.
% \begin{macrocode}
\newcount\Virgola
\Virgola=\z@
@@ -757,23 +776,24 @@
% \end{macrocode}
% In order to have this functionality work properly with pdfLaTeX,
% XeLaTeX, and LuaLaTeX, it is necessary to discover which engine
-% is being used, or better, wichich language handling package is
+% is being used, or better, which language handling package is
% being used: |babel| or |polyglossia|? Let us remember that testing
% the actual engine, as it would be possible with package |iftex|,
% does not tell the whole truth, because in the case of LuaLaTeX, that
% is similar to XeLaTeX for what concerns handling of OpenType fonts,
-% it uses the same engine as pdfLATeX and can use either |babel| or
+% but it uses the same engine as pdfLaTeX and can use either |babel| or
% |polyglossia|, so this is the real discriminant factor, not the
% typesetting engine.
%
% At the same time we need to perform some tests that require some
% smart control-sequence handling; therefore we call the |etoolbox|
-% package that allow us more testing functionality. There are no problems
+% package that allows us more testing functionality. There are no problems
% with this package that can be invoked also by other ones before or
% after |babel| is called; the |\RequirePackage| mechanism is sufficiently
-% smart to avoid reloading of the same package more than once. But we
+% smart to avoid reloading the same package more than once. But we
% have to delay this call, because |italian.ldf| is being read while
-% processing the options passed to |babel|, and this is forbidden; we
+% processing the options passed to |babel|, and while options are being
+% scanned and processed it is forbidden to load packages; we
% delay it at the end of processing the |babel| package itself.
% \begin{macrocode}
\AtEndOfPackage{\RequirePackage{etoolbox}}
diff --git a/Master/texmf-dist/tex/generic/babel-italian/italian.ldf b/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
index f28b5adba5c..da6c6f46052 100644
--- a/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
@@ -17,11 +17,10 @@
%% License, as described in lppl.txt in the base LaTeX distribution.
%% Either version 1.3 or, at your option, any later version.
\ProvidesLanguage{italian}
- [2013/11/11 v1.3d Italian support from the babel system]
-%% Italian support for the babel package
-%% Copyright (C) 2013 by Claudio Beccari
+ [2013/11/22 v1.3f Italian support from the babel system]
%%
%% Please report errors to: claudio dot beccari at gmail dot com
+%%
\LdfInit{italian}{captionsitalian}%
\ifx\l@italian\@undefined
\@nopatterns{Italian}%
@@ -125,7 +124,11 @@
\def\it@next{\slash\@gobble}%
\else
\ifx\it@temp"%
- \def\it@@next{``\@gobble}%
+ \else
+ \if\noexpand\it@temp\string-%
+ \def\it@@next{\bbl@allowhyphens-\bbl@allowhyphens
+ \@gobble}%
+ \fi
\fi
\fi
\fi
@@ -139,8 +142,8 @@
\@ifpackageloaded{units}{}{\@ifpackageloaded{siunitx}{}{%
\@ifpackageloaded{SIunits}{}{%
\activate@it@unit\addto\extrasitalian{%
- \babel@save\unit\let\unit\bbl@it@unit}\selectlanguage{italian}%
- }}}%
+ \babel@save\unit\let\unit\bbl@it@unit}%
+ }}}\ifcsstring{bbl@main@language}{italian}{\selectlanguage{italian}}{}%
}
\DeclareRobustCommand*{\bbl@it@ap}[1]{%
\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}%