From 1c9cfa88a38e47a75fd3a9d1cb19d81330927028 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Feb 2012 00:33:42 +0000 Subject: bibleref-french 2.3 (26feb12) git-svn-id: svn://tug.org/texlive/trunk@25516 c570f23f-e606-0410-a88d-b1316a301751 --- .../bibleref-french/bibleref-french-francais.pdf | Bin 324156 -> 324813 bytes .../bibleref-french/bibleref-french-francais.tex | 2 +- .../doc/latex/bibleref-french/bibleref-french.pdf | Bin 315066 -> 315900 bytes .../doc/latex/bibleref-french/inclus/styles.tex | 1 + .../texmf-dist/doc/latex/bibleref-french/test.tex | 6 ++- .../latex/bibleref-french/bibleref-french.dtx | 41 ++++++++++++++++----- .../tex/latex/bibleref-french/bibleref-french.sty | 37 +++++++++++++++---- 7 files changed, 68 insertions(+), 19 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 409cf8010b2..a65dffadf7d 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.pdf and b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french-francais.pdf differ 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 5762df7468e..872a2564f1d 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}\thanks{Version 2.2}} +\title{Le package \textsf{bibleref-french}\thanks{Version 2.3}} \author{Ma\"ieul Rouquette \\ \& \\ Rapha\"el Pinson \\ \texttt{raphink@gmail.com}} \maketitle 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 acfc97be1df..427337f96b8 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french.pdf and b/Master/texmf-dist/doc/latex/bibleref-french/bibleref-french.pdf differ 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 2258b445f18..d05cab0203f 100644 --- a/Master/texmf-dist/doc/latex/bibleref-french/inclus/styles.tex +++ b/Master/texmf-dist/doc/latex/bibleref-french/inclus/styles.tex @@ -1,6 +1,7 @@ \begin{tabular}{lp{0.5\textwidth}} \bfseries Style & \bfseries Ex\\ default & \biblerefstyle{default}\bibleverse{IICo}(12:1-5,7) ; \bibleverse{Qo}(1:3)(2:5) ; \bibleverse{Is}(10:)\\ +defaultshorter & \biblerefstyle{defaultshorter}\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:)\\ diff --git a/Master/texmf-dist/doc/latex/bibleref-french/test.tex b/Master/texmf-dist/doc/latex/bibleref-french/test.tex index fcbb993e24f..d37da51c3ef 100644 --- a/Master/texmf-dist/doc/latex/bibleref-french/test.tex +++ b/Master/texmf-dist/doc/latex/bibleref-french/test.tex @@ -2,7 +2,7 @@ \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[french]{babel} \usepackage[protestant,text]{bibleref-french} %\biblerefstyle{jerusalem} @@ -109,6 +109,10 @@ \ibibleverse{Ps} +\ibibleverse{Ps}(18:) + +\ibibleverse{Ps}(18:)-(19:) + \ibibleverse{Mt} \ibibleverse{Lc} 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 689b6045a74..99fa56c68c1 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 %\NeedsTeXFormat{LaTeX2e} -%\def\BRFfileversion{v2.2}% -%\def\BRFfiledate{2011/10/09}% +%\def\BRFfileversion{v2.3}% +%\def\BRFfiledate{2012/02/26}% %\def\BRFfileinfo{French translation of the bibleref package}% %\ProvidesPackage{bibleref-french} % [\BRFfiledate\space\BRFfileversion\space\BRFfileinfo] @@ -44,6 +44,8 @@ % \fi % % \CheckSum{0} +% \changes{v2.3}{2012/02/26}{New style : defaultshorter} +% \changes{v2.3}{2012/02/26}{Correction of loading package options to take the good style.} % \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} @@ -53,7 +55,7 @@ % % \GetFileInfo{bibleref-french.dtx} % -% \title{The \textsf{bibleref-french} package\thanks{Version 2.2}} +% \title{The \textsf{bibleref-french} package\thanks{Version 2.3}} % \author{Ma\"ieul Rouquette \\ \texttt{maieul at maieul dot net} \& \\ Rapha\"el Pinson \\ \texttt{raphink@gmail.com}} % % \maketitle @@ -247,6 +249,26 @@ \renewcommand*{\BRvrsep}{\mbox{--}\nobreak}% \renewcommand*{\BRvsep}{ ; }% \renewcommand*{\BRperiod}{}} +\newcommand*{\brs@defaultshorter}{% +\brabbrvname +\renewcommand*{\BRbooknumberstyle}[1]{##1~}% +\renewcommand*{\BRepistlenumberstyle}[1]{##1~}% +\renewcommand*{\BRbooktitlestyle}[1]{##1}% +\renewcommand*{\BRchapterstyle}[1]{##1}% +\renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% +\renewcommand*{\BRbookof}{}% +\renewcommand*{\BRgospel}{}% +\renewcommand*{\BRepistletothe}{}% +\renewcommand*{\BRepistleto}{}% +\renewcommand*{\BRepistleof}{}% +\renewcommand*{\BRbkchsep}{~}% +\renewcommand*{\BRchvsep}{,~}% +\renewcommand*{\BRchsep}{ ; }% +\renewcommand*{\BRvrsep}{\mbox{--}\nobreak}% +\renewcommand*{\BRvsep}{ ; }% +\renewcommand*{\BRperiod}{}} + % \end{macrocode} % % \subsection{Default full book names} @@ -1316,13 +1338,14 @@ chapitre \protect\numberstringnum{##1}}% % % \begin{macrocode} \DeclareOption{default}{\brs@default} +\DeclareOption{defaultshorter}{\brs@defaultshorter} \DeclareOption{jerusalem}{\brs@jerusalem} -\DeclareOption{colombe}{\brs@jerusalem} -\DeclareOption{colombefull}{\brs@jerusalem} -\DeclareOption{NBS}{\brs@jerusalem} -\DeclareOption{NBSfull}{\brs@jerusalem} -\DeclareOption{TOB}{\brs@jerusalem} -\DeclareOption{TOBfull}{\brs@jerusalem} +\DeclareOption{colombe}{\brs@colombe} +\DeclareOption{colombefull}{\brs@colombefull} +\DeclareOption{NBS}{\brs@NBS} +\DeclareOption{NBSfull}{\brs@NBSfull} +\DeclareOption{TOB}{\brs@TOB} +\DeclareOption{TOBfull}{\brs@TOBfull} \DeclareOption{text}{\brs@text} \DeclareOption{indexalphac}{\refmap@alphac} \DeclareOption{indexalphap}{\refmap@alphap} 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 2debe0d13eb..db5a673b857 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.2}% -\def\BRFfiledate{2011/10/09}% +\def\BRFfileversion{v2.3}% +\def\BRFfiledate{2012/02/26}% \def\BRFfileinfo{French translation of the bibleref package}% \ProvidesPackage{bibleref-french} [\BRFfiledate\space\BRFfileversion\space\BRFfileinfo] @@ -73,6 +73,26 @@ \renewcommand*{\BRvrsep}{\mbox{--}\nobreak}% \renewcommand*{\BRvsep}{ ; }% \renewcommand*{\BRperiod}{}} +\newcommand*{\brs@defaultshorter}{% +\brabbrvname +\renewcommand*{\BRbooknumberstyle}[1]{##1~}% +\renewcommand*{\BRepistlenumberstyle}[1]{##1~}% +\renewcommand*{\BRbooktitlestyle}[1]{##1}% +\renewcommand*{\BRchapterstyle}[1]{##1}% +\renewcommand*{\BRversestyle}[1]{##1}% +\renewcommand*{\BRversesuffixstyle}[1]{##1}% +\renewcommand*{\BRbookof}{}% +\renewcommand*{\BRgospel}{}% +\renewcommand*{\BRepistletothe}{}% +\renewcommand*{\BRepistleto}{}% +\renewcommand*{\BRepistleof}{}% +\renewcommand*{\BRbkchsep}{~}% +\renewcommand*{\BRchvsep}{,~}% +\renewcommand*{\BRchsep}{ ; }% +\renewcommand*{\BRvrsep}{\mbox{--}\nobreak}% +\renewcommand*{\BRvsep}{ ; }% +\renewcommand*{\BRperiod}{}} + \newcommand*{\brfullname@catholic}{% \def\br@Genesis{\BRbookoff Gen\`ese}% \def\br@Exodus{\BRbookofme Exode}% @@ -1045,13 +1065,14 @@ chapitre \protect\numberstringnum{##1}}% \newcommand*{\BRallowhypbch}{\renewcommand*{\BRbkchsep}{ }} \newcommand*{\BRforbidhypbch}{\renewcommand*{\BRbkchsep}{~}} \DeclareOption{default}{\brs@default} +\DeclareOption{defaultshorter}{\brs@defaultshorter} \DeclareOption{jerusalem}{\brs@jerusalem} -\DeclareOption{colombe}{\brs@jerusalem} -\DeclareOption{colombefull}{\brs@jerusalem} -\DeclareOption{NBS}{\brs@jerusalem} -\DeclareOption{NBSfull}{\brs@jerusalem} -\DeclareOption{TOB}{\brs@jerusalem} -\DeclareOption{TOBfull}{\brs@jerusalem} +\DeclareOption{colombe}{\brs@colombe} +\DeclareOption{colombefull}{\brs@colombefull} +\DeclareOption{NBS}{\brs@NBS} +\DeclareOption{NBSfull}{\brs@NBSfull} +\DeclareOption{TOB}{\brs@TOB} +\DeclareOption{TOBfull}{\brs@TOBfull} \DeclareOption{text}{\brs@text} \DeclareOption{indexalphac}{\refmap@alphac} \DeclareOption{indexalphap}{\refmap@alphap} -- cgit v1.2.3