diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/bibleref/CHANGES | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/bibleref/README | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css | 28 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html | 506 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/bibleref/bibleref-manual.tex | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/bibleref/bibleref.pdf | bin | 265738 -> 285680 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/bibleref/nlctdoc.cls | 973 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/bibleref/bibleref.dtx | 72 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/bibleref/bibleref.ins | 38 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/bibleref/bibleref.sty | 851 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bibleref/bibleref.sty | 19 |
11 files changed, 461 insertions, 2061 deletions
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 @@ <a - id="top"></a><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html > -<head><title>bibleref.sty v1.12: a LaTeX2εpackage for typesetting bible references</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> -<meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> -<!-- html --> -<meta name="src" content="bibleref-manual.tex"> -<meta name="date" content="2010-05-11 18:06:00"> -<link rel="stylesheet" type="text/css" href="bibleref-manual.css"> + id="top"></a><?xml version="1.0" encoding="iso-8859-1" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!--http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd--> +<html xmlns="http://www.w3.org/1999/xhtml" +> +<head><title>bibleref.sty v1.13: a LaTeX2εpackage for typesetting bible references</title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> +<meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> +<!-- xhtml,fn-in,css-in --> +<meta name="src" content="bibleref-manual.tex" /> +<meta name="date" content="2010-07-07 10:21:00" /> + +<style type="text/css"> +<!-- + +/* start css.sty */ +.cmmi-10{font-style: italic;} +.cmr-17{font-size:170%;} +.cmr-12{font-size:120%;} +.cmmi-12x-x-144{font-size:172%;font-style: italic;} +.cmtt-12{font-size:120%;font-family: monospace;} +.cmtt-12{font-family: monospace;} +.cmtt-12{font-family: monospace;} +.cmtt-10{font-family: monospace;} +.cmtt-10{font-family: monospace;} +.cmtt-10{font-family: monospace;} +.cmss-10{ font-family: sans-serif;} +.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; } +p.nopar { text-indent: 0em; } +p.indent{ text-indent: 1.5em } +@media print {div.crosslinks {visibility:hidden;}} +a img { border-top: 0; border-left: 0; border-right: 0; } +center { margin-top:1em; margin-bottom:1em; } +td center { margin-top:0em; margin-bottom:0em; } +.Canvas { position:relative; } +img.math{vertical-align:middle;} +li p.indent { text-indent: 0em } +li p:first-child{ margin-top:0em; } +li p:last-child, li div:last-child { margin-bottom:0.5em; } +li p~ul:last-child, li p~ol:last-child{ margin-bottom:0.5em; } +.enumerate1 {list-style-type:decimal;} +.enumerate2 {list-style-type:lower-alpha;} +.enumerate3 {list-style-type:lower-roman;} +.enumerate4 {list-style-type:upper-alpha;} +div.newtheorem { margin-bottom: 2em; margin-top: 2em;} +.obeylines-h,.obeylines-v {white-space: nowrap; } +div.obeylines-v p { margin-top:0; margin-bottom:0; } +.overline{ text-decoration:overline; } +.overline img{ border-top: 1px solid black; } +td.displaylines {text-align:center; white-space:nowrap;} +.centerline {text-align:center;} +.rightline {text-align:right;} +div.verbatim {font-family: monospace; white-space: nowrap; text-align:left; clear:both; } +.fbox {padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; } +div.fbox {display:table} +div.center div.fbox {text-align:center; clear:both; padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; } +div.minipage{width:100%;} +div.center, div.center div.center {text-align: center; margin-left:1em; margin-right:1em;} +div.center div {text-align: left;} +div.flushright, div.flushright div.flushright {text-align: right;} +div.flushright div {text-align: left;} +div.flushleft {text-align: left;} +.underline{ text-decoration:underline; } +.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; } +.framebox-c, .framebox-l, .framebox-r { padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; } +.framebox-c {text-align:center;} +.framebox-l {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;} +td p:first-child{ margin-top:0em; } +td p:last-child{ margin-bottom:0em; } +div.td00{ margin-left:0pt; margin-right:0pt; } +div.td01{ margin-left:0pt; margin-right:5pt; } +div.td10{ margin-left:5pt; margin-right:0pt; } +div.td11{ margin-left:5pt; margin-right:5pt; } +table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; } +td.td00{ padding-left:0pt; padding-right:0pt; } +td.td01{ padding-left:0pt; padding-right:5pt; } +td.td10{ padding-left:5pt; padding-right:0pt; } +td.td11{ padding-left:5pt; padding-right:5pt; } +table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; } +.hline hr, .cline hr{ height : 1px; margin:0px; } +.tabbing-right {text-align:right;} +span.TEX {letter-spacing: -0.125em; } +span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;} +a span.TEX span.E {text-decoration: none; } +span.LATEX span.A{ position:relative; top:-0.5ex; left:-0.4em; font-size:85%;} +span.LATEX span.TEX{ position:relative; left: -0.4em; } +div.float, div.figure {margin-left: auto; margin-right: auto;} +div.float img {text-align:center;} +div.figure img {text-align:center;} +.marginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;} +.marginpar p{margin-top:0.4em; margin-bottom:0.4em;} +table.equation {width:100%;} +.equation td{text-align:center; } +td.equation { margin-top:1em; margin-bottom:1em; } +td.equation-label { width:5%; text-align:center; } +td.eqnarray4 { width:5%; white-space: normal; } +td.eqnarray2 { width:5%; } +table.eqnarray-star, table.eqnarray {width:100%;} +div.eqnarray{text-align:center;} +div.array {text-align:center;} +div.pmatrix {text-align:center;} +table.pmatrix {width:100%;} +span.pmatrix img{vertical-align:middle;} +div.pmatrix {text-align:center;} +table.pmatrix {width:100%;} +span.bar-css {text-decoration:overline;} +img.cdots{vertical-align:middle;} +.partToc a, .partToc, .likepartToc a, .likepartToc {line-height: 200%; font-weight:bold; font-size:110%;} +.index-item, .index-subitem, .index-subsubitem {display:block} +div.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:left;} +div.caption span.id{font-weight: bold; white-space: nowrap; } +h1.partHead{text-align: center} +p.bibitem { text-indent: -2em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; } +p.bibitem-p { text-indent: 0em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; } +.paragraphHead, .likeparagraphHead { margin-top:2em; font-weight: bold;} +.subparagraphHead, .likesubparagraphHead { font-weight: bold;} +.quote {margin-bottom:0.25em; margin-top:0.25em; margin-left:1em; margin-right:1em; text-align:justify;} +.verse{white-space:nowrap; margin-left:2em} +div.maketitle {text-align:center;} +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; } +.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; } +div.important { background-color:red; } +/* end css.sty */ + + +--> +</style> </head><body > <div class="maketitle"> @@ -20,7 +158,7 @@ -<h2 class="titleHead">bibleref.sty v1.12: a <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +<h2 class="titleHead">bibleref.sty v1.13: a <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span>2ε package for typesetting bible references</h2> <div class="author" ><span @@ -35,9 +173,11 @@ class="cmr-12">Norwich. Norfolk. NR4 7TJ.</span> class="cmr-12">United Kingdom</span> <br /><a href="http://theoval.cmp.uea.ac.uk/~nlct/" class="url" ><span -class="cmtt-12">http://theoval.cmp.uea.ac.uk/~nlct/</span></a></div><br /> +class="cmtt-12">http://theoval.cmp.uea.ac.uk/</span><span +class="cmtt-12">~</span><span +class="cmtt-12">nlct/</span></a></div><br /> <div class="date" ><span -class="cmr-12">11th May 2010</span></div> +class="cmr-12">2010-07-07</span></div> </div> <h3 class="likesectionHead"><a id="x1-1000"></a>Contents</h3> @@ -58,16 +198,17 @@ href="#x1-70004" id="QQ2-1-8">Acknowledgements</a></span> href="#Q1-1-9">Index</a></span> </div> <!--l. 67--><p class="noindent" > +</p> <h3 class="sectionHead"><span class="titlemark">1 </span> <a id="x1-20001"></a>Introduction</h3> <!--l. 69--><p class="noindent" >The <span -class="cmss-10">bibleref </span>package was designed to provide consistent formatting for referencing parts +class="cmss-10">bibleref</span><a + id="dx1-2001"></a> package was designed to provide consistent formatting for referencing parts of the bible. -<!--l. 74--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 72--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\bibleverse</span><span class="cmtt-9"> </span></span><a - id="dx1-2001"></a><span -class="colorbox" id="colorbox1"><div class="minipage"> <span + id="dx1-2002"></a> <span class="cmtt-10">\bibleverse{</span><span class="cmsy-10">⟨</span><span class="cmti-10">book title</span><span @@ -80,14 +221,14 @@ class="cmtt-10">:</span><span class="cmsy-10">⟨</span><span class="cmti-10">verse(s)</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">)</span> </div></span> +class="cmtt-10">) </span></div><hr> -<!--l. 74--><p class="noindent" > +</p><!--l. 74--><p class="noindent" > This command can be used to cite a bible book, chapter or verse or range of chapters or verses. -<!--l. 78--><p class="indent" > The book title, <span +</p><!--l. 78--><p class="indent" > The book title, <span class="cmsy-10">⟨</span><span class="cmti-10">book title</span><span class="cmsy-10">⟩</span>, may be given either as the full title (e.g. <span @@ -99,7 +240,7 @@ with multiple parts should be preceded by the book number in uppercase roman numerals. For example, the second book of Kings should be entered as <span class="obeylines-h"><span class="verb"><span class="cmtt-10">\bibleverse{IIKings}</span></span></span> -<!--l. 85--><p class="indent" > You may have any number, or zero, sets of parenthesis <span class="obeylines-h"><span class="verb"><span +</p><!--l. 85--><p class="indent" > You may have any number, or zero, sets of parenthesis <span class="obeylines-h"><span class="verb"><span class="cmtt-10">(</span></span></span><span class="cmsy-10">⟨</span><span class="cmti-10">chapter</span><span @@ -112,18 +253,18 @@ class="cmtt-10">)</span></span></span>, 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. <span class="obeylines-h"><span class="verb"><span -class="cmtt-10">2-4</span></span></span>. In the typeset output the verses will be separated with -<!--l. 94--><p class="noindent" ><span class="marginpar"><span +class="cmtt-10">2-4</span></span></span>. In the typeset output the verses will be separated +with +</p><!--l. 92--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\BRvsep</span><span class="cmtt-9"> </span></span><a - id="dx1-2002"></a><span -class="colorbox" id="colorbox2"><div class="minipage"> <span -class="cmtt-10">\BRvsep</span> </div></span> -<!--l. 94--><p class="noindent" > + id="dx1-2003"></a> <span +class="cmtt-10">\BRvsep </span></div><hr> +</p><!--l. 94--><p class="noindent" > (an en-dash by default.) A chapter may be referenced without a verse, but the colon must remain, e.g. <span class="obeylines-h"><span class="verb"><span class="cmtt-10">(12:)</span></span></span> simply indicates chapter 12. -<!--l. 99--><p class="indent" > A range of verses spanning more than one chapter can be entered as +</p><!--l. 99--><p class="indent" > A range of verses spanning more than one chapter can be entered as <span class="cmtt-10">(</span><span class="cmsy-10">⟨</span><span @@ -142,15 +283,16 @@ class="cmsy-10">⟨</span><span class="cmti-10">v</span><span class="cmsy-10">⟩</span><span class="cmtt-10">)</span> -<!--l. 103--><p class="indent" > Examples: +</p><!--l. 103--><p class="indent" > Examples: </p> <div class="center" > <!--l. 104--><p class="noindent" > +</p> <div class="tabular"> <table id="TBL-2" class="tabular" cellspacing="0" cellpadding="0" ><colgroup id="TBL-2-1g"><col -id="TBL-2-1"><col -id="TBL-2-2"></colgroup><tr +id="TBL-2-1" /><col +id="TBL-2-2" /></colgroup><tr style="vertical-align:baseline;" id="TBL-2-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-1-1" class="td11"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\bibleverse{Ex}</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-2-1-2" @@ -197,25 +339,25 @@ class="cmtt-10">\bibleverse{IChronicles}(1:3)-(2:7)</span></span></span></td><td class="td11">1 Chronicles 1:3–2:7 </td></tr></table></div></div> <!--l. 119--><p class="indent" > The style of the reference can be specified either by package option or as the argument to the command -<!--l. 123--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 121--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\biblerefstyle</span><span class="cmtt-9"> </span></span><a - id="dx1-2003"></a><span -class="colorbox" id="colorbox3"><div class="minipage"> <span + id="dx1-2004"></a> <span class="cmtt-10">\biblerefstyle{</span><span class="cmsy-10">⟨</span><span class="cmti-10">style</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">}</span> </div></span> -<!--l. 123--><p class="noindent" > +class="cmtt-10">} </span></div><hr> +</p><!--l. 123--><p class="noindent" > Styles are listed in Table <a -href="#x1-20041">1<!--tex4ht:ref: tab:styles --></a>. +href="#x1-20051">1<!--tex4ht:ref: tab:styles --></a>. +</p> <div class="table"> <!--l. 126--><p class="indent" > <a - id="x1-20041"></a><hr class="float"><div class="float" + id="x1-20051"></a></p><hr class="float" /><div class="float" > @@ -224,52 +366,53 @@ href="#x1-20041">1<!--tex4ht:ref: tab:styles --></a>. ><span class="id">Table 1: </span><span class="content">Bible Citation Styles (can be used as package option or in the argument to <span -class="cmtt-10">\biblerefstyle</span>)</span></div><!--tex4ht:label?: x1-20041 --> +class="cmtt-10">\biblerefstyle</span>)</span></div><!--tex4ht:label?: x1-20051 --> <div class="center" > <!--l. 131--><p class="noindent" > +</p> <div class="tabular"> <table id="TBL-3" class="tabular" cellspacing="0" cellpadding="0" ><colgroup id="TBL-3-1g"><col -id="TBL-3-1"><col -id="TBL-3-2"></colgroup><tr +id="TBL-3-1" /><col +id="TBL-3-2" /></colgroup><tr style="vertical-align:baseline;" id="TBL-3-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-1" class="td11"><span class="cmbx-10">Style </span></td><td style="white-space:wrap; text-align:left;" id="TBL-3-1-2" class="td11"><!--l. 133--><p class="noindent" ><span -class="cmbx-10">Example</span> </td> +class="cmbx-10">Example</span> </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-2-1" class="td11">default </td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-2" -class="td11"><!--l. 134--><p class="noindent" >2 Corinthians 12:1–5 </td></tr><tr +class="td11"><!--l. 134--><p class="noindent" >2 Corinthians 12:1–5 </p></td></tr><tr style="vertical-align:baseline;" id="TBL-3-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-1" class="td11">jerusalem </td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-2" -class="td11"><!--l. 135--><p class="noindent" >2 Co 12:1–5</td> +class="td11"><!--l. 135--><p class="noindent" >2 Co 12:1–5</p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-1" class="td11">anglosaxon</td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-2" -class="td11"><!--l. 136--><p class="noindent" >II Cor. XII.1–5 </td> +class="td11"><!--l. 136--><p class="noindent" >II Cor. XII.1–5 </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-1" class="td11">JEH </td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-2" -class="td11"><!--l. 137--><p class="noindent" >2 Cor. xii. 1–5 </td> +class="td11"><!--l. 137--><p class="noindent" >2 Cor. xii. 1–5 </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-1" class="td11">NTG </td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-2" -class="td11"><!--l. 138--><p class="noindent" >2 Cor xii,1–5 </td> +class="td11"><!--l. 138--><p class="noindent" >2 Cor xii,1–5 </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-1" class="td11">MLA </td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-2" -class="td11"><!--l. 139--><p class="noindent" >2 Cor. xii.1–5 </td> +class="td11"><!--l. 139--><p class="noindent" >2 Cor. xii.1–5 </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-1" class="td11">chicago </td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-2" -class="td11"><!--l. 140--><p class="noindent" >2 Cor. xii : 1–5 </td> +class="td11"><!--l. 140--><p class="noindent" >2 Cor. xii : 1–5 </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-1" class="td11">text </td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-2" class="td11"><!--l. 141--><p class="noindent" >Second Epistle to the Corinthians, -chapter twelve verse one to five </td> +chapter twelve verse one to five </p></td> </tr></table></div></div> @@ -277,11 +420,10 @@ chapter twelve verse one to five </td> </div><hr class="endfloat" /> </div> <!--l. 146--><p class="indent" > You can change the name of a book using -<!--l. 149--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 147--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\setbooktitle</span><span class="cmtt-9"> </span></span><a - id="dx1-2005"></a><span -class="colorbox" id="colorbox4"><div class="minipage"> <span + id="dx1-2006"></a> <span class="cmtt-10">\setbooktitle{</span><span class="cmsy-10">⟨</span><span class="cmti-10">name</span><span @@ -290,8 +432,8 @@ class="cmtt-10">}{</span><span class="cmsy-10">⟨</span><span class="cmti-10">new title</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">}</span> </div></span> -<!--l. 149--><p class="noindent" > +class="cmtt-10">} </span></div><hr> +</p><!--l. 149--><p class="noindent" > Note that <span class="cmsy-10">⟨</span><span class="cmti-10">name</span><span @@ -301,13 +443,13 @@ class="cmtt-10">\setbookname{Revelation}{Apoc}</span></span></span> (<span class="cmbx-10">Note</span> that you shouldn’t do <span class="obeylines-h"><span class="verb"><span class="cmtt-10">\setbookname{Rev}{Apoc}</span></span></span>) -<!--l. 157--><p class="indent" > 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: -<!--l. 162--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 157--><p class="indent" > 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: +</p><!--l. 160--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\setindexbooktitle</span><span class="cmtt-9"> </span></span><a - id="dx1-2006"></a><span -class="colorbox" id="colorbox5"><div class="minipage"> <span + id="dx1-2007"></a> <span class="cmtt-10">\setindexbooktitle{</span><span class="cmsy-10">⟨</span><span class="cmti-10">name</span><span @@ -316,8 +458,8 @@ class="cmtt-10">}{</span><span class="cmsy-10">⟨</span><span class="cmti-10">title</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">}</span> </div></span> -<!--l. 162--><p class="noindent" > +class="cmtt-10">} </span></div><hr> +</p><!--l. 162--><p class="noindent" > In this case, <span class="cmsy-10">⟨</span><span class="cmti-10">name</span><span @@ -327,6 +469,7 @@ you do: +</p> <div class="verbatim" id="verbatim-1"> \setbooktitle{Psalms}{Psalm}  <br />\setindexbooktitle{Psalms}{Psalms} @@ -336,12 +479,11 @@ class="cmtt-10">\ibibleverse{Psalms}(2:)</span></span></span> will print Psalm t index, but <span class="obeylines-h"><span class="verb"><span class="cmtt-10">\ibibleverse{Ps}(2:)</span></span></span> will print Psalms in both the document and the index. -<!--l. 173--><p class="indent" > You can add a book using -<!--l. 176--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 173--><p class="indent" > You can add a book using +</p><!--l. 174--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\addbiblebook</span><span class="cmtt-9"> </span></span><a - id="dx1-2007"></a><span -class="colorbox" id="colorbox6"><div class="minipage"> <span + id="dx1-2008"></a> <span class="cmtt-10">\addbiblebook{</span><span class="cmsy-10">⟨</span><span class="cmti-10">name</span><span @@ -350,26 +492,26 @@ class="cmtt-10">}{</span><span class="cmsy-10">⟨</span><span class="cmti-10">title</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">}</span> </div></span> -<!--l. 176--><p class="noindent" > +class="cmtt-10">} </span></div><hr> +</p><!--l. 176--><p class="noindent" > For example: +</p> <div class="verbatim" id="verbatim-2"> \addbiblebook{Susanna}{Story of Susanna} </div> <!--l. 180--><p class="nopar" > -<!--l. 181--><p class="noindent" ><a -href="#top">Top</a> - <h3 class="sectionHead"><span class="titlemark">2 </span> <a +</p> +<!--l. 182--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2 </span> <a id="x1-30002"></a>Defining New Styles</h3> -<!--l. 185--><p class="noindent" >You can define a new style using the command -<!--l. 188--><p class="noindent" ><span class="marginpar"><span +<!--l. 184--><p class="noindent" >You can define a new style using the command +</p><!--l. 185--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\newbiblerefstyle</span><span class="cmtt-9"> </span></span><a - id="dx1-3001"></a><span -class="colorbox" id="colorbox7"><div class="minipage"> <span + id="dx1-3001"></a> <span class="cmtt-10">\newbiblerefstyle{</span><span class="cmsy-10">⟨</span><span class="cmti-10">style-name</span><span @@ -378,17 +520,19 @@ class="cmtt-10">}{</span><span class="cmsy-10">⟨</span><span class="cmti-10">commands</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">}</span> </div></span> -<!--l. 188--><p class="noindent" > +class="cmtt-10">}</span> +</div><hr> +</p><!--l. 187--><p class="noindent" > where <span class="cmsy-10">⟨</span><span class="cmti-10">commands</span><span class="cmsy-10">⟩ </span>are the commands needed to modify the citation style. -<!--l. 192--><p class="indent" > Example: This new style is based on the “default” style, but has verses in lower case +</p><!--l. 191--><p class="indent" > Example: This new style is based on the “default” style, but has verses in lower case Roman numerals, and redefines “Revelation” as “Apocalypse”. +</p> <div class="verbatim" id="verbatim-3"> \newbiblerefstyle{sample}{%  <br />\biblerefstyle{default}% @@ -396,19 +540,18 @@ Roman numerals, and redefines “Revelation” as “Apocalypse̶  <br />\setbooktitle{Revelation}{Apocalypse}%  <br />} </div> -<!--l. 202--><p class="nopar" > Note the use of <span class="obeylines-h"><span class="verb"><span +<!--l. 201--><p class="nopar" > Note the use of <span class="obeylines-h"><span class="verb"><span class="cmtt-10">##1</span></span></span> instead of <span class="obeylines-h"><span class="verb"><span class="cmtt-10">#1</span></span></span>. +</p><!--l. 204--><p class="noindent" > +</p> <!--l. 204--><p class="noindent" ><a -href="#top">Top</a> -<!--l. 206--><p class="noindent" > - <h3 class="sectionHead"><span class="titlemark">3 </span> <a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">3 </span> <a id="x1-40003"></a>Indexing Bible References</h3> -<!--l. 210--><p class="noindent" ><span class="marginpar"><span +<!--l. 206--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\ibibleverse</span><span class="cmtt-9"> </span></span><a - id="dx1-4001"></a><span -class="colorbox" id="colorbox8"><div class="minipage"> <span + id="dx1-4001"></a> <span class="cmtt-10">\ibibleverse{</span><span class="cmsy-10">⟨</span><span class="cmti-10">book title</span><span @@ -421,20 +564,19 @@ class="cmtt-10">}:</span><span class="cmsy-10">⟨</span><span class="cmti-10">verse(s)</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">)</span> </div></span> -<!--l. 210--><p class="noindent" > +class="cmtt-10">) </span></div><hr> +</p><!--l. 208--><p class="noindent" > This does the same as <span class="cmtt-10">\bibleverse </span>but also adds an index entry (provided you have used <span class="cmtt-10">\makeindex </span>in the preamble.) The default page number format is given by the command -<!--l. 217--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 213--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\bvidxpgformat</span><span class="cmtt-9"> </span></span><a - id="dx1-4002"></a><span -class="colorbox" id="colorbox9"><div class="minipage"> <span -class="cmtt-10">\bvidxpgformat</span> </div></span> -<!--l. 217--><p class="noindent" > + id="dx1-4002"></a> <span +class="cmtt-10">\bvidxpgformat </span></div><hr> +</p><!--l. 215--><p class="noindent" > This is <span class="cmtt-10">textrm </span>by default, but can be redefined. To override the page number format for a particular entry you can use the optional argument to <span @@ -443,12 +585,14 @@ example: +</p> <div class="verbatim" id="verbatim-4"> \ibibleverse[textit]{Exodus} </div> -<!--l. 223--><p class="nopar" > (Note there is no backslash.) -<!--l. 226--><p class="indent" > You may need to create your own custom <span -class="cmtt-10">makeindex </span>style file as the default uses a +<!--l. 221--><p class="nopar" > (Note there is no backslash.) +</p><!--l. 224--><p class="indent" > You may need to create your own custom <span +class="cmtt-10">makeindex</span><a + id="dx1-4003"></a> 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 <span class="cmtt-10">sample.ist </span>and write in the @@ -456,36 +600,39 @@ lines: +</p> <div class="verbatim" id="verbatim-5"> delim_0 "\\dotfill "  <br />delim_1 "\\dotfill "  <br />delim_2 "\\dotfill " </div> -<!--l. 235--><p class="nopar" > See the <span -class="cmtt-10">makeindex </span>documentation for further details. -<!--l. 237--><p class="noindent" ><a -href="#top">Top</a> -<!--l. 239--><p class="noindent" > - <h4 class="subsectionHead"><span class="titlemark">3.1 </span> <a +<!--l. 233--><p class="nopar" > See the <span +class="cmtt-10">makeindex</span><a + id="dx1-4004"></a> documentation for further details. +</p><!--l. 236--><p class="noindent" > +</p> +<!--l. 236--><p class="noindent" ><a +href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">3.1 </span> <a id="x1-50003.1"></a>Separate Scripture Index</h4> -<!--l. 241--><p class="noindent" >If you want a separate index for bible verses, in addition to a general index, you can +<!--l. 238--><p class="noindent" >If you want a separate index for bible verses, in addition to a general index, you can redefine -<!--l. 245--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 240--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\biblerefindex</span><span class="cmtt-9"> </span></span><a - id="dx1-5001"></a><span -class="colorbox" id="colorbox10"><div class="minipage"> <span -class="cmtt-10">\biblerefindex</span> </div></span> -<!--l. 245--><p class="noindent" > + id="dx1-5001"></a> <span +class="cmtt-10">\biblerefindex </span></div><hr> +</p><!--l. 242--><p class="noindent" > This command defaults to <span class="cmtt-10">\index</span>, but can be changed to the appropriate indexing command. For example, suppose you are using the <span -class="cmss-10">multind </span>package +class="cmss-10">multind</span><a + id="dx1-5002"></a> package and you want a general index and a scripture index, you can do something like: +</p> <div class="verbatim" id="verbatim-6"> \documentclass{article}  <br />\usepackage{bibleref} @@ -494,40 +641,47 @@ like:  <br />\makeindex{general}  <br />\renewcommand{\biblerefindex}{\index{scripture}} </div> -<!--l. 259--><p class="nopar" > In the document, you can use <span +<!--l. 256--><p class="nopar" > In the document, you can use <span class="cmtt-10">\ibibleverse </span>as before, and the scripture index is displayed using +</p> <div class="verbatim" id="verbatim-7"> \printindex{scripture}{Scripture Index} </div> -<!--l. 264--><p class="nopar" > You will then need to run <span -class="cmtt-10">makeindex </span>on the file <span +<!--l. 261--><p class="nopar" > You will then need to run <span +class="cmtt-10">makeindex</span><a + id="dx1-5003"></a> on the file <span class="cmtt-10">scripture.idx</span>. See the <span -class="cmss-10">multind</span> +class="cmss-10">multind</span><a + id="dx1-5004"></a> documentation for further details. -<!--l. 268--><p class="noindent" ><a -href="#top">Top</a> -<!--l. 270--><p class="noindent" > - <h4 class="subsectionHead"><span class="titlemark">3.2 </span> <a +</p><!--l. 266--><p class="noindent" > +</p> +<!--l. 266--><p class="noindent" ><a +href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">3.2 </span> <a id="x1-60003.2"></a>Changing the Sort Order</h4> -<!--l. 272--><p class="noindent" >The bible reference entries will be sorted alphabetically by <span -class="cmtt-10">makeindex</span>. However you +<!--l. 268--><p class="noindent" >The bible reference entries will be sorted alphabetically by <span +class="cmtt-10">makeindex</span><a + id="dx1-6001"></a>. However you may prefer the entries to be sorted according to their order in the bible. This can either be done using <span -class="cmtt-10">xindy </span>instead of <span -class="cmtt-10">makeindex </span>and creating your own custom +class="cmtt-10">xindy</span><a + id="dx1-6002"></a> instead of <span +class="cmtt-10">makeindex</span><a + id="dx1-6003"></a> and creating your own custom alphabet (see <span -class="cmtt-10">xindy </span>manual for details) or you can use <span -class="cmss-10">bibleref</span>’s mapping +class="cmtt-10">xindy</span><a + id="dx1-6004"></a> manual for details) or you can use <span +class="cmss-10">bibleref</span><a + id="dx1-6005"></a>’s mapping command. -<!--l. 281--><p class="noindent" ><span class="marginpar"><span +</p><!--l. 275--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\biblerefmap</span><span class="cmtt-9"> </span></span><a - id="dx1-6001"></a><span -class="colorbox" id="colorbox11"><div class="minipage"> <span + id="dx1-6006"></a> <span class="cmtt-10">\biblerefmap{</span><span class="cmsy-10">⟨</span><span class="cmti-10">label</span><span @@ -536,12 +690,13 @@ class="cmtt-10">}{</span><span class="cmsy-10">⟨</span><span class="cmti-10">new sort key</span><span class="cmsy-10">⟩</span><span -class="cmtt-10">}</span> </div></span> -<!--l. 281--><p class="noindent" > +class="cmtt-10">} </span></div><hr> +</p><!--l. 277--><p class="noindent" > For example, in the preamble: +</p> <div class="verbatim" id="verbatim-8"> \biblerefmap{Genesis}{01}  <br />\biblerefmap{Exodus}{02} @@ -550,14 +705,16 @@ For example, in the preamble:  <br />\biblerefmap{Deuteronomy}{05}  <br />... </div> -<!--l. 290--><p class="nopar" > When you run <span -class="cmtt-10">makeindex</span>, the references will now be sorted in numerical +<!--l. 286--><p class="nopar" > When you run <span +class="cmtt-10">makeindex</span><a + id="dx1-6007"></a>, the references will now be sorted in numerical order. -<!--l. 294--><p class="indent" > If you want to subdivide the index into, say, old and new testament, you can add +</p><!--l. 290--><p class="indent" > If you want to subdivide the index into, say, old and new testament, you can add this to the mapping. For example: +</p> <div class="verbatim" id="verbatim-9"> \biblerefmap{Genesis}{1@Old Testament!01}  <br />\biblerefmap{Exodus}{1@Old Testament!02} @@ -569,80 +726,105 @@ this to the mapping. For example:  <br />\biblerefmap{Mark}{2@New Testament!02}  <br />... </div> -<!--l. 306--><p class="nopar" > -<!--l. 307--><p class="noindent" ><a -href="#top">Top</a> -<!--l. 309--><p class="noindent" > - <h3 class="sectionHead"><span class="titlemark">4 </span> <a +<!--l. 302--><p class="nopar" > +</p><!--l. 304--><p class="noindent" > +</p> +<!--l. 304--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4 </span> <a id="x1-70004"></a>Acknowledgements</h3> -<!--l. 310--><p class="noindent" >Many thanks to all the useful comments from comp.text.tex, especially from +<!--l. 305--><p class="noindent" >Many thanks to all the useful comments from comp.text.tex, especially from Jesse Billett, Brooks Moses and Ulrich M. Schwarz. -<!--l. 317--><p class="indent" > <a +</p><!--l. 311--><p class="indent" > <a id="likesection.1"></a><a id="Q1-1-9"></a> -<!--l. 2--><p class="noindent" > - <h3 class="likesectionHead"><a +</p><!--l. 2--><p class="noindent" > +</p> +<!--l. 2--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="likesectionHead"><a id="x1-80004"></a>Index</h3> <!--l. 4--><p class="noindent" > <span class="cmbx-10">A</span> +</p> <div class="theindex"><span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\addbiblebook</span></span></span>  <a -href="bibleref-manual.html#dx1-2007" ><span +href="bibleref-manual.html#dx1-2008" ><span class="cmti-10">1</span></a> <br /></span> <p class="theindex"> <span class="cmbx-10">B</span> +<span class="index-item"><span +class="cmss-10">bibleref </span>package  <a +href="bibleref-manual.html#dx1-2001" >2</a>, <a +href="bibleref-manual.html#dx1-6005" >3</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\biblerefindex</span></span></span>  <a href="bibleref-manual.html#dx1-5001" ><span -class="cmti-10">2</span></a> <br /></span> +class="cmti-10">4</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\biblerefmap</span></span></span>  <a -href="bibleref-manual.html#dx1-6001" ><span -class="cmti-10">3</span></a> <br /></span> +href="bibleref-manual.html#dx1-6006" ><span +class="cmti-10">5</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\biblerefstyle</span></span></span>  <a -href="bibleref-manual.html#dx1-2003" ><span -class="cmti-10">4</span></a> <br /></span> +href="bibleref-manual.html#dx1-2004" ><span +class="cmti-10">6</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\bibleverse</span></span></span>  <a -href="bibleref-manual.html#dx1-2001" ><span -class="cmti-10">5</span></a> <br /></span> +href="bibleref-manual.html#dx1-2002" ><span +class="cmti-10">7</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\BRvsep</span></span></span>  <a -href="bibleref-manual.html#dx1-2002" ><span -class="cmti-10">6</span></a> <br /></span> +href="bibleref-manual.html#dx1-2003" ><span +class="cmti-10">8</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\bvidxpgformat</span></span></span>  <a href="bibleref-manual.html#dx1-4002" ><span -class="cmti-10">7</span></a> <br /></span> +class="cmti-10">9</span></a> <br /></span> </p><p class="theindex"> <span class="cmbx-10">I</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\ibibleverse</span></span></span>  <a href="bibleref-manual.html#dx1-4001" ><span -class="cmti-10">8</span></a> <br /></span> +class="cmti-10">10</span></a> <br /></span> + + + +</p><p class="theindex"> <span +class="cmbx-10">M</span> +<span class="index-item"><span +class="cmtt-10">makeindex</span>  <a +href="bibleref-manual.html#dx1-4003" >11</a>, <a +href="bibleref-manual.html#dx1-4004" >12</a>, <a +href="bibleref-manual.html#dx1-5003" >13</a>, <a +href="bibleref-manual.html#dx1-6001" >14</a>, <a +href="bibleref-manual.html#dx1-6003" >15</a>, <a +href="bibleref-manual.html#dx1-6007" >16</a> <br /></span> +<span class="index-item"><span +class="cmss-10">multind </span>package  <a +href="bibleref-manual.html#dx1-5002" >17</a>, <a +href="bibleref-manual.html#dx1-5004" >18</a> <br /></span> </p><p class="theindex"> <span class="cmbx-10">N</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\newbiblerefstyle</span></span></span>  <a href="bibleref-manual.html#dx1-3001" ><span -class="cmti-10">9</span></a> <br /></span> - - - +class="cmti-10">19</span></a> <br /></span> </p><p class="theindex"> <span class="cmbx-10">S</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\setbooktitle</span></span></span>  <a -href="bibleref-manual.html#dx1-2005" ><span -class="cmti-10">10</span></a> <br /></span> +href="bibleref-manual.html#dx1-2006" ><span +class="cmti-10">20</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\setindexbooktitle</span></span></span>  <a -href="bibleref-manual.html#dx1-2006" ><span -class="cmti-10">11</span></a> <br /></span> +href="bibleref-manual.html#dx1-2007" ><span +class="cmti-10">21</span></a> <br /></span> +</p><p class="theindex"> <span +class="cmbx-10">X</span> +<span class="index-item"><span +class="cmtt-10">xindy</span>  <a +href="bibleref-manual.html#dx1-6002" >22</a>, <a +href="bibleref-manual.html#dx1-6004" >23</a> <br /></span> </p></div> -<!--l. 317--><p class="noindent" ><a -href="#top">Top</a> </body></html> 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 Binary files differindex 580e0048c5a..fea95fb2d67 100644 --- a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf +++ b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf 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</def <</oc@ttf/ >>>% -/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} %</driver> %\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}% }% |