context-french (9nov11)

git-svn-id: svn://tug.org/texlive/trunk@24560 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 97 insertions, 72 deletions

diff --git a/Master/texmf-dist/doc/context/third/french/french-demo.pdf b/Master/texmf-dist/doc/context/third/french/french-demo.pdf
index 85b8c44c75c..30d7897c3c0 100644
--- a/Master/texmf-dist/doc/context/third/french/french-demo.pdf
+++ b/Master/texmf-dist/doc/context/third/french/french-demo.pdf
diff --git a/Master/texmf-dist/doc/context/third/french/french-doc.pdf b/Master/texmf-dist/doc/context/third/french/french-doc.pdf
index 249578f1197..85085be72ce 100644
--- a/Master/texmf-dist/doc/context/third/french/french-doc.pdf
+++ b/Master/texmf-dist/doc/context/third/french/french-doc.pdf
diff --git a/Master/texmf-dist/tex/context/third/french/t-french.mkiv b/Master/texmf-dist/tex/context/third/french/t-french.mkiv
new file mode 100644
index 00000000000..9d7bf2b7142
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/french/t-french.mkiv
@@ -0,0 +1,97 @@
+%D \module
+%D   [     file=t-french,
+%D      version=2011.11.08,
+%D        title=\CONTEXT\ User Module,
+%D     subtitle=For French documents,
+%D       author=Peter Münster,
+%D         date=\currentdate,
+%D    copyright=Peter Münster,
+%D        email=pmrb@free.fr,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Peter Münster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but without any warranty; without even the implied warranty of
+%C merchantability or fitness for a particular purpose.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+%D This module tries to do similar things as the frenchb.ldf in \LaTeX:
+%D \startitemize
+%D \item automatic space before » and after «, :, ?, ; and ! 
+%D \item changing symbol for itemize environment
+%D \stopitemize
+%D
+%D If I remember right, the \LaTeX\ babel package does a much better job at
+%D language switching, but I don't know, how this is possible in \ConTeXt.
+
+\writestatus{loading}{Typesetting French documents}
+
+\startsetups french
+  % This shoud be also active in footnotes, headers and footers, and not
+  % active in verbatim text:
+  \setcharacterspacing[frenchpunctuation]
+  % A question of style:
+  \setupitemize[symbol=2]
+  % What is this? I don't remember where this comes from:
+  \lccode`\'=`\'
+\stopsetups
+\startsetups not-french
+  \setcharacterspacing[reset]
+  \setupitemize[symbol=\currentitemlevel]
+\stopsetups
+\setuplanguage [default] [setups=not-french]
+\setuplanguage [fr]      [setups=french]
+\mainlanguage  [fr]
+
+\ifx \ieme  \undefined \def\ieme  {\highordinalstr{e}}   \fi
+\ifx \iemes \undefined \def\iemes {\highordinalstr{es}}  \fi
+\ifx \ier   \undefined \def\ier   {\highordinalstr{er}}  \fi
+\ifx \iere  \undefined \def\iere  {\highordinalstr{re}}  \fi
+\ifx \iers  \undefined \def\iers  {\highordinalstr{ers}} \fi
+\ifx \ieres \undefined \def\ieres {\highordinalstr{res}} \fi
+
+\doifnotmode{demo}{\endinput}
+
+%D Usage example:
+\def\myItems{%
+  \startitemize
+  \item test
+  \item test
+    \startitemize
+    \item test
+    \item test
+      \startitemize
+      \item test
+      \item test
+      \stopitemize
+    \stopitemize
+  \stopitemize}
+
+\usemodule[french]
+
+\starttext
+\startbuffer
+  Voilà: Voilà? Voilà! Voilà;
+  \start
+    \language[en]
+    some English text: «English» or \quotation{French}, ok?
+  \stop
+  «voilà» \quote{voilà} \quotation{voilà}
+  \myItems
+  \start
+    \language[en]
+    \myItems
+  \stop
+\stopbuffer
+\typebuffer
+\getbuffer
+\stoptext
diff --git a/Master/texmf-dist/tex/context/third/french/t-french.tex b/Master/texmf-dist/tex/context/third/french/t-french.tex
deleted file mode 100644
index 68325adde8a..00000000000
--- a/Master/texmf-dist/tex/context/third/french/t-french.tex
+++ /dev/null
@@ -1,72 +0,0 @@
-%D \module
-%D   [      file=t-french,
-%D        version=2008.05.04,
-%D          title=\CONTEXT\ User Module,
-%D       subtitle=For French documents,
-%D         author=Peter Münster,
-%D           date=\currentdate,
-%D      copyright={Peter Münster}]
-%C This module is copyrighted by Peter Münster.
-%C Please send any comments to pmrb at free.fr.
-%C You can find the latest version of this module on
-%C http://modules.contextgarden.net/
-
-% This program is free software; you can redistribute it and/or
-% modify it under the terms of the GNU General Public License
-% as published by the Free Software Foundation; either version 2
-% of the License, or (at your option) any later version.
-
-% This program is distributed in the hope that it will be useful,
-% but without any warranty; without even the implied warranty of
-% merchantability or fitness for a particular purpose.  See the
-% GNU General Public License for more details.
-
-%D This module tries to do similar things as the frenchb.ldf in LaTeX:
-%D \startitemize
-%D \item automatic space before » and after «, :, ?, ; and ! 
-%D \item changing symbol for itemize environment
-%D \stopitemize
-
-\writestatus{loading}{Typesetting French documents}
-\doifnotmode{mkiv}{\writestatus{error}{needs luatex}\wait\end}
-
-\startlanguagespecifics[fr]
-  \setcharacterspacing[frenchpunctuation]
-  \setupitemize[symbol=2]
-  \lccode`\'=`\'
-\stoplanguagespecifics
-
-\appendtoks
-  \setcharacterspacing[reset]%
-  \setupitemize[symbol=\currentitemlevel]%
-  \to \everyresetlanguagespecifics
-
-\mainlanguage[fr]
-
-\doifnotmode{demo}{\endinput}
-
-%D Usage example:
-\def\myItems{%
-  \startitemize
-  \item test
-  \item test
-    \startitemize
-    \item test
-    \item test
-      \startitemize
-      \item test
-      \item test
-      \stopitemize
-    \stopitemize
-  \stopitemize}
-
-\usemodule[french]
-
-\starttext
-Voilà: Voilà? Voilà! Voilà;
-{\en some english text: «English» or \quotation{French}, ok?}
-«voilà» \quote{voilà} \quotation{voilà}
-\myItems
-\en
-\myItems
-\stoptext