From e22515f37100cb2802961f6a7cb76c8a22a118db Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 11 Dec 2019 03:01:04 +0000 Subject: CTAN sync 201912110301 --- macros/latex/contrib/bibleref/CHANGES | 3 + macros/latex/contrib/bibleref/bibleref.dtx | 192 +++++++++++++++++++-- macros/latex/contrib/bibleref/bibleref.pdf | Bin 285284 -> 286825 bytes macros/latex/contrib/bibleref/makefile | 1 - .../contrib/bibleref/samples/sample-categories.pdf | Bin 12427 -> 12303 bytes .../contrib/bibleref/samples/sample-indextools.pdf | Bin 9544 -> 9463 bytes .../latex/contrib/bibleref/samples/sample-xidx.pdf | Bin 19945 -> 19439 bytes macros/latex/contrib/bibleref/samples/sample.pdf | Bin 40093 -> 39426 bytes 8 files changed, 182 insertions(+), 14 deletions(-) (limited to 'macros/latex/contrib/bibleref') diff --git a/macros/latex/contrib/bibleref/CHANGES b/macros/latex/contrib/bibleref/CHANGES index f69256bc20..29d7c6e962 100644 --- a/macros/latex/contrib/bibleref/CHANGES +++ b/macros/latex/contrib/bibleref/CHANGES @@ -1,3 +1,6 @@ +1.24 + * Add more abbreviation + * Add more \brthreeabbrvname 1.23 * Add Tt abbreviation 1.22 diff --git a/macros/latex/contrib/bibleref/bibleref.dtx b/macros/latex/contrib/bibleref/bibleref.dtx index ff5130502c..0802fcf73b 100644 --- a/macros/latex/contrib/bibleref/bibleref.dtx +++ b/macros/latex/contrib/bibleref/bibleref.dtx @@ -84,12 +84,9 @@ %indicating the chapter and verse or verses. Verses can be %specified as a comma separated list of individual verses or range %of verses. A range of verses should be written with a single -%hyphen, e.g.\ \verb|2-4|. In the typeset output the range of verses will -%be separated with -%\begin{definition}[\DescribeMacro{\BRvrsep}] -%\cs{BRvrsep} -%\end{definition} -%(an en-dash by default.) A chapter may be referenced without a +%hyphen, e.g.\ \verb|2-4|. +% +% A chapter may be referenced without a %verse, but the colon must remain, e.g.\ \verb|(12:)| simply %indicates chapter 12. % @@ -134,6 +131,42 @@ % \begin{verbatim} % \renewcommand{\BRotherchapterstyle}[1]{} % \end{verbatim} +%\subsection{Default separators} +% In the typeset output the range of verses will +%be separated with +%\begin{definition}[\DescribeMacro{\BRvrsep}] +%\cs{BRvrsep} +%\end{definition} +%(an en-dash by default.) +% +%In the typeset output the verses in a list of verses will +%be separated with +%\begin{definition}[\DescribeMacro{\BRvsep}] +%\cs{BRvsep} +%\end{definition} +%(a comma, by default). +% +% +%In the typeset output the chapters will +%be separated with +%\begin{definition}[\DescribeMacro{\BRchsep}] +%\cs{BRchsep} +%\end{definition} +%(a semi-colon, by default). +% +%In the typeset output the chapter and the verse will +%be separated with +%\begin{definition}[\DescribeMacro{\BRchvsep}] +%\cs{BRchvsep} +%\end{definition} +%(a colon, by default). +% +%In the typeset output the books name will be followed by +%\begin{definition}[\DescribeMacro{\BRperiod}] +%\cs{BRperiod} +%\end{definition} +%(nothing, by default). +% %\subsection{Examples} %\begin{center} %\begin{tabular}{ll} @@ -215,7 +248,9 @@ %\begin{verbatim} %\addbiblebook{Susanna}{Story of Susanna} %\end{verbatim} -% +%\begin{definition}[\DescribeMacro{\brthreeabbrvname}] +% The \cs{brthreeabbrvname} command switches all the abbreviation of the booktitle to be typeset using exaclty three characters. +%\end{definition} %\section{Defining New Styles} % %You can define a new style using the command @@ -973,7 +1008,7 @@ % Declare package % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2019/01/13 1.23 (NLCT and MR)] +\ProvidesPackage{bibleref}[2019/12/10 1.24 (NLCT and MR)] % \end{macrocode} % Need to do some conditional stuff % \begin{macrocode} @@ -1368,6 +1403,88 @@ \def\br@Revelation{Rev\BRperiod}} % \end{macrocode} %\end{macro} +% +%\begin{macro}{\brthreeabbrvname} +%\changes{1.24}{2019/12/10}{Added \cs{brthreelettabbrvname}} +% This switches to a standardized set of three-character abbreviations. +% \begin{macrocode} +\newcommand*{\brthreeabbrvname}{% +\def\br@Genesis{Gen\BRperiod}% +\def\br@Exodus{Exo\BRperiod}% +\def\br@Leviticus{Lev\BRperiod}% +\def\br@Numbers{Num\BRperiod}% +\def\br@Deuteronomy{Deu\BRperiod}% +\def\br@Joshua{Jos\BRperiod}% +\def\br@Judges{Jdg\BRperiod}% +\def\br@Ruth{Rut\BRperiod}% +\def\br@ISamuel{\BRbooknumberstyle{1}Sa\BRperiod}% +\def\br@IISamuel{\BRbooknumberstyle{2}Sa\BRperiod}% +\def\br@IKings{\BRbooknumberstyle{1}Ki\BRperiod}% +\def\br@IIKings{\BRbooknumberstyle{2}Ki\BRperiod}% +\def\br@IChronicles{\BRbooknumberstyle{1}Ch\BRperiod}% +\def\br@IIChronicles{\BRbooknumberstyle{2}Ch\BRperiod}% +\def\br@Ezra{Ezr\BRperiod}% +\def\br@Nehemiah{Neh\BRperiod}% +\def\br@Tobit{Tob\BRperiod}% +\def\br@Judith{Jdi\BRperiod}% +\def\br@Esther{Est\BRperiod}% +\def\br@IMaccabees{\BRbooknumberstyle{1}Ma\BRperiod}% +\def\br@IIMaccabees{\BRbooknumberstyle{2}Ma\BRperiod}% +\def\br@Job{Job}% +\def\br@Psalms{Psa\BRperiod}% +\def\br@Proverbs{Pro\BRperiod}% +\def\br@Ecclesiastes{Ecc\BRperiod}% +\def\br@SongofSongs{SoS\BRperiod}% +\def\br@Wisdom{Wis\BRperiod}% +\def\br@Ecclesiasticus{Ecu\BRperiod}% +\def\br@Isaiah{Isa\BRperiod}% +\def\br@Jeremiah{Jer\BRperiod}% +\def\br@Lamentations{Lam\BRperiod}% +\def\br@Baruch{Bar\BRperiod}% +\def\br@Ezekiel{Eze\BRperiod}% +\def\br@Daniel{Dan\BRperiod}% +\def\br@Hosea{Hos\BRperiod}% +\def\br@Joel{Joe\BRperiod}% +\def\br@Amos{Amo\BRperiod}% +\def\br@Obadiah{Oba\BRperiod}% +\def\br@Jonah{Jon\BRperiod}% +\def\br@Micah{Mic\BRperiod}% +\def\br@Nahum{Nah\BRperiod}% +\def\br@Habakkuk{Hab\BRperiod}% +\def\br@Zephaniah{Zep\BRperiod}% +\def\br@Haggai{Hag\BRperiod}% +\def\br@Zechariah{Zec\BRperiod}% +\def\br@Malachi{Mal\BRperiod}% +\def\br@Matthew{Mat\BRperiod}% +\def\br@Mark{Mar\BRperiod}% +\def\br@Luke{Luk\BRperiod}% +\def\br@John{Joh\BRperiod}% +\def\br@Acts{Act\BRperiod}% +\def\br@Romans{Rom\BRperiod}% +\def\br@ICorinthians{\BRepistlenumberstyle{1}Co\BRperiod}% +\def\br@IICorinthians{\BRepistlenumberstyle{2}Co\BRperiod}% +\def\br@Galatians{Gal\BRperiod}% +\def\br@Ephesians{Eph\BRperiod}% +\def\br@Philippians{Php\BRperiod}% +\def\br@Colossians{Col\BRperiod}% +\def\br@IThessalonians{\BRepistlenumberstyle{1}Th\BRperiod}% +\def\br@IIThessalonians{\BRepistlenumberstyle{2}Th\BRperiod}% +\def\br@ITimothy{\BRepistlenumberstyle{1}Ti\BRperiod}% +\def\br@IITimothy{\BRepistlenumberstyle{2}Ti\BRperiod}% +\def\br@Titus{Tit\BRperiod}% +\def\br@Philemon{Phm\BRperiod}% +\def\br@Hebrews{Heb\BRperiod}% +\def\br@James{Jam\BRperiod}% +\def\br@IPeter{\BRepistlenumberstyle{1}Pe\BRperiod}% +\def\br@IIPeter{\BRepistlenumberstyle{2}Pe\BRperiod}% +\def\br@IJohn{\BRepistlenumberstyle{1}Jo}% +\def\br@IIJohn{\BRepistlenumberstyle{2}Jo}% +\def\br@IIIJohn{\BRepistlenumberstyle{3}Jo}% +\def\br@Jude{Jde\BRperiod}% +\def\br@Revelation{Rev\BRperiod}} +% \end{macrocode} +%\end{macro} +% % Provide synonymns. % \begin{macrocode} \newcommand*\br@Gn{\br@Genesis}% @@ -1403,7 +1520,6 @@ \newcommand*\br@Lm{\br@Lamentations}% \newcommand*\br@Ba{\br@Baruch}% \newcommand*\br@Bar{\br@Baruch}% -\newcommand*\br@Ezk{\br@Ezekiel}% \newcommand*\br@Dn{\br@Daniel}% \newcommand*\br@Ho{\br@Hosea}% \newcommand*\br@Jl{\br@Joel}% @@ -1421,14 +1537,10 @@ \newcommand*\br@Mk{\br@Mark}% \newcommand*\br@Lk{\br@Luke}% \newcommand*\br@Jn{\br@John}% -\newcommand*\br@Ac{\br@Acts}% \newcommand*\br@Rm{\br@Romans}% -\newcommand*\br@ICo{\br@ICorinthians}% -\newcommand*\br@IICo{\br@IICorinthians}% \newcommand*\br@Ga{\br@Galatians}% \newcommand*\br@Ep{\br@Ephesians}% \newcommand*\br@Ph{\br@Philippians}% -\newcommand*\br@Col{\br@Colossians}% \newcommand*\br@ITh{\br@IThessalonians}% \newcommand*\br@IITh{\br@IIThessalonians}% \newcommand*\br@ITm{\br@ITimothy}% @@ -1447,27 +1559,48 @@ %\changes{1.21}{2018/11/17}{Add Wis abbreviation} %\changes{1.22}{2018/12/05}{Add Bar abbreviation} %\changes{1.23}{2019/01/13}{Add Ti abbreviation} +%\changes{1.24}{2019/12/10}{Added Exo, Levit, Deu, Jos, Jsh, Rut, IKi, IKin, IIKi, IIKin, IMac, IIMac, Psa, Psal, Pro, Son, Song, Songs, Ezk, Eze, Joe, Amo, Oba, Zec, Zep, Mat, Mar, Luk, Joh, Act, ICo IICo, Php, Col, IThe, IThes, IIThe, IIThes, ITi, IITi, Hb, Jam, IPe, IIPe, IJo, IJoh, IIJo, IIJoh, IIIJn, IIIJo, IIIJoh % \begin{macrocode} \newcommand*\br@Gen{\br@Genesis}% +\newcommand*\br@Exo{\br@Exodus}% \newcommand*\br@Exod{\br@Exodus}% \newcommand*\br@Lev{\br@Leviticus}% +\newcommand*\br@Levit{\br@Leviticus}% \newcommand*\br@Num{\br@Numbers}% +\newcommand*\br@Deu{\br@Deuteronomy}% \newcommand*\br@Deut{\br@Deuteronomy}% \newcommand*\br@Josh{\br@Joshua}% +\newcommand*\br@Jsh{\br@Joshua}% \newcommand*\br@Judg{\br@Judges}% +\newcommand*\br@Jdg{\br@Judges}% +\newcommand*\br@Rut{\br@Ruth}% \newcommand*\br@ISam{\br@ISamuel}% +\newcommand*\br@ISa{\br@ISamuel}% \newcommand*\br@IISam{\br@IISamuel}% +\newcommand*\br@IISa{\br@IISamuel}% \newcommand*\br@IKgs{\br@IKings}% +\newcommand*\br@IKi{\br@IKings}% +\newcommand*\br@IKin{\br@IKings}% \newcommand*\br@IIKgs{\br@IIKings}% +\newcommand*\br@IIKi{\br@IIKings}% +\newcommand*\br@IIKin{\br@IIKings}% \newcommand*\br@IChr{\br@IChronicles}% \newcommand*\br@IIChr{\br@IIChronicles}% \newcommand*\br@Neh{\br@Nehemiah}% \newcommand*\br@Esth{\br@Esther}% \newcommand*\br@IMacc{\br@IMaccabees}% +\newcommand*\br@IMac{\br@IMaccabees}% +\newcommand*\br@IIMac{\br@IIMaccabees}% \newcommand*\br@IIMacc{\br@IIMaccabees}% +\newcommand*\br@Psa{\br@Psalms}% +\newcommand*\br@Psal{\br@Psalms}% +\newcommand*\br@Pro{\br@Proverbs}% \newcommand*\br@Prov{\br@Proverbs}% \newcommand*\br@Eccl{\br@Ecclesiastes}% \newcommand*\br@SofS{\br@SongofSongs}% +\newcommand*\br@Son{\br@SongofSongs}% +\newcommand*\br@Song{\br@SongofSongs}% +\newcommand*\br@Songs{\br@SongofSongs}% \newcommand*\br@Wis{\br@Wisdom}% \newcommand*\br@Wisd{\br@Wisdom}% \newcommand*\br@Ecclus{\br@Ecclesiasticus}% @@ -1475,32 +1608,65 @@ \newcommand*\br@Jer{\br@Jeremiah}% \newcommand*\br@Lam{\br@Lamentations}% \newcommand*\br@Ezek{\br@Ezekiel}% +\newcommand*\br@Ezk{\br@Ezekiel}% +\newcommand*\br@Eze{\br@Ezekiel}% \newcommand*\br@Dan{\br@Daniel}% \newcommand*\br@Hos{\br@Hosea}% +\newcommand*\br@Joe{\br@Joel}% +\newcommand*\br@Amo{\br@Amos}% \newcommand*\br@Obad{\br@Obadiah}% +\newcommand*\br@Oba{\br@Obadiah}% \newcommand*\br@Mic{\br@Micah}% \newcommand*\br@Nah{\br@Nahum}% \newcommand*\br@Zeph{\br@Zephaniah}% +\newcommand*\br@Zep{\br@Zephaniah}% \newcommand*\br@Hag{\br@Haggai}% \newcommand*\br@Zech{\br@Zechariah}% +\newcommand*\br@Zec{\br@Zechariah}% \newcommand*\br@Mal{\br@Malachi}% \newcommand*\br@Matt{\br@Matthew}% +\newcommand*\br@Mat{\br@Matthew}% +\newcommand*\br@Mar{\br@Mark}% +\newcommand*\br@Luk{\br@Luke}% +\newcommand*\br@Joh{\br@John}% +\newcommand*\br@Ac{\br@Acts}% \newcommand*\br@Rom{\br@Romans}% +\newcommand*\br@ICo{\br@ICorinthians}% \newcommand*\br@ICor{\br@ICorinthians}% +\newcommand*\br@IICo{\br@IICorinthians}% \newcommand*\br@IICor{\br@IICorinthians}% \newcommand*\br@Gal{\br@Galatians}% \newcommand*\br@Eph{\br@Ephesians}% \newcommand*\br@Phil{\br@Philippians}% +\newcommand*\br@Php{\br@Philippians}% +\newcommand*\br@Col{\br@Colossians}% +\newcommand*\br@IThe{\br@IThessalonians}% +\newcommand*\br@IThes{\br@IThessalonians}% \newcommand*\br@IThess{\br@IThessalonians}% +\newcommand*\br@IIThe{\br@IIThessalonians}% +\newcommand*\br@IIThes{\br@IIThessalonians}% \newcommand*\br@IIThess{\br@IIThessalonians}% +\newcommand*\br@ITi{\br@ITimothy}% \newcommand*\br@ITim{\br@ITimothy}% +\newcommand*\br@IITi{\br@IITimothy}% \newcommand*\br@IITim{\br@IITimothy}% \newcommand*\br@Tit{\br@Titus}% \newcommand*\br@Ti{\br@Titus}% \newcommand*\br@Philem{\br@Philemon}% +\newcommand*\br@Hb{\br@Hebrews}% \newcommand*\br@Jas{\br@James}% +\newcommand*\br@Jam{\br@James}% \newcommand*\br@IPet{\br@IPeter}% +\newcommand*\br@IPe{\br@IPeter}% \newcommand*\br@IIPet{\br@IIPeter}% +\newcommand*\br@IIPe{\br@IIPeter}% +\newcommand*\br@IJo{\br@IJohn}% +\newcommand*\br@IJoh{\br@IJohn}% +\newcommand*\br@IIJo{\br@IIJohn}% +\newcommand*\br@IIJoh{\br@IIJohn}% +\newcommand*\br@IIIJn{\br@IIIJohn}% +\newcommand*\br@IIIJo{\br@IIIJohn}% +\newcommand*\br@IIIJoh{\br@IIIJohn}% \newcommand*\br@Rev{\br@Revelation} % \end{macrocode} %\begin{macro}{\brs@default} diff --git a/macros/latex/contrib/bibleref/bibleref.pdf b/macros/latex/contrib/bibleref/bibleref.pdf index d0d85d2b7e..99a06b2011 100644 Binary files a/macros/latex/contrib/bibleref/bibleref.pdf and b/macros/latex/contrib/bibleref/bibleref.pdf differ diff --git a/macros/latex/contrib/bibleref/makefile b/macros/latex/contrib/bibleref/makefile index b5dbbd7b50..90e5996d92 100644 --- a/macros/latex/contrib/bibleref/makefile +++ b/macros/latex/contrib/bibleref/makefile @@ -3,7 +3,6 @@ all:bibleref.pdf bibleref.sty mkdir bibleref mkdir bibleref/samples latexmk sample*tex - ln sample*tex bibleref/samples ln sample*pdf bibleref/samples ln CHANGES *ins *dtx bibleref.pdf README makefile bibleref @$(RM) ../bibleref.zip diff --git a/macros/latex/contrib/bibleref/samples/sample-categories.pdf b/macros/latex/contrib/bibleref/samples/sample-categories.pdf index e2822edd5b..4ccfb376e4 100644 Binary files a/macros/latex/contrib/bibleref/samples/sample-categories.pdf and b/macros/latex/contrib/bibleref/samples/sample-categories.pdf differ diff --git a/macros/latex/contrib/bibleref/samples/sample-indextools.pdf b/macros/latex/contrib/bibleref/samples/sample-indextools.pdf index 9f34cb6d51..21662c8438 100644 Binary files a/macros/latex/contrib/bibleref/samples/sample-indextools.pdf and b/macros/latex/contrib/bibleref/samples/sample-indextools.pdf differ diff --git a/macros/latex/contrib/bibleref/samples/sample-xidx.pdf b/macros/latex/contrib/bibleref/samples/sample-xidx.pdf index b890da74db..a4d31ce675 100644 Binary files a/macros/latex/contrib/bibleref/samples/sample-xidx.pdf and b/macros/latex/contrib/bibleref/samples/sample-xidx.pdf differ diff --git a/macros/latex/contrib/bibleref/samples/sample.pdf b/macros/latex/contrib/bibleref/samples/sample.pdf index 631b27f11b..3f58999daa 100644 Binary files a/macros/latex/contrib/bibleref/samples/sample.pdf and b/macros/latex/contrib/bibleref/samples/sample.pdf differ -- cgit v1.2.3