From cdb7652d653cc1c8c06315f735d1a70728d2f9b1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 Jul 2010 00:00:31 +0000 Subject: bibleref 1.13 (8jul10) git-svn-id: svn://tug.org/texlive/trunk@19317 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bibleref/CHANGES | 7 + Master/texmf-dist/doc/latex/bibleref/README | 14 +- .../doc/latex/bibleref/bibleref-manual.css | 28 +- .../doc/latex/bibleref/bibleref-manual.html | 506 +++++++---- .../doc/latex/bibleref/bibleref-manual.tex | 14 +- Master/texmf-dist/doc/latex/bibleref/bibleref.pdf | Bin 265738 -> 285680 bytes Master/texmf-dist/doc/latex/bibleref/nlctdoc.cls | 973 --------------------- .../texmf-dist/source/latex/bibleref/bibleref.dtx | 72 +- .../texmf-dist/source/latex/bibleref/bibleref.ins | 38 + .../texmf-dist/source/latex/bibleref/bibleref.sty | 851 ------------------ Master/texmf-dist/tex/latex/bibleref/bibleref.sty | 19 +- 11 files changed, 461 insertions(+), 2061 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/bibleref/nlctdoc.cls create mode 100644 Master/texmf-dist/source/latex/bibleref/bibleref.ins delete mode 100644 Master/texmf-dist/source/latex/bibleref/bibleref.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/bibleref/CHANGES b/Master/texmf-dist/doc/latex/bibleref/CHANGES index 06a5572e5fb..2be562e5231 100644 --- a/Master/texmf-dist/doc/latex/bibleref/CHANGES +++ b/Master/texmf-dist/doc/latex/bibleref/CHANGES @@ -1,3 +1,10 @@ +1.13: + * Changed \@ifnextchar to \new@ifnextchar to prevent spaces being + ignored after bible references. (amsgen.sty now a required + package.) + + * Removed spurious space when setting some of the styles + 1.12: * Fixed bug occurring when the verse number has a suffix. diff --git a/Master/texmf-dist/doc/latex/bibleref/README b/Master/texmf-dist/doc/latex/bibleref/README index 8367afdbb3e..3a6570ba544 100644 --- a/Master/texmf-dist/doc/latex/bibleref/README +++ b/Master/texmf-dist/doc/latex/bibleref/README @@ -1,6 +1,6 @@ -LaTeX Class File : bibleref v 1.12 +LaTeX Class File : bibleref v1.13 -Last Modified : 11 May 2010 +Last Modified : 2010-07-07 Author : Nicola Talbot @@ -11,10 +11,14 @@ Files : bibleref.dtx - documented source file The package file bibleref.sty can be used to ensure consistent formatting of bible citations. +INSTALLATION + To extract the code do: latex bibleref.ins +Put bibleref somewhere on TeX's path and refresh the database. + To extract the documentation do: latex bibleref.dtx @@ -22,6 +26,12 @@ latex bibleref.dtx A sample file, sample.tex, is provided. This will be extracted along with the style file bibleref.sty. +REQUIREMENTS + +ifthen +fmtcount +amsgen + This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css index 8e1433aac48..11c2f8c9b57 100644 --- a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css +++ b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css @@ -11,10 +11,10 @@ .cmtt-10{font-family: monospace;} .cmtt-10{font-family: monospace;} .cmss-10{ font-family: sans-serif;} -.cmti-10{ font-style: italic;} .cmtt-9{font-size:90%;font-family: monospace;} .cmtt-9{font-family: monospace;} .cmtt-9{font-family: monospace;} +.cmti-10{ font-style: italic;} .cmbx-10{ font-weight: bold;} p.noindent { text-indent: 0em } td p.noindent { text-indent: 0em; margin-top:0em; } @@ -60,6 +60,8 @@ div.flushleft {text-align: left;} .framebox-r {text-align:right;} span.thank-mark{ vertical-align: super } span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript{ font-size:80%; } +div.footnotes{border-top:solid 1px black; border-bottom:solid 1px black; padding-bottom:1ex; padding-top:0.5ex; margin-right:15%; margin-top:2ex; font-style:italic; font-size:85%;} +div.footnotes p{margin-top:0; margin-bottom:0; text-indent:0;} div.tabular, div.center div.tabular {text-align: center; margin-top:0.5em; margin-bottom:0.5em; } table.tabular td p{margin-top:0em;} table.tabular {margin-left: auto; margin-right: auto;} @@ -119,32 +121,10 @@ h2.titleHead{text-align:center;} div.maketitle{ margin-bottom: 2em; } div.author, div.date {text-align:center;} div.thanks{text-align:left; margin-left:10%; font-size:85%; font-style:italic; } -div.author{white-space: nowrap;} .quotation {margin-bottom:0.25em; margin-top:0.25em; margin-left:1em; } .abstract p {margin-left:5%; margin-right:5%;} div.abstract {width:100%;} table.multicols { width:100%; margin-left:1em; margin-top:1em; margin-bottom:1em; } -#colorbox1{border: solid 1px #000000;} -#colorbox1{background-color: rgb(255,255,191);} -#colorbox2{border: solid 1px #000000;} -#colorbox2{background-color: rgb(255,255,191);} -#colorbox3{border: solid 1px #000000;} -#colorbox3{background-color: rgb(255,255,191);} -#colorbox4{border: solid 1px #000000;} -#colorbox4{background-color: rgb(255,255,191);} -#colorbox5{border: solid 1px #000000;} -#colorbox5{background-color: rgb(255,255,191);} -#colorbox6{border: solid 1px #000000;} -#colorbox6{background-color: rgb(255,255,191);} -#colorbox7{border: solid 1px #000000;} -#colorbox7{background-color: rgb(255,255,191);} -#colorbox8{border: solid 1px #000000;} -#colorbox8{background-color: rgb(255,255,191);} -#colorbox9{border: solid 1px #000000;} -#colorbox9{background-color: rgb(255,255,191);} -#colorbox10{border: solid 1px #000000;} -#colorbox10{background-color: rgb(255,255,191);} -#colorbox11{border: solid 1px #000000;} -#colorbox11{background-color: rgb(255,255,191);} +div.important { background-color:red; } /* end css.sty */ diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html index 907adfab3d6..0d704c240eb 100644 --- a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html +++ b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html @@ -1,15 +1,153 @@ - -bibleref.sty v1.12: a LaTeX2εpackage for typesetting bible references - - - - - - - + id="top"> + + + +bibleref.sty v1.13: a LaTeX2εpackage for typesetting bible references + + + + + + + +
@@ -20,7 +158,7 @@ -

bibleref.sty v1.12: a LATbibleref.sty v1.13: a LATEX2ε package for typesetting bible references

Norwich. Norfolk. NR4 7TJ. class="cmr-12">United Kingdom
http://theoval.cmp.uea.ac.uk/~nlct/

+class="cmtt-12">http://theoval.cmp.uea.ac.uk/~nlct/

11th May 2010
+class="cmr-12">2010-07-07

Contents

@@ -58,16 +198,17 @@ href="#x1-70004" id="QQ2-1-8">Acknowledgements href="#Q1-1-9">Index

+

1 Introduction

The bibleref package was designed to provide consistent formatting for referencing parts +class="cmss-10">bibleref package was designed to provide consistent formatting for referencing parts of the bible. -


\bibleverse 
\bibleverse{book title:verse(s))
+class="cmtt-10">)

-

+

This command can be used to cite a bible book, chapter or verse or range of chapters or verses. -

The book title,

The book title, book title, may be given either as the full title (e.g. \bibleverse{IIKings} -

You may have any number, or zero, sets of parenthesis

You may have any number, or zero, sets of parenthesis (chapter), 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. 2-4. In the typeset output the verses will be separated with -

2-4. In the typeset output the verses will be separated +with +


\BRvsep 
\BRvsep
-

+ id="dx1-2003"> \BRvsep


+

(an en-dash by default.) A chapter may be referenced without a verse, but the colon must remain, e.g. (12:) simply indicates chapter 12. -

A range of verses spanning more than one chapter can be entered as +

A range of verses spanning more than one chapter can be entered as (v) -

Examples: +

Examples:

+

\bibleverse{Ex} \bibleverse{IChronicles}(1:3)-(2:7)1 Chronicles 1:3–2:7

The style of the reference can be specified either by package option or as the argument to the command -


\biblerefstyle 
\biblerefstyle{style}
-

+class="cmtt-10">}


+

Styles are listed in Table 1. +href="#x1-20051">1. +



@@ -224,52 +366,53 @@ href="#x1-20041">1. >Table 1: Bible Citation Styles (can be used as package option or in the argument to \biblerefstyle)
+class="cmtt-10">\biblerefstyle)

+

+class="cmbx-10">Example

2 Corinthians 12:1–5

+class="td11">

2 Co 12:1–5

+class="td11">

II Cor. XII.1–5

+class="td11">

2 Cor. xii. 1–5

+class="td11">

2 Cor xii,1–5

+class="td11">

2 Cor. xii.1–5

+class="td11">

2 Cor. xii : 1–5

+chapter twelve verse one to five

Style

Example

default

2 Corinthians 12:1–5

jerusalem

2 Co 12:1–5

anglosaxon

II Cor. XII.1–5

JEH

2 Cor. xii. 1–5

NTG

2 Cor xii,1–5

MLA

2 Cor. xii.1–5

chicago

2 Cor. xii : 1–5

text

Second Epistle to the Corinthians, -chapter twelve verse one to five

@@ -277,11 +420,10 @@ chapter twelve verse one to five

You can change the name of a book using -


\setbooktitle 
\setbooktitle{name}{new title}
-

+class="cmtt-10">}


+

Note that name\setbookname{Revelation}{Apoc} (Note that you shouldn’t do \setbookname{Rev}{Apoc}) -

If you want a different title for a book depending on whether it’s in the main -body of the document or in the index, you can set the index version using: -

If you want a different title for a book depending on whether it’s in the +main body of the document or in the index, you can set the index version +using: +


\setindexbooktitle 
\setindexbooktitle{name}{title}
-

+class="cmtt-10">}


+

In this case, name

\setbooktitle{Psalms}{Psalm}  
\setindexbooktitle{Psalms}{Psalms} @@ -336,12 +479,11 @@ class="cmtt-10">\ibibleverse{Psalms}(2:) will print Psalm t index, but \ibibleverse{Ps}(2:) will print Psalms in both the document and the index. -

You can add a book using -

You can add a book using +


\addbiblebook 
\addbiblebook{name}{title}
-

+class="cmtt-10">}


+

For example: +

\addbiblebook{Susanna}{Story of Susanna}

-

Top -

2 +

Top

2 Defining New Styles

-

You can define a new style using the command -

You can define a new style using the command +


\newbiblerefstyle 
\newbiblerefstyle{style-name}{commands}
-

+class="cmtt-10">} +


+

where commandsare the commands needed to modify the citation style. -

Example: This new style is based on the “default” style, but has verses in lower case +

Example: This new style is based on the “default” style, but has verses in lower case Roman numerals, and redefines “Revelation” as “Apocalypse”. +

\newbiblerefstyle{sample}{%  
\biblerefstyle{default}% @@ -396,19 +540,18 @@ Roman numerals, and redefines “Revelation” as “Apocalypse̶  
\setbooktitle{Revelation}{Apocalypse}%  
}
-

Note the use of

Note the use of ##1 instead of #1. +

+

Top -

-

3 Top

3 Indexing Bible References

-


\ibibleverse 
\ibibleverse{book title}:verse(s))
-

+class="cmtt-10">)


+

This does the same as \bibleverse but also adds an index entry (provided you have used \makeindex in the preamble.) The default page number format is given by the command -


\bvidxpgformat 
\bvidxpgformat
-

+ id="dx1-4002"> \bvidxpgformat


+

This is textrm by default, but can be redefined. To override the page number format for a particular entry you can use the optional argument to

\ibibleverse[textit]{Exodus}
-

(Note there is no backslash.) -

You may need to create your own custom makeindex style file as the default uses a +

(Note there is no backslash.) +

You may need to create your own custom makeindex style file as the default uses a comma and space to separate the item from the page number, which may cause confusion. For example, you could create a file called sample.ist and write in the @@ -456,36 +600,39 @@ lines: +

delim_0 "\\dotfill "  
delim_1 "\\dotfill "  
delim_2 "\\dotfill "
-

See the makeindex documentation for further details. -

Top -

-

3.1

See the makeindex documentation for further details. +

+

+

Top

3.1 Separate Scripture Index

-

If you want a separate index for bible verses, in addition to a general index, you can +

If you want a separate index for bible verses, in addition to a general index, you can redefine -


\biblerefindex 
\biblerefindex
-

+ id="dx1-5001"> \biblerefindex


+

This command defaults to \index, but can be changed to the appropriate indexing command. For example, suppose you are using the multind package +class="cmss-10">multind package and you want a general index and a scripture index, you can do something like: +

\documentclass{article}  
\usepackage{bibleref} @@ -494,40 +641,47 @@ like:  
\makeindex{general}  
\renewcommand{\biblerefindex}{\index{scripture}}
-

In the document, you can use

In the document, you can use \ibibleverse as before, and the scripture index is displayed using +

\printindex{scripture}{Scripture Index}
-

You will then need to run makeindex on the file

You will then need to run makeindex on the file scripture.idx. See the multind +class="cmss-10">multind documentation for further details. -

Top -

-

3.2

+

+

Top

3.2 Changing the Sort Order

-

The bible reference entries will be sorted alphabetically by makeindex. However you +

The bible reference entries will be sorted alphabetically by makeindex. However you may prefer the entries to be sorted according to their order in the bible. This can either be done using xindy instead of makeindex and creating your own custom +class="cmtt-10">xindy instead of makeindex and creating your own custom alphabet (see xindy manual for details) or you can use bibleref’s mapping +class="cmtt-10">xindy manual for details) or you can use bibleref’s mapping command. -


\biblerefmap 
\biblerefmap{label}{new sort key}
-

+class="cmtt-10">}


+

For example, in the preamble: +

\biblerefmap{Genesis}{01}  
\biblerefmap{Exodus}{02} @@ -550,14 +705,16 @@ For example, in the preamble:  
\biblerefmap{Deuteronomy}{05}  
...
-

When you run makeindex, the references will now be sorted in numerical +

When you run makeindex, the references will now be sorted in numerical order. -

If you want to subdivide the index into, say, old and new testament, you can add +

If you want to subdivide the index into, say, old and new testament, you can add this to the mapping. For example: +

\biblerefmap{Genesis}{1@Old Testament!01}  
\biblerefmap{Exodus}{1@Old Testament!02} @@ -569,80 +726,105 @@ this to the mapping. For example:  
\biblerefmap{Mark}{2@New Testament!02}  
...
-

-

Top -

-

4

+

+

+

Top

4 Acknowledgements

-

Many thanks to all the useful comments from comp.text.tex, especially from +

Many thanks to all the useful comments from comp.text.tex, especially from Jesse Billett, Brooks Moses and Ulrich M. Schwarz. -

-

-

+

+

Top

Index

A +

\addbiblebook  1

B +bibleref package  2, 3
\biblerefindex  2
+class="cmti-10">4
\biblerefmap  3
+href="bibleref-manual.html#dx1-6006" >5
\biblerefstyle  4
+href="bibleref-manual.html#dx1-2004" >6
\bibleverse  5
+href="bibleref-manual.html#dx1-2002" >7
\BRvsep  6
+href="bibleref-manual.html#dx1-2003" >8
\bvidxpgformat  7
+class="cmti-10">9

I \ibibleverse  8
+class="cmti-10">10
+ + + +

M +makeindex  11, 12, 13, 14, 15, 16
+multind package  17, 18

N \newbiblerefstyle  9
- - - +class="cmti-10">19

S \setbooktitle  10
+href="bibleref-manual.html#dx1-2006" >20
\setindexbooktitle  11
+href="bibleref-manual.html#dx1-2007" >21
+

X +xindy  22, 23

-

Top diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.tex b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.tex index e785800affb..abd811656ac 100644 --- a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.tex +++ b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.tex @@ -48,18 +48,18 @@ \usepackage{creatdtx} -\CheckSum{1892} +\CheckSum{1893} \begin{document} -\title{bibleref.sty v1.12: a \LaTeXe\ package for -typesetting bible references} +\title{bibleref.sty v1.13: +a \LaTeXe\ package for typesetting bible references} \author{Nicola Talbot\\[10pt] School of Computing Sciences\\ University of East Anglia\\ Norwich. Norfolk. NR4 7TJ.\\ United Kingdom\\ \url{http://theoval.cmp.uea.ac.uk/~nlct/}} -\date{11th May 2010} +\date{2010-07-07} \maketitle \tableofcontents @@ -178,7 +178,6 @@ For example: \begin{verbatim} \addbiblebook{Susanna}{Story of Susanna} \end{verbatim} -\toTop \section{Defining New Styles} @@ -201,7 +200,6 @@ has verses in lower case Roman numerals, and redefines } \end{verbatim} Note the use of \verb|##1| instead of \verb|#1|. -\toTop \section{Indexing Bible References} @@ -234,7 +232,6 @@ delim_1 "\\dotfill " delim_2 "\\dotfill " \end{verbatim} See the \app{makeindex} documentation for further details. -\toTop \subsection{Separate Scripture Index} @@ -265,7 +262,6 @@ the scripture index is displayed using You will then need to run \app{makeindex} on the file \texttt{scripture.idx}. See the \sty{multind} documentation for further details. -\toTop \subsection{Changing the Sort Order} @@ -304,7 +300,6 @@ testament, you can add this to the mapping. For example: \biblerefmap{Mark}{2@New Testament!02} ... \end{verbatim} -\toTop \section{Acknowledgements} Many thanks to all the useful comments from comp.text.tex, @@ -313,7 +308,6 @@ especially from Jesse~Billett, Brooks~Moses and Ulrich~M.~Schwarz. \StopEventually{\phantomsection \addcontentsline{toc}{section}{Index} \PrintIndex -\toTop } \end{document} diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf index 580e0048c5a..fea95fb2d67 100644 Binary files a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf and b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf differ diff --git a/Master/texmf-dist/doc/latex/bibleref/nlctdoc.cls b/Master/texmf-dist/doc/latex/bibleref/nlctdoc.cls deleted file mode 100644 index 91927b882e8..00000000000 --- a/Master/texmf-dist/doc/latex/bibleref/nlctdoc.cls +++ /dev/null @@ -1,973 +0,0 @@ -\NeedsTeXFormat{LaTeX2e} -\ProvidesClass{nlctdoc}[2010/05/11] -\DeclareOption{a5paper}{\@latexerr{Option not supported}% - {}} -\DeclareOption*{% - \PassOptionsToClass {\CurrentOption}{article}} -\ProcessOptions -\LoadClass{article} -\@ifundefined{macro@cnt}{}{\endinput} -\catcode`\^^A=14 -\AtBeginDocument{\catcode`\^^A=14\relax} -\def\macrocode{\macro@code - \frenchspacing \@vobeyspaces - \xmacro@code} -\def\macro@code{% - \topsep \MacrocodeTopsep - \@beginparpenalty \predisplaypenalty - \if@inlabel\leavevmode\fi - \trivlist \parskip \z@ \item[]% - \macro@font - \leftskip\@totalleftmargin \advance\leftskip\MacroIndent - \rightskip\z@ \parindent\z@ \parfillskip\@flushglue - \blank@linefalse \def\par{\ifblank@line - \leavevmode\fi - \blank@linetrue\@@par - \penalty\interlinepenalty} - \obeylines - \let\do\do@noligs \verbatim@nolig@list - \let\do\@makeother \dospecials - \global\@newlistfalse - \global\@minipagefalse - \ifcodeline@index - \everypar{\global\advance\c@CodelineNo\@ne - \llap{\theCodelineNo\ \hskip\@totalleftmargin}% - \check@module}% - \else \everypar{\check@module}% - \fi - \init@crossref} -\newif\ifblank@line -\def\endmacrocode{% - \ifpm@module \endgroup \pm@modulefalse \fi - \everypar{}% - \global\@inlabelfalse - \endtrivlist - \close@crossref} -\@ifundefined{MacroFont}{% - \if@compatibility - \def\MacroFont{\small - \usefont\encodingdefault - \ttdefault - \mddefault - \updefault - }% - \else - \def\MacroFont{\fontencoding\encodingdefault - \fontfamily\ttdefault - \fontseries\mddefault - \fontshape\updefault - \small}% - \fi - }{} -\@ifundefined{AltMacroFont}{% - \if@compatibility - \def\AltMacroFont{\small - \usefont\encodingdefault - \ttdefault - \mddefault - \sldefault - }% - \else - \def\AltMacroFont{\fontencoding\encodingdefault - \fontfamily\ttdefault - \fontseries\mddefault - \fontshape\sldefault - \small - }% - \fi - }{} -\AtBeginDocument{\let\macro@font\MacroFont} -\def\check@module{% - \ifcheck@modules - \ifpm@module \endgroup \pm@modulefalse \fi - \expandafter\futurelet\expandafter\next\expandafter\ch@percent - \fi} -\newif\ifpm@module -\def\DontCheckModules{\check@modulesfalse} -\def\CheckModules{\check@modulestrue} -\newif\ifcheck@modules \check@modulestrue -\def\ch@percent{% - \if \percentchar\next - \expandafter\check@angle - \fi} -\def\check@angle#1{\futurelet\next\ch@angle} -\begingroup -\catcode`\<\active -\gdef\ch@angle{\ifx<\next - \expandafter\ch@plus@etc - \else \percentchar \fi} -\gdef\ch@plus@etc<{\futurelet\next\check@plus@etc} -\gdef\check@plus@etc{% - \if +\next - \let\next\pm@module - \else\if -\next - \let\next\pm@module - \else\if *\next - \let\next\star@module - \else\if /\next - \let\next\slash@module - \else\ifx <\next - \percentchar - \else - \let\next\pm@module - \fi\fi\fi\fi\fi - \next} -\endgroup -\begingroup -\catcode`\~=\active -\lccode`\~=`\> -\lowercase{\gdef\pm@module#1~}{\pm@moduletrue - \Module{#1}\begingroup - \advance\guard@level\@ne - \ifnum\guard@level>\c@StandardModuleDepth\AltMacroFont\fi -} -\lowercase{\gdef\star@module#1~}{% - \Module{#1}% - \global \advance \guard@level\@ne - \ifnum \guard@level>\c@StandardModuleDepth - \global\let\macro@font=\AltMacroFont \macro@font - \fi} -\catcode`\>=\active -\gdef\slash@module#1>{% - \Module{#1}% - \global \advance \guard@level\m@ne - \ifnum \guard@level=\c@StandardModuleDepth - \global\let\macro@font\MacroFont \macro@font - \fi -} -\endgroup -\newcounter{StandardModuleDepth} -\newcount \guard@level -\@ifundefined{Module}{% - \def\Module#1{\mod@math@codes$\langle\mathsf{#1}\rangle$} - }{} -\def\mod@math@codes{\mathcode`\|="226A \mathcode`\&="2026} -\newskip\MacrocodeTopsep \MacrocodeTopsep = 3pt plus 1.2pt minus 1pt -\newdimen\MacroIndent -\settowidth\MacroIndent{\rmfamily\scriptsize 00\ } -\@namedef{macrocode*}{\macro@code\sxmacro@code} -\expandafter\let\csname endmacrocode*\endcsname = \endmacrocode -\catcode`\!=\catcode`\% ^^A In this section there must not be - ^^A any exclamation marks. - ^^A -\begingroup -\catcode`\|=\z@ \catcode`\[=\@ne \catcode`\]=\tw@ -\catcode`\{=12 \catcode`\}=12 -\catcode`\%=12 \catcode`\ =\active \catcode`\\=\active -!% \end{macrocode*} -! Next follows the actual definition of |\macro@code|; -! notice the -! use of the new escape character. We manage to get the argument -! surrounded by the string |\end{macrocode}|, but at the end -! however, in spite of the actual characters used during the -! definition of -! this macro, |\end| with the argument |{macrocode}| -! will be executed, to ensure a balanced environment. -! \begin{macrocode*} -|gdef|xmacro@code#1% \end{macrocode}[#1|end[macrocode]] -!% \end{macrocode*} -! \begin{macro}{\sxmacro@code} -! The definition of |\sxmacro@code| is completely analogous, -! only -! here a slightly different terminating string will be used. -! Note that the space is not active in this environment. -! \begin{macrocode} -|catcode`| =12 -|gdef|sxmacro@code#1% \end{macrocode*}[#1|end[macrocode*]] -!% \end{macrocode} -! because the |\catcode| changes have been made local by -! commencing a -! new group, there now follows the matching |\endgroup| -! in a rather -! unusual style of writing. -! \begin{macrocode} -|endgroup -!% \end{macrocode} -\catcode`\!=12 -\def\DescribeMacro{\leavevmode\@bsphack - \begingroup\MakePrivateLetters\Describe@Macro} -\def\Describe@Macro#1{\endgroup - \marginpar{\raggedleft\PrintDescribeMacro{#1}}% - \SpecialUsageIndex{#1}\@esphack\ignorespaces} -\def\DescribeEnv{\leavevmode\@bsphack\begingroup\MakePrivateLetters - \Describe@Env} -\def\Describe@Env#1{\endgroup - \marginpar{\raggedleft\PrintDescribeEnv{#1}}% - \SpecialEnvIndex{#1}\@esphack\ignorespaces} -\reversemarginpar -\setlength\marginparpush{0pt} \setlength\marginparwidth{8pc} -{\catcode`\|=\z@ \catcode`\\=12 -|gdef|bslash{\}} -\def\verbatim{\@beginparpenalty \predisplaypenalty \@verbatim - \MacroFont \frenchspacing \@vobeyspaces \@xverbatim} -\@namedef{verbatim*}{\@beginparpenalty \predisplaypenalty \@verbatim - \MacroFont \@sxverbatim} -\def\@verbatim{\trivlist \item[]\if@minipage\else\vskip\parskip\fi - \leftskip\@totalleftmargin\rightskip\z@ - \parindent\z@\parfillskip\@flushglue\parskip\z@ - \@@par - \@tempswafalse - \def\par{\if@tempswa\hbox{}\fi\@tempswatrue\@@par - \penalty\interlinepenalty - \check@percent}% - \obeylines - \let\do\do@noligs \verbatim@nolig@list - \let\do\@makeother \dospecials} -{\catcode`\%=12 - \long\gdef\check@percent#1{\ifx #1%\let\next\@empty \else - \let\next=#1\fi \next}} -\def\verb{\relax\ifmmode\hbox\else\leavevmode\null\fi - \bgroup \let\do\do@noligs \verbatim@nolig@list - \ttfamily \verb@eol@error \let\do\@makeother \dospecials - \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} -\let\verb@balance@group\@empty - -\def\verb@egroup{\global\let\verb@balance@group\@empty\egroup} - -\begingroup - \obeylines% - \gdef\verb@eol@error{\obeylines% - \def^^M{\verb@egroup\@latex@error{% - Text for \noexpand\verb command ended by end of line}\@ehc}}% -\endgroup -\def\@sverb#1{% - \catcode`#1\active \lccode`\~`#1% - \gdef\verb@balance@group{\verb@egroup - \@latex@error{Illegal use of \noexpand\verb command}\@ehc}% - \aftergroup\verb@balance@group - \lowercase{\let~\verb@egroup}} -\def\verbatim@nolig@list{\do\`\do\<\do\>\do\,\do\'\do\-} -\def\do@noligs#1{% - \catcode`#1\active - \begingroup - \lccode`\~=`#1\relax - \lowercase{\endgroup\def~{\leavevmode\kern\z@\char`#1}}} -\newcount\macro@cnt \macro@cnt=0 -\def\macro{\begingroup - \catcode`\\12 - \MakePrivateLetters \m@cro@ \iftrue} -\def\environment{\begingroup - \catcode`\\12 - \MakePrivateLetters \m@cro@ \iffalse} -\long\def\m@cro@#1#2{\endgroup \topsep\MacroTopsep \trivlist - \edef\saved@macroname{\string#2}% - \def\makelabel##1{\llap{##1}}% - \if@inlabel - \let\@tempa\@empty \count@\macro@cnt - \loop \ifnum\count@>\z@ - \edef\@tempa{\@tempa\hbox{\strut}}\advance\count@\m@ne \repeat - \edef\makelabel##1{\llap{\vtop to\baselineskip - {\@tempa\hbox{##1}\vss}}}% - \advance \macro@cnt \@ne - \else \macro@cnt\@ne \fi - \edef\@tempa{\noexpand\item[% - #1% - \noexpand\PrintMacroName - \else - \noexpand\PrintEnvName - \fi - {\string#2}]}% - \@tempa - \global\advance\c@CodelineNo\@ne - #1% - \SpecialMainIndex{#2}\nobreak - \DoNotIndex{#2}% - \else - \SpecialMainEnvIndex{#2}\nobreak - \fi - \global\advance\c@CodelineNo\m@ne - \ignorespaces} -\let\endmacro \endtrivlist -\let\endenvironment\endmacro -\newskip\MacroTopsep \MacroTopsep = 7pt plus 2pt minus 2pt -\@ifundefined{PrintMacroName} - {\def\PrintMacroName#1{\strut \MacroFont \string #1\ }}{} -\@ifundefined{PrintDescribeMacro} - {\def\PrintDescribeMacro#1{\strut \MacroFont \string #1\ }}{} -\@ifundefined{PrintDescribeEnv} - {\def\PrintDescribeEnv#1{\strut \MacroFont #1\ }}{} -\@ifundefined{PrintEnvName} - {\def\PrintEnvName#1{\strut \MacroFont #1\ }}{} -\begingroup -\catcode`\~\active -\gdef\SpecialEscapechar#1{% - \begingroup - \uccode`\~`#1% - \uppercase{\gdef\active@escape@char{~}}% - \escapechar\m@ne \xdef\special@escape@char{\string#1}% - \endgroup} -\endgroup -\begingroup \catcode`\|=\z@ \catcode`\\=\active -|gdef|init@crossref{|catcode`|\|active |let\|bslash - |MakePrivateLetters - |catcode|expandafter`|special@escape@char|active - |expandafter|let|active@escape@char|scan@macro} -|endgroup -\SpecialEscapechar{\\} -\@ifundefined{MakePrivateLetters} - {\let\MakePrivateLetters\makeatletter}{} -\def\close@crossref{\SpecialEscapechar\\} -\def\scan@macro{% - \special@escape@char - \step@checksum - \ifscan@allowed - \let\macro@namepart\@empty - \def\next{\futurelet\next\macro@switch}% - \else \let\next\@empty \fi - \next} -\newif\ifscan@allowed \scan@allowedtrue -\def\DisableCrossrefs{\@bsphack\scan@allowedfalse\@esphack} -\def\EnableCrossrefs{\@bsphack\scan@allowedtrue - \def\DisableCrossrefs{\@bsphack\@esphack}\@esphack} -\def\macro@switch{\ifcat\noexpand\next a% - \let\next\macro@name - \else \let\next\short@macro \fi - \next} -\begingroup -\catcode`\&=12 -\gdef\short@macro#1{\begingroup - \uccode`\&=\expandafter`\string#1% - \uppercase{\def\x{\def\macro@namepart{&}}}% - \expandafter\endgroup\x - \ifnot@excluded - \produce@index{#1}\fi - \scan@allowedfalse#1% - \scan@allowedtrue } -\endgroup -\def\produce@index#1{% - \if\noexpand#1\special@escape@char - \scan@allowedfalse \it@is@a\special@escape@char \else - \if\noexpand#1\bslash \it@is@a\bslash \else - \if\noexpand#1\space \it@is@a\space \else - \ifx#1\par - \it@is@a\space \else - \ifx#1\relax \else - \if\noexpand#1\bgroup \LeftBraceIndex \else - \if\noexpand#1\egroup \RightBraceIndex \else - \if\noexpand#1\percentchar \PercentIndex \else - \it@is@a{\string#1}% - \fi \fi \fi \fi \fi \fi \fi \fi} -\def\macro@name#1{\edef\macro@namepart{\macro@namepart#1}% - \futurelet\next\more@macroname} -\def\more@macroname{\ifcat\noexpand\next a% - \let\next\macro@name - \else \let\next\macro@finish \fi - \next} -\def\macro@finish{% - \macro@namepart - \ifnot@excluded - \edef\@tempa{\noexpand\SpecialIndex{\bslash\macro@namepart}}% - \@tempa \fi} -\def\DoNotIndex{\begingroup \MakePrivateLetters - \catcode`\\12 - \do@not@index} -\long\def\do@not@index#1{% - \endgroup - \addto@hook\index@excludelist{#1,}} -\long\def\addto@hook#1#2{#1\expandafter{\the#1#2}} -\newtoks\index@excludelist -\index@excludelist{} -\begingroup -\catcode`\|=0% -\catcode`\\=12 -|gdef|ifnot@excluded{|expandafter - |expanded@notin|expandafter{|expandafter - \|macro@namepart,}{|the|index@excludelist}} -|endgroup -\def\expanded@notin#1#2{% - \def\in@@##1#1##2##3\in@@{% - \ifx\expanded@notin##2}% - \expandafter\in@@#2#1\expanded@notin\in@@} -\@ifundefined{actualchar}{\def\actualchar{=}}{} -\@ifundefined{quotechar}{\def\quotechar{!}}{} -\@ifundefined{levelchar}{\def\levelchar{>}}{} -\@ifundefined{encapchar}{\def\encapchar{|}}{} -\@ifundefined{verbatimchar}{\def\verbatimchar{+}}{} -\def\SpecialIndex#1{\@bsphack\special@index{\expandafter\@gobble - \string#1\actualchar - \string\verb\quotechar*\verbatimchar\string#1\verbatimchar}% - \@esphack} - -\def\SpecialMainIndex#1{\@bsphack\SpecialIndex@{#1}{\encapchar main}% - \@esphack} -\begingroup - \catcode`\|=0 - \catcode`\\=12 - |gdef|@SpecialIndexHelper@#1#2|@nil{% - |if |noexpand#1\% - |gdef|@gtempa{#2}% - |else - |begingroup - |escapechar|m@ne - |expandafter|gdef|expandafter|@gtempa|expandafter{|string#1#2}% - |endgroup - |fi} -|endgroup -\def\SpecialIndex@#1#2{% - \@SpecialIndexHelper@#1\@nil - \def\@tempb{ }% - \ifcat \@tempb\@gtempa - \special@index{\quotechar\space\actualchar - \string\verb\quotechar*\verbatimchar - \quotechar\bslash\quotechar\space\verbatimchar#2}% - \else - \def\@tempb##1##2\relax{\ifx\relax##2\relax - \def\@tempc{\special@index{\quotechar##1\actualchar - \string\verb\quotechar*\verbatimchar - \quotechar\bslash\quotechar##1\verbatimchar#2}}% - \else - \def\@tempc{\special@index{##1##2\actualchar - \string\verb\quotechar*\verbatimchar - \bslash##1##2\verbatimchar#2}}% - \fi}% - \expandafter\@tempb\@gtempa\relax - \@tempc - \fi} -\def\SpecialMainEnvIndex#1{\@bsphack\special@index{% - #1\actualchar - {\string\ttfamily\space#1} - (environment)% - \encapchar main}% - \special@index{environments:\levelchar#1\actualchar{% - \string\ttfamily\space#1}\encapchar - main}\@esphack} -\def\SpecialUsageIndex#1{\@bsphack - {\let\special@index\index\SpecialIndex@{#1}{\encapchar usage}}% - \@esphack} -\def\SpecialEnvIndex#1{\@bsphack - \index{#1\actualchar{\protect\ttfamily#1} - (environment)\encapchar usage}% - \index{environments:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar - usage}\@esphack} -\def\SortIndex#1#2{\index{#1\actualchar#2}} -\def\it@is@a#1{\special@index{\quotechar #1\actualchar - \string\verb\quotechar*\verbatimchar - \quotechar\bslash\quotechar#1\verbatimchar}} -\@ifundefined{LeftBraceIndex}{\def\LeftBraceIndex{% - \special@index{\bgroup\actualchar\string\verb\quotechar*\verbatimchar - \quotechar\bslash{\verbatimchar\string\iffalse}\string\fi}}}{} - -\@ifundefined{RightBraceIndex}{\def\RightBraceIndex{% - \special@index{\egroup\actualchar\string\iffalse{\string\fi\string\verb - \quotechar*\verbatimchar\quotechar\bslash}\verbatimchar}}}{} -\@ifundefined{PercentIndex} - {\def\PercentIndex{\it@is@a\percentchar}}{} -\def\OldMakeindex{\def\PercentIndex{% - \special@index{\quotechar\percentchar\actualchar\string\verb - \quotechar*\verbatimchar\quotechar\bslash - \percentchar\percentchar\verbatimchar}}} -{\catcode`\%=12 \gdef\percentchar{%}} -\newif\ifhave@multicol -\IfFileExists{multicol.sty}{\have@multicoltrue - \RequirePackage{multicol}% - }{} - -\newdimen\IndexMin \IndexMin = 80pt -\newcount\c@IndexColumns \c@IndexColumns = 3 -\ifhave@multicol - \renewenvironment{theindex} - {\begin{multicols}\c@IndexColumns[\index@prologue][\IndexMin]% - \IndexParms \let\item\@idxitem \ignorespaces}% - {\end{multicols}} -\else - \typeout{Can't find multicol.sty -- will use normal index layout if - necessary.} - \def\theindex{\@restonecoltrue\if@twocolumn\@restonecolfalse\fi - \columnseprule \z@ \columnsep 35\p@ - \twocolumn[\index@prologue]% - \IndexParms \let\item\@idxitem \ignorespaces} - \def\endtheindex{\if@restonecol\onecolumn\else\clearpage\fi} -\fi -\long\def\IndexPrologue#1{\@bsphack\def\index@prologue{#1}\@esphack} -\@ifundefined{index@prologue} - {\def\index@prologue{\section*{Index}% - \markboth{Index}{Index}% - Numbers written in italic refer to the page - where the corresponding entry is described; - numbers underlined refer to the - \ifcodeline@index - code line of the - \fi - definition; numbers in roman refer to the - \ifcodeline@index - code lines - \else - pages - \fi - where the entry is used. - }}{} -\@ifundefined{IndexParms} - {\def\IndexParms{% - \parindent \z@ - \columnsep 15pt - \parskip 0pt plus 1pt - \rightskip 15pt - \mathsurround \z@ - \parfillskip=-15pt - \small - \def\@idxitem{\par\hangindent 30pt}% - \def\subitem{\@idxitem\hspace*{15pt}}% - \def\subsubitem{\@idxitem\hspace*{25pt}}% - \def\indexspace{\par\vspace{10pt plus 2pt minus 3pt}}% - }}{} -\def\efill{\hfill\nopagebreak}% -\def\dotfill{\leaders\hbox to.6em{\hss .\hss}\hskip\z@ plus 1fill}% -\def\dotfil{\leaders\hbox to.6em{\hss .\hss}\hfil}% -\def\pfill{\unskip~\dotfill\penalty500\strut\nobreak - \dotfil~\ignorespaces}% -\def\*{\leavevmode\lower.8ex\hbox{$\,\widetilde{\ }\,$}} -\@ifundefined{main}{\def\main#1{\underline{#1}}}{} -\@ifundefined{usage}{\def\usage#1{\textit{#1}}}{} -\def\PrintIndex{\@input@{\jobname.ind}% - \global\let\PrintIndex\@empty} -\def\changes{\@bsphack\begingroup\@sanitize - \catcode`\\\z@ \catcode`\ 10 \MakePercentIgnore - \changes@} -\def\changes@#1#2#3{% - \protected@edef\@tempa{\noexpand\glossary{#1\levelchar - \ifx\saved@macroname\@empty - \space - \actualchar - \generalname - \else - \expandafter\@gobble - \saved@macroname - \actualchar - \string\verb\quotechar*% - \verbatimchar\saved@macroname - \verbatimchar - \fi - :\levelchar #3}}% - \@tempa\endgroup\@esphack} -\def\saved@macroname{} -\def\generalname{General} -\let\RecordChanges\makeglossary -\newdimen\GlossaryMin \GlossaryMin = 80pt -\newcount\c@GlossaryColumns \c@GlossaryColumns = 2 -\ifhave@multicol - \newenvironment{theglossary}{% - \begin{multicols}\c@GlossaryColumns - [\glossary@prologue][\GlossaryMin]% - \GlossaryParms \let\item\@idxitem \ignorespaces}% - {\end{multicols}} -\else - \newenvironment{theglossary}{% - \@restonecoltrue\if@twocolumn\@restonecolfalse\fi - \columnseprule \z@ \columnsep 35\p@ - \twocolumn[\glossary@prologue]% - \GlossaryParms \let\item\@idxitem \ignorespaces} - {\if@restonecol\onecolumn\else\clearpage\fi} -\fi -\long\def\GlossaryPrologue#1{\@bsphack - \def\glossary@prologue{#1}% - \@esphack} -\@ifundefined{glossary@prologue} - {\def\glossary@prologue{\section*{{Change History}}% - \markboth{{Change History}}{{Change History}}% - }}{} -\@ifundefined{GlossaryParms}{\let\GlossaryParms\IndexParms}{} -\def\PrintChanges{\@input@{\jobname.gls}% - \global\let\PrintChanges\@empty} -\newcommand\AlsoImplementation{% - \long\def\StopEventually##1{\@bsphack\gdef\Finale{##1% - \check@checksum}% - \init@checksum - \@esphack}% - } -\AlsoImplementation -\def\OnlyDescription{\@bsphack\long\def\StopEventually##1{% - ##1\endinput}\@esphack} -\let\Finale\relax -\ifx\l@nohyphenation\undefined - \newlanguage\l@nohyphenation -\fi -\DeclareRobustCommand\meta[1]{% - \ensuremath\langle - \ifmmode \expandafter \nfss@text \fi - {% - \meta@font@select - \edef\meta@hyphen@restore - {\hyphenchar\the\font\the\hyphenchar\font}% - \hyphenchar\font\m@ne - \language\l@nohyphenation - #1\/% - \meta@hyphen@restore - }\ensuremath\rangle -} -\def\meta@font@select{\itshape} -\def\IndexInput#1{% - \begingroup \macro@code - \frenchspacing \@vobeyspaces - \input{#1}\endmacrocode - \endgroup} -\@ifundefined{ps@titlepage} - {\let\ps@titlepage=\ps@plain}{} -\def\MakeShortVerb{% - \@ifstar - {\def\@shortvrbdef{\verb*}\@MakeShortVerb}% - {\def\@shortvrbdef{\verb}\@MakeShortVerb}} -\def\@MakeShortVerb#1{% - \expandafter\ifx\csname cc\string#1\endcsname\relax - \@shortvrbinfo{Made }{#1}\@shortvrbdef - \add@special{#1}% - \expandafter - \xdef\csname cc\string#1\endcsname{\the\catcode`#1}% - \begingroup - \catcode`\~\active \lccode`\~`#1% - \lowercase{% - \global\expandafter\let - \csname ac\string#1\endcsname~% - \expandafter\gdef\expandafter~\expandafter{\@shortvrbdef~}}% - \endgroup - \global\catcode`#1\active - \else - \@shortvrbinfo\@empty{#1 already}{\@empty\verb(*)}% - \fi} -\def\DeleteShortVerb#1{% - \expandafter\ifx\csname cc\string#1\endcsname\relax - \@shortvrbinfo\@empty{#1 not}{\@empty\verb(*)}% - \else - \@shortvrbinfo{Deleted }{#1 as}{\@empty\verb(*)}% - \rem@special{#1}% - \global\catcode`#1\csname cc\string#1\endcsname - \global \expandafter\let \csname cc\string#1\endcsname \relax - \ifnum\catcode`#1=\active - \begingroup - \catcode`\~\active \lccode`\~`#1% - \lowercase{% - \global\expandafter\let\expandafter~% - \csname ac\string#1\endcsname}% - \endgroup \fi \fi} -\def\@shortvrbinfo#1#2#3{% - \PackageInfo{doc}{% - #1\expandafter\@gobble\string#2 a short reference - for \expandafter\string#3}} -\def\add@special#1{% - \rem@special{#1}% - \expandafter\gdef\expandafter\dospecials\expandafter - {\dospecials \do #1}% - \expandafter\gdef\expandafter\@sanitize\expandafter - {\@sanitize \@makeother #1}} -\def\rem@special#1{% - \def\do##1{% - \ifnum`#1=`##1 \else \noexpand\do\noexpand##1\fi}% - \xdef\dospecials{\dospecials}% - \begingroup - \def\@makeother##1{% - \ifnum`#1=`##1 \else \noexpand\@makeother\noexpand##1\fi}% - \xdef\@sanitize{\@sanitize}% - \endgroup} -\def\MakeShortverb{\typeout{*** Switch to \noexpand\MakeShortVerb - syntax, this is obsolete ***}\MakeShortVerb} -\def\DeleteShortverb{\typeout{*** Switch to \noexpand\DeleteShortVerb - syntax, this is obsolete ***}\DeleteShortVerb} -\def\init@checksum{\relax - \global\bslash@cnt\z@} -\def\check@checksum{\relax - \ifnum\check@sum=\z@ - \typeout{**********************************}% - \typeout{* This macro file has no checksum!}% - \typeout{* The checksum should be \the\bslash@cnt!}% - \typeout{**********************************}% - \else - \ifnum\check@sum=\bslash@cnt - \typeout{*******************}% - \typeout{* Checksum passed *}% - \typeout{*******************}% - \else - \PackageError{doc}{Checksum not passed - (\the\check@sum<>\the\bslash@cnt)}% - {The file currently documented seems to be wrong.^^J% - Try to get a correct version.}% - \fi - \fi - \global\check@sum\z@} -\newcount\check@sum \check@sum = \z@ -\newcount\bslash@cnt \bslash@cnt = \z@ -\def\CheckSum#1{\@bsphack\global\check@sum#1\relax\@esphack} -\def\step@checksum{\global\advance\bslash@cnt\@ne} -\def\CharacterTable{\begingroup \CharTableChanges \character@table} -\begingroup - \catcode`\~=11 - \gdef\character@table#1{\def\used~table{#1}% - \ifx\used~table\default~table - \typeout{***************************}% - \typeout{* Character table correct *}% - \typeout{***************************}% - \else - \PackageError{doc}{Character table corrupted} - {\the\wrong@table} - \show\default~table - \show\used~table - \fi - \endgroup} - \global\let\CharTableChanges\@empty - \makeatother - \gdef\default~table - {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z - Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z - Digits \0\1\2\3\4\5\6\7\8\9 - Exclamation \! Double quote \" Hash (number) \# - Dollar \$ Percent \% Ampersand \& - Acute accent \' Left paren \( Right paren \) - Asterisk \* Plus \+ Comma \, - Minus \- Point \. Solidus \/ - Colon \: Semicolon \; Less than \< - Equals \= Greater than \> Question mark \? - Commercial at \@ Left bracket \[ Backslash \\ - Right bracket \] Circumflex \^ Underscore \_ - Grave accent \` Left brace \{ Vertical bar \| - Right brace \} Tilde \~} -\endgroup - \newhelp\wrong@table{Some of the ASCII characters are corrupted.^^J - I now \string\show\space you both tables for comparison.} -\newif\ifcodeline@index \codeline@indexfalse -\let\CodelineNumbered\codeline@indextrue -\def\codeline@wrindex#1{\if@filesw - \immediate\write\@indexfile - {\string\indexentry{#1}% - {\number\c@CodelineNo}}\fi} -\let\special@index = \@gobble -\def\CodelineIndex{\makeindex - \codeline@indextrue - \let\special@index\codeline@wrindex} -\def\PageIndex{\makeindex - \codeline@indexfalse - \let\special@index\index} -\newcount\c@CodelineNo \c@CodelineNo\z@ -\@ifundefined{theCodelineNo} - {\ifx\selectfont\undefined - \def\theCodelineNo{\rmfamily\scriptsize\arabic{CodelineNo}}% - \else - \def\theCodelineNo{\reset@font\scriptsize\arabic{CodelineNo}}% - \fi} - {} - \tolerance=1000\relax -{ \catcode`\"=12 - \global\mathcode`\\="705C \global\mathcode`\@="7040 } -\@ifundefined{DocstyleParms}{}{} -\DocstyleParms \let\DocstyleParms\relax -\@ifundefined{AmSTeX} - {\def\AmSTeX{\leavevmode\hbox{$\mathcal A\kern-.2em\lower.376ex% - \hbox{$\mathcal M$}\kern-.2em\mathcal S$-\TeX}}}{} -\@ifundefined{BibTeX} - {\def\BibTeX{{\rmfamily B\kern-.05em% - \textsc{i\kern-.025em b}\kern-.08em% - T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}}{} -\@ifundefined{SliTeX} - {\def\SliTeX{{\rmfamily S\kern-.06emL\kern-.18em\raise.32ex\hbox - {\scshape i}\kern -.03em\TeX}}}{} -\@ifundefined{PlainTeX}{\def\PlainTeX{\textsc{Plain}\kern2pt\TeX}}{} -\@ifundefined{Web}{\def\Web{\textsc{Web}}}{} -\def\MakePercentIgnore{\catcode`\%9\relax} -\def\MakePercentComment{\catcode`\%14\relax} -\def\DocInput#1{\MakePercentIgnore\input{#1}\MakePercentComment} -\def\GetFileInfo#1{% - \def\filename{#1}% - \def\@tempb##1 ##2 ##3\relax##4\relax{% - \def\filedate{##1}% - \def\fileversion{##2}% - \def\fileinfo{##3}}% - \edef\@tempa{\csname ver@#1\endcsname}% - \expandafter\@tempb\@tempa\relax? ? \relax\relax} -\RequirePackage{dox} -\RequirePackage{color} -\RequirePackage{ifpdf} -\AtBeginDocument{\MakeShortVerb{\|}} -\DeclareFontShape{OT1}{cmtt}{bx}{n}{<-> ssub * cmtt/m/n}{} -\DeclareFontFamily{OMS}{cmtt}{\skewchar\font 48} % '60 -\DeclareFontShape{OMS}{cmtt}{m}{n}{<-> ssub * cmsy/m/n}{} -\DeclareFontShape{OMS}{cmtt}{bx}{n}{<-> ssub * cmsy/b/n}{} -\DeclareFontShape{OT1}{cmss}{m}{it}{<->ssub*cmss/m/sl}{} -\CodelineNumbered -\DisableCrossrefs -\setlength{\textwidth}{355pt} -\addtolength\marginparwidth{30pt} -\addtolength\oddsidemargin{20pt} -\addtolength\evensidemargin{20pt} -\setcounter{StandardModuleDepth}{1} -\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}} -\def\cmd@to@cs#1#2{\char\number`#2\relax} -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\providecommand\marg[1]{% - {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}} -\providecommand\oarg[1]{% - {\ttfamily[}\meta{#1}{\ttfamily]}} -\providecommand\parg[1]{% - {\ttfamily(}\meta{#1}{\ttfamily)}} -\def\oc@scan#1{% - \ifx\oc@bslash#1% - \egroup\let\next\oc@bslash\else - \ifcat a\noexpand#1% - #1\let\next\oc@scan\else - \ifx\oc@percent#1% - \def\next{\char`\%\egroup}% - \else - #1\let\next\egroup - \fi\fi\fi\next} -\def\oc@bslash{\bgroup\oc@ttf\char`\\\oc@scan}% -\def\oc@verb#1{% - \catcode`#1\active - \uccode`\~`#1% - \uppercase{\def~{{\oc@ttf\char`#1}}}} -\begingroup - \obeyspaces% - \catcode`\/=\catcode`\\ - /catcode`/\/active - /catcode`<=/catcode`{% - /catcode`>=/catcode`}% - /catcode`/{/active% - /catcode`/}/active% - /gdef/oldc< \end{oldcomments}>% - /gdef/begmac< \begin{macrocode}>% - /gdef/obs>>% -/endgroup% -\begingroup - \catcode`\/=\catcode`\\ - \catcode`\\=13 - /catcode`/|=/catcode`/% - /catcode`/%=13 - /gdef/oldcomments{| - /makeatletter - /let/do/oc@verb/dospecials - /frenchspacing/@vobeyspaces/obs - /raggedright - /oc@verb/>| - /oc@verb/<| - /let\/oc@bslash - /let%/oc@percent - /obeylines - /parindent/z@ - /ttfamily/expandafter/let/expandafter/oc@ttf/the/font - /rmfamily - /hfuzz/maxdimen - } -/endgroup -\begingroup - \sloppy% - \obeylines% - \gdef\oc@percent#1^^M{% - \ifvmode% - \def\commentline{#1}% - \ifx\commentline\oldc% - \end{oldcomments}% - \else% - \ifx\commentline\begmac% - \begin{macrocode}% - \else% - \leavevmode% - #1^^M% - \fi\fi% - \else% - {\oc@ttf\char`\%}#1^^M% - \fi}% -\endgroup% -\@addtoreset{CodelineNo}{part} -\def\partname{File} -\newcommand*{\DocInclude}[1]{% - \relax - \clearpage - \docincludeaux - \IfFileExists{#1.fdd}{\def\currentfile{#1.fdd}}{\def\currentfile{#1.dtx}}% - \ifnum\@auxout=\@partaux - \@latexerr{\string\include\space cannot be nested}\@eha - \else \@docinclude#1 \fi} -\def\@docinclude#1 {\clearpage -\if@filesw \immediate\write\@mainaux{\string\@input{#1.aux}}\fi -\@tempswatrue\if@partsw \@tempswafalse\edef\@tempb{#1}\@for -\@tempa:=\@partlist\do{\ifx\@tempa\@tempb\@tempswatrue\fi}\fi -\if@tempswa \let\@auxout\@partaux \if@filesw -\immediate\openout\@partaux #1.aux -\immediate\write\@partaux{\relax}\fi -\let\@ltxdoc@PrintIndex\PrintIndex -\let\PrintIndex\relax -\let\@ltxdoc@PrintChanges\PrintChanges -\let\PrintChanges\relax -\let\@ltxdoc@theglossary\theglossary -\let\@ltxdoc@endtheglossary\endtheglossary -\part{\currentfile}% - {\let\ttfamily\relax - \xdef\filekey{\filekey, \thepart={\ttfamily\currentfile}}}% -\DocInput{\currentfile}% -\let\PrintIndex\@ltxdoc@PrintIndex -\let\PrintChanges\@ltxdoc@PrintChanges -\let\theglossary\@ltxdoc@theglossary -\let\endtheglossary\@ltxdoc@endtheglossary -\clearpage -\@writeckpt{#1}\if@filesw \immediate\closeout\@partaux \fi -\else\@nameuse{cp@#1}\fi\let\@auxout\@mainaux} -\gdef\codeline@wrindex#1{\if@filesw - \immediate\write\@indexfile - {\string\indexentry{#1}% - {\filesep\number\c@CodelineNo}}\fi}% -\let\filesep\@empty -\def\aalph#1{\@aalph{\csname c@#1\endcsname}} -\def\@aalph#1{% - \ifcase#1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or - j\or k\or l\or m\or n\or o\or p\or q\or r\or s\or - t\or u\or v\or w\or x\or y\or z\or A\or B\or C\or - D\or E\or F\or G\or H\or I\or J\or K\or L\or M\or - N\or O\or P\or Q\or R\or S\or T\or U\or V\or W\or - X\or Y\or Z\else\@ctrerr\fi} -\def\docincludeaux{% - \def\thepart{\aalph{part}}\def\filesep{\thepart-}% - \let\filekey\@gobble - \g@addto@macro\index@prologue{% - \gdef\@oddfoot{\parbox{\textwidth}{\strut\footnotesize - \raggedright{\bfseries File Key:} \filekey}}% - \let\@evenfoot\@oddfoot}% - \global\let\docincludeaux\relax - \gdef\@oddfoot{% - \expandafter\ifx\csname ver@\currentfile\endcsname\relax - File \thepart: {\ttfamily\currentfile} % - \else - \GetFileInfo{\currentfile}% - File \thepart: {\ttfamily\filename} % - Date: \filedate\ % - Version \fileversion - \fi - \hfill\thepage}% - \let\@evenfoot\@oddfoot}% -\def\task#1#2{} -\renewcommand{\usage}[1]{\textit{\hyperpage{#1}}} -\renewcommand{\main}[1]{\hyperpage{#1}} -\newcommand{\see}[2]{\emph{see} #1} -\RecordChanges -\PageIndex -\CodelineNumbered -\newcommand{\sty}[1]{\textsf{#1}} -\newcommand*{\ics}[1]{\cs{#1}\SpecialMainIndex{#1}} - -\definecolor{defbackground}{rgb}{1,1,0.75} -\newsavebox\defsbox -\newlength\defwidth -\newenvironment{definition}[1][]{% -\def\defarg{#1}% -\setlength{\fboxsep}{4pt}\setlength{\fboxrule}{1.25pt}% -\begin{lrbox}{\defsbox}% -\setlength\defwidth\linewidth -\addtolength\defwidth{-2\fboxrule}% -\addtolength\defwidth{-2\fboxsep}% -\begin{minipage}{\defwidth}\flushleft -}{% -\end{minipage} -\end{lrbox}% -\vskip10pt -\noindent -\defarg\fcolorbox{black}{defbackground}{\usebox\defsbox}% -\vskip10pt -\noindent -\ignorespacesafterend -} - -\newcommand*{\app}[1]{\texttt{#1}} -\newcommand*{\qt}[1]{``#1''} - -\ifpdf - \newcommand*{\toTop}{} -\else - \newcommand*{\toTop}{\par\noindent\hyperlink{top}{Top}} - \AtBeginDocument{\hypertarget{top}{}} -\fi - -\endinput diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx index 558926080e0..0703a983c5d 100644 --- a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx +++ b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx @@ -11,7 +11,7 @@ % -doc "bibleref-manual.tex" % -author "Nicola Talbot" % bibleref -% Created on 2010/5/11 18:06 +% Created on 2010/7/7 10:21 %\fi %\iffalse %<*package> @@ -48,22 +48,22 @@ -\CheckSum{1892} +\CheckSum{1893} \begin{document} \DocInput{bibleref.dtx} \end{document} % %\fi -%\title{bibleref.sty v1.12: a \LaTeXe\ package for -%typesetting bible references} +%\title{bibleref.sty v1.13: +%a \LaTeXe\ package for typesetting bible references} %\author{Nicola Talbot\\[10pt] %School of Computing Sciences\\ %University of East Anglia\\ %Norwich. Norfolk. NR4 7TJ.\\ %United Kingdom\\ %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} -%\date{11th May 2010} +%\date{2010-07-07} % %\maketitle %\tableofcontents @@ -182,7 +182,6 @@ %\begin{verbatim} %\addbiblebook{Susanna}{Story of Susanna} %\end{verbatim} -%\toTop % %\section{Defining New Styles} % @@ -205,7 +204,6 @@ %} %\end{verbatim} %Note the use of \verb|##1| instead of \verb|#1|. -%\toTop % %\section{Indexing Bible References} % @@ -238,7 +236,6 @@ %delim_2 "\\dotfill " %\end{verbatim} %See the \app{makeindex} documentation for further details. -%\toTop % %\subsection{Separate Scripture Index} % @@ -269,7 +266,6 @@ %You will then need to run \app{makeindex} on the file %\texttt{scripture.idx}. See the \sty{multind} documentation %for further details. -%\toTop % %\subsection{Changing the Sort Order} % @@ -308,7 +304,6 @@ %\biblerefmap{Mark}{2@New Testament!02} %... %\end{verbatim} -%\toTop % %\section{Acknowledgements} %Many thanks to all the useful comments from comp.text.tex, @@ -317,7 +312,6 @@ %\StopEventually{\phantomsection %\addcontentsline{toc}{section}{Index} %\PrintIndex -%\toTop %} % % @@ -331,17 +325,23 @@ % Declare package % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2010/05/11 1.12 (NLCT)] +\ProvidesPackage{bibleref}[2010/07/07 1.13 (NLCT)] % \end{macrocode} % Need to do some conditional stuff % \begin{macrocode} \RequirePackage{ifthen} % \end{macrocode} -% The fmtcount package is needed for the full text +% The \sty{fmtcount} package is needed for the full text % citations % \begin{macrocode} \RequirePackage{fmtcount} % \end{macrocode} +% The \sty{amsgen} package is needed for \cs{new@ifnextchar} +%\changes{1.13}{2010/07/07}{Added amsgen which provides +%\cs{new@ifnextchar}} +% \begin{macrocode} +\RequirePackage{amsgen} +% \end{macrocode} %\begin{macro}{\BRbooknumberstyle} % The style of the book % number. By default, it simply displays its argument @@ -854,7 +854,7 @@ \renewcommand*{\BRepistletothe}{}% \renewcommand*{\BRepistleto}{}% \renewcommand*{\BRepistleof}{}% -\renewcommand*{\BRbkchsep}{ } +\renewcommand*{\BRbkchsep}{ }% \renewcommand*{\BRchvsep}{:}% \renewcommand*{\BRchsep}{;}% \renewcommand*{\BRvrsep}{--}% @@ -1154,8 +1154,12 @@ defined}{}}} % Sets the current style. % \begin{macrocode} \newcommand*{\biblerefstyle}[1]{% -\@ifundefined{brs@#1}{\PackageError{bibleref}{% -Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} + \@ifundefined{brs@#1}% + {% + \PackageError{bibleref}{Unknown biblerefstyle '#1'}{}% + }% + {\csname brs@#1\endcsname}% +} % \end{macrocode} %\end{macro} % @@ -1320,7 +1324,11 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} \def\@bv@mainidxentry{\BRbooktitlestyle{\csname bri@#1\endcsname}}% }% }% - \@ifnextchar(% +% \end{macrocode} +%\changes{1.13}{2010/07/07}{changed \cs{@ifnextchar} to +%\cs{new@ifnextchar}} +% \begin{macrocode} + \new@ifnextchar(% {\BRbkchsep\@bibleverse}% {\@end@@bibleverse}% } @@ -1383,9 +1391,13 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} \else \@bv@do{\BRchvsep}\@br@vrsty{#1}% \fi - \@ifnextchar(% +% \end{macrocode} +%\changes{1.13}{2010/07/07}{changed \cs{@ifnextchar} to +%\cs{new@ifnextchar}} +% \begin{macrocode} + \new@ifnextchar(% {\@bv@do{\BRchsep}\@bibleverse}% - {\@ifnextchar-% + {\new@ifnextchar-% {\@bv@do{\BRvrsep}\@bibleverser}% {\@end@@bibleverse}% }% @@ -1540,18 +1552,18 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} \usepackage{creatdtx} -\CheckSum{1892} +\CheckSum{1893} \begin{document} -\title{bibleref.sty v1.12: a \LaTeXe\ package for -typesetting bible references} +\title{bibleref.sty v1.13: +a \LaTeXe\ package for typesetting bible references} \author{Nicola Talbot\\[10pt] School of Computing Sciences\\ University of East Anglia\\ Norwich. Norfolk. NR4 7TJ.\\ United Kingdom\\ \url{http://theoval.cmp.uea.ac.uk/~nlct/}} -\date{11th May 2010} +\date{2010-07-07} \maketitle \tableofcontents @@ -1670,7 +1682,6 @@ For example: \begin{verbatim} \addbiblebook{Susanna}{Story of Susanna} \end{verbatim} -\toTop \section{Defining New Styles} @@ -1693,7 +1704,6 @@ has verses in lower case Roman numerals, and redefines } \end{verbatim} Note the use of \verb|##1| instead of \verb|#1|. -\toTop \section{Indexing Bible References} @@ -1726,7 +1736,6 @@ delim_1 "\\dotfill " delim_2 "\\dotfill " \end{verbatim} See the \app{makeindex} documentation for further details. -\toTop \subsection{Separate Scripture Index} @@ -1757,7 +1766,6 @@ the scripture index is displayed using You will then need to run \app{makeindex} on the file \texttt{scripture.idx}. See the \sty{multind} documentation for further details. -\toTop \subsection{Changing the Sort Order} @@ -1796,7 +1804,6 @@ testament, you can add this to the mapping. For example: \biblerefmap{Mark}{2@New Testament!02} ... \end{verbatim} -\toTop \section{Acknowledgements} Many thanks to all the useful comments from comp.text.tex, @@ -1805,7 +1812,6 @@ especially from Jesse~Billett, Brooks~Moses and Ulrich~M.~Schwarz. \StopEventually{\phantomsection \addcontentsline{toc}{section}{Index} \PrintIndex -\toTop } \end{document} @@ -1897,10 +1903,12 @@ Another new testament reference \ibibleverse{Matt}. \maketitle Long citation in text: -\biblerefstyle{text} -\bibleverse{IICor}(12:15,18,21-33). +\biblerefstyle{text}% +\bibleverse{IICor}(12:15,18,21-33) and +\bibleverse{Jeremiah}. Short citation in footnote\footnote{% -\biblerefstyle{chicago}\bibleverse{IICor}(12:15,18,21-33)}. +\biblerefstyle{chicago}\bibleverse{IICor}(12:15,18,21-33) and +\bibleverse{Jeremiah}}. \section{Default Style} diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.ins b/Master/texmf-dist/source/latex/bibleref/bibleref.ins new file mode 100644 index 00000000000..6c8d41369dd --- /dev/null +++ b/Master/texmf-dist/source/latex/bibleref/bibleref.ins @@ -0,0 +1,38 @@ +% bibleref.ins generated using makedtx version 0.94b 2010/7/7 10:21 +\input docstrip + +\preamble + + bibleref.dtx + Copyright 2010 Nicola Talbot + + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either version 1.3 + of this license of (at your option) any later version. + The latest version of this license is in + http://www.latex-project.org/lppl.txt + and version 1.3 or later is part of all distributions of LaTeX + version 2005/12/01 or later. + + This work has the LPPL maintenance status `maintained'. + + The Current Maintainer of this work is Nicola Talbot. + + This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref.sty, bibleref-manual.tex, sample-multind.tex, sample.tex, bibleref.perl. + +\endpreamble + +\askforoverwritefalse + +\generate{\file{bibleref.sty}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{bibleref.dtx}{bibleref.sty,package}} +\file{bibleref-manual.tex}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{bibleref.dtx}{bibleref-manual.tex,package}} +\file{sample-multind.tex}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{bibleref.dtx}{sample-multind.tex,package}} +\file{sample.tex}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{bibleref.dtx}{sample.tex,package}} +\file{bibleref.perl}{\nopreamble\nopostamble\from{bibleref.dtx}{bibleref.perl}} +} + +\endbatchfile diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.sty b/Master/texmf-dist/source/latex/bibleref/bibleref.sty deleted file mode 100644 index c09911c7c6e..00000000000 --- a/Master/texmf-dist/source/latex/bibleref/bibleref.sty +++ /dev/null @@ -1,851 +0,0 @@ -%% -%% This is file `bibleref.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% bibleref.dtx (with options: `bibleref.sty,package') -%% -%% bibleref.dtx -%% Copyright 2010 Nicola Talbot -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% The Current Maintainer of this work is Nicola Talbot. -%% -%% This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref.sty, bibleref-manual.tex, sample-multind.tex, sample.tex, bibleref.perl. -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2010/05/11 1.12 (NLCT)] -\RequirePackage{ifthen} -\RequirePackage{fmtcount} -\newcommand*{\BRbooknumberstyle}[1]{#1 } -\newcommand*{\BRepistlenumberstyle}[1]{#1 } -\newcommand*{\BRbookof}{} -\newcommand*{\BRgospel}{} -\newcommand*{\BRepistleto}{} -\newcommand*{\BRepistletothe}{} -\newcommand*{\BRepistleof}{} -\newcommand*{\BRbooktitlestyle}[1]{#1} -\newcommand*{\BRchapterstyle}[1]{#1} -\newcommand*{\BRversestyle}[1]{#1} -\newcommand*{\BRversesuffixstyle}[1]{#1} -\newcommand*{\BRbkchsep}{ } -\newcommand*{\BRchvsep}{:} -\newcommand*{\BRchsep}{;} -\newcommand*{\BRvrsep}{--} -\newcommand*{\BRvsep}{,} -\newcommand*{\BRperiod}{} -\newcommand*{\brfullname}{% -\def\br@Genesis{\BRbookof Genesis}% -\def\br@Exodus{\BRbookof Exodus}% -\def\br@Leviticus{\BRbookof Leviticus}% -\def\br@Numbers{\BRbookof Numbers}% -\def\br@Deuteronomy{\BRbookof Deuteronomy}% -\def\br@Joshua{\BRbookof Joshua}% -\def\br@Judges{\BRbookof Judges}% -\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 Kings}% -\def\br@IIKings{\BRbooknumberstyle{2}\BRbookof Kings}% -\def\br@IChronicles{\BRbooknumberstyle{1}\BRbookof Chronicles}% -\def\br@IIChronicles{\BRbooknumberstyle{2}\BRbookof Chronicles}% -\def\br@Ezra{\BRbookof Ezra}% -\def\br@Nehemiah{\BRbookof Nehemiah}% -\def\br@Tobit{\BRbookof Tobit}% -\def\br@Judith{\BRbookof Judith}% -\def\br@Esther{\BRbookof Esther}% -\def\br@IMaccabees{\BRbooknumberstyle{1}\BRbookof Maccabees}% -\def\br@IIMaccabees{\BRbooknumberstyle{2}\BRbookof Maccabees}% -\def\br@Job{\BRbookof Job}% -\def\br@Psalms{\BRbookof Psalms}% -\def\br@Proverbs{\BRbookof Proverbs}% -\def\br@Ecclesiastes{\BRbookof Ecclesiastes}% -\def\br@SongofSongs{\BRbookof Song of Songs}% -\def\br@Wisdom{\BRbookof Wisdom}% -\def\br@Ecclesiasticus{\BRbookof Ecclesiasticus}% -\def\br@Isaiah{\BRbookof Isaiah}% -\def\br@Jeremiah{\BRbookof Jeremiah}% -\def\br@Lamentations{\BRbookof Lamentations}% -\def\br@Baruch{\BRbookof Baruch}% -\def\br@Ezekiel{\BRbookof Ezekiel}% -\def\br@Daniel{\BRbookof Daniel}% -\def\br@Hosea{\BRbookof Hosea}% -\def\br@Joel{\BRbookof Joel}% -\def\br@Amos{\BRbookof Amos}% -\def\br@Obadiah{\BRbookof Obadiah}% -\def\br@Jonah{\BRbookof Jonah}% -\def\br@Micah{\BRbookof Micah}% -\def\br@Nahum{\BRbookof Nahum}% -\def\br@Habakkuk{\BRbookof Habakkuk}% -\def\br@Zephaniah{\BRbookof Zephaniah}% -\def\br@Haggai{\BRbookof Haggai}% -\def\br@Zechariah{\BRbookof Zechariah}% -\def\br@Malachi{\BRbookof Malachi}% -\def\br@Matthew{\BRgospel Matthew}% -\def\br@Mark{\BRgospel Mark}% -\def\br@Luke{\BRgospel Luke}% -\def\br@John{\BRgospel John}% -\def\br@Acts{Acts}% -\def\br@Romans{\BRepistletothe Romans}% -\def\br@ICorinthians{\BRepistlenumberstyle{1}\BRepistletothe Corinthians}% -\def\br@IICorinthians{\BRepistlenumberstyle{2}\BRepistletothe Corinthians}% -\def\br@Galatians{\BRepistletothe Galatians}% -\def\br@Ephesians{\BRepistletothe Ephesians}% -\def\br@Philippians{\BRepistletothe Philippians}% -\def\br@Colossians{\BRepistletothe Colossians}% -\def\br@IThessalonians{\BRepistlenumberstyle{1}\BRepistletothe Thessalonians}% -\def\br@IIThessalonians{\BRepistlenumberstyle{2}\BRepistletothe Thessalonians}% -\def\br@ITimothy{\BRepistlenumberstyle{1}\BRepistleto Timothy}% -\def\br@IITimothy{\BRepistlenumberstyle{2}\BRepistleto Timothy}% -\def\br@Titus{\BRepistleto Titus}% -\def\br@Philemon{\BRepistleto Philemon}% -\def\br@Hebrews{\BRepistletothe Hebrews}% -\def\br@James{\BRepistleof James}% -\def\br@IPeter{\BRepistlenumberstyle{1}\BRepistleof Peter}% -\def\br@IIPeter{\BRepistlenumberstyle{2}\BRepistleof Peter}% -\def\br@IJohn{\BRepistlenumberstyle{1}\BRepistleof John}% -\def\br@IIJohn{\BRepistlenumberstyle{2}\BRepistleof John}% -\def\br@IIIJohn{\BRepistlenumberstyle{3}\BRepistleof John}% -\def\br@Jude{\BRepistleof Jude}% -\def\br@Revelation{\BRbookof Revelation}} -\brfullname -\newcommand*{\brabbrvname}{% -\def\br@Genesis{Gn\BRperiod}% -\def\br@Exodus{Ex\BRperiod}% -\def\br@Leviticus{Lv\BRperiod}% -\def\br@Numbers{Nb\BRperiod}% -\def\br@Deuteronomy{Dt\BRperiod}% -\def\br@Joshua{Jos\BRperiod}% -\def\br@Judges{Jg\BRperiod}% -\def\br@Ruth{Rt\BRperiod}% -\def\br@ISamuel{\BRbooknumberstyle{1}S\BRperiod}% -\def\br@IISamuel{\BRbooknumberstyle{2}S\BRperiod}% -\def\br@IKings{\BRbooknumberstyle{1}K\BRperiod}% -\def\br@IIKings{\BRbooknumberstyle{2}K\BRperiod}% -\def\br@IChronicles{\BRbooknumberstyle{1}Ch\BRperiod}% -\def\br@IIChronicles{\BRbooknumberstyle{2}Ch\BRperiod}% -\def\br@Ezra{Ezr\BRperiod}% -\def\br@Nehemiah{Ne\BRperiod}% -\def\br@Tobit{Tb\BRperiod}% -\def\br@Judith{Jdt\BRperiod}% -\def\br@Esther{Est\BRperiod}% -\def\br@IMaccabees{\BRbooknumberstyle{1}M\BRperiod}% -\def\br@IIMaccabees{\BRbooknumberstyle{2}M\BRperiod}% -\def\br@Job{Jb\BRperiod}% -\def\br@Psalms{Ps\BRperiod}% -\def\br@Proverbs{Pr\BRperiod}% -\def\br@Ecclesiastes{Qo\BRperiod}% -\def\br@SongofSongs{Sg\BRperiod}% -\def\br@Wisdom{Ws\BRperiod}% -\def\br@Ecclesiasticus{Si\BRperiod}% -\def\br@Isaiah{Is\BRperiod}% -\def\br@Jeremiah{Jr\BRperiod}% -\def\br@Lamentations{Lm\BRperiod}% -\def\br@Baruch{Ba\BRperiod}% -\def\br@Ezekiel{Ezk\BRperiod}% -\def\br@Daniel{Dn\BRperiod}% -\def\br@Hosea{Ho\BRperiod}% -\def\br@Joel{Jl\BRperiod}% -\def\br@Amos{Am\BRperiod}% -\def\br@Obadiah{Ob\BRperiod}% -\def\br@Jonah{Jon\BRperiod}% -\def\br@Micah{Mi\BRperiod}% -\def\br@Nahum{Na\BRperiod}% -\def\br@Habakkuk{Hab\BRperiod}% -\def\br@Zephaniah{Zp\BRperiod}% -\def\br@Haggai{Hg\BRperiod}% -\def\br@Zechariah{Zc\BRperiod}% -\def\br@Malachi{Ml\BRperiod}% -\def\br@Matthew{Mt\BRperiod}% -\def\br@Mark{Mk\BRperiod}% -\def\br@Luke{Lk\BRperiod}% -\def\br@John{Jn\BRperiod}% -\def\br@Acts{Ac\BRperiod}% -\def\br@Romans{Rm\BRperiod}% -\def\br@ICorinthians{\BRepistlenumberstyle{1}Co\BRperiod}% -\def\br@IICorinthians{\BRepistlenumberstyle{2}Co\BRperiod}% -\def\br@Galatians{Ga\BRperiod}% -\def\br@Ephesians{Ep\BRperiod}% -\def\br@Philippians{Ph\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}Tm\BRperiod}% -\def\br@IITimothy{\BRepistlenumberstyle{2}Tm\BRperiod}% -\def\br@Titus{Tt\BRperiod}% -\def\br@Philemon{Phm\BRperiod}% -\def\br@Hebrews{Heb\BRperiod}% -\def\br@James{Jm\BRperiod}% -\def\br@IPeter{\BRepistlenumberstyle{1}P\BRperiod}% -\def\br@IIPeter{\BRepistlenumberstyle{2}P\BRperiod}% -\def\br@IJohn{\BRepistlenumberstyle{1}Jn\BRperiod}% -\def\br@IIJohn{\BRepistlenumberstyle{2}Jn\BRperiod}% -\def\br@IIIJohn{\BRepistlenumberstyle{3}Jn\BRperiod}% -\def\br@Jude{Jude}% -\def\br@Revelation{Rv\BRperiod}} -\newcommand*{\braltabbrvname}{% -\def\br@Genesis{Gen\BRperiod}% -\def\br@Exodus{Exod\BRperiod}% -\def\br@Leviticus{Lev\BRperiod}% -\def\br@Numbers{Num\BRperiod}% -\def\br@Deuteronomy{Deut\BRperiod}% -\def\br@Joshua{Josh\BRperiod}% -\def\br@Judges{Judg\BRperiod}% -\def\br@Ruth{Ruth}% -\def\br@ISamuel{\BRbooknumberstyle{1}Sam\BRperiod}% -\def\br@IISamuel{\BRbooknumberstyle{2}Sam\BRperiod}% -\def\br@IKings{\BRbooknumberstyle{1}Kgs\BRperiod}% -\def\br@IIKings{\BRbooknumberstyle{2}Kgs\BRperiod}% -\def\br@IChronicles{\BRbooknumberstyle{1}Chr\BRperiod}% -\def\br@IIChronicles{\BRbooknumberstyle{2}Chr\BRperiod}% -\def\br@Ezra{Ezra}% -\def\br@Nehemiah{Neh\BRperiod}% -\def\br@Tobit{Tobit}% -\def\br@Judith{Judith}% -\def\br@Esther{Esther}% -\def\br@IMaccabees{\BRbooknumberstyle{1}M\BRperiod}% -\def\br@IIMaccabees{\BRbooknumberstyle{2}M\BRperiod}% -\def\br@Job{Job}% -\def\br@Psalms{Ps\BRperiod}% -\def\br@Proverbs{Prov\BRperiod}% -\def\br@Ecclesiastes{Eccles\BRperiod}% -\def\br@SongofSongs{S\BRperiod\ of S\BRperiod}% -\def\br@Wisdom{Wisd\BRperiod}% -\def\br@Ecclesiasticus{Ecclus\BRperiod}% -\def\br@Isaiah{Isa\BRperiod}% -\def\br@Jeremiah{Jer\BRperiod}% -\def\br@Lamentations{Lam\BRperiod}% -\def\br@Baruch{Baruch}% -\def\br@Ezekiel{Ezek\BRperiod}% -\def\br@Daniel{Dan\BRperiod}% -\def\br@Hosea{Hos\BRperiod}% -\def\br@Joel{Joel}% -\def\br@Amos{Amos}% -\def\br@Obadiah{Obad}% -\def\br@Jonah{Jonah}% -\def\br@Micah{Mic\BRperiod}% -\def\br@Nahum{Nah\BRperiod}% -\def\br@Habakkuk{Hab\BRperiod}% -\def\br@Zephaniah{Zeph\BRperiod}% -\def\br@Haggai{Hag\BRperiod}% -\def\br@Zechariah{Zech\BRperiod}% -\def\br@Malachi{Mal\BRperiod}% -\def\br@Matthew{Matt\BRperiod}% -\def\br@Mark{Mark}% -\def\br@Luke{Luke}% -\def\br@John{John}% -\def\br@Acts{Acts}% -\def\br@Romans{Rom\BRperiod}% -\def\br@ICorinthians{\BRepistlenumberstyle{1}Cor\BRperiod}% -\def\br@IICorinthians{\BRepistlenumberstyle{2}Cor\BRperiod}% -\def\br@Galatians{Gal\BRperiod}% -\def\br@Ephesians{Eph\BRperiod}% -\def\br@Philippians{Phil\BRperiod}% -\def\br@Colossians{Col\BRperiod}% -\def\br@IThessalonians{\BRepistlenumberstyle{1}Thess\BRperiod}% -\def\br@IIThessalonians{\BRepistlenumberstyle{2}Thess\BRperiod}% -\def\br@ITimothy{\BRepistlenumberstyle{1}Tim\BRperiod}% -\def\br@IITimothy{\BRepistlenumberstyle{2}Tim\BRperiod}% -\def\br@Titus{Tit\BRperiod}% -\def\br@Philemon{Philem\BRperiod}% -\def\br@Hebrews{Heb\BRperiod}% -\def\br@James{Jas\BRperiod}% -\def\br@IPeter{\BRepistlenumberstyle{1}Pet\BRperiod}% -\def\br@IIPeter{\BRepistlenumberstyle{2}Pet\BRperiod}% -\def\br@IJohn{\BRepistlenumberstyle{1}John}% -\def\br@IIJohn{\BRepistlenumberstyle{2}John}% -\def\br@IIIJohn{\BRepistlenumberstyle{3}John}% -\def\br@Jude{Jude}% -\def\br@Revelation{Rev\BRperiod}} -\newcommand*\br@Gn{\br@Genesis}% -\newcommand*\br@Ex{\br@Exodus}% -\newcommand*\br@Lv{\br@Leviticus}% -\newcommand*\br@Nb{\br@Numbers}% -\newcommand*\br@Dt{\br@Deuteronomy}% -\newcommand*\br@Jos{\br@Joshua}% -\newcommand*\br@Jg{\br@Judges}% -\newcommand*\br@Rt{\br@Ruth}% -\newcommand*\br@IS{\br@ISamuel}% -\newcommand*\br@IIS{\br@IISamuel}% -\newcommand*\br@IK{\br@IKings}% -\newcommand*\br@IIK{\br@IIKings}% -\newcommand*\br@ICh{\br@IChronicles}% -\newcommand*\br@IICh{\br@IIChronicles}% -\newcommand*\br@Ezr{\br@Ezra}% -\newcommand*\br@Ne{\br@Nehemiah}% -\newcommand*\br@Tb{\br@Tobit}% -\newcommand*\br@Jdt{\br@Judith}% -\newcommand*\br@Est{\br@Esther}% -\newcommand*\br@IM{\br@IMaccabees}% -\newcommand*\br@IIM{\br@IIMaccabees}% -\newcommand*\br@Jb{\br@Job}% -\newcommand*\br@Ps{\br@Psalms}% -\newcommand*\br@Pr{\br@Proverbs}% -\newcommand*\br@Qo{\br@Ecclesiastes}% -\newcommand*\br@Sg{\br@SongofSongs}% -\newcommand*\br@Ws{\br@Wisdom}% -\newcommand*\br@Si{\br@Ecclesiasticus}% -\newcommand*\br@Is{\br@Isaiah}% -\newcommand*\br@Jr{\br@Jeremiah}% -\newcommand*\br@Lm{\br@Lamentations}% -\newcommand*\br@Ba{\br@Baruch}% -\newcommand*\br@Ezk{\br@Ezekiel}% -\newcommand*\br@Dn{\br@Daniel}% -\newcommand*\br@Ho{\br@Hosea}% -\newcommand*\br@Jl{\br@Joel}% -\newcommand*\br@Am{\br@Amos}% -\newcommand*\br@Ob{\br@Obadiah}% -\newcommand*\br@Jon{\br@Jonah}% -\newcommand*\br@Mi{\br@Micah}% -\newcommand*\br@Na{\br@Nahum}% -\newcommand*\br@Hab{\br@Habakkuk}% -\newcommand*\br@Zp{\br@Zephaniah}% -\newcommand*\br@Hg{\br@Haggai}% -\newcommand*\br@Zc{\br@Zechariah}% -\newcommand*\br@Ml{\br@Malachi}% -\newcommand*\br@Mt{\br@Matthew}% -\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}% -\newcommand*\br@IITm{\br@IITimothy}% -\newcommand*\br@Tt{\br@Titus}% -\newcommand*\br@Phm{\br@Philemon}% -\newcommand*\br@Heb{\br@Hebrews}% -\newcommand*\br@Jm{\br@James}% -\newcommand*\br@IP{\br@IPeter}% -\newcommand*\br@IIP{\br@IIPeter}% -\newcommand*\br@IJn{\br@IJohn}% -\newcommand*\br@IIJn{\br@IIJohn}% -\newcommand*\br@Rv{\br@Revelation} -\newcommand*\br@Gen{\br@Genesis}% -\newcommand*\br@Exod{\br@Exodus}% -\newcommand*\br@Lev{\br@Leviticus}% -\newcommand*\br@Num{\br@Numbers}% -\newcommand*\br@Deut{\br@Deuteronomy}% -\newcommand*\br@Josh{\br@Joshua}% -\newcommand*\br@Judg{\br@Judges}% -\newcommand*\br@ISam{\br@ISamuel}% -\newcommand*\br@IISam{\br@IISamuel}% -\newcommand*\br@IKgs{\br@IKings}% -\newcommand*\br@IIKgs{\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@IIMacc{\br@IIMaccabees}% -\newcommand*\br@Prov{\br@Proverbs}% -\newcommand*\br@Eccl{\br@Ecclesiastes}% -\newcommand*\br@SofS{\br@SongofSongs}% -\newcommand*\br@Wisd{\br@Wisdom}% -\newcommand*\br@Ecclus{\br@Ecclesiasticus}% -\newcommand*\br@Isa{\br@Isaiah}% -\newcommand*\br@Jer{\br@Jeremiah}% -\newcommand*\br@Lam{\br@Lamentations}% -\newcommand*\br@Ezek{\br@Ezekiel}% -\newcommand*\br@Dan{\br@Daniel}% -\newcommand*\br@Hos{\br@Hosea}% -\newcommand*\br@Obad{\br@Obadiah}% -\newcommand*\br@Mic{\br@Micah}% -\newcommand*\br@Nah{\br@Nahum}% -\newcommand*\br@Zeph{\br@Zephaniah}% -\newcommand*\br@Hag{\br@Haggai}% -\newcommand*\br@Zech{\br@Zechariah}% -\newcommand*\br@Mal{\br@Malachi}% -\newcommand*\br@Matt{\br@Matthew}% -\newcommand*\br@Rom{\br@Romans}% -\newcommand*\br@ICor{\br@ICorinthians}% -\newcommand*\br@IICor{\br@IICorinthians}% -\newcommand*\br@Gal{\br@Galatians}% -\newcommand*\br@Eph{\br@Ephesians}% -\newcommand*\br@Phil{\br@Philippians}% -\newcommand*\br@IThess{\br@IThessalonians}% -\newcommand*\br@IIThess{\br@IIThessalonians}% -\newcommand*\br@ITim{\br@ITimothy}% -\newcommand*\br@IITim{\br@IITimothy}% -\newcommand*\br@Tit{\br@Titus}% -\newcommand*\br@Philem{\br@Philemon}% -\newcommand*\br@Jas{\br@James}% -\newcommand*\br@IPet{\br@IPeter}% -\newcommand*\br@IIPet{\br@IIPeter}% -\newcommand*\br@Rev{\br@Revelation} -\newcommand*{\brs@default}{% -\brfullname -\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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{}} -\newcommand*{\brs@jerusalem}{% -\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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{}% -} -\newcommand*{\brs@anglosaxon}{% -\braltabbrvname -\renewcommand*{\BRbooknumberstyle}[1]{\MakeUppercase{\romannumeral##1} }% -\renewcommand*{\BRepistlenumberstyle}[1]{\MakeUppercase{\romannumeral##1} }% -\renewcommand*{\BRbooktitlestyle}[1]{##1}% -\renewcommand*{\BRchapterstyle}[1]{\MakeUppercase{\romannumeral##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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{.}% -} -\newcommand*{\brs@JEH}{% -\braltabbrvname -\renewcommand*{\BRbooknumberstyle}[1]{##1 }% -\renewcommand*{\BRepistlenumberstyle}[1]{##1 }% -\renewcommand*{\BRbooktitlestyle}[1]{##1}% -\renewcommand*{\BRchapterstyle}[1]{\romannumeral##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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{.}% -} -\newcommand*{\brs@MHRA}{% -\brfullname -\renewcommand*{\BRbooknumberstyle}[1]{\textsc{\romannumeral##1} }% -\renewcommand*{\BRepistlenumberstyle}[1]{\textsc{\romannumeral##1} }% -\renewcommand*{\BRbooktitlestyle}[1]{##1}% -\renewcommand*{\BRchapterstyle}[1]{\romannumeral##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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{}% -} -\newcommand*{\brs@NTG}{% -\braltabbrvname -\renewcommand*{\BRbooknumberstyle}[1]{##1 }% -\renewcommand*{\BRepistlenumberstyle}[1]{##1 }% -\renewcommand*{\BRbooktitlestyle}[1]{##1}% -\renewcommand*{\BRchapterstyle}[1]{\romannumeral##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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{}% -} -\newcommand*{\brs@MLA}{% -\braltabbrvname -\renewcommand*{\BRbooknumberstyle}[1]{##1 }% -\renewcommand*{\BRepistlenumberstyle}[1]{##1 }% -\renewcommand*{\BRbooktitlestyle}[1]{##1}% -\renewcommand*{\BRchapterstyle}[1]{\romannumeral##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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{.}% -} -\newcommand*{\brs@chicago}{% -\braltabbrvname -\renewcommand*{\BRbooknumberstyle}[1]{##1 }% -\renewcommand*{\BRepistlenumberstyle}[1]{##1 }% -\renewcommand*{\BRbooktitlestyle}[1]{##1}% -\renewcommand*{\BRchapterstyle}[1]{\romannumeral##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}{--}% -\renewcommand*{\BRvsep}{,}% -\renewcommand*{\BRperiod}{.}% -} -\newcommand*{\brs@text}{% -\biblerefstyle{default}% -\renewcommand{\BRbooknumberstyle}[1]{% -\Ordinalstringnum{##1}\ }% -\renewcommand{\BRepistlenumberstyle}[1]{% -\Ordinalstringnum{##1}\ }% -\renewcommand{\BRbookof}{Book of }% -\renewcommand{\BRgospel}{Gospel according to St }% -\renewcommand{\BRepistletothe}{Epistle to the }% -\renewcommand{\BRepistleto}{Epistle to }% -\renewcommand{\BRepistleof}{Epistle of }% -\renewcommand{\BRchapterstyle}[1]{% -chapter \numberstringnum{##1}}% -\renewcommand{\BRbkchsep}{, }% -\renewcommand{\BRchvsep}{ verse }% -\renewcommand{\BRchsep}{, }% -\renewcommand{\BRvrsep}{ to }% -\renewcommand{\BRvsep}{, }% -\renewcommand{\BRversestyle}[1]{\numberstringnum{##1}}% -\renewcommand*{\BRversesuffixstyle}[1]{##1}% -} -\DeclareOption{default}{\brs@default} -\DeclareOption{jerusalem}{\brs@jerusalem} -\DeclareOption{anglosaxon}{\brs@anglosaxon} -\DeclareOption{JEH}{\brs@JEH} -\DeclareOption{MHRA}{\brs@MHRA} -\DeclareOption{NTG}{\brs@NTG} -\DeclareOption{MLA}{\brs@MLA} -\DeclareOption{chicago}{\brs@chicago} -\DeclareOption{text}{\brs@text} -\ProcessOptions -\newcommand{\newbiblerefstyle}[2]{% -\@ifundefined{brs@#1}{% -\expandafter\def\csname brs@#1\endcsname{#2}}{% -\PackageError{bibleref}{bible ref style '#1' already -defined}{}}} -\newcommand*{\setbooktitle}[2]{% - \@ifundefined{br@#1}% - {% - \PackageError{bibleref}{Unknown book `#1'}{}% - }% - {% - \expandafter\def\csname br@#1\endcsname{#2}% - }% -} -\newcommand*{\setindexbooktitle}[2]{% - \@ifundefined{br@#1}% - {% - \PackageError{bibleref}{Unknown book `#1'}{}% - }% - {% - \expandafter\def\csname bri@#1\endcsname{#2}% - }% -} -\newcommand*{\addbiblebook}[2]{% - \@ifundefined{br@#1}% - {% - \expandafter\def\csname br@#1\endcsname{#2}% - }% - {% - \PackageError{bibleref}{Book `#1' already defined}{}% - }% -} -\newcommand*{\biblerefstyle}[1]{% -\@ifundefined{brs@#1}{\PackageError{bibleref}{% -Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} -\newcommand*{\@br@vrsty}[1]{\@@br@vrsty#1-\@nil\end} -\def\@@br@vrsty#1-#2\end{% -\@do@verses#1,\relax\end -\ifx\@nil#2\relax -\else - \@bv@addtochidxsort{-}% - \@bv@do{\BRvrsep}% - \@@br@vrsty#2\end% -\fi -} -\def\br@stripverse#1{% - \def\@br@versenum{}% - \def\@br@versesuffix{}% - \@br@stripverse#1\relax -} -\def\@br@stripverse#1#2{% - \@br@checkisdigit{#1}% - \if@br@isdigit - \expandafter\toks@\expandafter{\@br@versenum}% - \edef\@br@versenum{\the\toks@#1}% - \let\@br@next\@br@stripverse - \else - \def\@br@versesuffix{#1}% - \let\@br@next\@@br@stripverse - \fi - \ifx#2\relax - \let\@br@next\relax - \fi - \@br@next#2% -} -\def\@@br@stripverse#1\relax{% - \protected@edef\@br@versesuffix{\@br@versesuffix#1}% -} -\newif\if@br@isdigit -\newcommand*{\@br@checkisdigit}[1]{% - \@br@isdigittrue - \if#10\relax - \else - \if#11\relax - \else - \if#12\relax - \else - \if#13\relax - \else - \if#14\relax - \else - \if#15\relax - \else - \if#16\relax - \else - \if#17\relax - \else - \if#18\relax - \else - \if#19\relax - \else - \@br@isdigitfalse - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi -} -\def\@do@verses#1,#2\end{% -\def\@br@tmp{#1}% -\ifx\@br@tmp\@empty -\else - \br@stripverse{#1}% - \ifnum\@br@versenum<10\relax - \@bv@addtochidxsort{00#1}% - \else - \ifnum\@br@versenum<100\relax - \@bv@addtochidxsort{0#1}% - \else - \@bv@addtochidxsort{#1}% - \fi - \fi - \edef\@br@tmp{% - \noexpand\BRversestyle{\@br@versenum}% - \noexpand\BRversesuffixstyle{\@br@versesuffix}}% - \expandafter\@bv@do\expandafter{\@br@tmp}% -\fi -\ifx\relax#2\relax -\else - \@bv@addtochidxsort{,}% - \@bv@do{\BRvsep}% - \@do@verses#2\end -\fi -} -\newcommand*{\bibleverse}[1]{% - \@ifundefined{br@#1}% - {% - \PackageError{bibleref}{Unknown book '#1'}{}% - }% - {% - \@bv@idxsort{\csname br@#1\endcsname}% - \def\@bv@chidxsort{}% - \BRbooktitlestyle{\csname br@#1\endcsname}% - \@ifundefined{bri@#1}% - {% - \def\@bv@mainidxentry{\BRbooktitlestyle{\csname br@#1\endcsname}}% - }% - {% - \def\@bv@mainidxentry{\BRbooktitlestyle{\csname bri@#1\endcsname}}% - }% - }% - \@ifnextchar(% - {\BRbkchsep\@bibleverse}% - {\@end@@bibleverse}% -} -\def\@bibleverse(#1:{% - \def\@bv@tmp{#1}% - \ifx\@bv@tmp\@empty - \else - \ifnum\@bv@tmp<10\relax - \@bv@addtochidxsort{00#1:}% - \else - \ifnum\@bv@tmp<100\relax - \@bv@addtochidxsort{0#1:}% - \else - \@bv@addtochidxsort{#1:}% - \fi - \fi - \@bv@do{\BRchapterstyle{#1}}% - \fi - \@@bibleverse -} -\def\@bibleverser-(#1:{% - \def\@bv@tmp{#1}% - \ifx\@bv@tmp\@empty - \else - \ifnum\@bv@tmp<10\relax - \@bv@addtochidxsort{00#1:}% - \else - \ifnum\@bv@tmp<100\relax - \@bv@addtochidxsort{0#1:}% - \else - \@bv@addtochidxsort{#1:}% - \fi - \fi - \@bv@do{\BRchapterstyle{#1}}% - \fi - \@@bibleverse -} -\def\@@bibleverse#1){% - \def\@bv@tmp{#1}% - \ifx\@bv@tmp\@empty - \else - \@bv@do{\BRchvsep}\@br@vrsty{#1}% - \fi - \@ifnextchar(% - {\@bv@do{\BRchsep}\@bibleverse}% - {\@ifnextchar-% - {\@bv@do{\BRvrsep}\@bibleverser}% - {\@end@@bibleverse}% - }% -} -\newcommand*{\@end@@bibleverse}{% -\if@bv@idx - \expandafter\@do@bibleref@map\@@bv@idxsort\relax - \ifx\@bv@idxentry\@empty - \def\@bv@tmp{\@bv@mainidxentry}% - \else - \def\@bv@tmp{\@bv@mainidxentry!\@bv@chidxsort @\@bv@idxentry}% - \fi - \biblerefindex - {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}% - \@bv@idxfalse -\fi -} -\newcommand*{\biblerefindex}{\index} -\newcommand*{\biblerefmap}[2]{% - \expandafter\def\csname @bibleref@map@#1\endcsname{#2}% -} -\def\@do@bibleref@map#1\relax{% - \@ifundefined{@bibleref@map@#1}{}{% - \expandafter\let\expandafter\@@bv@idxsort - \csname @bibleref@map@#1\endcsname - }% -} -\newcommand{\@bv@do}[1]{#1\@bv@addtoidx{#1}} -\newtoks\@bv@tmpa -\newtoks\@bv@tmpb -\newcommand{\@bv@addtoidx}[1]{% -\if@bv@idx - \@bv@tmpa={#1}% - \@bv@tmpb=\expandafter{\@bv@idxentry}% - \protected@edef\@bv@idxentry{\the\@bv@tmpb\the\@bv@tmpa}% -\fi} -\newcommand{\@bv@addtochidxsort}[1]{% -\if@bv@idx - \@bv@tmpa={#1}% - \@bv@tmpb=\expandafter{\@bv@chidxsort}% - \edef\@bv@chidxsort{\the\@bv@tmpb\the\@bv@tmpa}% -\fi -} -\newif\if@bv@idx -\@bv@idxfalse -\newcommand{\@bv@idxsort}[1]{% -\if@bv@idx -{\def\BRbooknumberstyle##1##2\relax{##2##1}% -\def\BRepistlenumberstyle##1##2\relax{##2##1}% -\def\BRgospel{}\def\BRbookof{}\def\BRepistleto{}% -\def\BRepistletothe{}\def\BRepistleof{}% -\xdef\@@bv@idxsort{#1\relax}% -}% -\fi} -\newcommand*{\ibibleverse}[1][\bvidxpgformat]{% -\def\@bv@idxpgformat{#1}% -\@bv@idxtrue\def\@bv@idxentry{}\bibleverse} -\newcommand*{\bvidxpgformat}{textrm} -\endinput -%% -%% End of file `bibleref.sty'. diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty index c09911c7c6e..725444ad9ea 100644 --- a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty +++ b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty @@ -39,9 +39,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2010/05/11 1.12 (NLCT)] +\ProvidesPackage{bibleref}[2010/07/07 1.13 (NLCT)] \RequirePackage{ifthen} \RequirePackage{fmtcount} +\RequirePackage{amsgen} \newcommand*{\BRbooknumberstyle}[1]{#1 } \newcommand*{\BRepistlenumberstyle}[1]{#1 } \newcommand*{\BRbookof}{} @@ -418,7 +419,7 @@ \renewcommand*{\BRepistletothe}{}% \renewcommand*{\BRepistleto}{}% \renewcommand*{\BRepistleof}{}% -\renewcommand*{\BRbkchsep}{ } +\renewcommand*{\BRbkchsep}{ }% \renewcommand*{\BRchvsep}{:}% \renewcommand*{\BRchsep}{;}% \renewcommand*{\BRvrsep}{--}% @@ -628,8 +629,12 @@ defined}{}}} }% } \newcommand*{\biblerefstyle}[1]{% -\@ifundefined{brs@#1}{\PackageError{bibleref}{% -Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} + \@ifundefined{brs@#1}% + {% + \PackageError{bibleref}{Unknown biblerefstyle '#1'}{}% + }% + {\csname brs@#1\endcsname}% +} \newcommand*{\@br@vrsty}[1]{\@@br@vrsty#1-\@nil\end} \def\@@br@vrsty#1-#2\end{% \@do@verses#1,\relax\end @@ -741,7 +746,7 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} \def\@bv@mainidxentry{\BRbooktitlestyle{\csname bri@#1\endcsname}}% }% }% - \@ifnextchar(% + \new@ifnextchar(% {\BRbkchsep\@bibleverse}% {\@end@@bibleverse}% } @@ -785,9 +790,9 @@ Unknown biblerefstyle '#1'}{}}{\csname brs@#1\endcsname}} \else \@bv@do{\BRchvsep}\@br@vrsty{#1}% \fi - \@ifnextchar(% + \new@ifnextchar(% {\@bv@do{\BRchsep}\@bibleverse}% - {\@ifnextchar-% + {\new@ifnextchar-% {\@bv@do{\BRvrsep}\@bibleverser}% {\@end@@bibleverse}% }% -- cgit v1.2.3