| [efrench] [59] R?\195?\169solution du probl?\195?\168me \arabic aussi d?\195? \169fini dans french.sty pour passer ?\195?\160 la langue arabe. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/efrench Archives
]
Revision: 59
Author: rayj
Date: 2011-09-26 08:03:10 +0200 (Mon, 26 Sep 2011)
Log Message:
-----------
R?\195?\169solution du probl?\195?\168me \arabic aussi d?\195?\169fini dans french.sty pour passer ?\195?\160 la langue arabe. Le changement de langue est d?\195?\169sormais \arabicLang pour l'arabe, mais \arabicTeXmods pour le contexte, donc sans changement.
Cette extension affectera toutes les langues <langue> o?\195?\185 \<langue> existerait d?\195?\169ja avec \<langue>Lang pour passer ?\195?\160 la langue, en fait ?\195?\160 ses c?\195?\169sures.
Raymond 26 septembre 2011
Modified Paths:
--------------
trunk/doc/french_doc.txt
trunk/inputs/french/french.sty
trunk/inputs/french/frenchle.sty
Modified: trunk/doc/french_doc.txt
===================================================================
--- trunk/doc/french_doc.txt 2011-02-01 10:30:27 UTC (rev 58)
+++ trunk/doc/french_doc.txt 2011-09-26 06:03:10 UTC (rev 59)
@@ -107,8 +107,8 @@
\ifx\@unexpandable@protect\undefined\let\protect\empty%
\else\let\protect\@unexpandable@protect%
\fi%
- \xdef\FSfd{30 avril 2010}% eFrench
- \xdef\FSfv{V5,9994}%
+ \xdef\FSfd{15 septembre 2011}% eFrench
+ \xdef\FSfv{V5,9995}% r j +
\xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
}}%
\edef\FSfd{2007/06/28 }%
@@ -206,7 +206,22 @@
% printed. 2007/06/28
%
% and also check if there is any frpatch.sty file available.
+% %%%%%%%%%%%%%%%%%%%%%%%
+% Distributed as eFrench under LPPL is same as version 5,9994
+% but without the test for a shareware licence
+% Changes made by Raymond Juillerat 2010/05/04
%
+% V5,9995 Some changes because a problem arose with the language arabic
+% in that case, the language switch \arabic was in conflict with the
+% arabic format for numbers, also \arabic.
+% Therefore in this version, the switch is to be made with \arabicLang, but
+% the configuration file for the language arabic is as usual \arabicTeXmods.
+% These changes affect all languages <language> were \<language> already
+% exists and would enter in conflict with. Language switch is made with
+% \<language>Lang and the context is defined with \<language>TeXmods.
+% Same changes were made in frenchle
+% Changes made by Raymond Juillerat 2011/09/26
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Object: DOCUMENT CLASS OPTION for printing French texts with TeX or LaTeX
@@ -3815,6 +3830,10 @@
\ifx\undefined\@excn\@tempc%
\else\ifx\@tempb\@excn\@tempc\fi\fi}%
\gdef\NouveauLangage[##1]##2{% -....................... \NouveauLangage[##]{name}
+%arabic as a language should not change the definition of \arabic V5,9995
+% the same is valid for future similar cases V5,9995
+ \expandafter\@ifundefined{##2}{\lang@defifalse}% V5,9995
+ {\lang@defitrue}% V5,9995
%-- check for an anormal change in language.dat:
\expandafter\@ifundefined{l@##2}{}% -do nothing, unused at initex
{% -First accept babel definitions (\chardef) of languages.
@@ -3829,11 +3848,23 @@
\fi\fi}%
%--
\expandafter\tl@ng\csname##2TeXmods\endcsname%
- \expandafter\gdef\csname##2 \endcsname% -The protected language cs.
+ \iflang@defi% V5,9995
+ \expandafter\gdef\csname##2Lang \endcsname% V5,9995
+ {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname% V5,9995
+ \@Hif\language=##1\@Hfi\relax}% V5,9995
+ \expandafter\gdef\csname##2Lang\endcsname% V5,9995
+ {\protect\csname##2Lang \endcsname}% V5,9995
+ \typeout{eFrench Info : % V5,9995
+ <b.o.i>##2Lang commute sur langue ##2 = = = =}% V5,9995
+ \typeout{eFrench Info : % V5,9995
+ et <b.o.i>##2TeXmods pour ses extensions = = = =}% V5,9995
+ \else% V5,9995
+ \expandafter\gdef\csname##2Lang \endcsname%
{\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
\@Hif\language=##1\@Hfi\relax}%
\expandafter\gdef\csname##2\endcsname% -The language cs.
{\protect\csname##2 \endcsname}%
+ \fi% V5,9995
}% -\NouveauLangage
% test if #1 equal ``='' that means same language hyphenation but a dialect.
\edef\@temp@{=}%
@@ -3876,6 +3907,9 @@
}}%
\fi
\else\@FrCount=-1%
+\newif\iflang@defi% V5,9995
+\let\englishORI\english% V5,9995
+\let\english\undefined% V5,9995
\loop \endlinechar=-1 \read\@inputcheck to \@lineD \endlinechar`\^^M%
\ifx\@lineD\empty \else \advance\@FrCount by 1%
\edef\@lineD{\@lineD\space\space/{\the\@FrCount}}%
@@ -3883,7 +3917,8 @@
\fi%
\ifeof\@inputcheck \@morefalse \fi%
\if@more\repeat%
-\fi\closein\@inputcheck%
+\fi\closein\@inputcheck% < language.dat
+\ifx\undefined\english\let\english\englishORI\fi% V5,9995 !
\let\hyphenation\@hyphenation% -reset original cs.
%
\def\@MLtst{\@ifundefined{fhyph}% -if French and \fhyph undef. (no language.dat)
Modified: trunk/inputs/french/french.sty
===================================================================
--- trunk/inputs/french/french.sty 2011-02-01 10:30:27 UTC (rev 58)
+++ trunk/inputs/french/french.sty 2011-09-26 06:03:10 UTC (rev 59)
@@ -10,8 +10,8 @@
\ifx\@unexpandable@protect\undefined\let\protect\empty%
\else\let\protect\@unexpandable@protect%
\fi%
- \xdef\FSfd{30 avril 2010}% eFrench
- \xdef\FSfv{V5,9994}%
+ \xdef\FSfd{26 septembre 2011}% eFrench
+ \xdef\FSfv{V5,9995}%
\xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
}}%
\edef\FSfd{2007/06/28 }%
@@ -881,7 +881,7 @@
\@ifundefined{lettrinefont}{\let\lettrinefont\Huge}{}%
\let\sv@lf=\lettrinefont%
\ifx\@pdfcreator\undefined%
- \else\addto\@pdfcreator{, with \frenchpack\space shareware}\fi%
+ \else\addto\@pdfcreator{, with \frenchpack\space package}\fi%
\def\noresetatpart{\ifFLA\let\cl@part\empty\fi}%
\def\noresetatchapter{\ifFLA\let\cl@chapter\empty\fi}%
\@ifundefined{chapter}{}{}%
@@ -2781,7 +2781,11 @@
\if@FE\expandafter\@@input##2\relax\fi\fi}%
\ifx\undefined\@excn\@tempc%
\else\ifx\@tempb\@excn\@tempc\fi\fi}%
-\gdef\NouveauLangage[##1]##2{%
+\gdef\NouveauLangage[##1]##2{% > def nouveau langage 1
+%arabic as a language should not change the definition of \arabic
+% the same is valid for future similar cases
+ \expandafter\@ifundefined{##2}{\lang@defifalse}%
+ {\lang@defitrue}%
\expandafter\@ifundefined{l@##2}{}%
{%
\chardef\l@no##1\expandafter\if\csname l@##2\endcsname\l@no\else%
@@ -2794,12 +2798,24 @@
}[##2]\f@ERRdat%
\fi\fi}%
\expandafter\tl@ng\csname##2TeXmods\endcsname%
+ \iflang@defi%
+ \expandafter\gdef\csname##2Lang \endcsname%
+ {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
+ \@Hif\language=##1\@Hfi\relax}%
+ \expandafter\gdef\csname##2Lang\endcsname%
+ {\protect\csname##2Lang \endcsname}%
+ \typeout{eFrench Info : %
+ <b.o.i>##2Lang commute sur langue ##2 = = = =}%
+ \typeout{eFrench Info : %
+ et <b.o.i>##2TeXmods pour ses extensions = = = =}%
+ \else%
\expandafter\gdef\csname##2 \endcsname%
{\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
\@Hif\language=##1\@Hfi\relax}%
\expandafter\gdef\csname##2\endcsname%
{\protect\csname##2 \endcsname}%
- }%
+ \fi%
+ }% < def nouveau langage 1
\edef\@temp@{=}%
\def\@langue##1##2 ##3 ##4/##5{\def\@tempa{=}\def\@tempb{##1}%
\ifx\@tempa\@tempb%
@@ -2814,7 +2830,7 @@
\@rhef##1/##3/%
}%
\let\hyphenation\f@hyphenation%
-\openin\@inputcheck = language.dat \def\@tempb{}%
+\openin\@inputcheck = language.dat \def\@tempb{}% > language.dat
\ifeof\@inputcheck\@Ffnt{language.dat}%
\ifx\undefined\french %
\else\xdef\@PrevF{\french}%
@@ -2836,6 +2852,9 @@
}}%
\fi
\else\@FrCount=-1%
+\newif\iflang@defi%
+\let\englishORI\english%
+\let\english\undefined%
\loop \endlinechar=-1 \read\@inputcheck to \@lineD \endlinechar`\^^M%
\ifx\@lineD\empty \else \advance\@FrCount by 1%
\edef\@lineD{\@lineD\space\space/{\the\@FrCount}}%
@@ -2843,7 +2862,8 @@
\fi%
\ifeof\@inputcheck \@morefalse \fi%
\if@more\repeat%
-\fi\closein\@inputcheck%
+\fi\closein\@inputcheck% < language.dat
+\ifx\undefined\english\let\english\englishORI\fi% !
\let\hyphenation\@hyphenation%
\def\@MLtst{\@ifundefined{fhyph}%
{\if@PMF\gdef\french{\switchtolanguage\frenchTeXmods}%
Modified: trunk/inputs/french/frenchle.sty
===================================================================
--- trunk/inputs/french/frenchle.sty 2011-02-01 10:30:27 UTC (rev 58)
+++ trunk/inputs/french/frenchle.sty 2011-09-26 06:03:10 UTC (rev 59)
@@ -2,7 +2,6 @@
% This is frenchle.sty (informations en francais ci-dessous.tex)
% This is the light version of THE multilingual "FrenchPro" package for LaTeX.
% Copyright Bernard Gaulle, 2000-2007, Copyright notice is LPLL.
-%% checksum = "07474 2039 3140 82597"
% If you want to have informations about the professional version
% ask Bernard GAULLE <frenchprobg -At- free.fr>, otherwise <frenchlebg -AT- free.fr>.
%
@@ -47,8 +46,8 @@
\ifx\@unexpandable@protect\undefined\let\protect\empty%
\else\let\protect\@unexpandable@protect%
\fi%
- \xdef\FSfd{28 juin 2007}%
- \xdef\FSfv{V5,9994}%
+ \xdef\FSfd{26 septembre 2011}%
+ \xdef\FSfv{V5,9995}%
\xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
}}%
\edef\FSfd{2007/06/28 }%
@@ -169,7 +168,7 @@
{\def\ier{er}%
\f@issue%
\@fW{^^J -23- \@txt@msg{Extension \string : \frenchpack\space}%
- \@txt@msg{\frenchstyleid\space(B.Gaulle)}%
+ \@txt@msg{\frenchstyleid\space(eFrench)}%
}%
}%
\let\ifFW\iftrue%
@@ -1916,7 +1915,11 @@
\if@FE\expandafter\@@input##2\relax\fi\fi}%
\ifx\undefined\@excn\@tempc%
\else\ifx\@tempb\@excn\@tempc\fi\fi}%
-\gdef\NouveauLangage[##1]##2{%
+\gdef\NouveauLangage[##1]##2{% > def nouveau langage 1
+%arabic as a language should not change the definition of \arabic
+% the same is valid for future similar cases
+ \expandafter\@ifundefined{##2}{\lang@defifalse}%
+ {\lang@defitrue}%
\expandafter\@ifundefined{l@##2}{}%
{%
\chardef\l@no##1\expandafter\if\csname l@##2\endcsname\l@no\else%
@@ -1929,12 +1932,24 @@
}[##2]\f@ERRdat%
\fi\fi}%
\expandafter\tl@ng\csname##2TeXmods\endcsname%
+ \iflang@defi%
+ \expandafter\gdef\csname##2Lang \endcsname%
+ {\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
+ \@Hif\language=##1\@Hfi\relax}%
+ \expandafter\gdef\csname##2Lang\endcsname%
+ {\protect\csname##2Lang \endcsname}%
+ \typeout{eFrench Info : %
+ <b.o.i>##2Lang commute sur langue ##2 = = = =}%
+ \typeout{eFrench Info : %
+ et <b.o.i>##2TeXmods pour ses extensions = = = =}%
+ \else%
\expandafter\gdef\csname##2 \endcsname%
{\expandafter\switchtolanguage\csname ##2TeXmods\endcsname%
\@Hif\language=##1\@Hfi\relax}%
\expandafter\gdef\csname##2\endcsname%
{\protect\csname##2 \endcsname}%
- }%
+ \fi%
+ }% < def nouveau langage 1
\edef\@temp@{=}%
\def\@langue##1##2 ##3 ##4/##5{\def\@tempa{=}\def\@tempb{##1}%
\ifx\@tempa\@tempb%
@@ -1949,7 +1964,7 @@
\@rhef##1/##3/%
}%
\let\hyphenation\f@hyphenation%
-\openin\@inputcheck = language.dat \def\@tempb{}%
+\openin\@inputcheck = language.dat \def\@tempb{}% > language.dat
\ifeof\@inputcheck\@Ffnt{language.dat}%
\ifx\undefined\french %
\else\xdef\@PrevF{\french}%
@@ -1971,6 +1986,9 @@
}}%
\fi
\else\@FrCount=-1%
+\newif\iflang@defi%
+\let\englishORI\english%
+\let\english\undefined%
\loop \endlinechar=-1 \read\@inputcheck to \@lineD \endlinechar`\^^M%
\ifx\@lineD\empty \else \advance\@FrCount by 1%
\edef\@lineD{\@lineD\space\space/{\the\@FrCount}}%
@@ -1978,7 +1996,8 @@
\fi%
\ifeof\@inputcheck \@morefalse \fi%
\if@more\repeat%
-\fi\closein\@inputcheck%
+\fi\closein\@inputcheck% < language.dat
+\ifx\undefined\english\let\english\englishORI\fi% !
\let\hyphenation\@hyphenation%
\def\@MLtst{\@ifundefined{fhyph}%
{\if@PMF\gdef\french{\switchtolanguage\frenchTeXmods}%