summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/xelatex/polyglossia
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-22 00:02:31 +0000
committerKarl Berry <karl@freefriends.org>2009-11-22 00:02:31 +0000
commit37c4a5be1d1d1c895526e9c5ae9e5918fb133d80 (patch)
tree6fde677a6e13e2677babd7003dfaa3d210feb973 /Master/texmf-dist/source/xelatex/polyglossia
parentc8f25e8c064910cbdae63d68ad0b753dcd925264 (diff)
polyglossia update (20nov09)
git-svn-id: svn://tug.org/texlive/trunk@16115 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/xelatex/polyglossia')
-rw-r--r--Master/texmf-dist/source/xelatex/polyglossia/polyglossia.dtx1430
1 files changed, 924 insertions, 506 deletions
diff --git a/Master/texmf-dist/source/xelatex/polyglossia/polyglossia.dtx b/Master/texmf-dist/source/xelatex/polyglossia/polyglossia.dtx
index f25a048d995..af729ebc418 100644
--- a/Master/texmf-dist/source/xelatex/polyglossia/polyglossia.dtx
+++ b/Master/texmf-dist/source/xelatex/polyglossia/polyglossia.dtx
@@ -1,8 +1,8 @@
%\iffalse
% polyglossia.dtx generated using mkpolyglossiadtx.pl
-% (derived from makedtx.pl version (c) Nicola Talbot)
+% (derived from makedtx.pl version 0.94b (c) Nicola Talbot)
%
-% Created on 2009/1/26 11:54
+% Created on 2009/11/20 10:17
%<*internal>
\iffalse
%</internal>
@@ -10,7 +10,7 @@
¦----------------------------------------------¦
¦ ¦
- ¦ THE POLYGLOSSIA PACKAGE v1.0.2 ¦
+ ¦ THE POLYGLOSSIA PACKAGE v1.1.0 ¦
¦ ¦
¦ Modern multilingual typesetting with XeLaTeX ¦
¦ ¦
@@ -38,7 +38,8 @@ Polyglossia makes it possible to automate the following tasks:
written from right to left (via the package bidi, available separately).
Several features of Babel that do not make sense in the XeTeX world (like font
-encodings, shorthands, etc) are not supported.
+encodings, shorthands, etc) are not supported. For German however, several
+shorthands do make sense and can be activated with the language option babelshorthands=true.
Polyglossia is distributed in the traditional way with *.dtx and *.ins files,
and also comes with a TDS-conformant ready-to-unpack zip file.
@@ -52,6 +53,32 @@ and follow the instructions displayed.
CHANGES
+1.1.0
+ * Use \newXeTeXintercharclass (thanks to Enrico Gregorio)
+ * Fixed implementation of shorthands for German (Babel code in file babelsh.def)
+ * Arabic (Khaled Hosny):
+ - Fix abjad form for 3 and 5 and add option abjadjimnotail
+ - bugfix for \arabicnumber
+ - make Gregorian calender the default
+ - fixed typos in the sample text
+ * Turkish (S. Ö. Yıldız):
+ - fix white-space before : and !
+ - also check if the font specified TRK for language
+ - added missing Turkish translation of "Glossary"
+ * Suppress nopattern warning for non-hyphenated scripts
+ * Changed U+0163 to U+021B for Romanian (Elie Roux)
+ * Stylistic fixes and use macro \xpg@option for package options (E. Gregorio)
+ * Fix monthnames in Dutch (A. Ledda)
+ * Add Brazilian translation for "glossary"
+ * Remove spurious space generated by gloss-spanish
+ * Fix ldf file for brazilian
+ * Various improvements in the code communicated by E. Gregorio:
+ - remove superfluous \protect\language
+ - change default language from 0 to \l@nohyphenation=255
+ - localize lccode handling of apostrophe in French; add it to Italian
+ * Fix frenchspacing for vietnamese
+ * Other minor bugfixes
+
1.0.2
This is mostly a bug fixes release.
* Captions corrected in Hebrew, Russian and Spanish
@@ -72,7 +99,7 @@ CHANGES
------------------------------
- François Charette, Jan 2009
+ François Charette, Dec 2009
<firmicus ατ gmx δοτ net>
------------------------------
%</README>
@@ -90,14 +117,14 @@ CHANGES
____________________________
The polyglossia package
- (C) 2008 François Charette
+ (C) 2009 François Charette
License information appended
\endpreamble
\postamble
- Copyright (C) by François Charette <firmicus ατ gmx δοτ net>
+ Copyright (C) 2009 by François Charette <firmicus ατ gmx δοτ net>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -118,6 +145,7 @@ CHANGES
\generate{\file{farsical.sty}{\from{polyglossia.dtx}{farsical.sty}}}
\generate{\file{hebrewcal.sty}{\from{polyglossia.dtx}{hebrewcal.sty}}}
\generate{\file{hijrical.sty}{\from{polyglossia.dtx}{hijrical.sty}}}
+\generate{\file{babelsh.def}{\from{polyglossia.dtx}{babelsh.def}}}
\generate{\file{cal-util.def}{\from{polyglossia.dtx}{cal-util.def}}}
\generate{\file{gloss-albanian.ldf}{\from{polyglossia.dtx}{gloss-albanian.ldf}}}
\generate{\file{gloss-amharic.ldf}{\from{polyglossia.dtx}{gloss-amharic.ldf}}}
@@ -173,6 +201,7 @@ CHANGES
\generate{\file{gloss-turkish.ldf}{\from{polyglossia.dtx}{gloss-turkish.ldf}}}
\generate{\file{gloss-ukrainian.ldf}{\from{polyglossia.dtx}{gloss-ukrainian.ldf}}}
\generate{\file{gloss-usorbian.ldf}{\from{polyglossia.dtx}{gloss-usorbian.ldf}}}
+\generate{\file{gloss-vietnamese.ldf}{\from{polyglossia.dtx}{gloss-vietnamese.ldf}}}
\generate{\file{gloss-welsh.ldf}{\from{polyglossia.dtx}{gloss-welsh.ldf}}}
\generate{\file{arabicdigits.map}{\from{polyglossia.dtx}{arabicdigits.map}}}
\generate{\file{farsidigits.map}{\from{polyglossia.dtx}{farsidigits.map}}}
@@ -265,9 +294,9 @@ CHANGES
\defaultfontfeatures{Scale=MatchLowercase}
\setmonofont{DejaVu Sans Mono}%{Consolas}
\setsansfont{Lucida Sans Unicode}
-\newfontfamily\arabicfont[Script=Arabic,Scale=1.5]{Scheherazade}
-\newfontfamily\farsifont[Script=Arabic,Scale=1.33]{Farsi Simple Bold}
-\newfontfamily\syriacfont[Script=Syriac,Scale=1.5,ExternalLocation="/mnt/data/fonts/syriac/"]{SyrCOMJerusalem.otf}
+\newfontfamily\arabicfont[Script=Arabic]{Scheherazade}
+\newfontfamily\farsifont[Script=Arabic]{Farsi Simple Bold}
+\newfontfamily\syriacfont[Script=Syriac]{Serto Jerusalem}
\newfontfamily\hebrewfont[Script=Hebrew]{SBL Hebrew}
\newcommand\Babel{\pkg{babel}\xspace}
@@ -294,7 +323,7 @@ CHANGES
% \GetFileInfo{polyglossia.sty}
%
% \title{\textcolor{lightblue}{\huge
-% \fontspec[ExternalLocation="/mnt/data/fonts/greek/"]{GFSAmbrosia.otf}
+% \fontspec{GFS Ambrosia}
% Π$\;\,$ο$\;\,$λ$\;\,$υ$\;\,$γ$\;\,$λ$\;\,$ω$\;\,$σ$\;\,$σ$\;\,$ι$\;\,$α}\\[16pt]
% \color{myblue}Polyglossia: A Babel Replacement for \XeLaTeX}
% \author{\scshape\color{myblue}François Charette}
@@ -538,7 +567,7 @@ CHANGES
% \subsection{arabic}
% \textbf{Options}:
% \begin{itemize}
-% \item \TB{calendar} = \textit{islamic} (= hijri) or gregorian
+% \item \TB{calendar} = \textit{gregorian} or islamic (= hijri)
% \item \TB{locale} = \textit{default},\footnote{ %
% For Egypt, Sudan, Yemen and the Golf states.}
% mashriq,\footnote{ %
@@ -548,6 +577,8 @@ CHANGES
% as well as the form of the numerals (unless overriden by the following option).
% \item \TB{numerals} = \textit{mashriq} or maghrib
% (the latter is the default when locale = algeria, tunisia or morocco)
+% \item \TB{abjadjimnotail} = \textit{false} or true.\new{1.0.3}
+% Set this to true if you want the \textit{abjad} form of the number three to be \textarabic{ج‍}\ – as in the manuscript tradition – instead of the modern usage \textarabic{ج}.
% \end{itemize}
% \textbf{Commands}:
% \begin{itemize}
@@ -589,11 +620,10 @@ CHANGES
% the latest (experimental) hyphenation patterns ‘(n)german-x-latest’
% will be loaded instead of ‘german’ or ‘ngerman’. NB: This is based on
% the file \texttt{language.dat} that comes with \TeX Live 2008.
-% \item\TB{babelshorthands} = \textit{false} or true: \new{1.0.2}
+% \item\TB{babelshorthands} = \textit{false} or true: \new{1.0.3}
% if this is turned on, all shorthands defined in the Babel
% language for fine-tuning the hyphenation of German words are
-% activated. NB: This feature has not been much tested and should be
-% considered experimental.
+% activated. (NB: This feature was broken in the previous version.)
% \begin{itemize}
% \item ¦"ck¦ for ¦ck¦ to be hyphenated as ¦k-k¦
% \item ¦"ff¦ for ¦ff¦ to be hyphenated as ¦ff-f¦; this is also available for the letters l, m, n, p, r and t
@@ -775,7 +805,7 @@ CHANGES
% (in days) to the date computed by the arithmetical algorithm.\footnote{ %
% The Islamic calendar is indeed a purely lunar calendar based on the observation
% of the first visibility of the lunar crescent at the beginning of the lunar month,
-% so their can be differences between different localities, as well as between
+% so there can be differences between different localities, as well as between
% civil and religious authorities.}
% For instance if ¦\Hijritoday¦ yields the date “7 Rajab 1429” (which is the date that was
% displayed on the front page of \href{http://www.aljazeera.net}{aljazeera.net} on
@@ -804,7 +834,10 @@ CHANGES
% (\pkg{arabi}), and Vafa Khalighi (\pkg{xepersian}). I should also thank other
% individuals for their assistance in supporting specific languages: Yves Codet
% (Sanskrit), Zdenek Wagner (Hindi), Mikhal Oren (Hebrew), Sergey Astanin (Russian),
-% and several other members of the \XeTeX\ user community.
+% Khaled Hosny (Arabic), Sertaç Ö. Yıldız (Turkish),
+% and several other members of the \XeTeX\ user community, notably Enrico Gregorio, who
+% has sent me many useful suggestions and corrections and contributed the ¦\newXeTeXintercharclass¦
+% mechanism in xelatex.ini which is now used by polyglossia.
% And of course my gratitude also goes to Jonathan Kew, the formidable author of \XeTeX!
%
%
@@ -819,8 +852,8 @@ CHANGES
% \subsection{polyglossia.sty}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{polyglossia}[2009/01/25 v1.0.2
- Babel replacement for XeLaTeX]
+\ProvidesPackage{polyglossia}[2009/11/20 v1.1.0
+ Babel replacement for XeLaTeX]
\RequirePackage{etoolbox}
\RequirePackage{fontspec} %which itself depends on xkeyval
@@ -872,10 +905,10 @@ CHANGES
\begingroup%
\let\label\relax \let\index\relax \let\glossary\relax%
\unrestored@protected@xdef\@themark%
- {{\foreignlanguage{##1}{%
- \protect\@@ensure@maindir{####1}}}%
- {\foreignlanguage{##1}{%
- \protect\@@ensure@maindir{####2}}}}%
+ {{\foreignlanguage{##1}{%
+ \protect\@@ensure@maindir{####1}}}%
+ {\foreignlanguage{##1}{%
+ \protect\@@ensure@maindir{####2}}}}%
\@temptokena \expandafter{\@themark}%
\mark{\the\@temptokena}%
\endgroup%
@@ -884,7 +917,7 @@ CHANGES
\begingroup%
\let\label\relax \let\index\relax \let\glossary\relax%
\expandafter\@markright\@themark%
- {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}%
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}%
\@temptokena \expandafter{\@themark}%
\mark{\the\@temptokena}%
\endgroup%
@@ -895,11 +928,15 @@ CHANGES
\else%\ifx\@tmpa\opt@disabled
\def\local@marks##1{}
\xpg@info{Option: localmarks=off}
- %\fi%
- \fi%
+ %\fi
+ \fi
}
\setkeys{polyglossia}{localmarks=on}
+%% when no patterns are available, we use \l@nohyphenation, assigned to 255
+%% (suggestion by Enrico Gregorio)
+\@ifundefined{l@nohyphenation}{\chardef\l@nohyphenation=255 }{}
+
\newcommand{\setdefaultlanguage}[2][]{%
\IfFileExists{gloss-#2.ldf}%
{\ifcsundef{#2@loaded}%
@@ -916,12 +953,12 @@ CHANGES
\else%
\newenvironment{#2}[1][]{\begin{otherlanguage}[####1]{#2}}%
{\end{otherlanguage}}%
- \fi%
+ \fi
\expandafter\newcommand\csname text#2\endcsname[2][]{%
\ifcsdef{RL}%
{\ifcsundef{#2@RL}%
{\@ensure@LR{\foreignlanguage[####1]{#2}{####2}}}%
- {\@ensure@RL{\foreignlanguage[####1]{#2}{####2}}}}%
+ {\@ensure@RTL{\foreignlanguage[####1]{#2}{####2}}}}%
{\foreignlanguage[####1]{#2}{####2}}%
}%
\csletcs{local#2}{text#2}%
@@ -996,12 +1033,12 @@ CHANGES
\else%
\newenvironment{#2}[1][]{\begin{otherlanguage}[####1]{#2}}%
{\end{otherlanguage}}%
- \fi%
+ \fi
\expandafter\newcommand\csname text#2\endcsname[2][]{%
\ifcsdef{RL}{%
- \ifcsundef{#2@RL}%
- {\@ensure@LR{\foreignlanguage[####1]{#2}{####2}}}%
- {\@ensure@RL{\foreignlanguage[####1]{#2}{####2}}}%
+ \ifcsundef{#2@RL}%
+ {\@ensure@LR{\foreignlanguage[####1]{#2}{####2}}}%
+ {\@ensure@RTL{\foreignlanguage[####1]{#2}{####2}}}%
}{% else
\foreignlanguage[####1]{#2}{####2}%
}}%
@@ -1014,7 +1051,7 @@ CHANGES
{\xpg@nolang{#2}\hyphenrules{#2}}%
%TODO ? \expandafter\ifx\csname l@#2\endcsname\@undefined
%\xpg@nopatterns{#2}\expandafter\adddialect\csname l@#2\endcsname 0%
- %\else\expandafter\expandafter\protect\language=\csname l@#2\endcsname\fi%
+ %\else\expandafter\expandafter\protect\language=\csname l@#2\endcsname\fi
}
\newcommand\setotherlanguages[1]{%
@@ -1069,7 +1106,7 @@ CHANGES
\addtocontents{toc}{\protect\select@language{#1}}%
\addtocontents{lof}{\protect\select@language{#1}}%
\addtocontents{lot}{\protect\select@language{#1}}%
- \fi%
+ \fi
}
\ifcsundef{select@language}{}%
@@ -1107,9 +1144,9 @@ CHANGES
\else
\expandafter\ifx\csname l@#1\endcsname\l@nohyphenation%
\xpg@warning{\string\setlocalhyphenmin useless for unhyphenated language #1}%
- \else%
+ \else
\providehyphenmins{#1}{#2#3}%
- \fi%
+ \fi
\fi}
\def\use@localhyphenmins#1{%
@@ -1117,6 +1154,8 @@ CHANGES
{\expandafter\expandafter\expandafter\set@hyphenmins\csname #1hyphenmins\endcsname\relax}}
%% package options
+
+%%\DeclareOption{shorthands}{\setkeys{polyglossia}{shorthands=true}}
\DeclareOption{nolocalmarks}{\setkeys{polyglossia}{localmarks=off}}
\DeclareOption{quiet}{%
\gdef\@latex@info#1{\relax}% no latex info
@@ -1124,56 +1163,19 @@ CHANGES
\gdef\@font@warning#1{\relax}% no latex font warnings
\gdef\zf@PackageInfo#1{\relax}% no fontspec info
\gdef\xpg@info#1{\relax}}% no polyglossia info
-\DeclareOption{USenglish}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=american]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=american]{english}}}%
- \@temp}
-\DeclareOption{american}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=american]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=american]{english}}}%
- \@temp}
-\DeclareOption{UKenglish}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=british]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=british]{english}}}%
- \@temp}
-\DeclareOption{british}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=british]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=british]{english}}}%
- \@temp}
-\DeclareOption{australian}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=australian]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=australian]{english}}}%
- \@temp}
-\DeclareOption{newzealand}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=newzealand]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=newzealand]{english}}}%
- \@temp}
-\DeclareOption{ngerman}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[spelling=new]{german}}}%
- {\edef\@temp{\noexpand\setotherlanguage[spelling=new]{german}}}%
- \@temp}
-\DeclareOption{polygreek}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=poly]{greek}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=poly]{greek}}}%
- \@temp}
-\DeclareOption{monogreek}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=mono]{greek}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=mono]{greek}}}%
- \@temp}
-\DeclareOption{ancientgreek}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=ancient]{greek}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=ancient]{greek}}}%
- \@temp}
+\def\xpg@option#1#2{%
+ \ifcsundef{xpg@main@language}{\setdefaultlanguage}{\setotherlanguage}%
+ [#1]{#2}}
+\DeclareOption{USenglish}{\xpg@option{variant=american}{english}}
+\DeclareOption{american}{\xpg@option{variant=american}{english}}
+\DeclareOption{UKenglish}{\xpg@option{variant=british}{english}}
+\DeclareOption{british}{\xpg@option{variant=british}{english}}
+\DeclareOption{australian}{\xpg@option{variant=australian}{english}}
+\DeclareOption{newzealand}{\xpg@option{variant=newzealand}{english}}
+\DeclareOption{ngerman}{\xpg@option{spelling=new}{german}}
+\DeclareOption{polygreek}{\xpg@option{variant=poly}{greek}}
+\DeclareOption{monogreek}{\xpg@option{variant=mono}{greek}}
+\DeclareOption{ancientgreek}{\xpg@option{variant=ancient}{greek}}
%%% FIXME: this does not work when gloss-<option>.ldf contains a \RequirePackage command !!!
%%% let's try with \AtEndOfPackage (not tested)
\DeclareOption*{%
@@ -1196,7 +1198,7 @@ CHANGES
Farsi (jalali) calendar]
\RequirePackage{bidi,calc}
-%TODO - rewrite completely using use calc
+%TODO - rewrite completely using calc
%% - use Reingold & Dershowitz ME
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1377,7 +1379,7 @@ CHANGES
\JALALI@d = \JALALI@dn \advance \JALALI@d by -\JALALI@sn
\fi
%% DATE FORMATTING
-\if@rl{\farsinumber\JALALI@d\space%
+\if@RTL{\farsinumber\JALALI@d\space%
\Jalalimonth{\JALALI@m}\space\farsinumber\JALALI@y}%
\else%
\number\JALALI@d\space\JalalimonthEnglish{\JALALI@m}%
@@ -1419,7 +1421,7 @@ CHANGES
\def\hebrewdate#1#2#3{%
\HebrewFromGregorian{#1}{#2}{#3}%
{\hebrewday}{\hebrewmonth}{\hebrewyear}%
- \if@rl%
+ \if@RTL%
\@FormatForHebrew{\hebrewday}{\hebrewmonth}{\hebrewyear}%
\else%
\@FormatForEnglish{\hebrewday}{\hebrewmonth}{\hebrewyear}%
@@ -1783,7 +1785,7 @@ CHANGES
\def\Hijridate#1#2#3{%
\HijriFromGregorian{#1}{#2}{#3}%
- \if@rl%
+ \if@RTL%
\FormatHijriDate%
\else%
\FormatHijriDateEnglish%
@@ -1815,12 +1817,323 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\@rabicnumb@r#1{\@ifundefined{arabicnumber}{{\addfontfeature{Mapping=arabicdigits} #1}}%
{\arabicnumber{#1}}}
-\def\FormatHijriDate{\@ensure@RL{%
+\def\FormatHijriDate{\@ensure@RTL{%
\@rabicnumb@r{\value{Hijriday}}\space\HijriMonthArabic{\value{Hijrimonth}}\space\@rabicnumb@r{\value{Hijriyear}}}}
% \end{macrocode}
% \iffalse
%</hijrical.sty>
+%<*babelsh.def>
+% \fi
+% \clearpage
+%
+% \subsection{babelsh.def}
+% \begin{macrocode}
+\ifx\initiate@active@char\@undefined
+\else
+ \bbl@afterfi\endinput
+\fi
+\ProvidesFile{babelsh.def}
+ [2009/05/07 %
+ Babel common definitions for shorthands^^J
+ Taken verbatim from babel.def (2008/07/06 v3.8l)]
+\def\bbl@add@special#1{\begingroup
+ \def\do{\noexpand\do\noexpand}%
+ \def\@makeother{\noexpand\@makeother\noexpand}%
+ \edef\x{\endgroup
+ \def\noexpand\dospecials{\dospecials\do#1}%
+ \expandafter\ifx\csname @sanitize\endcsname\relax \else
+ \def\noexpand\@sanitize{\@sanitize\@makeother#1}%
+ \fi}%
+ \x}
+\def\bbl@remove@special#1{\begingroup
+ \def\x##1##2{\ifnum`#1=`##2\noexpand\@empty
+ \else\noexpand##1\noexpand##2\fi}%
+ \def\do{\x\do}%
+ \def\@makeother{\x\@makeother}%
+ \edef\x{\endgroup
+ \def\noexpand\dospecials{\dospecials}%
+ \expandafter\ifx\csname @sanitize\endcsname\relax \else
+ \def\noexpand\@sanitize{\@sanitize}%
+ \fi}%
+ \x}
+\long\def\bbl@afterelse#1\else#2\fi{\fi#1}
+\long\def\bbl@afterfi#1\fi{\fi#1}
+\def\initiate@active@char#1{%
+ \expandafter\ifx\csname active@char\string##1\endcsname\relax
+ \bbl@afterfi{\@initiate@active@char{#1}}%
+ \fi}
+\begingroup
+ \catcode`\~\active
+ \def\x{\endgroup
+ \def\@initiate@active@char##1{%
+ \ifcat\noexpand##1\noexpand~\relax
+ \@ifundefined{normal@char\string##1}{%
+ \expandafter\let\csname normal@char\string##1\endcsname##1%
+ \expandafter\gdef
+ \expandafter##1%
+ \expandafter{%
+ \expandafter\active@prefix\expandafter##1%
+ \csname normal@char\string##1\endcsname}}{}%
+ \else
+ \@activated{##1}%
+ \@namedef{normal@char\string##1}{##1}%
+ \ifx##1'%
+ \let\prim@s\bbl@prim@s
+ \@namedef{normal@char\string##1}{%
+ \textormath{##1}{^\bgroup\prim@s}}%
+ \fi
+ \ifx##1^%
+ \gdef\bbl@act@caret{%
+ \ifmmode
+ \csname normal@char\string^\endcsname
+ \else
+ \bbl@afterfi
+ {\if@safe@actives
+ \bbl@afterelse\csname normal@char\string##1\endcsname
+ \else
+ \bbl@afterfi\csname user@active\string##1\endcsname
+ \fi}%
+ \fi}
+ \fi
+ \@ifpackagewith{babel}{KeepShorthandsActive}{}{%
+ \edef\bbl@tempa{\catcode`\noexpand##1\the\catcode`##1}%
+ \expandafter\AtEndOfPackage\expandafter{\bbl@tempa}}%
+ \@tempcnta=\lccode`\~
+ \lccode`~=`##1%
+ \lowercase{%
+ \catcode`~\active
+ \expandafter\bbl@add@special
+ \csname \string##1\endcsname
+ \AtBeginDocument{%
+ \catcode`##1\active
+ \if@filesw
+ \immediate\write\@mainaux{%
+ \string\catcode`##1\string\active}%
+ \fi}%
+ \expandafter\gdef
+ \expandafter~%
+ \expandafter{%
+ \expandafter\active@prefix\expandafter##1%
+ \csname normal@char\string##1\endcsname}}%
+ \lccode`\~\@tempcnta
+ \fi
+ \ifx##1^%
+ \@namedef{active@char\string##1}{\bbl@act@caret}%
+ \else
+ \@namedef{active@char\string##1}{%
+ \if@safe@actives
+ \bbl@afterelse\csname normal@char\string##1\endcsname
+ \else
+ \bbl@afterfi\csname user@active\string##1\endcsname
+ \fi}%
+ \fi
+ \@namedef{user@active\string##1}{%
+ \expandafter\ifx
+ \csname \user@group @sh@\string##1@\endcsname
+ \relax
+ \bbl@afterelse\bbl@sh@select\user@group##1%
+ {user@active@arg\string##1}{language@active\string##1}%
+ \else
+ \bbl@afterfi\csname \user@group @sh@\string##1@\endcsname
+ \fi}%
+ \long\@namedef{user@active@arg\string##1}####1{%
+ \expandafter\ifx
+ \csname \user@group @sh@\string##1@\string####1@\endcsname
+ \relax
+ \bbl@afterelse
+ \csname language@active\string##1\endcsname####1%
+ \else
+ \bbl@afterfi
+ \csname \user@group @sh@\string##1@\string####1@%
+ \endcsname
+ \fi}%
+ \@namedef{\user@group @sh@\string##1@@}{%
+ \csname normal@char\string##1\endcsname}
+ \@namedef{language@active\string##1}{%
+ \expandafter\ifx
+ \csname \language@group @sh@\string##1@\endcsname
+ \relax
+ \bbl@afterelse\bbl@sh@select\language@group##1%
+ {language@active@arg\string##1}{system@active\string##1}%
+ \else
+ \bbl@afterfi
+ \csname \language@group @sh@\string##1@\endcsname
+ \fi}%
+ \long\@namedef{language@active@arg\string##1}####1{%
+ \expandafter\ifx
+ \csname \language@group @sh@\string##1@\string####1@\endcsname
+ \relax
+ \bbl@afterelse
+ \csname system@active\string##1\endcsname####1%
+ \else
+ \bbl@afterfi
+ \csname \language@group @sh@\string##1@\string####1@%
+ \endcsname
+ \fi}%
+ \@namedef{system@active\string##1}{%
+ \expandafter\ifx
+ \csname \system@group @sh@\string##1@\endcsname
+ \relax
+ \bbl@afterelse\bbl@sh@select\system@group##1%
+ {system@active@arg\string##1}{normal@char\string##1}%
+ \else
+ \bbl@afterfi\csname \system@group @sh@\string##1@\endcsname
+ \fi}%
+ \long\@namedef{system@active@arg\string##1}####1{%
+ \expandafter\ifx
+ \csname \system@group @sh@\string##1@\string####1@\endcsname
+ \relax
+ \bbl@afterelse\csname normal@char\string##1\endcsname####1%
+ \else
+ \bbl@afterfi
+ \csname \system@group @sh@\string##1@\string####1@\endcsname
+ \fi}%
+ \@namedef{user@sh@\string##1@\string\protect@}{%
+ \csname user@active\string##1\endcsname}%
+ }%
+ }\x
+\def\bbl@sh@select#1#2{%
+ \expandafter\ifx\csname#1@sh@\string#2@sel\endcsname\relax
+ \bbl@afterelse\bbl@scndcs
+ \else
+ \bbl@afterfi\csname#1@sh@\string#2@sel\endcsname
+ \fi
+}
+\def\active@prefix#1{%
+ \ifx\protect\@typeset@protect
+ \else
+ \ifx\protect\@unexpandable@protect
+ \bbl@afterelse\bbl@afterfi\noexpand#1\@gobble
+ \else
+ \bbl@afterfi\bbl@afterfi\protect#1\@gobble
+ \fi
+ \fi}
+\newif\if@safe@actives
+\@safe@activesfalse
+\def\bbl@restore@actives{\if@safe@actives\@safe@activesfalse\fi}
+\def\bbl@activate#1{%
+ \expandafter\def
+ \expandafter#1\expandafter{%
+ \expandafter\active@prefix
+ \expandafter#1\csname active@char\string#1\endcsname}%
+}
+\def\bbl@deactivate#1{%
+ \expandafter\def
+ \expandafter#1\expandafter{%
+ \expandafter\active@prefix
+ \expandafter#1\csname normal@char\string#1\endcsname}%
+}
+\def\bbl@firstcs#1#2{\csname#1\endcsname}
+\def\bbl@scndcs#1#2{\csname#2\endcsname}
+\def\declare@shorthand#1#2{\@decl@short{#1}#2\@nil}
+\def\@decl@short#1#2#3\@nil#4{%
+ \def\bbl@tempa{#3}%
+ \ifx\bbl@tempa\@empty
+ \expandafter\let\csname #1@sh@\string#2@sel\endcsname\bbl@scndcs
+ \@namedef{#1@sh@\string#2@}{#4}%
+ \else
+ \expandafter\let\csname #1@sh@\string#2@sel\endcsname\bbl@firstcs
+ \@namedef{#1@sh@\string#2@\string#3@}{#4}%
+ \fi}
+\def\textormath#1#2{%
+ \ifmmode
+ \bbl@afterelse#2%
+ \else
+ \bbl@afterfi#1%
+ \fi}
+\def\user@group{user}
+\def\language@group{english}
+\def\system@group{system}
+\def\useshorthands#1{%
+ \def\user@group{user}%
+ \initiate@active@char{#1}%
+ \@tempcnta\lccode`\~
+ \lccode`~=`#1%
+ \lowercase{\catcode`~\active\bbl@activate{~}}%
+ \lccode`\~\@tempcnta}
+\def\defineshorthand{\declare@shorthand{user}}
+\def\languageshorthands#1{\def\language@group{#1}}
+\def\aliasshorthand#1#2{%
+ \expandafter\ifx\csname active@char\string#2\endcsname\relax
+ \ifx\document\@notprerr
+ \@notshorthand{#2}
+ \else
+ \initiate@active@char{#2}%
+ \@tempcnta\lccode`\~
+ \lccode`~=`#2%
+ \lowercase{\let~#1}%
+ \lccode`\~\@tempcnta
+ \fi
+ \fi
+}
+\def\@notshorthand#1{%
+ \PackageError{babel}{%
+ The character `\string #1' should be made
+ a shorthand character;\MessageBreak
+ add the command \string\useshorthands\string{#1\string} to
+ the preamble.\MessageBreak
+ I will ignore your instruction}{}%
+ }
+\newcommand*\shorthandon[1]{\bbl@switch@sh{on}#1\@nil}
+\newcommand*\shorthandoff[1]{\bbl@switch@sh{off}#1\@nil}
+\def\bbl@switch@sh#1#2#3\@nil{%
+ \@ifundefined{active@char\string#2}{%
+ \PackageError{babel}{%
+ The character '\string #2' is not a shorthand character
+ in \languagename}{%
+ Maybe you made a typing mistake?\MessageBreak
+ I will ignore your instruction}}{%
+ \csname bbl@switch@sh@#1\endcsname#2}%
+ \ifx#3\@empty\else
+ \bbl@afterfi\bbl@switch@sh{#1}#3\@nil
+ \fi}
+\def\bbl@switch@sh@off#1{\catcode`#112\relax}
+\begingroup
+ \catcode`\~\active
+ \def\x{\endgroup
+ \def\bbl@switch@sh@on##1{%
+ \begingroup
+ \lccode`~=`##1%
+ \lowercase{\endgroup
+ \catcode`~\active
+ }%
+ }%
+ }
+\x
+\declare@shorthand{system}{"}{\csname normal@char\string"\endcsname}
+\declare@shorthand{system}{'}{%
+ \textormath{\csname normal@char\string'\endcsname}%
+ {\sp\bgroup\prim@s}}
+\declare@shorthand{system}{`}{\csname normal@char\string`\endcsname}
+\def\bbl@prim@s{%
+ \prime\futurelet\@let@token\bbl@pr@m@s}
+\begingroup
+ \catcode`\'\active\let'\relax
+ \def\x{\endgroup
+ \def\bbl@pr@m@s{%
+ \ifx'\@let@token
+ \expandafter\pr@@@s
+ \else
+ \ifx^\@let@token
+ \expandafter\expandafter\expandafter\pr@@@t
+ \else
+ \egroup
+ \fi
+ \fi}%
+ }
+\x
+\initiate@active@char{~}
+\declare@shorthand{system}{~}{\leavevmode\nobreak\ }
+\bbl@activate{~}
+\def\bbl@disc#1#2{%
+ \nobreak\discretionary{#2-}{}{#1}\allowhyphens}
+%HERE ENDS THE CODE COPIED FROM babel.def --------------------
+\def\bbl@disc@german#1#2{%
+ \nobreak\discretionary{#2-}{}{#1}}
+% \end{macrocode}
+% \iffalse
+%</babelsh.def>
%<*cal-util.def>
% \fi
% \clearpage
@@ -1910,7 +2223,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@albanian\@undefined
\xpg@nopatterns{Albanian}
- \adddialect\l@albanian0\fi
+ \adddialect\l@albanian\l@nohyphenation\fi
\def\captionsalbanian{%
\def\refname{Referencat}%
@@ -1942,7 +2255,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
Qershor\or Korrik\or Gusht\or Shtator\or Tetor\or Nëntor\or
Dhjetor\fi \space \number\year}}}
-\def\albanian@language{\protect\language=\l@albanian}
+\def\albanian@language{\language=\l@albanian}
\setlocalhyphenmins{albanian}{2}{2}
@@ -1968,8 +2281,8 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\makeatletter
\ifx\l@amharic\@undefined%
- \xpg@nopatterns{Amharic}%
- \adddialect\l@amharic0%
+ %\xpg@nopatterns{Amharic}%
+ \adddialect\l@amharic\l@nohyphenation%
\fi
\def\captionsamharic{%
@@ -2190,7 +2503,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\let\normalfont=\amharic@font%
\def\reset@font{\normalfont}}
-\def\amharic@language{\protect\language=\l@amharic}
+\def\amharic@language{\language=\l@amharic}
% \end{macrocode}
@@ -2208,53 +2521,66 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\makeatletter
\ifx\l@arabic\@undefined
- \xpg@nopatterns{arabic}%
- \adddialect\l@arabic0
+ %\xpg@nopatterns{arabic}%
+ \adddialect\l@arabic\l@nohyphenation
\fi
\def\arabic@RL{\relax}
-\newif\if@eastern@numerals
+\newif\ifeastern@numerals
\def\tmp@mashriq{mashriq}
\def\tmp@maghrib{maghrib}
\define@key{arabic}{numerals}[mashriq]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@mashriq\@eastern@numeralstrue\else%
- \ifx\@tmpa\tmp@maghrib\@eastern@numeralsfalse\fi%
- \fi}
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@mashriq%
+ \eastern@numeralstrue%
+ \else
+ \ifx\@tmpa\tmp@maghrib\eastern@numeralsfalse\fi%
+ \fi}
+
+\newif\ifabjad@jim@notail
+\def\tmp@true{true}
+\define@key{arabic}{abjadjimnotail}[true]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@true\abjad@jim@notailtrue%
+ \else
+ \abjad@jim@notailfalse
+ \fi}
\def\tmp@morocco{morocco}
\def\tmp@algeria{algeria}
\define@key{arabic}{locale}[default]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@morocco%
- \@eastern@numeralsfalse%
- \else\ifx\@tmpa\tmp@algeria%
- \@eastern@numeralsfalse%
- \fi%
- \fi%
- \gdef\@@arabic@month{\@arabic@month{#1}}}
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@morocco%
+ \eastern@numeralsfalse%
+ \else
+ \ifx\@tmpa\tmp@algeria%
+ \eastern@numeralsfalse%
+ \fi%
+ \fi%
+ \gdef\@@arabic@month{\@arabic@month{#1}}}
\newif\if@hijrical
\def\tmp@hijri{hijri}
\def\tmp@islamic{islamic}
-\define@key{arabic}{calendar}[islamic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@hijri\@hijricaltrue%
- \else%
- \ifx\@tmpa\tmp@islamic\@hijricaltrue%
- \else\@hijricalfalse%
- \fi\fi}
+\define@key{arabic}{calendar}[gregorian]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@hijri\@hijricaltrue%
+ \else
+ \ifx\@tmpa\tmp@islamic\@hijricaltrue%
+ \else\@hijricalfalse%
+ \fi
+ \fi}
\define@key{arabic}{hijricorrection}[0]{%
- \gdef\@hijri@correction{#1}}%
+ \gdef\@hijri@correction{#1}}%
% This should set the defaults
-\setkeys{arabic}{locale,calendar,numerals,hijricorrection}
+\setkeys{arabic}{locale,calendar,numerals,hijricorrection,abjadjimnotail=false}
\def\arabicgregmonth@default#1{\ifcase#1%
% Egypt, Sudan, Yemen and Golf states
- \or يناير\or فبراير\or مارس\or ابريل\or مايو\or يونيو\or يوليو\or اغستس\or سبتمبر\or أكتوبر\or نوفمبر\or ديسمبر\fi}
+ \or يناير\or فبراير\or مارس\or أبريل\or مايو\or يونيو\or يوليو\or أغسطس\or سبتمبر\or أكتوبر\or نوفمبر\or ديسمبر\fi}
\def\arabicgregmonth@mashriq#1{\ifcase#1%
% Iraq Syria Jordan Lebanon Palestine
\or كانون الثاني\or شباط\or آذار\or نيسان\or أيار\or حزيران\or تموز\or آب\or أيلول\or تشرين الأول\or تشرين الثاني\or كانون الأول\fi}
@@ -2275,35 +2601,35 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\arabicgregmonth@default}}
\def\captionsarabic{%
-\def\prefacename{\@ensure@RL{مدخل}}%
-\def\refname{\@ensure@RL{المراجع}}
-\def\abstractname{\@ensure@RL{ملخص}}%
-\def\bibname{\@ensure@RL{المصادر}}%
-\def\chaptername{\@ensure@RL{الباب}}%
-\def\appendixname{\@ensure@RL{الملاحق}}%
-\def\contentsname{\@ensure@RL{المحتويات}}
-%\def\contentsname{\@ensure@RL{الفهرس}}%
-\def\listfigurename{\@ensure@RL{قائمة الأشكال}}%
-\def\listtablename{\@ensure@RL{قائمة الجداول}}%
-\def\indexname{\@ensure@RL{الفهرس}}%
-\def\figurename{\@ensure@RL{شكل}}%
-\def\tablename{\@ensure@RL{جدول}}%
-\def\partname{\@ensure@RL{القسم}}%
-\def\enclname{\@ensure@RL{المرفقات}}%<-- Needs translation
-\def\ccname{\@ensure@RL{نسخة ل‬}}% <<
-\def\headtoname{\@ensure@RL{إلى}}%<-- Needs translation
-\def\pagename{\@ensure@RL{صفحة}}%
-\def\seename{\@ensure@RL{راجع}}%\alefhamza\nun\za\ra
-\def\alsoname{\@ensure@RL{راجع أيضاً}}%<<\alefhamza\nun\za\ra
-\def\proofname{\@ensure@RL{برهان}}%
-\def\glossaryname{\@ensure@RL{قاموس}}%<<
+\def\prefacename{\@ensure@RTL{مدخل}}%
+\def\refname{\@ensure@RTL{المراجع}}
+\def\abstractname{\@ensure@RTL{ملخص}}%
+\def\bibname{\@ensure@RTL{المصادر}}%
+\def\chaptername{\@ensure@RTL{باب}}%
+\def\appendixname{\@ensure@RTL{الملاحق}}%
+\def\contentsname{\@ensure@RTL{المحتويات}}
+%\def\contentsname{\@ensure@RTL{الفهرس}}%
+\def\listfigurename{\@ensure@RTL{قائمة الأشكال}}%
+\def\listtablename{\@ensure@RTL{قائمة الجداول}}%
+\def\indexname{\@ensure@RTL{الفهرس}}%
+\def\figurename{\@ensure@RTL{شكل}}%
+\def\tablename{\@ensure@RTL{جدول}}%
+\def\partname{\@ensure@RTL{القسم}}%
+\def\enclname{\@ensure@RTL{المرفقات}}%<-- Needs translation
+\def\ccname{\@ensure@RTL{نسخة ل‬}}% <<
+\def\headtoname{\@ensure@RTL{إلى}}%<-- Needs translation
+\def\pagename{\@ensure@RTL{صفحة}}%
+\def\seename{\@ensure@RTL{راجع}}%\alefhamza\nun\za\ra
+\def\alsoname{\@ensure@RTL{راجع أيضًا}}%<<\alefhamza\nun\za\ra
+\def\proofname{\@ensure@RTL{برهان}}%
+\def\glossaryname{\@ensure@RTL{قاموس}}%<<
}
\def\datearabic{%
\def\today{%
\if@hijrical%
\Hijritoday[\@hijri@correction]%
\else%
- \if@rl%
+ \if@RTL%
\arabicnumber\day\space\@@arabic@month{\month}%
\space\arabicnumber\year%
\else% in LR environment we format the gregorian date within \textenglish
@@ -2315,7 +2641,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\fi}}
-\def\arabicnumber#1{\if@eastern@numerals{\protect\addfontfeature{Mapping=arabicdigits}\number#1}\else\RL{\reset@font\number#1}\fi}
+\def\arabicnumber#1{\ifeastern@numerals{\addfontfeature{Mapping=arabicdigits}\number#1}\else\RL{\reset@font\number#1}\fi}
\def\@ornatebracearabic#1{\RL{\char"FD3F\@arabic#1\char"FD3E}}
\def\@ornatebracealph#1{\RL{\char"FD3F\@alph#1\char"FD3E}}
@@ -2326,7 +2652,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\else%
\ifnum#1<\z@\space\xpg@ill@value{#1}{abjad numeral}%
\else%
- \ifnum#1<10\expandafter\abj@num@i\number#1%
+ \ifnum#1<10\expandafter\abj@num@i@iso\number#1%
\else%
\ifnum#1<100\expandafter\abj@num@ii\number#1%
\else%
@@ -2341,8 +2667,13 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\fi
}
\def\abjad@zero{}
+\def\abjad@three{ج\ifabjad@jim@notail\char"200D\fi}
+\def\abj@num@i@iso#1{%
+ \ifcase#1\or ا\or ب\or\abjad@three\or د%
+ \or ه\char"200D\or و\or ز\or ح\or ط\fi%
+ \ifnum#1=\z@\abjad@zero\fi}
\def\abj@num@i#1{%
- \ifcase#1\or ا\or ب\or ج\char"200D\or د%
+ \ifcase#1\or ا\or ب\or\abjad@three\or د%
\or ه\or و\or ز\or ح\or ط\fi%
\ifnum#1=\z@\abjad@zero\fi}
\def\abj@num@ii#1{%
@@ -2500,7 +2831,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@malay\@undefined
\ifx\l@meyalu\@undefined
\xpg@nopatterns{Bahasa Indonesia}
- \adddialect\l@bahasa0\relax
+ \adddialect\l@bahasa\l@nohyphenation\relax
\else
\let\l@bahasa\l@meyalu
\fi
@@ -2551,7 +2882,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
Juli\or Agustus\or September\or Oktober\or Nopember\or Desember\fi
\space \number\year}}
-\def\bahasai@language{\protect\language=\l@bahasai}
+\def\bahasai@language{\language=\l@bahasai}
\setlocalhyphenmins{bahasai}{2}{2}
@@ -2576,7 +2907,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@indon\@undefined
\ifx\l@indonesian\@undefined
\xpg@nopatterns{Bahasa Malaysia}
- \adddialect\l@malay0\relax
+ \adddialect\l@malay\l@nohyphenation\relax
\else
\let\l@malay\l@indonesian
\fi
@@ -2627,7 +2958,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
Julai\or Ogos\or September\or Oktober\or November\or Disember\fi
\space \number\year}}
-\def\bahasam@language{\protect\language=\l@bahasam}
+\def\bahasam@language{\language=\l@bahasam}
\setlocalhyphenmins{bahasam}{2}{2}
@@ -2646,7 +2977,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@basque\@undefined%
\xpg@nopatterns{Basque}%
- \adddialect\l@basque0%
+ \adddialect\l@basque\l@nohyphenation%
\fi
\def\captionsbasque{%
@@ -2680,7 +3011,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
irailaren\or urriaren\or azaroaren\or
abenduaren\fi~\number\day}}
-\def\basque@language{\protect\language=\l@basque}
+\def\basque@language{\language=\l@basque}
\setlocalhyphenmins{basque}{2}{2}
@@ -2693,17 +3024,17 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
%
% \subsection{gloss-brazil.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for portuguese]
+\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for portuguese]
\makeatletter
-\def\portuges@font{\normalfontlatin}
+\def\brazil@font{\normalfontlatin}
%FIXME check this:
-\ifx\l@portuges\@undefined
+\ifx\l@brazil\@undefined
\ifx\l@portuguese\@undefined
- \xpg@nopatterns{Portuguese}
- \adddialect\l@portuges0
+ \xpg@nopatterns{Brazilian Portuguese}
+ \adddialect\l@brazil\l@nohyphenation
\else
- \let\l@portuges\l@portuguese
+ \let\l@brazil\l@portuguese
\fi
\fi
@@ -2729,7 +3060,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\ccname{Cópia para}%
\def\headtoname{Para}%
\def\proofname{Demonstração}%
- \def\glossaryname{Glossary}%
+ \def\glossaryname{Glossário}%
}
\def\datebrazil{%
\def\today{\number\day\space de\space\ifcase\month\or
@@ -2738,7 +3069,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\fi\space de\space\number\year}%
}
-\def\brazil@language{\protect\language=\l@portuges}
+\def\brazil@language{\language=\l@brazil}
\setlocalhyphenmins{brazil}{2}{3}
@@ -2757,18 +3088,24 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@breton\@undefined%
\xpg@nopatterns{Breton}%
- \adddialect\l@breton0%
+ \adddialect\l@breton\l@nohyphenation%
\fi
+\newXeTeXintercharclass\breton@punctthin % ! ? ;
+\newXeTeXintercharclass\breton@punctthick % :
+
+\def\breton@punctthinspace{\unskip\thinspace}
+\def\breton@punctthickspace{\unskip\nobreakspace}
+
\def\breton@punctuation{%
\frenchspacing%
\XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\; 7%
- \XeTeXcharclass `\: 7%
- \XeTeXcharclass `\? 8%
- \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
- \XeTeXinterchartoks 0 8 = {\unskip\kern\fontdimen2\font\kern-1.4\fontdimen3\font}%
+ \XeTeXcharclass `\! \breton@punctthin
+ \XeTeXcharclass `\? \breton@punctthin
+ \XeTeXcharclass `\; \breton@punctthin
+ \XeTeXcharclass `\: \breton@punctthick
+ \XeTeXinterchartoks \z@ \breton@punctthin = \breton@punctthinspace
+ \XeTeXinterchartoks \z@ \breton@punctthick = \breton@punctthickspace
}
\def\nobreton@punctuation{%
@@ -2808,7 +3145,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
Gouere\or Eost\or Gwengolo\or Here\or Du\or Kerzu\fi
\space\number\year}}
-\def\breton@language{\protect\language=\l@breton}
+\def\breton@language{\language=\l@breton}
\setlocalhyphenmins{breton}{2}{2}
@@ -2838,23 +3175,25 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@bulgarian\@undefined%
\xpg@nopatterns{Bulgarian}%
- \adddialect\l@bulgarian0%
+ \adddialect\l@bulgarian\l@nohyphenation%
\fi
\def\bulgarian@Alph#1{%
\ifcase#1\or
А\or Б\or В\or Г\or Д\or Е\or Ж\or
- З\or И\or К\or Л\or М\or Н\or О\or
- П\or Р\or С\or Т\or У\or Ф\or Х\or
- Ц\or Ч\or Ш\or Ш\or Ю\or Я\else
+ З\or И\or Й\or К\or Л\or М\or Н\or
+ О\or П\or Р\or С\or Т\or У\or Ф\or
+ Х\or Ц\or Ч\or Ш\or Щ\or Ъ\or
+ Ю\or Я\else
\xpg@ill@value{#1}{bulgarian@Alph}\fi}%
\def\bulgarian@alph#1{%
\ifcase#1\or
а\or б\or в\or г\or д\or е\or ж\or
- з\or и\or к\or л\or м\or н\or о\or
- п\or р\or с\or т\or у\or ф\or х\or
- ц\or ч\or ш\or щ\or ю\or я\else
+ з\or и\or й\or к\or л\or м\or н\or
+ о\or п\or р\or с\or т\or у\or ф\or
+ х\or ц\or ч\or ш\or щ\or ъ\or ь\or
+ ю\or я\else
\xpg@ill@value{#1}{bulgarian@alph}\fi}%
\def\bulgarian@numbers{%
@@ -2877,9 +3216,9 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\chaptername{Глава}%
\def\appendixname{Приложение}%
\def\contentsname{Съдържание}%
- \def\listfigurename{Списхrdsnк на фигурите}%
- \def\listtablename{Списхrdsnк на таблиците}%
- \def\indexname{Азбуцhен указател}%
+ \def\listfigurename{Списък на фигурите}%
+ \def\listtablename{Списък на таблиците}%
+ \def\indexname{Азбучен указател}%
\def\figurename{Фигура}%
\def\tablename{Таблица}%
%\def\thepart{}%
@@ -2912,7 +3251,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\todayRoman{\number\day.\,\month@Roman.\,\number\year~г.}%
}
-\def\bulgarian@language{\protect\language=\l@bulgarian}
+\def\bulgarian@language{\language=\l@bulgarian}
\def\bulgarian@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
@@ -2964,7 +3303,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@catalan\@undefined%
\xpg@nopatterns{Catalan}%
- \adddialect\l@catalan0%
+ \adddialect\l@catalan\l@nohyphenation%
\fi
\def\captionscatalan{%
@@ -2998,7 +3337,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
de novembre\or de desembre\fi
\space de~\number\year}}
-\def\catalan@language{\protect\language=\l@catalan}
+\def\catalan@language{\language=\l@catalan}
\setlocalhyphenmins{catalan}{2}{2}
@@ -3016,7 +3355,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@coptic\@undefined%
\xpg@nopatterns{Coptic}%
- \adddialect\l@coptic0%
+ \adddialect\l@coptic\l@nohyphenation%
\fi
%\def\captionscoptic{%
@@ -3047,7 +3386,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
% \def\today{<++>}%
% }
-\def\coptic@language{\protect\language=\l@coptic}
+\def\coptic@language{\language=\l@coptic}
\def\coptic@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
@@ -3087,7 +3426,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@croatian\@undefined%
\xpg@nopatterns{Croatian}%
- \adddialect\l@croatian0%
+ \adddialect\l@croatian\l@nohyphenation%
\fi
\def\captionscroatian{%
@@ -3119,7 +3458,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
lipnja\or srpnja\or kolovoza\or rujna\or listopada\or studenog\or
prosinca\fi \space \number\year.}}
-\def\croatian@language{\protect\language=\l@croatian}
+\def\croatian@language{\language=\l@croatian}
\setlocalhyphenmins{croatian}{2}{2}
@@ -3138,7 +3477,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@czech\@undefined%
\xpg@nopatterns{Czech}%
- \adddialect\l@czech0%
+ \adddialect\l@czech\l@nohyphenation%
\fi
\def\captionsczech{%
@@ -3172,7 +3511,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
října\or listopadu\or prosince\fi
\space \number\year}}
-\def\czech@language{\protect\language=\l@czech}
+\def\czech@language{\language=\l@czech}
\setlocalhyphenmins{czech}{2}{2}%
@@ -3203,7 +3542,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@danish\@undefined
\xpg@nopatterns{Danish}
- \adddialect\l@danish0
+ \adddialect\l@danish\l@nohyphenation
\fi
\def\captionsdanish{%
@@ -3234,7 +3573,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space\number\year}
\def\danish@language{%
- \protect\language=\l@danish}
+ \language=\l@danish}
\setlocalhyphenmins{danish}{2}{3}%
@@ -3264,8 +3603,8 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\makeatletter
\ifx\l@divehi\@undefined%
- \xpg@nopatterns{Divehi}%
- \adddialect\l@divehi0%
+ %\xpg@nopatterns{Divehi}%
+ \adddialect\l@divehi\l@nohyphenation%
\fi
\def\divehi@RL{\relax}
@@ -3296,7 +3635,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
% }
%\def\datedivehi{\def\today{<++>}}
-\def\divehi@language{\protect\language=\l@divehi}
+\def\divehi@language{\language=\l@divehi}
\def\divehi@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
@@ -3346,7 +3685,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@dutch\@undefined
\xpg@nopatterns{Dutch}
- \adddialect\l@dutch0
+ \adddialect\l@dutch\l@nohyphenation
\fi
\def\dutch@punctuation{%
@@ -3380,12 +3719,12 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\proofname{Bewijs}%
\def\glossaryname{Verklarende Woordenlijst}%
\def\today{\number\day~\ifcase\month%
- Januarie\or Februarie\or Maart\or April\or Mei\or Junie\or
- Julie\or Augustus\or September\or Oktober\or November\or
- Desember\fi
+ \or januari\or februari\or maart\or april\or mei\or juni\or
+ juli\or augustus\or september\or oktober\or november\or
+ december\fi
\space \number\year}}
-\def\dutch@language{\protect\language=\l@dutch}
+\def\dutch@language{\language=\l@dutch}
\setlocalhyphenmins{dutch}{2}{2}%
@@ -3418,7 +3757,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@USenglish\@undefined%
\ifx\l@american\@undefined%
\xpg@nopatterns{English}%
- \adddialect\l@english0%
+ \adddialect\l@english\l@nohyphenation%
\else%
\let\l@english\l@american%
\fi%
@@ -3538,7 +3877,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@esperanto\@undefined%
\xpg@nopatterns{Esperanto}%
- \adddialect\l@esperanto0%
+ \adddialect\l@esperanto\l@nohyphenation%
\fi
\def\captionsesperanto{%
@@ -3597,7 +3936,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\let\@alph\latin@alph%
}
-\def\esperanto@language{\protect\language=\l@esperanto}
+\def\esperanto@language{\language=\l@esperanto}
\setlocalhyphenmins{esperanto}{2}{2}%
@@ -3616,7 +3955,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@estonian\@undefined%
\xpg@nopatterns{Estonian}%
- \adddialect\l@estonian0%
+ \adddialect\l@estonian\l@nohyphenation%
\fi
\def\captionsestonian{%
@@ -3649,7 +3988,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
juuli\or august\or september\or oktoober\or november\or
detsember\fi\space\number\year.\space a.}}
-\def\estonian@language{\protect\language=\l@estonian}
+\def\estonian@language{\language=\l@estonian}
\setlocalhyphenmins{estonian}{2}{2}%
@@ -3679,10 +4018,10 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\RequirePackage{farsical}
\makeatletter
-%\ifx\l@farsi\@undefined
-% \xpg@nopatterns{Farsi}%
-\adddialect\l@farsi0
-%\fi
+\ifx\l@farsi\@undefined
+ %\xpg@nopatterns{Farsi}%
+ \adddialect\l@farsi\l@nohyphenation
+\fi
\def\farsi@RL{\relax}
@@ -3709,30 +4048,30 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\or نیسان\or ایار\or حزیران\or تموز\or آب\or ایلول\or تشرین اول\or تشرین ثانی\or کانون اول\fi}
\def\captionsfarsi{%
-\def\prefacename{\@ensure@RL{پیشگفتار}}%
-\def\refname{\@ensure@RL{مراجع}}%
-\def\abstractname{\@ensure@RL{چکیده}}%
-\def\bibname{\@ensure@RL{کتاب‌نامه}}%
-\def\chaptername{\@ensure@RL{فصل}}%
-\def\appendixname{\@ensure@RL{پیوست}}%
-\def\contentsname{\@ensure@RL{فهرست مطالب}}%
-\def\listfigurename{\@ensure@RL{لیست تصاویر}}%
-\def\listtablename{\@ensure@RL{لیست جداول}}%
-\def\indexname{\@ensure@RL{نمایه}}%
-\def\figurename{\@ensure@RL{شكل}}%
-\def\tablename{\@ensure@RL{جدول}}%
-\def\partname{\@ensure@RL{بخش}}%
-%\def\enclname{\@ensure@RL{}}%<-- Needs translation
-%\def\ccname{\@ensure@RL{}}%<-- Needs translation
-%\def\headtoname{\@ensure@RL{}}%<-- Needs translation
-\def\pagename{\@ensure@RL{صفحة}}%
-%\def\seename{\@ensure@RL{}}%<-- Needs translation
-%\def\alsoname{\@ensure@RL{}}%<-- Needs translation
-\def\proofname{\@ensure@RL{برهان}}%
-\def\glossaryname{\@ensure@RL{لغت‌نامه}}%<-- Needs to be checked
+\def\prefacename{\@ensure@RTL{پیشگفتار}}%
+\def\refname{\@ensure@RTL{مراجع}}%
+\def\abstractname{\@ensure@RTL{چکیده}}%
+\def\bibname{\@ensure@RTL{کتاب‌نامه}}%
+\def\chaptername{\@ensure@RTL{فصل}}%
+\def\appendixname{\@ensure@RTL{پیوست}}%
+\def\contentsname{\@ensure@RTL{فهرست مطالب}}%
+\def\listfigurename{\@ensure@RTL{لیست تصاویر}}%
+\def\listtablename{\@ensure@RTL{لیست جداول}}%
+\def\indexname{\@ensure@RTL{نمایه}}%
+\def\figurename{\@ensure@RTL{شكل}}%
+\def\tablename{\@ensure@RTL{جدول}}%
+\def\partname{\@ensure@RTL{بخش}}%
+%\def\enclname{\@ensure@RTL{}}%<-- Needs translation
+%\def\ccname{\@ensure@RTL{}}%<-- Needs translation
+%\def\headtoname{\@ensure@RTL{}}%<-- Needs translation
+\def\pagename{\@ensure@RTL{صفحة}}%
+%\def\seename{\@ensure@RTL{}}%<-- Needs translation
+%\def\alsoname{\@ensure@RTL{}}%<-- Needs translation
+\def\proofname{\@ensure@RTL{برهان}}%
+\def\glossaryname{\@ensure@RTL{لغت‌نامه}}%<-- Needs to be checked
}
\def\datefarsi{%
- \def\today{\@ensure@RL{\farsinumber\day\space\farsigregmonth{\month}\space\farsinumber\year}}%
+ \def\today{\@ensure@RTL{\farsinumber\day\space\farsigregmonth{\month}\space\farsinumber\year}}%
}
\def\farsinumber#1{\if@western@numerals\RL{\number#1}\else%
@@ -3887,7 +4226,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@finnish\@undefined%
\xpg@nopatterns{Finnish}%
- \adddialect\l@finnish0%
+ \adddialect\l@finnish\l@nohyphenation%
\fi
\def\captionsfinnish{%
@@ -3921,7 +4260,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
syyskuuta\or lokakuuta\or marraskuuta\or joulukuuta\fi
\space\number\year}}
-\def\finnish@language{\protect\language=\l@finnish}
+\def\finnish@language{\language=\l@finnish}
\setlocalhyphenmins{finnish}{2}{2}%
@@ -3949,70 +4288,51 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ProvidesFile{gloss-french.ldf}[polyglossia: module for french]
\makeatletter
\def\french@font{\normalfontlatin}
-\lccode"2019="2019
\ifx\l@french\@undefined%
\xpg@nopatterns{French}%
- \adddialect\l@french0%
+ \adddialect\l@french\l@nohyphenation%
\fi
+\newXeTeXintercharclass\french@punctthin % ! ? ;
+\newXeTeXintercharclass\french@punctthick % :
+\newXeTeXintercharclass\french@punctguill % « »
+
+\def\french@punctthinspace{\unskip\thinspace}
+\def\french@punctthickspace{\unskip\nobreakspace}
+
\def\french@punctuation{%
- \frenchspacing%
- \XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\? 7%
- \XeTeXcharclass `\; 7%
- \XeTeXcharclass `\: 7%
- \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
+ \frenchspacing
+ \lccode"2019="2019
+ \XeTeXinterchartokenstate=1
+ \XeTeXcharclass `\! \french@punctthin
+ \XeTeXcharclass `\? \french@punctthin
+ \XeTeXcharclass `\; \french@punctthin
+ \XeTeXcharclass `\: \french@punctthick
+ \XeTeXinterchartoks \z@ \french@punctthin = \french@punctthinspace
+ \XeTeXinterchartoks \z@ \french@punctthick = \french@punctthickspace
}
\def\nofrench@punctuation{%
- \nonfrenchspacing%
- \XeTeXinterchartokenstate=0%
+ \nonfrenchspacing
+ \lccode"2019=\z@
+ \XeTeXinterchartokenstate=0
}
\def\french@guillemets{%
- \XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\« 8%
- \XeTeXcharclass `\» 8%
- \XeTeXinterchartoks 8 0 = {\kern.1667em}%
- \XeTeXinterchartoks 0 8 = {\unskip\kern.1667em}%
- \XeTeXinterchartoks 8 7 = {\unskip\kern.1667em}% "»;" -> "» ;"
- \XeTeXinterchartoks 7 8 = {\unskip\kern.1667em}% "?»" -> "? »"
+ \XeTeXinterchartokenstate=1
+ \XeTeXcharclass `\« \french@punctguill
+ \XeTeXcharclass `\» \french@punctguill
+ \XeTeXinterchartoks \french@punctguill \z@ = \french@punctthickspace
+ \XeTeXinterchartoks \z@ \french@punctguill = \french@punctthickspace
+ \XeTeXinterchartoks \french@punctguill \french@punctthin = \french@punctthinspace
+ % "»;" -> "» ;"
+ \XeTeXinterchartoks \french@punctguill \french@punctthick = \french@punctthickspace
+ % "»:" -> "» :"
+ \XeTeXinterchartoks \french@punctthin \french@punctguill = \french@punctthickspace
+ % "?»" -> "? »"
}
-%\newcounter{niveauguillemets}[paragraph]
-%
-%\def\tmp@normal{normal}
-%\def\tmp@paragraphe{paragraphe}
-%\def\tmp@ligne{ligne}
-
-%TODO
-%\define@key{french}{guillemets}[normal]{
-% \def\@tmpa{#1}
-% \ifx\@tmpa\tmp@ligne%
-% \def\french@guill@mets{% FIXME
-% \def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em\setcounter{niveauguillemets}{1}%
-% \ifthenelse{\value{niveauguillemets} = 1}{\localleftbox{«\kern.1667em}}%
-% {\everypar={{«}\kern.1667em}\setcounter{niveauguillemets}{1}}}%
-% \def\RightPointingDoubleAngleQuotationMark{\unskip\kern.1667em»%
-% \everypar={}\localleftbox{}}}%
-% \else\ifx\@tmpa\tmp@paragraphe%
-% \def\french@guill@mets{\def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em%
-% \everypar={«\kern.1667em}}\def\RightPointingDoubleAngleQuotationMark%
-% {\unskip\kern.1667em»\everypar={}}}%
-% \else\ifx\@tmpa\tmp@normal%
-% \def\french@guill@mets{\def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em}%
-% \def\RightPointingDoubleAngleQuotationMark{\unskip\kern.1667em»}}%
-%\fi\fi\fi}
-%
-%\def\tmp@sans{sansaccents}
-%\define@key{french}{majuscules}{%
-% \def\@tmpa{#1}%
-% \ifx\@tmpa\tmp@sans%
-% \addfontfeature{Mapping=sansaccents}% <<< TODO!
-% \fi}
-
\def\captionsfrench{%
\def\refname{Références}%
\def\abstractname{Résumé}%
@@ -4052,7 +4372,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
décembre\fi%
\space \number\year}}
-\def\french@language{\protect\language=\l@french}
+\def\french@language{\language=\l@french}
\setlocalhyphenmins{french}{2}{2}%
@@ -4086,7 +4406,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@galician\@undefined%
\xpg@nopatterns{Galician}%
- \adddialect\l@galician0%
+ \adddialect\l@galician\l@nohyphenation%
\fi
\def\captionsgalician{%
@@ -4119,7 +4439,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
xullo\or agosto\or setembro\or outubro\or novembro\or decembro\fi
\space de~\number\year}}
-\def\galician@language{\protect\language=\l@galician}
+\def\galician@language{\language=\l@galician}
\setlocalhyphenmins{galician}{2}{2}%
@@ -4145,21 +4465,21 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\@tmpa\tmp@old%
\ifx\l@german\@undefined%
\xpg@nopatterns{german}%
- \adddialect\l@german0%
+ \adddialect\l@german\l@nohyphenation%
\fi%
\@german@oldspellingtrue%
\else%
\ifx\@tmpa\tmp@oldyr%
\ifx\l@german\@undefined%
\xpg@nopatterns{german}%
- \adddialect\l@german0%
+ \adddialect\l@german\l@nohyphenation%
\fi%
\@german@oldspellingtrue%
\else%
\ifx\l@ngerman\@undefined%
\ifx\l@german\@undefined%
\xpg@nopatterns{ngerman}%
- \adddialect\l@ngerman0%
+ \adddialect\l@ngerman\l@nohyphenation%
\else%
\xpg@warning{You asked for `ngerman' but only `german' hyphenation is available!}%
\@german@oldspellingtrue%
@@ -4171,91 +4491,68 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\fi%
}
+\newif\if@german@fraktur
+\def\tmp@fraktur{fraktur}
+\define@key{german}{script}[latin]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@fraktur\@german@frakturtrue\else%
+ \@german@frakturfalse%
+ \fi}
+
\define@boolkey{german}[german@]{latesthyphen}[false]{}
\define@boolkey{german}[german@]{babelshorthands}[false]{}
-\setkeys{german}{spelling,latesthyphen,babelshorthands}
+\setkeys{german}{spelling,latesthyphen,babelshorthands,script}
-%% definitions from babel.def and germanb.ldf
-\long\def\bbl@afterelse#1\else#2\fi{\fi#1}
-\long\def\bbl@afterfi#1\fi{\fi#1}
-\def\textormath#1#2{%
- \ifmmode
- \bbl@afterelse#2%
- \else
- \bbl@afterfi#1%
- \fi}
+\ifcsundef{initiate@active@char}{%
+\input{babelsh.def}%
+\initiate@active@char{"}%
+}{}
-\def\bbl@disc#1#2{%
- \nobreak\discretionary{#2-}{}{#1}}
+\def\german@shorthands{%
+\bbl@activate{"}%
+\def\language@group{german}%
+\declare@shorthand{german}{"`}{„}%
+\declare@shorthand{german}{"'}{“}%
+\declare@shorthand{german}{"<}{«}%
+\declare@shorthand{german}{">}{»}%
+\declare@shorthand{german}{"c}{\textormath{\bbl@disc@german ck}{c}}%
+\declare@shorthand{german}{"C}{\textormath{\bbl@disc@german CK}{C}}%
+\declare@shorthand{german}{"F}{\textormath{\bbl@disc@german F{FF}}{F}}%
+\declare@shorthand{german}{"l}{\textormath{\bbl@disc@german l{ll}}{l}}%
+\declare@shorthand{german}{"L}{\textormath{\bbl@disc@german L{LL}}{L}}%
+\declare@shorthand{german}{"m}{\textormath{\bbl@disc@german m{mm}}{m}}%
+\declare@shorthand{german}{"M}{\textormath{\bbl@disc@german M{MM}}{M}}%
+\declare@shorthand{german}{"n}{\textormath{\bbl@disc@german n{nn}}{n}}%
+\declare@shorthand{german}{"N}{\textormath{\bbl@disc@german N{NN}}{N}}%
+\declare@shorthand{german}{"p}{\textormath{\bbl@disc@german p{pp}}{p}}%
+\declare@shorthand{german}{"P}{\textormath{\bbl@disc@german P{PP}}{P}}%
+\declare@shorthand{german}{"r}{\textormath{\bbl@disc@german r{rr}}{r}}%
+\declare@shorthand{german}{"R}{\textormath{\bbl@disc@german R{RR}}{R}}%
+\declare@shorthand{german}{"t}{\textormath{\bbl@disc@german t{tt}}{t}}%
+\declare@shorthand{german}{"T}{\textormath{\bbl@disc@german T{TT}}{T}}%
+\declare@shorthand{german}{"f}{\textormath{\bbl@discff}{f}}%
\def\bbl@discff{\penalty\@M
- \afterassignment\bbl@insertff \let\bbl@nextff= }
+ \afterassignment\bbl@insertff \let\bbl@nextff= }%
\def\bbl@insertff{%
\if f\bbl@nextff
\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
- {\relax\discretionary{ff-}{f}{ff}}{f\bbl@nextff}}
-\let\bbl@nextff=f
-
-\def\german@shorthands{%
- \XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\" 7%
- \XeTeXcharclass `\c 8%
- \XeTeXcharclass `\C 9%
- \XeTeXcharclass `\F 10%
- \XeTeXcharclass `\l 11%
- \XeTeXcharclass `\L 12%
- \XeTeXcharclass `\m 13%
- \XeTeXcharclass `\M 14%
- \XeTeXcharclass `\n 15%
- \XeTeXcharclass `\N 16%
- \XeTeXcharclass `\p 17%
- \XeTeXcharclass `\P 18%
- \XeTeXcharclass `\r 19%
- \XeTeXcharclass `\R 20%
- \XeTeXcharclass `\t 21%
- \XeTeXcharclass `\T 22%
- \XeTeXcharclass `\f 23%
- \XeTeXcharclass `\- 24%
- \XeTeXcharclass `\| 25%
- \XeTeXcharclass `\~ 26%
- \XeTeXcharclass `\= 27%
- \XeTeXcharclass `\` 28%
- \XeTeXcharclass `\' 29%
- \XeTeXcharclass `\< 30%
- \XeTeXcharclass `\> 31%
- \XeTeXinterchartoks 7 8 = {\textormath{\bbl@disc ck}{c}}%
- \XeTeXinterchartoks 7 9 = {\textormath{\bbl@disc CK}{C}}%
- \XeTeXinterchartoks 7 10 = {\textormath{\bbl@disc F{FF}}{F}}%
- \XeTeXinterchartoks 7 11 = {\textormath{\bbl@disc l{ll}}{l}}%
- \XeTeXinterchartoks 7 12 = {\textormath{\bbl@disc L{LL}}{L}}%
- \XeTeXinterchartoks 7 13 = {\textormath{\bbl@disc m{mm}}{m}}%
- \XeTeXinterchartoks 7 14 = {\textormath{\bbl@disc M{MM}}{M}}%
- \XeTeXinterchartoks 7 15 = {\textormath{\bbl@disc n{nn}}{n}}%
- \XeTeXinterchartoks 7 16 = {\textormath{\bbl@disc N{NN}}{N}}%
- \XeTeXinterchartoks 7 17 = {\textormath{\bbl@disc p{pp}}{p}}%
- \XeTeXinterchartoks 7 18 = {\textormath{\bbl@disc P{PP}}{P}}%
- \XeTeXinterchartoks 7 19 = {\textormath{\bbl@disc r{rr}}{r}}%
- \XeTeXinterchartoks 7 20 = {\textormath{\bbl@disc R{RR}}{R}}%
- \XeTeXinterchartoks 7 21 = {\textormath{\bbl@disc t{tt}}{t}}%
- \XeTeXinterchartoks 7 22 = {\textormath{\bbl@disc T{TT}}{T}}%
- \XeTeXinterchartoks 7 23 = {\textormath{\bbl@discff}{f}}%
- \XeTeXinterchartoks 7 24 = {\nobreak\-\nobreak\hskip\z@skip}%
- \XeTeXinterchartoks 7 25 = {\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}}{}}%
- \XeTeXinterchartoks 7 7 = {\hskip\z@skip}%
- \XeTeXinterchartoks 7 26 = {\textormath{\leavevmode\hbox{-}}{-}}%
- \XeTeXinterchartoks 7 27 = {\penalty\@M-\hskip\z@skip}%
- \XeTeXinterchartoks 7 28 = „%
- \XeTeXinterchartoks 7 29 = “%
- \XeTeXinterchartoks 7 30 = «%
- \XeTeXinterchartoks 7 31 = »%
+ {\relax\discretionary{ff-}{f}{ff}\allowhyphens}{f\bbl@nextff}}%
+\let\bbl@nextff=f%
+\declare@shorthand{german}{"-}{\nobreak\-\nobreak\hskip\z@skip}%
+\declare@shorthand{german}{"|}{\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}}{}}%
+\declare@shorthand{german}{""}{\hskip\z@skip}%
+\declare@shorthand{german}{"~}{\textormath{\leavevmode\hbox{-}}{-}}%
+\declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip}%
+\def\ck{\allowhyphens\discretionary{k-}{k}{ck}\allowhyphens}%
}
\def\nogerman@shorthands{%
- \XeTeXinterchartokenstate=0%
+ \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
}
-\def\captionsgerman{%
+\def\captions@german{%
\def\prefacename{Vorwort}%
\def\refname{Literatur}%
\def\abstractname{Zusammenfassung}%
@@ -4278,7 +4575,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\proofname{Beweis}%
\def\glossaryname{Glossar}%
}
-\def\dategerman{%
+\def\date@german{%
\def\today{\number\day.%
\space \ifcase\month%TODO add option for Austrian forms (Jänner etc)
\or Januar\or Februar\or März\or April\or Mai\or Juni\or%
@@ -4287,7 +4584,33 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space \number\year}%
}
-\def\german@language{\protect\language=%
+%%Strings for Fraktur contributed by Gerrit <z0idberg . gmx . de>
+\def\captions@german@fraktur{%
+ \captions@german%
+ \def\abstractname{Zuſammenfaſſung}%
+ \def\seename{ſiehe}%
+ \def\alsoname{ſiehe auch}%
+ \def\glossaryname{Gloſſar}%
+ }
+
+\def\date@german@fraktur{%
+ \def\today{\number\day.%
+ \space \ifcase\month%TODO add option for Austrian forms (Jänner etc)
+ \or Januar\or Februar\or März\or April\or Mai\or Juni\or%
+ Juli\or Auguſt\or September\or Oktober\or November\or%
+ Dezember\fi%
+ \space \number\year}%
+}
+
+\def\captionsgerman{%
+ \if@german@fraktur\captions@german@fraktur\else\captions@german\fi%
+ }
+
+\def\dategerman{%
+ \if@german@fraktur\date@german@fraktur\else\date@german\fi%
+ }
+
+\def\german@language{\language=%
\csname l@\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi\endcsname}
\setlocalhyphenmins{german}{2}{2}%
@@ -4634,7 +4957,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@greek\@undefined
\ifx\l@polygreek\@undefined
\xpg@nopatterns{Greek}
- \adddialect\l@greek0
+ \adddialect\l@greek\l@nohyphenation
\else
\let\l@greek\l@polygreek
\fi
@@ -4971,7 +5294,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\let\greek@Alph\@undefined%
}
-\def\greek@language{\protect\language=\greek@variant}
+\def\greek@language{\language=\greek@variant}
\def\greek@font{%
\@ifundefined{greekfont}{%
@@ -5017,8 +5340,8 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\makeatletter
\ifx\l@hebrew\@undefined
- \xpg@nopatterns{Hebrew}%
- \adddialect\l@hebrew0
+ %\xpg@nopatterns{Hebrew}%
+ \adddialect\l@hebrew\l@nohyphenation
\fi
\def\hebrew@RL{\relax}
@@ -5237,7 +5560,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@hindi\@undefined%
\ifx\l@sanskrit\@undefined%
\xpg@nopatterns{Hindi}%
- \adddialect\l@hindi0%
+ \adddialect\l@hindi\l@nohyphenation%
\else
\let\l@hindi\l@sanskrit%
\fi
@@ -5286,7 +5609,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space\number\year}%
}
-\def\hindi@language{\protect\language=\l@hindi}
+\def\hindi@language{\language=\l@hindi}
\def\hindi@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
@@ -5341,7 +5664,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@icelandic\@undefined%
\xpg@nopatterns{Icelandic}%
- \adddialect\l@icelandic0%
+ \adddialect\l@icelandic\l@nohyphenation%
\fi
\def\captionsicelandic{%
@@ -5376,7 +5699,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space\number\year}%
}
-\def\icelandic@language{\protect\language=\l@icelandic}
+\def\icelandic@language{\language=\l@icelandic}
\setlocalhyphenmins{icelandic}{2}{2}%
@@ -5394,7 +5717,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@interlingua\@undefined%
\xpg@nopatterns{Interlingua}%
- \adddialect\l@interlingua0%
+ \adddialect\l@interlingua\l@nohyphenation%
\fi
\def\captionsinterlingua{%
@@ -5428,7 +5751,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
decembre\fi
\space \number\year}}
-\def\interlingua@language{\protect\language=\l@interlingua}
+\def\interlingua@language{\language=\l@interlingua}
\setlocalhyphenmins{interlingua}{2}{2}%
@@ -5447,7 +5770,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@irish\@undefined%
\xpg@nopatterns{Irish}%
- \adddialect\l@irish0%
+ \adddialect\l@irish\l@nohyphenation%
\fi
\def\captionsirish{%
@@ -5484,7 +5807,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
Mí na Samhna\or Mí na Nollag\fi
\space \number\year}}
-\def\irish@language{\protect\language=\l@irish}
+\def\irish@language{\language=\l@irish}
\setlocalhyphenmins{irish}{2}{2}%
@@ -5503,7 +5826,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@italian\@undefined
\xpg@nopatterns{Italian}
- \adddialect\l@italian0
+ \adddialect\l@italian\l@nohyphenation
\fi
\def\captionsitalian{%
@@ -5536,13 +5859,23 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
dicembre\fi\space \number\year}
}
-\def\italian@language{\protect\language=\l@italian}
+\def\italian@language{\language=\l@italian}
\setlocalhyphenmins{italian}{2}{2}%
-%\def\blockextras@italian{%
-% %TODO ? \clubpenalty3000\widowpenalty3000\finalhyphendemerits50000000
-% }
+\def\noextras@italian{%
+ \lccode"2019=0%
+ \nofrench@indent}
+
+\def\blockextras@italian{%
+ \lccode"2019="2019
+ %TODO ? \clubpenalty3000\widowpenalty3000\finalhyphendemerits50000000 << in Babel
+ \french@indent%
+ }
+
+\def\inlineextras@italian{%
+ \lccode"2019="2019
+ }
% \end{macrocode}
% \iffalse
@@ -5559,7 +5892,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@latin\@undefined
\xpg@nopatterns{latin}
- \adddialect\l@latin0
+ \adddialect\l@latin\l@nohyphenation
\fi
\def\captionslatin{%
@@ -5593,7 +5926,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
Decembris\fi%
\space \uppercase\expandafter{\romannumeral\year}}}
-\def\latin@language{\protect\language=\l@latin}
+\def\latin@language{\language=\l@latin}
\setlocalhyphenmins{latin}{2}{2}%
@@ -5624,7 +5957,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@latvian\@undefined
\xpg@nopatterns{Latvian}
- \adddialect\l@latvian0
+ \adddialect\l@latvian\l@nohyphenation
\fi
\def\captionslatvian{%
@@ -5659,7 +5992,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
jūlijā\or augustā\or septembrī\or%
oktobrī\or novembrī\or decembrī\fi}}
-\def\latvian@language{\protect\language=\l@latvian}
+\def\latvian@language{\language=\l@latvian}
\setlocalhyphenmins{latvian}{2}{2}%
@@ -5725,7 +6058,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
godownika\fi\space \number\year}}%
}
-\def\lsorbian@language{\protect\language=\l@lsorbian}
+\def\lsorbian@language{\language=\l@lsorbian}
\setlocalhyphenmins{lsorbian}{2}{2}%
@@ -5745,7 +6078,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@magyar\@undefined
\ifx\l@hungarian\@undefined
\xpg@nopatterns{Magyar}
- \adddialect\l@magyar0
+ \adddialect\l@magyar\l@nohyphenation
\else
\let\l@magyar\l@hungarian
\fi
@@ -5802,7 +6135,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
31-én\fi}}%
\let\ontoday\ondatemagyar}
-\def\magyar@language{\protect\language=\l@magyar}
+\def\magyar@language{\language=\l@magyar}
\def\noextras@magyar{%
\let\ontoday\@undefined
@@ -5825,7 +6158,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@norsk\@undefined%
\xpg@nopatterns{Norsk}%
- \adddialect\l@norsk0%
+ \adddialect\l@norsk\l@nohyphenation%
\fi
\def\captionsnorsk{%
@@ -5859,7 +6192,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\fi\space\number\year}%
}
-\def\norsk@language{\protect\language=\l@norsk}
+\def\norsk@language{\language=\l@norsk}
\setlocalhyphenmins{norsk}{2}{2}%
@@ -5890,7 +6223,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@nynorsk\@undefined%
\xpg@nopatterns{Nynorsk}%
- \adddialect\l@nynorsk0%
+ \adddialect\l@nynorsk\l@nohyphenation%
\fi
\def\captionsnynorsk{%
@@ -5924,7 +6257,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\fi\space\number\year}%
}
-\def\norsk@language{\protect\language=\l@nynorsk}
+\def\norsk@language{\language=\l@nynorsk}
\setlocalhyphenmins{nynorsk}{2}{2}%
@@ -5955,7 +6288,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@polish\@undefined
\xpg@nopatterns{polish}
- \adddialect\l@polish0
+ \adddialect\l@polish\l@nohyphenation
\fi
\def\captionspolish{%
@@ -5988,7 +6321,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
listopada\or grudnia\fi%
\space\number\day, \number\year}}
-\def\polish@language{\protect\language=\l@polish}
+\def\polish@language{\language=\l@polish}
\setlocalhyphenmins{polish}{2}{2}%
@@ -6020,7 +6353,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@portuges\@undefined
\ifx\l@portuguese\@undefined
\xpg@nopatterns{Portuguese}
- \adddialect\l@portuges0
+ \adddialect\l@portuges\l@nohyphenation
\else
\let\l@portuges\l@portuguese
\fi
@@ -6057,7 +6390,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\fi\space de\space\number\year}%
}
-\def\portuges@language{\protect\language=\l@portuges}
+\def\portuges@language{\language=\l@portuges}
%\setlocalhyphenmins{portuges}{2}{3}% this is the default
@@ -6076,14 +6409,14 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@romanian\@undefined%
\xpg@nopatterns{Romanian}%
- \adddialect\l@romanian0%
+ \adddialect\l@romanian\l@nohyphenation%
\fi
\def\captionsromanian{%
\def\refname{Bibliografie}%
\def\abstractname{Rezumat}%
\def\bibname{Bibliografie}%
- \def\prefacename{Prefaţă}%
+ \def\prefacename{Prefață}%
\def\chaptername{Capitolul}%
\def\appendixname{Anexa}%
\def\contentsname{Cuprins}%
@@ -6100,7 +6433,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\enclname{Anexă}%
\def\ccname{Copie}%
\def\headtoname{Pentru}%
- \def\proofname{Demonstraţie}%
+ \def\proofname{Demonstrație}%
\def\glossaryname{Glosar}%
}
\def\dateromanian{%
@@ -6111,7 +6444,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space \number\year}%
}
-\def\romanian@language{\protect\language=\l@romanian}
+\def\romanian@language{\language=\l@romanian}
\setlocalhyphenmins{romanian}{2}{2}%
@@ -6129,7 +6462,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@russian\@undefined
\xpg@nopatterns{Russian}
- \adddialect\l@russian0
+ \adddialect\l@russian\l@nohyphenation
\fi
\def\russian@font{%
@@ -6293,7 +6626,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\let\@alph\latin@alph%
}
-\def\russian@language{\protect\language=\l@russian}
+\def\russian@language{\language=\l@russian}
\setlocalhyphenmins{russian}{2}{2}%
@@ -6326,25 +6659,9 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@samin\@undefined%
\xpg@nopatterns{Samin}%
- \adddialect\l@samin0%
+ \adddialect\l@samin\l@nohyphenation%
\fi
-%\def\samin@punctuation{%
-% \frenchspacing%
-% \XeTeXinterchartokenstate=1%
-% \XeTeXcharclass `\! 7%
-% \XeTeXcharclass `\? 7%
-% \XeTeXcharclass `\; 7%
-% \XeTeXcharclass `\: 7%
-% \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
-% }
-%
-%\def\nosamin@punctuation{%
-% \nonfrenchspacing%
-% \XeTeXinterchartokenstate=0%
-%}
-
-
\def\captionssamin{%
\def\refname{Čujuhusat}%
\def\abstractname{Čoahkkáigeassu}%
@@ -6386,7 +6703,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space\number\day.~b.\space\number\year}%
}
-\def\samin@language{\protect\language=\l@samin}
+\def\samin@language{\language=\l@samin}
\setlocalhyphenmins{samin}{2}{2}%
@@ -6405,7 +6722,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@sanskrit\@undefined%
\ifx\l@prakrit\@undefined%
\xpg@nopatterns{Sanskrit}%
- \adddialect\l@sanskrit0%
+ \adddialect\l@sanskrit\l@nohyphenation%
\else%
\let\l@sanskrit=\l@prakrit%
\fi%
@@ -6417,16 +6734,19 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\setkeys{sanskrit}{Script}
+\newXeTeXintercharclass\sanskrit@punctthin % ! ? ; : danda double_danda
+\def\sanskrit@punctthinspace{\unskip\thinspace}
+
\def\sanskrit@punctuation{%
\frenchspacing%
\XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\? 7%
- \XeTeXcharclass `\; 7%
- \XeTeXcharclass `\: 7%
- \XeTeXcharclass `\। 7% danda \ as requested by
- \XeTeXcharclass `\॥ 7% double danda / Yves Codet
- \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
+ \XeTeXcharclass `\! \sankskrit@punctthin
+ \XeTeXcharclass `\? \sankskrit@punctthin
+ \XeTeXcharclass `\; \sankskrit@punctthin
+ \XeTeXcharclass `\: \sankskrit@punctthin
+ \XeTeXcharclass `\। \sankskrit@punctthin
+ \XeTeXcharclass `\॥ \sankskrit@punctthin
+ \XeTeXinterchartoks \z@ \sanskrit@punctthin = \sanskrit@punctthinspace
}
\def\nosanskrit@punctuation{%
@@ -6494,7 +6814,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\let\ttfamily=\sanskrit@font%
\def\reset@font{\normalfont}}
-\def\sanskrit@language{\protect\language=\l@sanskrit}
+\def\sanskrit@language{\language=\l@sanskrit}
\setlocalhyphenmins{sanskrit}{1}{5}%
@@ -6521,7 +6841,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@scottish\@undefined%
\xpg@nopatterns{Scottish}%
- \adddialect\l@scottish0%
+ \adddialect\l@scottish\l@nohyphenation%
\fi
\def\captionsscottish{%
@@ -6558,7 +6878,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space \number\year}%
}
-\def\scottish@language{\protect\language=\l@scottish}
+\def\scottish@language{\language=\l@scottish}
\setlocalhyphenmins{scottish}{2}{2}%
@@ -6577,7 +6897,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
%TODO eventually there will be patterns for Serbian-Latin as well as Serbian-Cyrillic
\ifx\l@serbian\@undefined%
\xpg@nopatterns{Serbian}%
- \adddialect\l@serbian0%
+ \adddialect\l@serbian\l@nohyphenation%
\fi
\newif\if@serbian@cyr
@@ -6695,7 +7015,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\if@serbian@cyr\serbian@font@cyr\else\serbian@font@lat\fi}
%TODO when available load latin hyphenation patterns as well!
-\def\serbian@language{\protect\language=\l@serbian}
+\def\serbian@language{\language=\l@serbian}
\setlocalhyphenmins{serbian}{2}{2}%
@@ -6721,7 +7041,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@slovak\@undefined%
\xpg@nopatterns{Slovak}%
- \adddialect\l@slovak0%
+ \adddialect\l@slovak\l@nohyphenation%
\fi
\def\captionsslovak{%
@@ -6756,7 +7076,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space \number\year}%
}
-\def\slovak@language{\protect\language=\l@slovak}
+\def\slovak@language{\language=\l@slovak}
\setlocalhyphenmins{slovak}{2}{2}%
@@ -6776,7 +7096,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@slovenian\@undefined%
\ifx\l@slovene\@undefined%
\xpg@nopatterns{Slovenian}%
- \adddialect\l@slovenian0%
+ \adddialect\l@slovenian\l@nohyphenation%
\fi\fi
\def\captionsslovenian{%
@@ -6810,7 +7130,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space \number\year}%
}
-\def\slovenian@language{\protect\language=\l@slovenian}
+\def\slovenian@language{\language=\l@slovenian}
\setlocalhyphenmins{slovenian}{2}{2}%
@@ -6829,7 +7149,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@spanish\@undefined
\xpg@nopatterns{spanish}
- \adddialect\l@spanish0
+ \adddialect\l@spanish\l@nohyphenation
\fi
\def\captionsspanish{%
@@ -6859,10 +7179,10 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\today{\number\day~de~\ifcase\month\or
enero\or febrero\or marzo\or abril\or mayo\or junio\or
julio\or agosto\or septiembre\or octubre\or noviembre\or
- diciembre\fi\space \number\year}
+ diciembre\fi\space \number\year}%
}
-\def\spanish@language{\protect\language=\l@spanish}
+\def\spanish@language{\language=\l@spanish}
\setlocalhyphenmins{spanish}{2}{2}%
@@ -6893,7 +7213,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@swedish\@undefined%
\xpg@nopatterns{Swedish}%
- \adddialect\l@swedish0%
+ \adddialect\l@swedish\l@nohyphenation%
\fi
\def\captionsswedish{%
@@ -6933,7 +7253,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\today{\number\day/\number\month\space\number\year}}%
}
-\def\swedish@language{\protect\language=\l@swedish}
+\def\swedish@language{\language=\l@swedish}
\setlocalhyphenmins{swedish}{2}{2}%
@@ -6963,8 +7283,8 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\makeatletter
\ifx\l@syriac\@undefined
- \xpg@nopatterns{Syriac}%
- \adddialect\l@syriac0
+ %\xpg@nopatterns{Syriac}%
+ \adddialect\l@syriac\l@nohyphenation
\fi
\def\syriac@RL{\relax}
@@ -7015,27 +7335,27 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
% \def\@syriac@locale{#1}}
%
%\def\captionssyriac{%
-%\def\prefacename{\@ensure@RL{}}%
-%\def\refname{\@ensure@RL{}}
-%\def\abstractname{\@ensure@RL{}}%
-%\def\bibname{\@ensure@RL{}}%
-%\def\chaptername{\@ensure@RL{}}%
-%\def\appendixname{\@ensure@RL{}}%
-%\def\contentsname{\@ensure@RL{}}
-%\def\listfigurename{\@ensure@RL{}}%
-%\def\listtablename{\@ensure@RL{}}%
-%\def\indexname{\@ensure@RL{}}%
-%\def\figurename{\@ensure@RL{}}%
-%\def\tablename{\@ensure@RL{}}%
-%\def\partname{\@ensure@RL{}}%
-%\def\enclname{\@ensure@RL{}}%
-%\def\ccname{\@ensure@RL{}}%
-%\def\headtoname{\@ensure@RL{}}%
-%\def\pagename{\@ensure@RL{}}%
-%\def\seename{\@ensure@RL{}}%
-%\def\alsoname{\@ensure@RL{}}%
-%\def\proofname{\@ensure@RL{}}%
-%\def\glossaryname{\@ensure@RL{}}%
+%\def\prefacename{\@ensure@RTL{}}%
+%\def\refname{\@ensure@RTL{}}
+%\def\abstractname{\@ensure@RTL{}}%
+%\def\bibname{\@ensure@RTL{}}%
+%\def\chaptername{\@ensure@RTL{}}%
+%\def\appendixname{\@ensure@RTL{}}%
+%\def\contentsname{\@ensure@RTL{}}
+%\def\listfigurename{\@ensure@RTL{}}%
+%\def\listtablename{\@ensure@RTL{}}%
+%\def\indexname{\@ensure@RTL{}}%
+%\def\figurename{\@ensure@RTL{}}%
+%\def\tablename{\@ensure@RTL{}}%
+%\def\partname{\@ensure@RTL{}}%
+%\def\enclname{\@ensure@RTL{}}%
+%\def\ccname{\@ensure@RTL{}}%
+%\def\headtoname{\@ensure@RTL{}}%
+%\def\pagename{\@ensure@RTL{}}%
+%\def\seename{\@ensure@RTL{}}%
+%\def\alsoname{\@ensure@RTL{}}%
+%\def\proofname{\@ensure@RTL{}}%
+%\def\glossaryname{\@ensure@RTL{}}%
%}
\def\datesyriac{%
@@ -7044,7 +7364,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\or ܬܫܪܝܢ ܩܕܡ% ܬܫܪܝܢ ܩܕܝܡ
\or ܬܫܪܝܢ ܐܚܪܝ\or ܟܢܘܢ ܩܕܡ% ܟܢܘܢ ܩܕܝܡ
\fi}%
- \def\today{\@ensure@RL{\syriacnumber\day{\space}%
+ \def\today{\@ensure@RTL{\syriacnumber\day{\space}%
\syriac@month{\month}{\space}\syriacnumber\year}}%
}
@@ -7267,7 +7587,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\let\ttfamily=\thai@font%
\def\reset@font{\normalfont}}
-\def\thai@language{\protect\language=\l@nohyphenation}
+\def\thai@language{\language=\l@nohyphenation}
\def\blockextras@thai{%
\renewcommand{\baselinestretch}{1.2}% FIXME restore default value in noextras?
@@ -7288,23 +7608,35 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
\@ifundefined{turkishfont}{%
\zf@check@ot@lang{TUR}%
- \if@tempswa\addfontfeature{Language=Turkish}\fi}
+ \if@tempswa
+ \addfontfeature{Language=Turkish}%
+ \else
+ \zf@check@ot@lang{TRK}%
+ \if@tempswa
+ \addfontfeature{Language=Turkish}\fi%
+ \fi}
{\turkishfont}%
}%
\ifx\l@turkish\@undefined
\xpg@nopatterns{turkish}
- \adddialect\l@turkish0
+ \adddialect\l@turkish\l@nohyphenation
\fi
+\newXeTeXintercharclass\turkish@punctthin % ! :
+\newXeTeXintercharclass\turkish@punctthick % =
+
+\def\turkish@punctthinspace{\ifdim\lastskip>\z@\unskip\penalty\@M\thinspace\fi}
+\def\turkish@punctthickspace{\unskip\nobreakspace}
+
\def\turkish@punctuation{%
\frenchspacing%
\XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\= 8%
- \XeTeXcharclass `\: 7%
- \XeTeXinterchartoks 0 7 = {\unskip\penalty\@M\thinspace}%
- \XeTeXinterchartoks 0 8 = {\unskip\kern\fontdimen2\font\kern-1.4\fontdimen3\font}%
+ \XeTeXcharclass `\! \turkish@punctthin
+ \XeTeXcharclass `\: \turkish@punctthin
+ \XeTeXcharclass `\= \turkish@punctthick
+ \XeTeXinterchartoks \z@ \turkish@punctthin = \turkish@punctthinspace
+ \XeTeXinterchartoks \z@ \turkish@punctthick = \turkish@punctthickspace
}
\def\noturkish@punctuation{%
@@ -7334,7 +7666,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\seename{bkz.}%
\def\alsoname{ayrıca bkz.}%
\def\proofname{Kanıt}%
- \def\glossaryname{Glossary}% <-- Needs translation
+ \def\glossaryname{Lügatçe}%
}
\def\dateturkish{%
\def\today{\number\day~\ifcase\month\or
@@ -7344,7 +7676,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space\number\year}
}
-\def\turkish@language{\protect\language=\l@turkish}
+\def\turkish@language{\language=\l@turkish}
\setlocalhyphenmins{turkish}{2}{2}%
@@ -7377,7 +7709,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@ukrainian\@undefined%
\xpg@nopatterns{Ukrainian}%
- \adddialect\l@ukrainian0%
+ \adddialect\l@ukrainian\l@nohyphenation%
\fi
\def\ukrainian@font{%
@@ -7467,7 +7799,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\let\@alph\latin@alph%
}
-\def\ukrainian@language{\protect\language=\l@ukrainian}
+\def\ukrainian@language{\language=\l@ukrainian}
\setlocalhyphenmins{ukrainian}{2}{2}%
@@ -7499,7 +7831,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@uppersorbian\@undefined
\ifx\l@usorbian\@undefined
\xpg@nopatterns{Upper Sorbian}
- \adddialect\l@usorbian0
+ \adddialect\l@usorbian\l@nohyphenation
\let\l@uppersorbian\l@usorbian
\else
\let\l@uppersorbian\l@usorbian
@@ -7546,13 +7878,84 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
hodownika\fi \space \number\year}%
}
-\def\usorbian@language{\protect\language=\l@usorbian}
+\def\usorbian@language{\language=\l@usorbian}
\setlocalhyphenmins{usorbian}{2}{2}%
% \end{macrocode}
% \iffalse
%</gloss-usorbian.ldf>
+%<*gloss-vietnamese.ldf>
+% \fi
+% \clearpage
+%
+% \subsection{gloss-vietnamese.ldf}
+% \begin{macrocode}
+\ProvidesFile{gloss-vietnamese.ldf}[polyglossia: module for vietnamese]
+%% Strings contributed by Daniel Owens < dhowens . pmbx . net >
+\makeatletter
+
+\def\vietnamese@font{%
+\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
+\@ifundefined{vietnamesefont}{%
+ \zf@check@ot@lang{VIT}%
+ \if@tempswa\addfontfeature{Language=Vietnamese}\fi}
+ {\vietnamesefont}%
+}%
+
+\ifx\l@vietnamese\@undefined%
+ \xpg@nopatterns{Vietnamese}%
+ \adddialect\l@vietnamese\l@nohyphenation%
+\fi
+
+\def\captionsvietnamese{%
+ \def\refname{Tài liệu}%
+ \def\abstractname{Tóm tắt nội dung}%
+ \def\bibname{Tài liệu tham khảo}%
+ \def\prefacename{Lời nói đầu}%
+ \def\chaptername{Chương}%
+ \def\appendixname{Phụ lục}%
+ \def\contentsname{Mục lục}%
+ \def\listfigurename{Danh sách hình vẽ}%
+ \def\listtablename{Danh sách bẳng}%
+ \def\indexname{Chỉ mục}%
+ \def\figurename{Hình}%
+ \def\tablename{Bẳng}%
+ \def\partname{Phần}%
+ \def\pagename{Trang}%
+ \def\seename{Xem}%
+ \def\alsoname{Xem thêm}%
+ \def\enclname{Kèm theo}%
+ \def\ccname{Cùng gửi}%
+ \def\headtoname{Gửi}%
+ \def\proofname{Chứng minh}%
+ \def\glossaryname{Từ điển chú giải}%
+ }
+\def\datevietnamese{%
+ \def\today{%
+ Ngày \number\day\space
+ tháng \number\month\space
+ năm \number\year}%
+ }
+
+\def\vietnamese@language{\language=\l@vietnamese}
+
+\setlocalhyphenmins{vietnamese}{2}{2}%
+
+\def\noextras@vietnamese{%
+ \nonfrenchspacing%
+}
+
+\def\blockextras@vietnamese{%
+ \frenchspacing%
+}
+
+\def\inlineextras@vietnamese{%
+ \frenchspacing%
+}
+% \end{macrocode}
+% \iffalse
+%</gloss-vietnamese.ldf>
%<*gloss-welsh.ldf>
% \fi
% \clearpage
@@ -7565,7 +7968,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\ifx\l@welsh\@undefined%
\xpg@nopatterns{Welsh}%
- \adddialect\l@welsh0%
+ \adddialect\l@welsh\l@nohyphenation%
\fi
\def\captionswelsh{%
@@ -7601,7 +8004,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\space\number\year}%
}
-\def\welsh@language{\protect\language=\l@welsh}
+\def\welsh@language{\language=\l@welsh}
\setlocalhyphenmins{welsh}{2}{3}%
@@ -7693,7 +8096,7 @@ U+0039 <> U+0E59 ;
¦----------------------------------------------¦
¦ ¦
- ¦ THE POLYGLOSSIA PACKAGE v1.0.2 ¦
+ ¦ THE POLYGLOSSIA PACKAGE v1.1.0 ¦
¦ ¦
¦ Modern multilingual typesetting with XeLaTeX ¦
¦ ¦
@@ -7721,7 +8124,8 @@ Polyglossia makes it possible to automate the following tasks:
written from right to left (via the package bidi, available separately).
Several features of Babel that do not make sense in the XeTeX world (like font
-encodings, shorthands, etc) are not supported.
+encodings, shorthands, etc) are not supported. For German however, several
+shorthands do make sense and can be activated with the language option babelshorthands=true.
Polyglossia is distributed in the traditional way with *.dtx and *.ins files,
and also comes with a TDS-conformant ready-to-unpack zip file.
@@ -7735,6 +8139,32 @@ and follow the instructions displayed.
CHANGES
+1.1.0
+ * Use \newXeTeXintercharclass (thanks to Enrico Gregorio)
+ * Fixed implementation of shorthands for German (Babel code in file babelsh.def)
+ * Arabic (Khaled Hosny):
+ - Fix abjad form for 3 and 5 and add option abjadjimnotail
+ - bugfix for \arabicnumber
+ - make Gregorian calender the default
+ - fixed typos in the sample text
+ * Turkish (S. Ö. Yıldız):
+ - fix white-space before : and !
+ - also check if the font specified TRK for language
+ - added missing Turkish translation of "Glossary"
+ * Suppress nopattern warning for non-hyphenated scripts
+ * Changed U+0163 to U+021B for Romanian (Elie Roux)
+ * Stylistic fixes and use macro \xpg@option for package options (E. Gregorio)
+ * Fix monthnames in Dutch (A. Ledda)
+ * Add Brazilian translation for "glossary"
+ * Remove spurious space generated by gloss-spanish
+ * Fix ldf file for brazilian
+ * Various improvements in the code communicated by E. Gregorio:
+ - remove superfluous \protect\language
+ - change default language from 0 to \l@nohyphenation=255
+ - localize lccode handling of apostrophe in French; add it to Italian
+ * Fix frenchspacing for vietnamese
+ * Other minor bugfixes
+
1.0.2
This is mostly a bug fixes release.
* Captions corrected in Hebrew, Russian and Spanish
@@ -7755,7 +8185,7 @@ CHANGES
------------------------------
- François Charette, Jan 2009
+ François Charette, Dec 2009
<firmicus ατ gmx δοτ net>
------------------------------
%</README>
@@ -7860,17 +8290,17 @@ CHANGES
\setotherlanguage[variant=british,ordinalmonthday=false]{english}
\setotherlanguage[variant=poly]{greek}
\setotherlanguage[numerals=thai]{thai}
-\setotherlanguages{german,latin,russian,turkish,polish,latvian,sanskrit,ukrainian,arabic,farsi,syriac,divehi,hebrew,amharic}
+\setotherlanguage[locale=mashriq]{arabic}
+\setotherlanguage[spelling=new,latesthyphen=true,babelshorthands=true]{german}
+\setotherlanguages{german,latin,russian,turkish,polish,latvian,sanskrit,ukrainian,farsi,syriac,divehi,hebrew,amharic}
\setromanfont{Linux Libertine}
\defaultfontfeatures{Scale=MatchLowercase,RawFeature={+locl}}
\setmonofont{Inconsolata}
-\setsansfont{Gill Sans Std}
-\newfontfamily\arabicfont[Script=Arabic]{Adobe Arabic}%{Scheherazade}%
-\newfontfamily\syriacfont[ExternalLocation="/mnt/data/fonts/syriac/",
- Script=Syriac]{SyrCOMJerusalem.otf}
-\newfontfamily\hebrewfont[Script=Hebrew,Scale=1]{Adobe Hebrew}
+\newfontfamily\arabicfont[Script=Arabic]{Scheherazade}%
+\newfontfamily\syriacfont[Script=Syriac]{Serto Jerusalem}
+\newfontfamily\hebrewfont[Script=Hebrew]{David CLM}
\newfontfamily\sanskritfont[Script=Devanagari]{Sanskrit 2003}
-\newfontfamily\thaifont[ExternalLocation="/mnt/data/fonts/thai/",Script=Thai]{Norasi.ttf}%{Arial Unicode MS}
+\newfontfamily\thaifont[Script=Thai]{Norasi}%{Arial Unicode MS}
\newfontfamily\thaanafont[Script=Thaana,WordSpace=2]{TITUS Cyberbit Basic}
\newfontfamily\ethiopicfont[Script=Ethiopic]{Abyssinica SIL}
\parskip 1.33\baselineskip
@@ -7886,9 +8316,9 @@ CHANGES
(\today)
\end{english}
-\begin{german}[spelling=new,latesthyphen=true]
+\begin{german}
\textbf{Die deutsche Sprache}\footnote{ From \url{http://de.wikipedia.org/wiki/Deutsche_Sprache}} (auch das Deutsche) gehört zum westlichen Zweig der germanischen Sprachen und ist eine der meistgesprochenen europäischen Sprachen weltweit, und gilt so als Weltsprache.\\
-(\today)
+("<\today">)
\end{german}
\begin{russian}
@@ -7946,9 +8376,7 @@ Quamquam sermone nativo fungi desinit, cumque nostris diebus perpauci Latine loq
\end{sanskrit}
\begin{Arabic}[]
-%في فضل علم التاريخ وتحقيق مذاهبه والأملاع لما يعرض للمؤرخين من المغالط والأوهام وذكر شيء من أسبابها.
«اعلم أنّ فنّ التاريخ فنّ عزيز المذهب، جمّ الفوائد، شريف الغاية؛ إذ هو يوقفنا على أحوال الماضين من الأمم في أخلاقهم، و الأنبياء في سيرهم، و الملوك في دولهم و سياستهم؛ حتّى تتمّ فائدة الإقتداء في ذلك لمن يرومه في أحوال الدين و الدنيا.» (ابن خلدون، المقدّمة)\\
-%فهو محتاج إلى مآخذ متعددة و معارف متنوعة و حسن نظر و تثبت يفضيان بصاحبهما إلى الحق و ينكبان به عن المزلات و المغالط لأن الأخبار إذا اعتمد فيها على مجرد النقل و لم تحكم أصول العادة و قواعد السياسة و طبيعة العمران و الأحوال في الاجتماع الإنساني و لا قيس الغائب منها بالشاهد و الحاضر بالذاهب فربما لم يؤمن فيها من العثور و مزلة القدم و الحيد عن جادة الصدق و كثيراً ما وقع للمؤرخين و المفسرين و أئمة النقل من المغالط في الحكايات و الوقائع لاعتمادهم فيها على مجرد النقل غثاً أو سميناً و لم يعرضوها على أصولها و لا قاسوها بأشباهها و لا سبروها بمعيار الحكمة و الوقوف على طبائع الكائنات و تحكيم النظر و البصيرة في الأخبار فضلوا عن الحق و تاهوا في بيداء الوهم و الغلط و لا سيما في إحصاء الأعداد من الأموال و العساكر إذا عرضت في الحكايات إذ هي مظنة الكذب و مطية الهذر و لا بد من ردها إلى الأصول و عرضها على القواعد.
(\today\ = \Hijritoday[0])
\end{Arabic}
@@ -7970,13 +8398,6 @@ Quamquam sermone nativo fungi desinit, cumque nostris diebus perpauci Latine loq
ދިވެހިބަހަކީ ދިވެހިރާއްޖޭގެ ރަސްމީ ބަހެވެ. މި ބަހުން ވާހަކަ ދައްކައި އުޅެނީ ދިވެހިރާއްޖޭގެ އަހުލުވެރިންގެ އިތުރުން ހިންދުސްތާނުގެ މަލިކު ގެ
އަހުލުވެރިންނެވެ. އެބައިމީހުން މި ބަހަށް ކިޔަނީ މަހަލް ބަހެވެ. ބަހާބެހޭ މާހިރުން ދިވެހިބަސް ހިމަނުއްވައިފައިވަނީ އިންޑޯ އާރިޔަން ބަސްތަކުގެ
ތެރޭގަ އެވެ.
-%ދިވެހި ބަހުގެ މަތިކޮޅުގައި އެންމެ ކުރީޒަމާނުގައި އޮތް މައި ބަސް " ޕުރޯޓޯ- އިންޑޯ- ޔޫރަޕިއަން" ބަހުން ވާހަކަދައްކާ އުލުނު
-%ބަޔަކު ދެބަޔަކަށް ބެހިގެން، އެއްބަޔަކު ހުޅަނގުގެ ރަށްރަށަށް އަނެއްބަޔަކު އިރުމަތީ ރަށްރަށަށް ގޮސް އެތަންތާނގައި ރަށްވެހިވީ އެވެ. މި މީހުން
-%ވާހަކަދައްކާ އުޅުނު ބަސް ބަދަލުވެ ތަރައްޤީވެ ވަކި ބަސް ބަހަށްވީ އެތައް ވޭލާއެއްގެ ނުވަތަ ޒަމާނެއްގެ ތެރޭގަ އެވެ. އިރުމައްޗަށް އައި މައިގަނޑު
-%ބަހަކީ އިންޑޯ- އިރޭނިއަން ބަހެވެ. މި ބަސް ކަފިވީ އިރޭނިއަން ބަހަށާއި، އިންޑޯ އާރިއަން (ސާންސްކިރިތު) ބަހަށެވެ. މިދެންނެވި ސާންސްކިރިތުގެ
-%ހުޅަނގާއި، ހުޅަނގު ދެކުނުގެ ބައިގައިވަނީ ގުޖަރާތީ މަރާޓީ ކޮންކަނީ، ދިވެހި، ސިންހަޅަ، މި ބަސްބަހެވެ، ވީމާ، މިބަސް ތަކުގައި ބޭނުންކުރާ
-%ލަފުޒުތަކާއި، ޤަވާއިދާއި އަދި ބަހުގެ އަދަބުތަކުގައި ތިމާގެކަންހުރެ އެވެ. ހުޅަނގަށް ގޮސްފައިވާ ގޮފީގެ ބަސްތަކާއި، އަލުގަނޑުމެންގެ އިންޑިކު
-%ނުވަތަ ސާންސްކިރިތުން އުފެދިފައިވާ ބަސްތަކާއި ވަރަށް ތަފާތެވެ. އިނގިރާސި ބަހަކީ މިދެންނެވި ހުޅަނގަށް ގޮސްފައިވާ ގޮފީގެ އަލްމާނީ ބަހެކެވެ.
\end{divehi}
%\fontspec[Script=Georgian]{DejaVu Serif}
@@ -7998,23 +8419,20 @@ Quamquam sermone nativo fungi desinit, cumque nostris diebus perpauci Latine loq
\setdefaultlanguage[calendar=gregorian,hijricorrection=1,locale=mashriq]{arabic}
\setotherlanguage[variant=british]{english}
\setotherlanguage{farsi}
-\setromanfont{Junicode}
\defaultfontfeatures{Scale=MatchLowercase}
-\setmonofont{Inconsolata}
-\setsansfont{Lucida Sans Unicode}
-\newfontfamily\arabicfont[Script=Arabic,Scale=1.3]{Adobe Arabic}%{Scheherazade}%
+\newfontfamily\arabicfont[Script=Arabic,Scale=1.3]{Scheherazade}%
\newfontfamily\arabicfonttt[Script=Arabic,Scale=.75]{DejaVu Sans Mono}
\newfontfamily\farsifont[Script=Arabic,Scale=1.1,WordSpace=2]{IranNastaliq}
\parindent 0pt
\makeatletter
\makeatother
-\title{امتحان تأييد اللغة العربية}
+\title{اختبار دعم اللغة العربية}
\author{فرانسوا شاريت}
\begin{document}
\pagenumbering{alph}
\maketitle
\tableofcontents
-\chapter{امتحان}
+\chapter{تجربة}
\pagenumbering{arabic}
\section{لغات مختلفة}
@@ -8022,12 +8440,12 @@ Quamquam sermone nativo fungi desinit, cumque nostris diebus perpauci Latine loq
\textbf{العربية}\footnote{%
من «\LR{\textenglish{\url{http://ar.wikipedia.org/wiki/}}\RL{\ttfamily لغة عربية}}»}
أكبر لغات المجموعة السامية من حيث عدد المتحدثين، وإحدى أكثر اللغات انتشارا في
-العالم، يتحدثها أكثر من ٤٢٢ مليون نسمة،١ ويتوزع متحدثوها في المنطقة المعروفة
+العالم، يتحدثها أكثر من ٤٢٢ مليون نسمة، ويتوزع متحدثوها في المنطقة المعروفة
باسم الوطن العربي، بالإضافة إلى العديد من المناطق الأخرى المجاورة كالأحواز وتركيا
وتشاد ومالي والسنغال. وللغة العربية أهمية قصوى لدى أتباع الديانة الإسلامية، فهي
لغة مصدري التشريع الأساسيين في الإسلام: القرآن، والأحاديث النبوية المروية عن النبي
محمد، ولا تتم الصلاة في الإسلام (وعبادات أخرى) إلا بإتقان بعض من كلمات هذه اللغة.
-والعربية هي أيضاً لغة طقسية رئيسية لدى عدد من الكنائس المسيحية في العالم العربي،
+والعربية هي أيضًا لغة طقسية رئيسية لدى عدد من الكنائس المسيحية في العالم العربي،
كما كتبت بها الكثير من أهم الأعمال الدينية والفكرية اليهودية في العصور الوسطى.
وإثر انتشار الإسلام، وتأسيسه دولا، ارتفعت مكانة اللغة العربية، وأصبحت لغة السياسة
والعلم والأدب لقرون طويلة في الأراضي التي حكمها المسلمون، وأثرت العربية، تأثيرا
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 11:20:45 +0000