bibleref-french (11oct11)

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

8 files changed, 235 insertions, 167 deletions

diff --git a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.pdf b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.pdf
index 3709053c6f4..409cf8010b2 100644
--- a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.pdf
+++ b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.pdf
diff --git a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.tex b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.tex
index 5728709e977..5762df7468e 100644
--- a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.tex
+++ b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.tex
@@ -14,7 +14,7 @@
 \begin{document}
 
 \shorthandoff{:}
-\title{Le package \textsf{bibleref-french}}
+\title{Le package \textsf{bibleref-french}\thanks{Version 2.2}}
 \author{Ma\"ieul Rouquette \\ \& \\ Rapha\"el Pinson \\ \texttt{raphink@gmail.com}}
 
 \maketitle
@@ -116,26 +116,5 @@ Pour ce faire, vous devez redéfinir, avec  \cs{renewcommand} l'une ou plus de c
  \item \cs{AT};
  \item \cs{NT}.
 \end{itemize}
-\section{Problèmes connus}
 
-\subsection{Noms de livre dans le style  \textsf{text}}
-
-Le style \verb|text| doit être redéfinie pour prendre en considération les spécificités du français. Le tableau~\ref{tab:textspec} liste ces spécificités.
-
-\begin{table}[tbh]
-\caption{Spécificités françaises dans les noms de livres, avec les problèmes actuels en emphase} 
-\label{tab:textspec}
-\vspace{10pt}
-\begin{center}
-\begin{tabular}{lp{0.5\textwidth}}
-\bfseries Anglais & \bfseries Français\\
-Book of Genesis & Livre \emph{de la} Gen\`ese\\
-Book of Exodus & Livre \emph{de l'}Exode\\
-Book of Deuteronomy & Livre \emph{du} Deut\'eronome\\
-Book of Numbers & Livre \emph{des} Nombres\\
-Book of Acts & Livre \emph{des} Actes des Ap\^otres\\
-Book of Revelations & Livre \emph{de l'}Apocalypse\\
-\end{tabular}
-\end{center}
-\end{table}
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french.pdf b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french.pdf
index 246632505a1..acfc97be1df 100644
--- a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french.pdf
+++ b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french.pdf
diff --git a/Master/texmf-dist/doc/latex/bibleref-french/inclus/styles.tex b/Master/texmf-dist/doc/latex/bibleref-french/inclus/styles.tex
index 549f764cf89..2258b445f18 100644
--- a/Master/texmf-dist/doc/latex/bibleref-french/inclus/styles.tex
+++ b/Master/texmf-dist/doc/latex/bibleref-french/inclus/styles.tex
@@ -1,12 +1,12 @@
 \begin{tabular}{lp{0.5\textwidth}}
 \bfseries Style & \bfseries Ex\\
-default & \biblerefstyle{default}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-jerusalem & \biblerefstyle{jerusalem}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-colombe & \biblerefstyle{colombe}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-colombefull & \biblerefstyle{colombefull}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-NBS & \biblerefstyle{NBS}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-NBSfull & \biblerefstyle{NBSfull}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-TOB & \biblerefstyle{TOB}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-TOBfull & \biblerefstyle{TOBfull}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
-text & \biblerefstyle{text}\bibleverse{IICor}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+default & \biblerefstyle{default}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+jerusalem & \biblerefstyle{jerusalem}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+colombe & \biblerefstyle{colombe}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+colombefull & \biblerefstyle{colombefull}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+NBS & \biblerefstyle{NBS}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+NBSfull & \biblerefstyle{NBSfull}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+TOB & \biblerefstyle{TOB}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+TOBfull & \biblerefstyle{TOBfull}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
+text & \biblerefstyle{text}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\
 \end{tabular}
diff --git a/Master/texmf-dist/doc/latex/bibleref-french/makefile b/Master/texmf-dist/doc/latex/bibleref-french/makefile
index 4f3fe86b3f3..dd4e17d4ba8 100644
--- a/Master/texmf-dist/doc/latex/bibleref-french/makefile
+++ b/Master/texmf-dist/doc/latex/bibleref-french/makefile
@@ -19,6 +19,7 @@ all:bibleref-french.sty  bibleref-french-francais.pdf  bibleref-french.pdf dist
 
 
 %.sty: %.ins %.dtx 
+	@rm -f $*.sty
 	@pdflatex $*.ins
 
 bibleref-french-francais.pdf: bibleref-french-francais.tex inclus/bible.bib inclus/styles.tex inclus/livres.tex
diff --git a/Master/texmf-dist/doc/latex/bibleref-french/test.tex b/Master/texmf-dist/doc/latex/bibleref-french/test.tex
index 8a26c7217d5..fcbb993e24f 100644
--- a/Master/texmf-dist/doc/latex/bibleref-french/test.tex
+++ b/Master/texmf-dist/doc/latex/bibleref-french/test.tex
@@ -2,9 +2,9 @@
 \documentclass[]{article}
 \usepackage{geometry} % see geometry.pdf on how to lay out the page. There's lots.
 \geometry{a4paper} % or letter or a5paper or ... etc
+\usepackage[french]{babel}
 
-
-\usepackage[catholic]{bibleref-french}
+\usepackage[protestant,text]{bibleref-french}
 %\biblerefstyle{jerusalem}
 
 
@@ -14,79 +14,153 @@
 \begin{document}
 
 
+
 \ibibleverse{Gn}
+
 \ibibleverse{Ex}
+
 \ibibleverse{Lv}
+
 \ibibleverse{Nb}
+
 \ibibleverse{Dt}
+
 \ibibleverse{Jos}
+
 \ibibleverse{Jg}
+
 \ibibleverse{IS}
+
 \ibibleverse{IIS}
+
 \ibibleverse{IR}
+
 \ibibleverse{IIR}
+
 \ibibleverse{ICh}
+
 \ibibleverse{IICh}
+
 \ibibleverse{Esd}
+
 \ibibleverse{Ne}
+
 \ibibleverse{IM}
+
 \ibibleverse{IIM}
+
 \ibibleverse{Is}
+
 \ibibleverse{Es}
+
 \ibibleverse{Jr}
+
 \ibibleverse{Ez}
+
 \ibibleverse{Os}
+
 \ibibleverse{Jl}
+
 \ibibleverse{Am}
+
 \ibibleverse{Ab}
+
 \ibibleverse{Jon}
+
 \ibibleverse{Mi}
+
 \ibibleverse{Na}
+
 \ibibleverse{So}
+
 \ibibleverse{Ha}
+
 \ibibleverse{Ag}
+
 \ibibleverse{Za}
+
 \ibibleverse{Ml}
+
 \ibibleverse{Dn}
+
 \ibibleverse{Jb}
+
 \ibibleverse{Pr}
+
 \ibibleverse{Qo}
+
 \ibibleverse{Ct}
+
 \ibibleverse{Rt}
+
 \ibibleverse{Lm}
+
 \ibibleverse{Est}
+
 \ibibleverse{Tb}
+
 \ibibleverse{Jdt}
+
 \ibibleverse{Ba}
+
 \ibibleverse{Sg}
+
 \ibibleverse{Si}
+
 \ibibleverse{Ps}
+
 \ibibleverse{Mt}
+
 \ibibleverse{Lc}
+
 \ibibleverse{Jn}
+
 \ibibleverse{Mc}
+
 \ibibleverse{Ac}
+
 \ibibleverse{Rm}
+
 \ibibleverse{ICo}
+
 \ibibleverse{IICo}
+
 \ibibleverse{Ga}
+
 \ibibleverse{Ep}
+
 \ibibleverse{Ph}
+
 \ibibleverse{Col}
+
 \ibibleverse{ITh}
+
 \ibibleverse{IITh}
+
 \ibibleverse{ITm}
+
 \ibibleverse{IITm}
+
 \ibibleverse{Tt}
+
 \ibibleverse{Phm}
+
 \ibibleverse{He}
+
 \ibibleverse{Jc}
+
 \ibibleverse{IP}
+
 \ibibleverse{IIP}
+
 \ibibleverse{IJn}
+
 \ibibleverse{IIJn}
+
 \ibibleverse{IIIJn}
+
 \ibibleverse{Jude}
+
 \ibibleverse{Ap}	
 
 
diff --git a/Master/texmf-dist/source/latex/bibleref-french/bibleref-french.dtx b/Master/texmf-dist/source/latex/bibleref-french/bibleref-french.dtx
index daad5517325..689b6045a74 100644
--- a/Master/texmf-dist/source/latex/bibleref-french/bibleref-french.dtx
+++ b/Master/texmf-dist/source/latex/bibleref-french/bibleref-french.dtx
@@ -14,8 +14,8 @@
 %
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}
-%<package|extract|driver>\def\BRFfileversion{v2.1}%
-%<package|extract|driver>\def\BRFfiledate{2011/09/18}%
+%<package|extract|driver>\def\BRFfileversion{v2.2}%
+%<package|extract|driver>\def\BRFfiledate{2011/10/09}%
 %<package|extract|driver>\def\BRFfileinfo{French translation of the bibleref package}%
 %<package>\ProvidesPackage{bibleref-french}
 %<package>   [\BRFfiledate\space\BRFfileversion\space\BRFfileinfo]
@@ -44,6 +44,7 @@
 % \fi
 %
 % \CheckSum{0}
+% \changes{v2.2}{2011/10/09}{Corrections about the style text and the gender of noun, and illusion (ex section "know issues")}
 % \changes{v2.1}{2011/09/18}{New options to manage sorting in index}
 % \changes{v2.0.1}{2011/07/12}{Non breakable space after comma in jerusalem style. No differences between catholics and protestants about the name of Qohelet}
 % \changes{v2.0}{2011/06/18}{Make dtx, add styles and protestant/catholic
@@ -52,7 +53,7 @@
 %
 % \GetFileInfo{bibleref-french.dtx}
 %
-% \title{The \textsf{bibleref-french} package\thanks{Version 2.1}}
+% \title{The \textsf{bibleref-french} package\thanks{Version 2.2}}
 % \author{Ma\"ieul Rouquette \\ \texttt{maieul at maieul dot net} \& \\ Rapha\"el Pinson \\ \texttt{raphink@gmail.com}}
 %
 % \maketitle
@@ -186,29 +187,6 @@
 % \item \cs{AT};
 % \item \cs{NT}.
 % \end{itemize}
-% \section{Known Issues}
-%
-% \subsection{Book Names in \textsf{text} style}
-%
-% The \textsf{text} style has to be refined to take in consideration the
-% specificities of French. Table~\ref{tab:textspec} lists these specificities.
-%
-%\begin{table}[tbh]
-%\caption{French specificities in Bible book names, with current issues emphasized} 
-%\label{tab:textspec}
-%\vspace{10pt}
-%\begin{center}
-%\begin{tabular}{lp{0.5\textwidth}}
-%\bfseries English & \bfseries French\\
-%Book of Genesis & Livre \emph{de la} Gen\`ese\\
-%Book of Exodus & Livre \emph{de l'}Exode\\
-%Book of Deuteronomy & Livre \emph{du} Deut\'eronome\\
-%Book of Numbers & Livre \emph{des} Nombres\\
-%Book of Acts & Livre \emph{des} Actes des Ap\^otres\\
-%Book of Revelations & Livre \emph{de l'}Apocalypse\\
-%\end{tabular}
-%\end{center}
-%\end{table}
 %
 % \StopEventually{\FloatBarrier\PrintIndex\phantomsection\addcontentsline{toc}{section}{Changes History}\PrintChanges}
 %
@@ -219,13 +197,20 @@
 %  \begin{macrocode}
 \RequirePackage{bibleref}
 \RequirePackage{etoolbox}
-\patchcmd{\@bible@verse}{\@bv@idxsort{\csname br@#1\endcsname}}{\@bv@idxsort{#1}}
+\patchcmd{\@bible@verse}{\@bv@idxsort{\csname br@#1\endcsname}}{\@bv@idxsort{#1}}{}{}
 %  \end{macrocode}
 %
 % 
 % \subsection{Default separators}
 %
 %  \begin{macrocode}
+\newcommand*{\BRbookofp}{}% For proper noun
+\newcommand*{\BRbookofm}{}% For masculine name
+\newcommand*{\BRbookofme}{}% For masculine name preceded by elision
+\newcommand*{\BRbookoff}{}% For feminine name
+\newcommand*{\BRbookoffe}{}% For feminine name preceded by elision
+\newcommand*{\BRbookofpl}{}% For plural name
+\newcommand*{\BRbookofe}{}% For name preceded by elision.
 \renewcommand*{\BRbooknumberstyle}[1]{#1~}%
 \renewcommand*{\BRepistlenumberstyle}[1]{#1~}%
 \renewcommand*{\BRbooktitlestyle}[1]{#1}%
@@ -268,57 +253,57 @@
 %
 %  \begin{macrocode}
 \newcommand*{\brfullname@catholic}{%
-\def\br@Genesis{\BRbookof Gen\`ese}%
-\def\br@Exodus{\BRbookof Exode}%
-\def\br@Leviticus{\BRbookof L\'evitique}%
-\def\br@Numbers{\BRbookof Nombres}%
-\def\br@Deuteronomy{\BRbookof Deut\'eronome}%
-\def\br@Joshua{\BRbookof Josu\'e}%
-\def\br@Judges{\BRbookof Juges}%
-\def\br@Ruth{\BRbookof Ruth}%
-\def\br@ISamuel{\BRbooknumberstyle{1}\BRbookof Samuel}%
-\def\br@IISamuel{\BRbooknumberstyle{2}\BRbookof Samuel}%
-\def\br@IKings{\BRbooknumberstyle{1}\BRbookof Rois}%
-\def\br@IIKings{\BRbooknumberstyle{2}\BRbookof Rois}%
-\def\br@IChronicles{\BRbooknumberstyle{1}\BRbookof Chroniques}%
-\def\br@IIChronicles{\BRbooknumberstyle{2}\BRbookof Chroniques}%
-\def\br@Ezra{\BRbookof Esdras}%
-\def\br@Nehemiah{\BRbookof N\'eh\'emie}%
-\def\br@Tobit{\BRbookof Tobie}%
-\def\br@Judith{\BRbookof Judith}%
-\def\br@Esther{\BRbookof Esther}%
-\def\br@IMaccabees{\BRbooknumberstyle{1}\BRbookof Maccab\'ees}%
-\def\br@IIMaccabees{\BRbooknumberstyle{2}\BRbookof Maccab\'ees}%
-\def\br@Job{\BRbookof Job}%
-\def\br@Psalms{\BRbookof Psaumes}%
-\def\br@Proverbs{\BRbookof Proverbes}%
-\def\br@Ecclesiastes{\BRbookof Qoh\'elet}%
-\def\br@SongofSongs{\BRbookof Cantique des cantiques}%
-\def\br@Wisdom{\BRbookof Sagesse}%
-\def\br@Ecclesiasticus{\BRbookof Siracide}%
-\def\br@Isaiah{\BRbookof Isa\"ie}%
-\def\br@Jeremiah{\BRbookof J\'er\'emie}%
-\def\br@Lamentations{\BRbookof Lamentations}%
-\def\br@Baruch{\BRbookof Baruch}%
-\def\br@Ezekiel{\BRbookof \'Ez\'echiel}%
-\def\br@Daniel{\BRbookof Daniel}%
-\def\br@Hosea{\BRbookof Os\'ee}%
-\def\br@Joel{\BRbookof Jo\"el}%
-\def\br@Amos{\BRbookof Amos}%
-\def\br@Obadiah{\BRbookof Abdias}%
-\def\br@Jonah{\BRbookof Jonas}%
-\def\br@Micah{\BRbookof Mich\'ee}%
-\def\br@Nahum{\BRbookof Nahum}%
-\def\br@Habakkuk{\BRbookof Habaquq}%
-\def\br@Zephaniah{\BRbookof Sophonie}%
-\def\br@Haggai{\BRbookof Agg\'ee}%
-\def\br@Zechariah{\BRbookof Zacharie}%
-\def\br@Malachi{\BRbookof Malachie}%
+\def\br@Genesis{\BRbookoff Gen\`ese}%
+\def\br@Exodus{\BRbookofme Exode}%
+\def\br@Leviticus{\BRbookofm L\'evitique}%
+\def\br@Numbers{\BRbookofpl Nombres}%
+\def\br@Deuteronomy{\BRbookofm Deut\'eronome}%
+\def\br@Joshua{\BRbookofp Josu\'e}%
+\def\br@Judges{\BRbookofpl Juges}%
+\def\br@Ruth{\BRbookofp Ruth}%
+\def\br@ISamuel{\BRbooknumberstyle{1}\BRbookofp Samuel}%
+\def\br@IISamuel{\BRbooknumberstyle{2}\BRbookofp Samuel}%
+\def\br@IKings{\BRbooknumberstyle{1}\BRbookofpl Rois}%
+\def\br@IIKings{\BRbooknumberstyle{2}\BRbookofpl Rois}%
+\def\br@IChronicles{\BRbooknumberstyle{1}\BRbookofpl Chroniques}%
+\def\br@IIChronicles{\BRbooknumberstyle{2}\BRbookofpl Chroniques}%
+\def\br@Ezra{\BRbookofe Esdras}%
+\def\br@Nehemiah{\BRbookofp N\'eh\'emie}%
+\def\br@Tobit{\BRbookofp Tobie}%
+\def\br@Judith{\BRbookofp Judith}%
+\def\br@Esther{\BRbookofe Esther}%
+\def\br@IMaccabees{\BRbooknumberstyle{1}\BRbookofpl Maccab\'ees}%
+\def\br@IIMaccabees{\BRbooknumberstyle{2}\BRbookofpl Maccab\'ees}%
+\def\br@Job{\BRbookofp Job}%
+\def\br@Psalms{\BRbookofpl Psaumes}%
+\def\br@Proverbs{\BRbookofpl Proverbes}%
+\def\br@Ecclesiastes{\BRbookofm Qoh\'elet}%
+\def\br@SongofSongs{\BRbookofm Cantique des cantiques}%
+\def\br@Wisdom{\BRbookoff Sagesse}%
+\def\br@Ecclesiasticus{\BRbookofm Siracide}%
+\def\br@Isaiah{\BRbookofe Isa\"ie}%
+\def\br@Jeremiah{\BRbookofp J\'er\'emie}%
+\def\br@Lamentations{\BRbookofpl Lamentations}%
+\def\br@Baruch{\BRbookofp Baruch}%
+\def\br@Ezekiel{\BRbookofe \'Ez\'echiel}%
+\def\br@Daniel{\BRbookofp Daniel}%
+\def\br@Hosea{\BRbookofe Os\'ee}%
+\def\br@Joel{\BRbookofp Jo\"el}%
+\def\br@Amos{\BRbookofe Amos}%
+\def\br@Obadiah{\BRbookofe Abdias}%
+\def\br@Jonah{\BRbookofp Jonas}%
+\def\br@Micah{\BRbookofp Mich\'ee}%
+\def\br@Nahum{\BRbookofp Nahum}%
+\def\br@Habakkuk{\BRbookofp Habaquq}%
+\def\br@Zephaniah{\BRbookofp Sophonie}%
+\def\br@Haggai{\BRbookofe Agg\'ee}%
+\def\br@Zechariah{\BRbookofp Zacharie}%
+\def\br@Malachi{\BRbookofp Malachie}%
 \def\br@Matthew{\BRgospel Matthieu}%
 \def\br@Mark{\BRgospel Marc}%
 \def\br@Luke{\BRgospel Luc}%
 \def\br@John{\BRgospel Jean}%
-\def\br@Acts{Actes}%
+\def\br@Acts{Actes des ap\^otres}%
 \def\br@Romans{\BRepistletothe Romains}%
 \def\br@ICorinthians{\BRepistlenumberstyle{1}\BRepistletothe Corinthiens}%
 \def\br@IICorinthians{\BRepistlenumberstyle{2}\BRepistletothe Corinthiens}%
@@ -340,7 +325,7 @@
 \def\br@IIJohn{\BRepistlenumberstyle{2}\BRepistleof Jean}%
 \def\br@IIIJohn{\BRepistlenumberstyle{3}\BRepistleof Jean}%
 \def\br@Jude{\BRepistleof Jude}%
-\def\br@Revelation{\BRbookof Apocalypse}}
+\def\br@Revelation{\BRbookoffe Apocalypse}}
 \brfullname
 %  \end{macrocode}
 %
@@ -706,13 +691,24 @@
 \renewcommand*{\brs@text}{%
 \biblerefstyle{default}%
 \renewcommand{\BRbooknumberstyle}[1]{%
-\protect\Ordinalstringnum{##1}\ }%
+\ifnum ##1 = 1%
+Premier %
+\else%
+\protect\Ordinalstringnum{##1}\ %
+\fi%
+}%
 \renewcommand{\BRepistlenumberstyle}[1]{%
 \protect\Ordinalstringnum{##1}\ }%
-\renewcommand{\BRbookof}{Livre de }%
+\renewcommand*{\BRbookofm}{Livre du }% For masculine name
+\renewcommand*{\BRbookofme}{Livre de l'}% For masculine name preceded by elision
+\renewcommand*{\BRbookofp}{Livre de }% For proper noun
+\renewcommand*{\BRbookoff}{Livre de la }% For feminine name
+\renewcommand*{\BRbookoffe}{Livre de l'}% For feminine name precede by elision
+\renewcommand*{\BRbookofpl}{Livre des }% For plural name
+\renewcommand*{\BRbookofe}{Livre d'}% For name preceded by elision.
 \renewcommand{\BRgospel}{\'Evangile selon Saint }%
 \renewcommand{\BRepistletothe}{\'Ep\^itre aux }%
-\renewcommand{\BRepistleto}{\'Ep\^itre à }%
+\renewcommand{\BRepistleto}{\'Ep\^itre \`a }%
 \renewcommand{\BRepistleof}{\'Ep\^itre de }%
 \renewcommand{\BRchapterstyle}[1]{%
 chapitre \protect\numberstringnum{##1}}%
@@ -731,7 +727,7 @@ chapitre \protect\numberstringnum{##1}}%
 %  \begin{macrocode}
 \newcommand*{\brfullname@protestant}{%
 \brfullname@catholic%
-\def\br@Isaiah{\BRbookof Esa\"ie}%
+\def\br@Isaiah{\BRbookofe Esa\"ie}%
 }
 \newcommand*{\brabbrvname@protestant}{%
 \brabbrvname@catholic%
diff --git a/Master/texmf-dist/tex/latex/bibleref-french/bibleref-french.sty b/Master/texmf-dist/tex/latex/bibleref-french/bibleref-french.sty
index 95d0978d1d1..2debe0d13eb 100644
--- a/Master/texmf-dist/tex/latex/bibleref-french/bibleref-french.sty
+++ b/Master/texmf-dist/tex/latex/bibleref-french/bibleref-french.sty
@@ -19,8 +19,8 @@
 %% version 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\BRFfileversion{v2.1}%
-\def\BRFfiledate{2011/09/18}%
+\def\BRFfileversion{v2.2}%
+\def\BRFfiledate{2011/10/09}%
 \def\BRFfileinfo{French translation of the bibleref package}%
 \ProvidesPackage{bibleref-french}
    [\BRFfiledate\space\BRFfileversion\space\BRFfileinfo]
@@ -29,7 +29,14 @@
 
 \RequirePackage{bibleref}
 \RequirePackage{etoolbox}
-\patchcmd{\@bible@verse}{\@bv@idxsort{\csname br@#1\endcsname}}{\@bv@idxsort{#1}}
+\patchcmd{\@bible@verse}{\@bv@idxsort{\csname br@#1\endcsname}}{\@bv@idxsort{#1}}{}{}
+\newcommand*{\BRbookofp}{}% For proper noun
+\newcommand*{\BRbookofm}{}% For masculine name
+\newcommand*{\BRbookofme}{}% For masculine name preceded by elision
+\newcommand*{\BRbookoff}{}% For feminine name
+\newcommand*{\BRbookoffe}{}% For feminine name preceded by elision
+\newcommand*{\BRbookofpl}{}% For plural name
+\newcommand*{\BRbookofe}{}% For name preceded by elision.
 \renewcommand*{\BRbooknumberstyle}[1]{#1~}%
 \renewcommand*{\BRepistlenumberstyle}[1]{#1~}%
 \renewcommand*{\BRbooktitlestyle}[1]{#1}%
@@ -67,57 +74,57 @@
 \renewcommand*{\BRvsep}{ ; }%
 \renewcommand*{\BRperiod}{}}
 \newcommand*{\brfullname@catholic}{%
-\def\br@Genesis{\BRbookof Gen\`ese}%
-\def\br@Exodus{\BRbookof Exode}%
-\def\br@Leviticus{\BRbookof L\'evitique}%
-\def\br@Numbers{\BRbookof Nombres}%
-\def\br@Deuteronomy{\BRbookof Deut\'eronome}%
-\def\br@Joshua{\BRbookof Josu\'e}%
-\def\br@Judges{\BRbookof Juges}%
-\def\br@Ruth{\BRbookof Ruth}%
-\def\br@ISamuel{\BRbooknumberstyle{1}\BRbookof Samuel}%
-\def\br@IISamuel{\BRbooknumberstyle{2}\BRbookof Samuel}%
-\def\br@IKings{\BRbooknumberstyle{1}\BRbookof Rois}%
-\def\br@IIKings{\BRbooknumberstyle{2}\BRbookof Rois}%
-\def\br@IChronicles{\BRbooknumberstyle{1}\BRbookof Chroniques}%
-\def\br@IIChronicles{\BRbooknumberstyle{2}\BRbookof Chroniques}%
-\def\br@Ezra{\BRbookof Esdras}%
-\def\br@Nehemiah{\BRbookof N\'eh\'emie}%
-\def\br@Tobit{\BRbookof Tobie}%
-\def\br@Judith{\BRbookof Judith}%
-\def\br@Esther{\BRbookof Esther}%
-\def\br@IMaccabees{\BRbooknumberstyle{1}\BRbookof Maccab\'ees}%
-\def\br@IIMaccabees{\BRbooknumberstyle{2}\BRbookof Maccab\'ees}%
-\def\br@Job{\BRbookof Job}%
-\def\br@Psalms{\BRbookof Psaumes}%
-\def\br@Proverbs{\BRbookof Proverbes}%
-\def\br@Ecclesiastes{\BRbookof Qoh\'elet}%
-\def\br@SongofSongs{\BRbookof Cantique des cantiques}%
-\def\br@Wisdom{\BRbookof Sagesse}%
-\def\br@Ecclesiasticus{\BRbookof Siracide}%
-\def\br@Isaiah{\BRbookof Isa\"ie}%
-\def\br@Jeremiah{\BRbookof J\'er\'emie}%
-\def\br@Lamentations{\BRbookof Lamentations}%
-\def\br@Baruch{\BRbookof Baruch}%
-\def\br@Ezekiel{\BRbookof \'Ez\'echiel}%
-\def\br@Daniel{\BRbookof Daniel}%
-\def\br@Hosea{\BRbookof Os\'ee}%
-\def\br@Joel{\BRbookof Jo\"el}%
-\def\br@Amos{\BRbookof Amos}%
-\def\br@Obadiah{\BRbookof Abdias}%
-\def\br@Jonah{\BRbookof Jonas}%
-\def\br@Micah{\BRbookof Mich\'ee}%
-\def\br@Nahum{\BRbookof Nahum}%
-\def\br@Habakkuk{\BRbookof Habaquq}%
-\def\br@Zephaniah{\BRbookof Sophonie}%
-\def\br@Haggai{\BRbookof Agg\'ee}%
-\def\br@Zechariah{\BRbookof Zacharie}%
-\def\br@Malachi{\BRbookof Malachie}%
+\def\br@Genesis{\BRbookoff Gen\`ese}%
+\def\br@Exodus{\BRbookofme Exode}%
+\def\br@Leviticus{\BRbookofm L\'evitique}%
+\def\br@Numbers{\BRbookofpl Nombres}%
+\def\br@Deuteronomy{\BRbookofm Deut\'eronome}%
+\def\br@Joshua{\BRbookofp Josu\'e}%
+\def\br@Judges{\BRbookofpl Juges}%
+\def\br@Ruth{\BRbookofp Ruth}%
+\def\br@ISamuel{\BRbooknumberstyle{1}\BRbookofp Samuel}%
+\def\br@IISamuel{\BRbooknumberstyle{2}\BRbookofp Samuel}%
+\def\br@IKings{\BRbooknumberstyle{1}\BRbookofpl Rois}%
+\def\br@IIKings{\BRbooknumberstyle{2}\BRbookofpl Rois}%
+\def\br@IChronicles{\BRbooknumberstyle{1}\BRbookofpl Chroniques}%
+\def\br@IIChronicles{\BRbooknumberstyle{2}\BRbookofpl Chroniques}%
+\def\br@Ezra{\BRbookofe Esdras}%
+\def\br@Nehemiah{\BRbookofp N\'eh\'emie}%
+\def\br@Tobit{\BRbookofp Tobie}%
+\def\br@Judith{\BRbookofp Judith}%
+\def\br@Esther{\BRbookofe Esther}%
+\def\br@IMaccabees{\BRbooknumberstyle{1}\BRbookofpl Maccab\'ees}%
+\def\br@IIMaccabees{\BRbooknumberstyle{2}\BRbookofpl Maccab\'ees}%
+\def\br@Job{\BRbookofp Job}%
+\def\br@Psalms{\BRbookofpl Psaumes}%
+\def\br@Proverbs{\BRbookofpl Proverbes}%
+\def\br@Ecclesiastes{\BRbookofm Qoh\'elet}%
+\def\br@SongofSongs{\BRbookofm Cantique des cantiques}%
+\def\br@Wisdom{\BRbookoff Sagesse}%
+\def\br@Ecclesiasticus{\BRbookofm Siracide}%
+\def\br@Isaiah{\BRbookofe Isa\"ie}%
+\def\br@Jeremiah{\BRbookofp J\'er\'emie}%
+\def\br@Lamentations{\BRbookofpl Lamentations}%
+\def\br@Baruch{\BRbookofp Baruch}%
+\def\br@Ezekiel{\BRbookofe \'Ez\'echiel}%
+\def\br@Daniel{\BRbookofp Daniel}%
+\def\br@Hosea{\BRbookofe Os\'ee}%
+\def\br@Joel{\BRbookofp Jo\"el}%
+\def\br@Amos{\BRbookofe Amos}%
+\def\br@Obadiah{\BRbookofe Abdias}%
+\def\br@Jonah{\BRbookofp Jonas}%
+\def\br@Micah{\BRbookofp Mich\'ee}%
+\def\br@Nahum{\BRbookofp Nahum}%
+\def\br@Habakkuk{\BRbookofp Habaquq}%
+\def\br@Zephaniah{\BRbookofp Sophonie}%
+\def\br@Haggai{\BRbookofe Agg\'ee}%
+\def\br@Zechariah{\BRbookofp Zacharie}%
+\def\br@Malachi{\BRbookofp Malachie}%
 \def\br@Matthew{\BRgospel Matthieu}%
 \def\br@Mark{\BRgospel Marc}%
 \def\br@Luke{\BRgospel Luc}%
 \def\br@John{\BRgospel Jean}%
-\def\br@Acts{Actes}%
+\def\br@Acts{Actes des ap\^otres}%
 \def\br@Romans{\BRepistletothe Romains}%
 \def\br@ICorinthians{\BRepistlenumberstyle{1}\BRepistletothe Corinthiens}%
 \def\br@IICorinthians{\BRepistlenumberstyle{2}\BRepistletothe Corinthiens}%
@@ -139,7 +146,7 @@
 \def\br@IIJohn{\BRepistlenumberstyle{2}\BRepistleof Jean}%
 \def\br@IIIJohn{\BRepistlenumberstyle{3}\BRepistleof Jean}%
 \def\br@Jude{\BRepistleof Jude}%
-\def\br@Revelation{\BRbookof Apocalypse}}
+\def\br@Revelation{\BRbookoffe Apocalypse}}
 \brfullname
 \newcommand*{\brabbrvname@catholic}{%
 \def\br@Genesis{Gn\BRperiod}%
@@ -433,13 +440,24 @@
 \renewcommand*{\brs@text}{%
 \biblerefstyle{default}%
 \renewcommand{\BRbooknumberstyle}[1]{%
-\protect\Ordinalstringnum{##1}\ }%
+\ifnum ##1 = 1%
+Premier %
+\else%
+\protect\Ordinalstringnum{##1}\ %
+\fi%
+}%
 \renewcommand{\BRepistlenumberstyle}[1]{%
 \protect\Ordinalstringnum{##1}\ }%
-\renewcommand{\BRbookof}{Livre de }%
+\renewcommand*{\BRbookofm}{Livre du }% For masculine name
+\renewcommand*{\BRbookofme}{Livre de l'}% For masculine name preceded by elision
+\renewcommand*{\BRbookofp}{Livre de }% For proper noun
+\renewcommand*{\BRbookoff}{Livre de la }% For feminine name
+\renewcommand*{\BRbookoffe}{Livre de l'}% For feminine name precede by elision
+\renewcommand*{\BRbookofpl}{Livre des }% For plural name
+\renewcommand*{\BRbookofe}{Livre d'}% For name preceded by elision.
 \renewcommand{\BRgospel}{\'Evangile selon Saint }%
 \renewcommand{\BRepistletothe}{\'Ep\^itre aux }%
-\renewcommand{\BRepistleto}{\'Ep\^itre à }%
+\renewcommand{\BRepistleto}{\'Ep\^itre \`a }%
 \renewcommand{\BRepistleof}{\'Ep\^itre de }%
 \renewcommand{\BRchapterstyle}[1]{%
 chapitre \protect\numberstringnum{##1}}%
@@ -453,7 +471,7 @@ chapitre \protect\numberstringnum{##1}}%
 }
 \newcommand*{\brfullname@protestant}{%
 \brfullname@catholic%
-\def\br@Isaiah{\BRbookof Esa\"ie}%
+\def\br@Isaiah{\BRbookofe Esa\"ie}%
 }
 \newcommand*{\brabbrvname@protestant}{%
 \brabbrvname@catholic%