From 15703ccdfc4e8e60c48c88a46bd19990f7f97264 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 23 Jan 2011 01:07:05 +0000
Subject: bibleref 1.14 (19jan11)

git-svn-id: svn://tug.org/texlive/trunk@21145 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/latex/bibleref/CHANGES       |   26 +
 Master/texmf-dist/doc/latex/bibleref/README        |    7 +-
 .../doc/latex/bibleref/bibleref-manual.css         |    5 +
 .../doc/latex/bibleref/bibleref-manual.html        |  683 +++++++---
 .../doc/latex/bibleref/bibleref-manual.tex         |  245 +++-
 Master/texmf-dist/doc/latex/bibleref/bibleref.pdf  |  Bin 285680 -> 283190 bytes
 .../latex/bibleref/samples/sample-categories.pdf   |  Bin 0 -> 41538 bytes
 .../latex/bibleref/samples/sample-categories.tex   |   90 ++
 .../doc/latex/bibleref/samples/sample-multind.pdf  |  Bin 0 -> 29702 bytes
 .../doc/latex/bibleref/samples/sample-multind.tex  |   85 ++
 .../doc/latex/bibleref/samples/sample-xidx.pdf     |  Bin 0 -> 70657 bytes
 .../doc/latex/bibleref/samples/sample-xidx.tex     |   75 ++
 .../doc/latex/bibleref/samples/sample.ist          |   46 +
 .../doc/latex/bibleref/samples/sample.pdf          |  Bin 0 -> 133110 bytes
 .../doc/latex/bibleref/samples/sample.tex          |  294 +++++
 .../texmf-dist/source/latex/bibleref/bibleref.dtx  | 1346 +++++++++++++++-----
 .../texmf-dist/source/latex/bibleref/bibleref.ins  |   18 +-
 Master/texmf-dist/tex/latex/bibleref/bibleref.sty  |  187 ++-
 18 files changed, 2503 insertions(+), 604 deletions(-)
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.tex
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.pdf
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.tex
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.tex
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample.ist
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf
 create mode 100644 Master/texmf-dist/doc/latex/bibleref/samples/sample.tex

(limited to 'Master/texmf-dist')

diff --git a/Master/texmf-dist/doc/latex/bibleref/CHANGES b/Master/texmf-dist/doc/latex/bibleref/CHANGES
index 2be562e5231..5ee47a2c53b 100644
--- a/Master/texmf-dist/doc/latex/bibleref/CHANGES
+++ b/Master/texmf-dist/doc/latex/bibleref/CHANGES
@@ -1,3 +1,29 @@
+1.14:
+
+  * added
+
+    \ibiblechvs	- only displays chapter and verse,
+		but indexes under book, chapter and verse.
+    \ibiblevs	- only displays verse, but indexes under book,
+		chapter and verse.
+
+    \biblerefcategory - sets up reference categories.
+
+  * Index now displayed using bibleref style current at \makeindex
+    rather than style in use when \ibibleref used.
+
+  * If there are chapter lists/ranges with no verses, can now
+    put the list in a single (chapter list:) for example
+    \ibibleverse{Gen}(1-5,9:)
+
+  * Added new package bibleref-xidx:
+
+    - extended bibleref indexing support
+
+    - verses added as subitems to chapters in index
+
+    - options to suppress the verses or chapters appearing in index
+
 1.13:
   * Changed \@ifnextchar to \new@ifnextchar to prevent spaces being
     ignored after bible references. (amsgen.sty now a required
diff --git a/Master/texmf-dist/doc/latex/bibleref/README b/Master/texmf-dist/doc/latex/bibleref/README
index 3a6570ba544..65ac3a93efc 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 v1.13
+LaTeX Class File : bibleref v1.14
 
-Last Modified : 2010-07-07
+Last Modified : 2011-01-19
 
 Author        : Nicola Talbot
 
@@ -9,7 +9,8 @@ Files         : bibleref.dtx   - documented source file
 
 
 The package file bibleref.sty can be used to ensure
-consistent formatting of bible citations.
+consistent formatting of bible citations. Also comes with
+bibleref-xidx.sty for extended bibleref indexing functions.
 
 INSTALLATION
 
diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css
index 11c2f8c9b57..e7e817164bf 100644
--- a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css
+++ b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.css
@@ -4,6 +4,7 @@
 .cmr-17{font-size:170%;}
 .cmr-12{font-size:120%;}
 .cmmi-12x-x-144{font-size:172%;font-style: italic;}
+.cmr-8{font-size:80%;}
 .cmtt-12{font-size:120%;font-family: monospace;}
 .cmtt-12{font-family: monospace;}
 .cmtt-12{font-family: monospace;}
@@ -11,11 +12,15 @@
 .cmtt-10{font-family: monospace;}
 .cmtt-10{font-family: monospace;}
 .cmss-10{  font-family: sans-serif;}
+.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;}
+.cmssbx-10{ font-family: sans-serif; font-weight: bold;}
+.cmssbx-10{ font-family: sans-serif; font-weight: bold;}
+.cmr-9{font-size:90%;}
 p.noindent { text-indent: 0em }
 td p.noindent { text-indent: 0em; margin-top:0em; }
 p.nopar { text-indent: 0em; }
diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html
index 0d704c240eb..2525bee6b23 100644
--- a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html
+++ b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.html
@@ -5,13 +5,13 @@
 <!--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&#x03B5;package for typesetting bible references</title> 
+<head><title>bibleref.sty v1.14: a LaTeX2&#x03B5;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" /> 
+<meta name="date" content="2011-01-19 22:37:00" /> 
  
 <style type="text/css"> 
 <!--  
@@ -21,6 +21,7 @@
 .cmr-17{font-size:170%;}  
 .cmr-12{font-size:120%;}  
 .cmmi-12x-x-144{font-size:172%;font-style: italic;}  
+.cmr-8{font-size:80%;}  
 .cmtt-12{font-size:120%;font-family: monospace;}  
 .cmtt-12{font-family: monospace;}  
 .cmtt-12{font-family: monospace;}  
@@ -28,11 +29,15 @@
 .cmtt-10{font-family: monospace;}  
 .cmtt-10{font-family: monospace;}  
 .cmss-10{ font-family: sans-serif;}  
+.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;}  
+.cmssbx-10{ font-family: sans-serif; font-weight: bold;}  
+.cmssbx-10{ font-family: sans-serif; font-weight: bold;}  
+.cmr-9{font-size:90%;}  
 p.noindent { text-indent: 0em }  
 td p.noindent { text-indent: 0em; margin-top:0em; }  
 p.nopar { text-indent: 0em; }  
@@ -158,7 +163,7 @@ div.important { background-color:red; }
 
                                                                     
 
-<h2 class="titleHead">bibleref.sty v1.13: a <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span 
+<h2 class="titleHead">bibleref.sty v1.14: a <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span 
 class="E">E</span>X</span></span>2&#x03B5;&#x00A0;package for
 typesetting bible references</h2>
               <div class="author" ><span 
@@ -173,11 +178,9 @@ 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/</span><span 
-class="cmtt-12">~</span><span 
-class="cmtt-12">nlct/</span></a></div><br />
+class="cmtt-12">http://theoval.cmp.uea.ac.uk/~nlct/</span></a></div><br />
 <div class="date" ><span 
-class="cmr-12">2010-07-07</span></div>
+class="cmr-12">2011-01-19</span></div>
    </div>
    <h3 class="likesectionHead"><a 
  id="x1-1000"></a>Contents</h3>
@@ -189,23 +192,33 @@ href="#x1-30002" id="QQ2-1-4">Defining New Styles</a></span>
 <br />   <span class="sectionToc" >3 <a 
 href="#x1-40003" id="QQ2-1-5">Indexing Bible References</a></span>
 <br />   &#x00A0;<span class="subsectionToc" >3.1 <a 
-href="#x1-50003.1" id="QQ2-1-6">Separate Scripture Index</a></span>
+href="#x1-50003.1" id="QQ2-1-6">Index Categories</a></span>
 <br />   &#x00A0;<span class="subsectionToc" >3.2 <a 
-href="#x1-60003.2" id="QQ2-1-7">Changing the Sort Order</a></span>
+href="#x1-60003.2" id="QQ2-1-7">The <span 
+class="cmss-10">bibleref-xidx </span>Package</a></span>
+<br />   &#x00A0;<span class="subsectionToc" >3.3 <a 
+href="#x1-70003.3" id="QQ2-1-8">Separate Scripture Index</a></span>
+<br />   &#x00A0;<span class="subsectionToc" >3.4 <a 
+href="#x1-80003.4" id="QQ2-1-9">Changing the Sort Order</a></span>
 <br />   <span class="sectionToc" >4 <a 
-href="#x1-70004" id="QQ2-1-8">Acknowledgements</a></span>
+href="#x1-90004" id="QQ2-1-10">Distributing New Styles</a></span>
+<br />   <span class="sectionToc" >5 <a 
+href="#x1-100005" id="QQ2-1-11">Acknowledgements</a></span>
 <br />   <span class="sectionToc" ><a 
-href="#Q1-1-9">Index</a></span>
+href="#Q1-1-12">Index</a></span>
    </div>
-<!--l. 67--><p class="noindent" >
+<!--l. 28--><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 
+<!--l. 30--><p class="noindent" >The <span 
 class="cmss-10">bibleref</span><a 
  id="dx1-2001"></a> package was designed to provide consistent formatting for referencing parts
 of the bible.
-</p><!--l. 72--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+                                                                    
+
+                                                                    
+</p><!--l. 33--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\bibleverse</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
  id="dx1-2002"></a> <span 
@@ -222,13 +235,24 @@ class="cmsy-10">&#x27E8;</span><span
 class="cmti-10">verse(s)</span><span 
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">) </span></div><hr>
-                                                                    
-
-                                                                    
-</p><!--l. 74--><p class="noindent" >
+</p><!--l. 35--><p class="noindent" >
 This command can be used to cite a bible book, chapter or verse or range of chapters or
 verses.
-</p><!--l. 78--><p class="indent" >   The book title, <span 
+</p><!--l. 39--><p class="indent" >   <div class="important" title="Important Note"> Be careful if you use <span 
+class="cmss-10">bibleref</span><a 
+ id="dx1-2003"></a> with <span 
+class="cmss-10">babel</span><a 
+ id="dx1-2004"></a> as some of <span 
+class="cmss-10">babel</span>&#8217;s language options make
+the colon character active, which will cause a problem for <span 
+class="cmtt-10">\bibleverse </span>(and
+<span 
+class="cmtt-10">\ibibleverse</span><a 
+ id="dx1-2005"></a>, described later). Check the <span 
+class="cmss-10">babel </span>documentation to find out how to
+make the colon non-active. </div>
+</p><!--l. 45--><p class="noindent" >
+</p><!--l. 47--><p class="indent" >   The book title, <span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">book title</span><span 
 class="cmsy-10">&#x27E9;</span>, may be given either as the full title (e.g.&#x00A0;<span 
@@ -237,10 +261,10 @@ an abbreviation (e.g.&#x00A0;<span
 class="cmtt-10">Mt </span>or <span 
 class="cmtt-10">Matt</span>), most standard abbreviations are recognised. Books
 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
+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>
-</p><!--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. 54--><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">&#x27E8;</span><span 
 class="cmti-10">chapter</span><span 
@@ -255,16 +279,16 @@ list of individual verses or range of verses. A range of verses should be writte
 single hyphen, e.g.&#x00A0;<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
-</p><!--l. 92--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+</p><!--l. 61--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\BRvsep</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
- id="dx1-2003"></a> <span 
+ id="dx1-2006"></a> <span 
 class="cmtt-10">\BRvsep </span></div><hr>
-</p><!--l. 94--><p class="noindent" >
+</p><!--l. 63--><p class="noindent" >
 (an en-dash by default.) A chapter may be referenced without a verse, but the colon
 must remain, e.g.&#x00A0;<span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">(12:)</span></span></span> simply indicates chapter 12.
-</p><!--l. 99--><p class="indent" >   A range of verses spanning more than one chapter can be entered as
+</p><!--l. 68--><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">&#x27E8;</span><span 
@@ -283,10 +307,17 @@ class="cmsy-10">&#x27E8;</span><span
 class="cmti-10">v</span><span 
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">)</span>
-</p><!--l. 103--><p class="indent" >   Examples: </p>
+</p><!--l. 72--><p class="indent" >   If there is no verse, but there are multiple chapters or chapter ranges, these may be
+specified in the <span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">chapter</span><span 
+class="cmsy-10">&#x27E9; </span>part, using a comma to separate individual chapters and a
+hyphen to separate ranges. Note that you still need a colon at the end of the
+list.
+</p><!--l. 77--><p class="indent" >   Examples: </p>
 <div class="center" 
 >
-<!--l. 104--><p class="noindent" >
+<!--l. 78--><p class="noindent" >
 </p>
 <div class="tabular"> <table id="TBL-2" class="tabular" 
 cellspacing="0" cellpadding="0"  
@@ -336,28 +367,37 @@ class="td11">Revelation 1:2,5,7&#8211;9,11</td>
  style="vertical-align:baseline;" id="TBL-2-9-"><td  style="white-space:nowrap; text-align:left;" id="TBL-2-9-1"  
 class="td11"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\bibleverse{IChronicles}(1:3)-(2:7)</span></span></span></td><td  style="white-space:nowrap; text-align:left;" id="TBL-2-9-2"  
-class="td11">1 Chronicles 1:3&#8211;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
+class="td11">1 Chronicles 1:3&#8211;2:7    </td>
+</tr><tr  
+ style="vertical-align:baseline;" id="TBL-2-10-"><td  style="white-space:nowrap; text-align:left;" id="TBL-2-10-1"  
+class="td11"><span class="obeylines-h"><span class="verb"><span 
+class="cmtt-10">\bibleverse{Luke}(1,4-5,8:)</span></span></span>        </td><td  style="white-space:nowrap; text-align:left;" id="TBL-2-10-2"  
+class="td11">Luke 1,4&#8211;5,8              </td></tr></table>
+</div></div>
+<!--l. 94--><p class="indent" >   The style of the reference can be specified either by package option or as the
 argument to the command
-</p><!--l. 121--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+                                                                    
+
+                                                                    
+</p><!--l. 96--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\biblerefstyle</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
- id="dx1-2004"></a> <span 
+ id="dx1-2007"></a> <span 
 class="cmtt-10">\biblerefstyle{</span><span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">style</span><span 
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">} </span></div><hr>
-</p><!--l. 123--><p class="noindent" >
+</p><!--l. 98--><p class="noindent" >
 Styles are listed in Table&#x00A0;<a 
-href="#x1-20051">1<!--tex4ht:ref: tab:styles --></a>.
+href="#x1-20081">1<!--tex4ht:ref: tab:styles --></a>.
 </p>
    <div class="table">
                                                                     
 
                                                                     
-<!--l. 126--><p class="indent" >   <a 
- id="x1-20051"></a></p><hr class="float" /><div class="float" 
+<!--l. 101--><p class="indent" >   <a 
+ id="x1-20081"></a></p><hr class="float" /><div class="float" 
 >
                                                                     
 
@@ -366,10 +406,10 @@ href="#x1-20051">1<!--tex4ht:ref: tab:styles --></a>.
 ><span class="id">Table&#x00A0;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-20051 -->
+class="cmtt-10">\biblerefstyle</span>)</span></div><!--tex4ht:label?: x1-20081 -->
 <div class="center" 
 >
-<!--l. 131--><p class="noindent" >
+<!--l. 106--><p class="noindent" >
 </p>
 <div class="tabular"> <table id="TBL-3" class="tabular" 
 cellspacing="0" cellpadding="0"  
@@ -379,39 +419,39 @@ 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="td11"><!--l. 108--><p class="noindent" ><span 
 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&#8211;5                          </p></td></tr><tr  
+class="td11"><!--l. 109--><p class="noindent" >2 Corinthians 12:1&#8211;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&#8211;5</p></td>
+class="td11"><!--l. 110--><p class="noindent" >2 Co 12:1&#8211;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&#8211;5                                 </p></td>
+class="td11"><!--l. 111--><p class="noindent" >II Cor. XII.1&#8211;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&#8211;5                                  </p></td>
+class="td11"><!--l. 112--><p class="noindent" >2 Cor. xii. 1&#8211;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&#8211;5                                    </p></td>
+class="td11"><!--l. 113--><p class="noindent" >2 Cor xii,1&#8211;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.&#x00A0;xii.1&#8211;5                                   </p></td>
+class="td11"><!--l. 114--><p class="noindent" >2 Cor.&#x00A0;xii.1&#8211;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.&#x00A0;xii : 1&#8211;5                                  </p></td>
+class="td11"><!--l. 115--><p class="noindent" >2 Cor.&#x00A0;xii : 1&#8211;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&#x00A0;Epistle   to   the   Corinthians,
+class="td11"><!--l. 116--><p class="noindent" >Second&#x00A0;Epistle   to   the   Corinthians,
 chapter twelve verse one to five            </p></td>
 </tr></table></div></div>
                                                                     
@@ -419,11 +459,11 @@ chapter twelve verse one to five            </p></td>
                                                                     
    </div><hr class="endfloat" />
    </div>
-<!--l. 146--><p class="indent" >   You can change the name of a book using
-</p><!--l. 147--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+<!--l. 121--><p class="indent" >   You can change the name of a book using
+</p><!--l. 122--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\setbooktitle</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
- id="dx1-2006"></a> <span 
+ id="dx1-2009"></a> <span 
 class="cmtt-10">\setbooktitle{</span><span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">name</span><span 
@@ -433,7 +473,7 @@ class="cmsy-10">&#x27E8;</span><span
 class="cmti-10">new title</span><span 
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">} </span></div><hr>
-</p><!--l. 149--><p class="noindent" >
+</p><!--l. 124--><p class="noindent" >
 Note that <span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">name</span><span 
@@ -443,13 +483,13 @@ class="cmtt-10">\setbookname{Revelation}{Apoc}</span></span></span> (<span
 class="cmbx-10">Note</span>
 that you shouldn&#8217;t do <span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\setbookname{Rev}{Apoc}</span></span></span>)
-</p><!--l. 157--><p class="indent" >   If you want a different title for a book depending on whether it&#8217;s in the
+</p><!--l. 132--><p class="indent" >   If you want a different title for a book depending on whether it&#8217;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 
+</p><!--l. 135--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\setindexbooktitle</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
- id="dx1-2007"></a> <span 
+ id="dx1-2010"></a> <span 
 class="cmtt-10">\setindexbooktitle{</span><span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">name</span><span 
@@ -459,7 +499,7 @@ class="cmsy-10">&#x27E8;</span><span
 class="cmti-10">title</span><span 
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">} </span></div><hr>
-</p><!--l. 162--><p class="noindent" >
+</p><!--l. 137--><p class="noindent" >
 In this case, <span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">name</span><span 
@@ -474,16 +514,16 @@ you do:
 \setbooktitle{Psalms}{Psalm}
 &#x00A0;<br />\setindexbooktitle{Psalms}{Psalms}
 </div>
-<!--l. 168--><p class="nopar" > Then <span class="obeylines-h"><span class="verb"><span 
+<!--l. 143--><p class="nopar" > Then <span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\ibibleverse{Psalms}(2:)</span></span></span> will print Psalm the document and Psalms in the
 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.
-</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 
+</p><!--l. 148--><p class="indent" >   You can add a book using
+</p><!--l. 149--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\addbiblebook</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
- id="dx1-2008"></a> <span 
+ id="dx1-2011"></a> <span 
 class="cmtt-10">\addbiblebook{</span><span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">name</span><span 
@@ -493,7 +533,7 @@ class="cmsy-10">&#x27E8;</span><span
 class="cmti-10">title</span><span 
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">} </span></div><hr>
-</p><!--l. 176--><p class="noindent" >
+</p><!--l. 151--><p class="noindent" >
 For example:
                                                                     
 
@@ -502,13 +542,13 @@ For example:
    <div class="verbatim" id="verbatim-2">
 \addbiblebook{Susanna}{Story&#x00A0;of&#x00A0;Susanna}
 </div>
-<!--l. 180--><p class="nopar" >
+<!--l. 155--><p class="nopar" >
 </p>
-<!--l. 182--><p class="noindent" ><a 
+<!--l. 157--><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. 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 
+<!--l. 159--><p class="noindent" >You can define a new style using the command
+</p><!--l. 160--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\newbiblerefstyle</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
  id="dx1-3001"></a> <span 
@@ -522,12 +562,12 @@ class="cmti-10">commands</span><span
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">}</span>
 </div><hr>
-</p><!--l. 187--><p class="noindent" >
+</p><!--l. 162--><p class="noindent" >
 where <span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">commands</span><span 
 class="cmsy-10">&#x27E9; </span>are the commands needed to modify the citation style.
-</p><!--l. 191--><p class="indent" >   Example: This new style is based on the &#8220;default&#8221; style, but has verses in lower case
+</p><!--l. 166--><p class="indent" >   Example: This new style is based on the &#8220;default&#8221; style, but has verses in lower case
 Roman numerals, and redefines &#8220;Revelation&#8221; as &#8220;Apocalypse&#8221;.
                                                                     
 
@@ -540,19 +580,25 @@ Roman numerals, and redefines &#8220;Revelation&#8221; as &#8220;Apocalypse&#822
 &#x00A0;<br />\setbooktitle{Revelation}{Apocalypse}%
 &#x00A0;<br />}
 </div>
-<!--l. 201--><p class="nopar" > Note the use of <span class="obeylines-h"><span class="verb"><span 
+<!--l. 176--><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. 179--><p class="indent" >   If you want to distribute a new style, see section&#x00A0;<a 
+href="#x1-90004">4<!--tex4ht:ref: sec:distnewstyles --></a>.
+</p><!--l. 182--><p class="noindent" >
 </p>
-<!--l. 204--><p class="noindent" ><a 
+<!--l. 182--><p class="noindent" ><a 
 href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">3   </span> <a 
  id="x1-40003"></a>Indexing Bible References</h3>
-<!--l. 206--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span 
+<!--l. 184--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\ibibleverse</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
  id="dx1-4001"></a> <span 
-class="cmtt-10">\ibibleverse{</span><span 
+class="cmtt-10">\ibibleverse[</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">format</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">]{</span><span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">book title</span><span 
 class="cmsy-10">&#x27E9;</span><span 
@@ -564,19 +610,20 @@ class="cmtt-10">}:</span><span
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">verse(s)</span><span 
 class="cmsy-10">&#x27E9;</span><span 
-class="cmtt-10">) </span></div><hr>
-</p><!--l. 208--><p class="noindent" >
+class="cmtt-10">)</span>
+</div><hr>
+</p><!--l. 186--><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
-</p><!--l. 213--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span 
+</p><!--l. 191--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\bvidxpgformat</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
  id="dx1-4002"></a> <span 
 class="cmtt-10">\bvidxpgformat </span></div><hr>
-</p><!--l. 215--><p class="noindent" >
+</p><!--l. 193--><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 
@@ -589,10 +636,64 @@ example:
    <div class="verbatim" id="verbatim-4">
 \ibibleverse[textit]{Exodus}
 </div>
-<!--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 
+<!--l. 199--><p class="nopar" > (Note there is no backslash.)
+</p><!--l. 202--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+class="cmtt-9">\ibiblechvs</span><span 
+class="cmtt-9">&#x00A0;</span></span><a 
+ id="dx1-4003"></a> <span 
+class="cmtt-10">\ibiblechvs[</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">format</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">]{</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">book title</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">}({</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">chapter</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">}:</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">verse(s)</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">)</span>
+</div><hr>
+</p><!--l. 204--><p class="noindent" >
+This is similar to <span 
+class="cmtt-10">\ibibleverse </span>except that it doesn&#8217;t display the book name in
+the text. The reference is indexed under the book title in the same way as
+<span 
+class="cmtt-10">\ibibleverse</span>.
+</p><!--l. 209--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+class="cmtt-9">\ibiblevs</span><span 
+class="cmtt-9">&#x00A0;</span></span><a 
+ id="dx1-4004"></a> <span 
+class="cmtt-10">\ibiblevs[</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">format</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">]{</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">book title</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">}({</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">chapter</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">}:</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">verse(s)</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">)</span>
+</div><hr>
+</p><!--l. 211--><p class="noindent" >
+This is similar to <span 
+class="cmtt-10">\ibiblechvs </span>except that it only displays the verse(s) in the
+text.
+</p><!--l. 215--><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
+ id="dx1-4005"></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
@@ -606,34 +707,161 @@ delim_0&#x00A0;"\\dotfill&#x00A0;"
 &#x00A0;<br />delim_1&#x00A0;"\\dotfill&#x00A0;"
 &#x00A0;<br />delim_2&#x00A0;"\\dotfill&#x00A0;"
 </div>
-<!--l. 233--><p class="nopar" > See the <span 
+<!--l. 224--><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" >
+ id="dx1-4006"></a> documentation for further details.
+</p><!--l. 227--><p class="noindent" >
 </p>
-<!--l. 236--><p class="noindent" ><a 
+<!--l. 227--><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. 238--><p class="noindent" >If you want a separate index for bible verses, in addition to a general index, you can
+ id="x1-50003.1"></a>Index Categories</h4>
+<!--l. 229--><p class="noindent" >You may prefer to index the bible reference under a category with the book title as a
+sub item of that category. This can be achieved using:
+</p><!--l. 232--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+class="cmtt-9">\biblerefcategory</span><span 
+class="cmtt-9">&#x00A0;</span></span><a 
+ id="dx1-5001"></a> <span 
+class="cmtt-10">\biblerefcategory[</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">sort key</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">]{</span><span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">category title</span><span 
+class="cmsy-10">&#x27E9;</span><span 
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 234--><p class="noindent" >
+The optional argument is the sort key to be used by <span 
+class="cmtt-10">makeindex</span><a 
+ id="dx1-5002"></a> or <span 
+class="cmtt-10">xindy</span><a 
+ id="dx1-5003"></a>. If omitted
+<span 
+class="cmsy-10">&#x27E8;</span><span 
+class="cmti-10">category title</span><span 
+class="cmsy-10">&#x27E9; </span>is used.
+</p><!--l. 239--><p class="indent" >   Note that <span 
+class="cmtt-10">\ibibleverse</span><a 
+ id="dx1-5004"></a>, <span 
+class="cmtt-10">\ibiblechvs</span><a 
+ id="dx1-5005"></a> and <span 
+class="cmtt-10">\ibiblevs</span><a 
+ id="dx1-5006"></a> use the category that is
+currently set. If you need to keep switching categories, you may find it easier to define a
+shortcut command. For example, suppose you&#8217;re discussing the differences
+between the King James and the New Jerusalem versions, you could define the
+following:
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-6">
+\newcommand{\kjref}{\biblerefcategory{King&#x00A0;James}\ibibleverse}
+&#x00A0;<br />\newcommand{\njref}{\biblerefcategory{New&#x00A0;Jerusalem}\ibibleverse}
+</div>
+<!--l. 248--><p class="nopar" > You can now use <span 
+class="cmtt-10">\kjref </span>and <span 
+class="cmtt-10">\njref </span>in the same way that you would use
+<span 
+class="cmtt-10">\ibibleverse</span>
+</p><!--l. 252--><p class="indent" >   You can disable the category by setting it to nothing:
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-7">
+\biblerefcategory{}
+</div>
+<!--l. 255--><p class="nopar" >
+</p><!--l. 257--><p class="noindent" >
+</p>
+<!--l. 257--><p class="noindent" ><a 
+href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">3.2   </span> <a 
+ id="x1-60003.2"></a>The <span 
+class="cmss-10">bibleref-xidx </span>Package</h4>
+<!--l. 259--><p class="noindent" >The <span 
+class="cmss-10">bibleref</span><a 
+ id="dx1-6001"></a> package comes with a supplementary package <span 
+class="cmss-10">bibleref-xidx</span><a 
+ id="dx1-6002"></a> that modifies the
+way bible references are added to the index. With no package options, i.e.,
+just
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-8">
+\usepackage{bibleref-xidx}
+</div>
+<!--l. 264--><p class="nopar" > the verses will appear as sub-items of the chapters. Note that a verse range will be
+considered a single item so, for example,
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-9">
+\ibibleverse{Ex}(9:1)
+&#x00A0;<br />\ibibleverse{Ex}(9:4)
+&#x00A0;<br />\ibibleverse{Ex}(9:1-4)
+</div>
+<!--l. 271--><p class="nopar" > will occur as three separate entries under Exodus chapter&#x00A0;9. Also note that <span class="obeylines-h"><span class="verb"><span 
+class="cmtt-10">(9-14:)</span></span></span>
+and <span class="obeylines-h"><span class="verb"><span 
+class="cmtt-10">(9:)-(14:)</span></span></span> will be treated differently.
+</p><!--l. 276--><p class="indent" >   The <span 
+class="cmss-10">bibleref-xidx</span><a 
+ id="dx1-6003"></a> package can be loaded with the following options:
+     </p><dl class="description"><dt class="description">
+<span 
+class="cmssbx-10">noverses</span><a 
+ id="dx1-6004"></a> </dt><dd 
+class="description">Don&#8217;t show the verses in the index.
+     </dd><dt class="description">
+<span 
+class="cmssbx-10">verses</span><a 
+ id="dx1-6005"></a> </dt><dd 
+class="description">Show the verses (and chapters) in the index (default).
+     </dd><dt class="description">
+<span 
+class="cmssbx-10">nochapters</span><a 
+ id="dx1-6006"></a> </dt><dd 
+class="description">Don&#8217;t show the chapters (and verses) in the index.
+     </dd><dt class="description">
+<span 
+class="cmssbx-10">chapters</span><a 
+ id="dx1-6007"></a> </dt><dd 
+class="description">Show the chapters in the index (default).</dd></dl>
+<!--l. 285--><p class="noindent" >All other package options will be passed to the <span 
+class="cmss-10">bibleref</span><a 
+ id="dx1-6008"></a> package, which <span 
+class="cmss-10">bibleref-xidx</span><a 
+ id="dx1-6009"></a>
+automatically loads.
+</p><!--l. 288--><p class="noindent" >
+</p>
+<!--l. 288--><p class="noindent" ><a 
+href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">3.3   </span> <a 
+ id="x1-70003.3"></a>Separate Scripture Index</h4>
+<!--l. 290--><p class="noindent" >If you want a separate index for bible verses, in addition to a general index, you can
 redefine
-</p><!--l. 240--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+</p><!--l. 292--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\biblerefindex</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
- id="dx1-5001"></a> <span 
+ id="dx1-7001"></a> <span 
 class="cmtt-10">\biblerefindex </span></div><hr>
-</p><!--l. 242--><p class="noindent" >
+</p><!--l. 294--><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><a 
- id="dx1-5002"></a> package
+ id="dx1-7002"></a> package
 and you want a general index and a scripture index, you can do something
 like:
                                                                     
 
                                                                     
 </p>
-   <div class="verbatim" id="verbatim-6">
+   <div class="verbatim" id="verbatim-10">
 \documentclass{article}
 &#x00A0;<br />\usepackage{bibleref}
 &#x00A0;<br />\usepackage{multind}
@@ -641,47 +869,47 @@ like:
 &#x00A0;<br />\makeindex{general}
 &#x00A0;<br />\renewcommand{\biblerefindex}{\index{scripture}}
 </div>
-<!--l. 256--><p class="nopar" > In the document, you can use <span 
+<!--l. 308--><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">
+   <div class="verbatim" id="verbatim-11">
 \printindex{scripture}{Scripture&#x00A0;Index}
 </div>
-<!--l. 261--><p class="nopar" > You will then need to run <span 
+<!--l. 313--><p class="nopar" > You will then need to run <span 
 class="cmtt-10">makeindex</span><a 
- id="dx1-5003"></a> on the file <span 
+ id="dx1-7003"></a> on the file <span 
 class="cmtt-10">scripture.idx</span>. See the <span 
 class="cmss-10">multind</span><a 
- id="dx1-5004"></a>
+ id="dx1-7004"></a>
 documentation for further details.
-</p><!--l. 266--><p class="noindent" >
+</p><!--l. 318--><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. 268--><p class="noindent" >The bible reference entries will be sorted alphabetically by <span 
+<!--l. 318--><p class="noindent" ><a 
+href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">3.4   </span> <a 
+ id="x1-80003.4"></a>Changing the Sort Order</h4>
+<!--l. 320--><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
+ id="dx1-8001"></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><a 
- id="dx1-6002"></a> instead of <span 
+ id="dx1-8002"></a> instead of <span 
 class="cmtt-10">makeindex</span><a 
- id="dx1-6003"></a> and creating your own custom
+ id="dx1-8003"></a> and creating your own custom
 alphabet (see <span 
 class="cmtt-10">xindy</span><a 
- id="dx1-6004"></a> manual for details) or you can use <span 
+ id="dx1-8004"></a> manual for details) or you can use <span 
 class="cmss-10">bibleref</span><a 
- id="dx1-6005"></a>&#8217;s mapping
+ id="dx1-8005"></a>&#8217;s mapping
 command.
-</p><!--l. 275--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
+</p><!--l. 327--><p class="indent" >   <hr><div title="Definition"><span class="marginpar"><span 
 class="cmtt-9">\biblerefmap</span><span 
 class="cmtt-9">&#x00A0;</span></span><a 
- id="dx1-6006"></a> <span 
+ id="dx1-8006"></a> <span 
 class="cmtt-10">\biblerefmap{</span><span 
 class="cmsy-10">&#x27E8;</span><span 
 class="cmti-10">label</span><span 
@@ -691,13 +919,13 @@ class="cmsy-10">&#x27E8;</span><span
 class="cmti-10">new sort key</span><span 
 class="cmsy-10">&#x27E9;</span><span 
 class="cmtt-10">} </span></div><hr>
-</p><!--l. 277--><p class="noindent" >
+</p><!--l. 329--><p class="noindent" >
 For example, in the preamble:
                                                                     
 
                                                                     
 </p>
-   <div class="verbatim" id="verbatim-8">
+   <div class="verbatim" id="verbatim-12">
 \biblerefmap{Genesis}{01}
 &#x00A0;<br />\biblerefmap{Exodus}{02}
 &#x00A0;<br />\biblerefmap{Leviticus}{03}
@@ -705,17 +933,17 @@ For example, in the preamble:
 &#x00A0;<br />\biblerefmap{Deuteronomy}{05}
 &#x00A0;<br />...
 </div>
-<!--l. 286--><p class="nopar" > When you run <span 
+<!--l. 338--><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
+ id="dx1-8007"></a>, the references will now be sorted in numerical
 order.
-</p><!--l. 290--><p class="indent" >   If you want to subdivide the index into, say, old and new testament, you can add
+</p><!--l. 342--><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">
+   <div class="verbatim" id="verbatim-13">
 \biblerefmap{Genesis}{1@Old&#x00A0;Testament!01}
 &#x00A0;<br />\biblerefmap{Exodus}{1@Old&#x00A0;Testament!02}
 &#x00A0;<br />\biblerefmap{Leviticus}{1@Old&#x00A0;Testament!03}
@@ -726,106 +954,255 @@ this to the mapping. For example:
 &#x00A0;<br />\biblerefmap{Mark}{2@New&#x00A0;Testament!02}
 &#x00A0;<br />...
 </div>
-<!--l. 302--><p class="nopar" >
-</p><!--l. 304--><p class="noindent" >
+<!--l. 354--><p class="nopar" >
+</p><!--l. 356--><p class="noindent" >
 </p>
-<!--l. 304--><p class="noindent" ><a 
+<!--l. 356--><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. 305--><p class="noindent" >Many thanks to all the useful comments from comp.text.tex, especially from
+ id="x1-90004"></a>Distributing New Styles</h3>
+<!--l. 359--><p class="noindent" >If you want a new bible reference style (or translation) publicly available, then it&#8217;s a
+good idea to upload it to CTAN (<a 
+href="www.ctan.org" class="url" ><span 
+class="cmtt-10">www.ctan.org</span></a>). If you&#8217;ve never done this before, you
+might find it a bit daunting, so here are a few pointers.
+</p><!--l. 364--><p class="indent" >   I suggest that you give the name of your new package the prefix <span 
+class="cmtt-10">bibleref- </span>as then it will
+appear close to <span 
+class="cmss-10">bibleref</span><a 
+ id="dx1-9001"></a> in the alphabetical list in the catalogue. Suppose your new style is called
+&#8220;mystyle&#8221;<span class="footnote-mark"><a 
+href="#fn1x0" id="fn1x0-bk"><sup class="textsuperscript">1</sup></a></span><a 
+ id="x1-9002f1"></a>,
+then create a file called <span 
+class="cmtt-10">bibleref-mystyle.sty</span>. At the start of the file, do:
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-14">
+\NeedsTeXFormat{LaTeX2e}
+&#x00A0;<br />\ProvidesPackage{bibleref-mystyle}[2011/01/19&#x00A0;v1.0&#x00A0;Bible&#x00A0;reference
+&#x00A0;<br />style&#x00A0;conforming&#x00A0;to&#x00A0;something&#x00A0;or&#x00A0;other]
+</div>
+<!--l. 374--><p class="nopar" > (Change the date and the brief description in the line above to something more
+appropriate.) Next you need to load <span 
+class="cmss-10">bibleref</span><a 
+ id="dx1-9003"></a>:
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-15">
+\RequirePackage{bibleref}
+</div>
+<!--l. 379--><p class="nopar" > Now do the new style stuff (or redefine styles to provide translations):
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-16">
+\newbiblerefstyle{mystyle}{%
+&#x00A0;<br />\biblerefstyle{default}%
+&#x00A0;<br />\renewcommand{\BRversestyle}[1]{\romannumeral##1}%
+&#x00A0;<br />\setbooktitle{Revelation}{Apocalypse}%
+&#x00A0;<br />}
+</div>
+<!--l. 388--><p class="nopar" > (Again change the above to whatever is appropriate.) Put any new book definitions
+that your style may require, for example:
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-17">
+\addbiblebook{Susanna}{Story&#x00A0;of&#x00A0;Susanna}
+</div>
+<!--l. 393--><p class="nopar" > and add any <span 
+class="cmtt-10">\biblerefmap </span>commands that are required. Then set your new style as
+the current style, if appropriate:
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-18">
+\biblerefstyle{mystyle}
+</div>
+<!--l. 398--><p class="nopar" > On the last line of the file add:
+                                                                    
+
+                                                                    
+</p>
+   <div class="verbatim" id="verbatim-19">
+\endinput
+</div>
+<!--l. 402--><p class="nopar" >
+</p><!--l. 404--><p class="indent" >   Next you need to create a file called &#8220;README&#8221; that contains some information
+about your new package, including what license you want to distribute it under. (If you
+don&#8217;t know anything about licenses, I recommend you choose the <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span 
+class="E">E</span>X</span></span>&#x00A0;Project
+Public License, LPPL.)
+</p><!--l. 409--><p class="indent" >   It&#8217;s worth adding a sample file or a little bit of documentation that illustrates how
+the references appear.
+</p><!--l. 412--><p class="indent" >   Put your .sty file, README file and samples or documentation into a zip archive.
+You&#8217;re now ready to upload it. There are several upload pages. The main one is at
+<a 
+href="http://www.ctan.org/upload.html" class="url" ><span 
+class="cmtt-10">http://www.ctan.org/upload.html</span></a>. The name of your contribution is the name of
+your package (&#8220;bibleref-mystyle&#8221; in this example). Remember to put your name and
+email in the relevant input boxes. Sometime after you&#8217;ve uploaded your zip file,
+you&#8217;ll get a copy of the announcement from one of the CTAN maintainers. It
+usually takes a day to establish itself. After that people can download and use
+it.
+</p><!--l. 422--><p class="noindent" >
+</p>
+<!--l. 422--><p class="noindent" ><a 
+href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">5   </span> <a 
+ id="x1-100005"></a>Acknowledgements</h3>
+<!--l. 423--><p class="noindent" >Many thanks to all the useful comments from comp.text.tex, especially from
 Jesse&#x00A0;Billett, Brooks&#x00A0;Moses and Ulrich&#x00A0;M.&#x00A0;Schwarz.
-</p><!--l. 311--><p class="indent" >   <a 
+                                                                    
+
+                                                                    
+</p><!--l. 429--><p class="indent" >   <a 
  id="likesection.1"></a><a 
- id="Q1-1-9"></a>
-</p><!--l. 2--><p class="noindent" >
+ id="Q1-1-12"></a>
 </p>
 <!--l. 2--><p class="noindent" ><a 
 href="#top">Top</a></p><h3 class="likesectionHead"><a 
- id="x1-80004"></a>Index</h3>
+ id="x1-110005"></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>&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-2008" ><span 
+href="bibleref-manual.html#dx1-2011" ><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">babel </span>package&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-2004" >2</a> <br /></span>
+<span class="index-item"><span 
 class="cmss-10">bibleref </span>package&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-2001" >2</a>, <a 
-href="bibleref-manual.html#dx1-6005" >3</a> <br /></span>
+href="bibleref-manual.html#dx1-2001" >3</a>, <a 
+href="bibleref-manual.html#dx1-2003" >4</a>, <a 
+href="bibleref-manual.html#dx1-6001" >5</a>, <a 
+href="bibleref-manual.html#dx1-6008" >6</a>, <a 
+href="bibleref-manual.html#dx1-8005" >7</a>, <a 
+href="bibleref-manual.html#dx1-9001" >8</a>, <a 
+href="bibleref-manual.html#dx1-9003" >9</a> <br /></span>
+<span class="index-item"><span 
+class="cmss-10">bibleref-xidx </span>package&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#x1-60003.2" >10</a>, <a 
+href="bibleref-manual.html#dx1-6002" >11</a>, <a 
+href="bibleref-manual.html#dx1-6003" >12</a>, <a 
+href="bibleref-manual.html#dx1-6009" >13</a> <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
-class="cmtt-10">\biblerefindex</span></span></span>&#x00A0;&#x00A0;<a 
+class="cmtt-10">\biblerefcategory</span></span></span>&#x00A0;&#x00A0;<a 
 href="bibleref-manual.html#dx1-5001" ><span 
-class="cmti-10">4</span></a> <br /></span>
+class="cmti-10">14</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span 
+class="cmtt-10">\biblerefindex</span></span></span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-7001" ><span 
+class="cmti-10">15</span></a> <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\biblerefmap</span></span></span>&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-6006" ><span 
-class="cmti-10">5</span></a> <br /></span>
+href="bibleref-manual.html#dx1-8006" ><span 
+class="cmti-10">16</span></a> <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\biblerefstyle</span></span></span>&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-2004" ><span 
-class="cmti-10">6</span></a> <br /></span>
+href="bibleref-manual.html#dx1-2007" ><span 
+class="cmti-10">17</span></a> <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\bibleverse</span></span></span>&#x00A0;&#x00A0;<a 
 href="bibleref-manual.html#dx1-2002" ><span 
-class="cmti-10">7</span></a> <br /></span>
+class="cmti-10">18</span></a> <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\BRvsep</span></span></span>&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-2003" ><span 
-class="cmti-10">8</span></a> <br /></span>
+href="bibleref-manual.html#dx1-2006" ><span 
+class="cmti-10">19</span></a> <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\bvidxpgformat</span></span></span>&#x00A0;&#x00A0;<a 
 href="bibleref-manual.html#dx1-4002" ><span 
-class="cmti-10">9</span></a> <br /></span>
+class="cmti-10">20</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">\ibiblechvs</span></span></span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-4003" ><span 
+class="cmti-10">21</span></a>, <a 
+href="bibleref-manual.html#dx1-5005" ><span class="underline">22</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\ibibleverse</span></span></span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-2005" ><span class="underline">23</span></a>, <a 
 href="bibleref-manual.html#dx1-4001" ><span 
-class="cmti-10">10</span></a> <br /></span>
-                                                                    
-
-                                                                    
+class="cmti-10">24</span></a>, <a 
+href="bibleref-manual.html#dx1-5004" ><span class="underline">25</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span 
+class="cmtt-10">\ibiblevs</span></span></span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-4004" ><span 
+class="cmti-10">26</span></a>, <a 
+href="bibleref-manual.html#dx1-5006" ><span class="underline">27</span></a> <br /></span>
 </p><p class="theindex">                                                                  <span 
 class="cmbx-10">M</span>
 <span class="index-item"><span 
 class="cmtt-10">makeindex</span>&#x00A0;&#x00A0;<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>
+href="bibleref-manual.html#dx1-4005" >28</a>, <a 
+href="bibleref-manual.html#dx1-4006" >29</a>, <a 
+href="bibleref-manual.html#dx1-5002" >30</a>, <a 
+href="bibleref-manual.html#dx1-7003" >31</a>, <a 
+href="bibleref-manual.html#dx1-8001" >32</a>, <a 
+href="bibleref-manual.html#dx1-8003" >33</a>, <a 
+href="bibleref-manual.html#dx1-8007" >34</a> <br /></span>
 <span class="index-item"><span 
 class="cmss-10">multind </span>package&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-5002" >17</a>, <a 
-href="bibleref-manual.html#dx1-5004" >18</a> <br /></span>
+href="bibleref-manual.html#dx1-7002" >35</a>, <a 
+href="bibleref-manual.html#dx1-7004" >36</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>&#x00A0;&#x00A0;<a 
 href="bibleref-manual.html#dx1-3001" ><span 
-class="cmti-10">19</span></a> <br /></span>
+class="cmti-10">37</span></a> <br /></span>
+</p><p class="theindex">                                                                  <span 
+class="cmbx-10">P</span>
+<span class="index-item">package options:<br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span 
+class="cmss-10">chapters</span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-6007" ><span class="underline">38</span></a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span 
+class="cmss-10">nochapters</span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-6006" ><span class="underline">39</span></a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span 
+class="cmss-10">noverses</span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-6004" ><span class="underline">40</span></a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span 
+class="cmss-10">verses</span>&#x00A0;&#x00A0;<a 
+href="bibleref-manual.html#dx1-6005" ><span class="underline">41</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>&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-2006" ><span 
-class="cmti-10">20</span></a> <br /></span>
+href="bibleref-manual.html#dx1-2009" ><span 
+class="cmti-10">42</span></a> <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\setindexbooktitle</span></span></span>&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-2007" ><span 
-class="cmti-10">21</span></a> <br /></span>
+href="bibleref-manual.html#dx1-2010" ><span 
+class="cmti-10">43</span></a> <br /></span>
 </p><p class="theindex">                                                                  <span 
 class="cmbx-10">X</span>
 <span class="index-item"><span 
 class="cmtt-10">xindy</span>&#x00A0;&#x00A0;<a 
-href="bibleref-manual.html#dx1-6002" >22</a>, <a 
-href="bibleref-manual.html#dx1-6004" >23</a> <br /></span>
+href="bibleref-manual.html#dx1-5003" >44</a>, <a 
+href="bibleref-manual.html#dx1-8002" >45</a>, <a 
+href="bibleref-manual.html#dx1-8004" >46</a> <br /></span>
 </p></div>
-    
+   <div class="footnotes"><!--l. 367--><p class="indent" >    <span class="footnote-mark"><a 
+href="#fn1x0-bk" id="fn1x0"><sup class="textsuperscript">1</sup></a></span><span 
+class="cmr-8">Choose a more descriptive name than this.</span></p>                                                          </div>
+ 
 </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 abd811656ac..ac507246864 100644
--- a/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.tex
+++ b/Master/texmf-dist/doc/latex/bibleref/bibleref-manual.tex
@@ -1,57 +1,18 @@
-%%
-%% This is file `bibleref-manual.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% bibleref.dtx  (with options: `bibleref-manual.tex,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         \~}
 \documentclass{nlctdoc}
 
 \usepackage{bibleref}
 \usepackage[colorlinks,bookmarks,pdfauthor={Nicola L.C. Talbot},
             hyperindex=false,
-            pdftitle={bibleref.sty: a LaTeX package for
+            pdftitle={bibleref.sty: a LaTeX package for 
             typesetting bible references}]{hyperref}
 
 \usepackage{creatdtx}
 
-\CheckSum{1893}
+\CheckSum{2503}
+\OnlyDescription
 
 \begin{document}
-\title{bibleref.sty v1.13:
+\title{bibleref.sty v1.14:
 a \LaTeXe\ package for typesetting bible references}
 \author{Nicola Talbot\\[10pt]
 School of Computing Sciences\\
@@ -59,7 +20,7 @@ University of East Anglia\\
 Norwich. Norfolk. NR4 7TJ.\\
 United Kingdom\\
 \url{http://theoval.cmp.uea.ac.uk/~nlct/}}
-\date{2010-07-07}
+\date{2011-01-19}
 
 \maketitle
 \tableofcontents
@@ -72,14 +33,22 @@ parts of the bible.
 \begin{definition}[\DescribeMacro{\bibleverse}]
 \cs{bibleverse}\marg{book title}\texttt(\meta{chapter}\texttt{:}\meta{verse(s)}\texttt)
 \end{definition}
-This command can be used to cite a bible book, chapter or verse
+This command can be used to cite a bible book, chapter or verse 
 or range of chapters or verses.
 
+\begin{important}
+Be careful if you use \sty{bibleref} with \sty{babel} as some of 
+\styfmt{babel}'s language options make the colon character active,
+which will cause a problem for \cs{bibleverse} (and \ics{ibibleverse},
+described later). Check the \styfmt{babel} documentation to find out
+how to make the colon non-active.
+\end{important}
+
 The book title, \meta{book title}, may be given either as the
 full title (e.g.\ \texttt{Matthew}) or as an abbreviation (e.g.\
 \texttt{Mt} or \texttt{Matt}), most standard abbreviations are
 recognised.  Books with multiple parts should be preceded by the
-book number in uppercase roman numerals. For example, the second
+book number in uppercase Roman numerals. For example, the second
 book of Kings should be entered as \verb|\bibleverse{IIKings}|
 
 You may have any number, or zero, sets of parenthesis
@@ -100,6 +69,11 @@ A range of verses spanning more than one chapter can
 be entered as \texttt(\meta{ch}\texttt:\meta{v}\texttt{)-(}\meta
 {ch}\texttt:\meta{v}\texttt)
 
+If there is no verse, but there are multiple chapters or chapter
+ranges, these may be specified in the \meta{chapter} part, using a
+comma to separate individual chapters and a hyphen to separate
+ranges. Note that you still need a colon at the end of the list.
+
 Examples:
 \begin{center}
 \begin{tabular}{ll}
@@ -112,11 +86,12 @@ Examples:
 \verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
 \verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
 \verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
-\bibleverse{IChronicles}(1:3)-(2:7)
+\bibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\bibleverse{Luke}(1,4-5,8:)| &\bibleverse{Luke}(1,4-5,8:)
 \end{tabular}
 \end{center}
 
-The style of the reference can be specified either by
+The style of the reference can be specified either by 
 package option or as the argument to the command
 \begin{definition}[\DescribeMacro{\biblerefstyle}]
 \cs{biblerefstyle}\marg{style}
@@ -124,7 +99,7 @@ package option or as the argument to the command
 Styles are listed in Table~\ref{tab:styles}.
 
 \begin{table}[tbh]
-\caption{Bible Citation Styles (can be used as package option or in the argument to
+\caption{Bible Citation Styles (can be used as package option or in the argument to 
 \cs{biblerefstyle})}
 \label{tab:styles}
 \vspace{10pt}
@@ -143,15 +118,15 @@ text & \biblerefstyle{text}\bibleverse{IICor}(12:1-5)
 \end{center}
 \end{table}
 
-You can change the name of a book using
+You can change the name of a book using 
 \begin{definition}[\DescribeMacro{\setbooktitle}]
 \cs{setbooktitle}\marg{name}\marg{new title}
 \end{definition}
 Note that \meta{name} must be the full name, not the
 abbreviated name of the book. For example, to change
-Revelation to Apoc, do
+Revelation to Apoc, do 
 \verb|\setbookname{Revelation}{Apoc}|
-(\textbf{Note} that you shouldn't do
+(\textbf{Note} that you shouldn't do 
 \verb|\setbookname{Rev}{Apoc}|)
 
 If you want a different title for a book depending on whether it's
@@ -160,7 +135,7 @@ index version using:
 \begin{definition}[\DescribeMacro{\setindexbooktitle}]
 \cs{setindexbooktitle}\marg{name}\marg{title}
 \end{definition}
-In this case, \meta{name} should be the name you'll use in
+In this case, \meta{name} should be the name you'll use in 
 \cs{ibibleverse}. For example, if you do:
 \begin{verbatim}
 \setbooktitle{Psalms}{Psalm}
@@ -188,7 +163,7 @@ You can define a new style using the command
 where \meta{commands} are
 the commands needed to modify the citation style.
 
-Example:
+Example: 
 This new style is based on the \qt{default} style, but
 has verses in lower case Roman numerals, and redefines
 \qt{Revelation} as \qt{Apocalypse}.
@@ -201,19 +176,22 @@ has verses in lower case Roman numerals, and redefines
 \end{verbatim}
 Note the use of \verb|##1| instead of \verb|#1|.
 
+If you want to distribute a new style, see
+section~\ref{sec:distnewstyles}.
+
 \section{Indexing Bible References}
 
 \begin{definition}[\DescribeMacro{\ibibleverse}]
-\cs{ibibleverse}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
+\cs{ibibleverse}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
 \end{definition}
 This does the same as \cs{bibleverse}
-but also adds an index entry (provided you have used
-\cs{makeindex} in the preamble.) The default page number
-format is given by the command
+but also adds an index entry (provided you have used 
+\cs{makeindex} in the preamble.) The default page number 
+format is given by the command 
 \begin{definition}[\DescribeMacro{\bvidxpgformat}]
 \cs{bvidxpgformat}
 \end{definition}
-This is \texttt{textrm} by default, but can be redefined. To
+This is \texttt{textrm} by default, but can be redefined. To 
 override the page number format for a particular entry you can
 use the optional argument to \cs{ibibleverse}. For example:
 \begin{verbatim}
@@ -221,6 +199,19 @@ use the optional argument to \cs{ibibleverse}. For example:
 \end{verbatim}
 (Note there is no backslash.)
 
+\begin{definition}[\DescribeMacro{\ibiblechvs}]
+\cs{ibiblechvs}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
+\end{definition}
+This is similar to \cs{ibibleverse} except that it doesn't display
+the book name in the text. The reference is indexed under the book
+title in the same way as \cs{ibibleverse}.
+
+\begin{definition}[\DescribeMacro{\ibiblevs}]
+\cs{ibiblevs}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
+\end{definition}
+This is similar to \cs{ibiblechvs} except that it only displays the 
+verse(s) in the text.
+
 You may need to create your own custom \app{makeindex} style file
 as the default uses a comma and space to separate the item from
 the page number, which may cause confusion. For example, you
@@ -233,6 +224,67 @@ delim_2 "\\dotfill "
 \end{verbatim}
 See the \app{makeindex} documentation for further details.
 
+\subsection{Index Categories}
+
+You may prefer to index the bible reference under a category with
+the book title as a sub item of that category. This can be achieved
+using:
+\begin{definition}[\DescribeMacro{\biblerefcategory}]
+\cs{biblerefcategory}\oarg{sort key}\marg{category title}
+\end{definition}
+The optional argument is the sort key to be used by
+\app{makeindex} or \app{xindy}. If omitted \meta{category title} is
+used.
+
+Note that \ics{ibibleverse}, \ics{ibiblechvs} and \ics{ibiblevs} 
+use the category that is currently set. If you need to keep
+switching categories, you may find it easier to define a shortcut
+command. For example, suppose you're discussing the differences
+between the King James and the New Jerusalem versions, you could
+define the following:
+\begin{verbatim}
+\newcommand{\kjref}{\biblerefcategory{King James}\ibibleverse}
+\newcommand{\njref}{\biblerefcategory{New Jerusalem}\ibibleverse}
+\end{verbatim}
+You can now use \cs{kjref} and \cs{njref} in the same way that you
+would use \cs{ibibleverse}
+
+You can disable the category by setting it to nothing:
+\begin{verbatim}
+\biblerefcategory{}
+\end{verbatim}
+
+\subsection{The \sty{bibleref-xidx} Package}
+
+The \sty{bibleref} package comes with a supplementary package
+\sty{bibleref-xidx} that modifies the way bible references are added to 
+the index. With no package options, i.e., just
+\begin{verbatim}
+\usepackage{bibleref-xidx}
+\end{verbatim}
+the verses will appear as sub-items of the chapters. Note that a
+verse range will be considered a single item so, for example,
+\begin{verbatim}
+\ibibleverse{Ex}(9:1)
+\ibibleverse{Ex}(9:4)
+\ibibleverse{Ex}(9:1-4)
+\end{verbatim}
+will occur as three separate entries under Exodus chapter~9.
+Also note that \verb|(9-14:)| and \verb|(9:)-(14:)| will be treated
+differently.
+
+The \sty{bibleref-xidx} package can be loaded with the following options:
+\begin{description}
+\item[\pkgopt{noverses}] Don't show the verses in the index.
+\item[\pkgopt{verses}] Show the verses (and chapters) in the index
+(default).
+\item[\pkgopt{nochapters}] Don't show the chapters (and verses) in the 
+index.
+\item[\pkgopt{chapters}] Show the chapters in the index (default).
+\end{description}
+All other package options will be passed to the \sty{bibleref}
+package, which \sty{bibleref-xidx} automatically loads.
+
 \subsection{Separate Scripture Index}
 
 If you want a separate index for bible verses, in addition to
@@ -287,7 +339,7 @@ For example, in the preamble:
 When you run \app{makeindex}, the references will now be sorted
 in numerical order.
 
-If you want to subdivide the index into, say, old and new
+If you want to subdivide the index into, say, old and new 
 testament, you can add this to the mapping. For example:
 \begin{verbatim}
 \biblerefmap{Genesis}{1@Old Testament!01}
@@ -301,16 +353,79 @@ testament, you can add this to the mapping. For example:
 ...
 \end{verbatim}
 
+\section{Distributing New Styles}
+\label{sec:distnewstyles}
+
+If you want a new bible reference style (or translation) publicly
+available, then it's a good idea to upload it to CTAN
+(\url{www.ctan.org}). If you've never done this before, you might
+find it a bit daunting, so here are a few pointers.
+
+I suggest that you give the name of your new package the prefix \texttt{bibleref-} as
+then it will appear close to \sty{bibleref} in the alphabetical list
+in the catalogue. Suppose your new style is called
+``mystyle''\footnote{Choose a more descriptive name than this.},
+then create a file called \texttt{bibleref-mystyle.sty}. At the
+start of the file, do:
+\begin{verbatim}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bibleref-mystyle}[2011/01/19 v1.0 Bible reference
+style conforming to something or other]
+\end{verbatim}
+(Change the date and the brief description in the line above to 
+something more appropriate.) Next you need to load \sty{bibleref}:
+\begin{verbatim}
+\RequirePackage{bibleref}
+\end{verbatim}
+Now do the new style stuff (or redefine styles to provide
+translations):
+\begin{verbatim}
+\newbiblerefstyle{mystyle}{%
+\biblerefstyle{default}%
+\renewcommand{\BRversestyle}[1]{\romannumeral##1}%
+\setbooktitle{Revelation}{Apocalypse}%
+}
+\end{verbatim}
+(Again change the above to whatever is appropriate.) Put any new
+book definitions that your style may require, for example:
+\begin{verbatim}
+\addbiblebook{Susanna}{Story of Susanna}
+\end{verbatim}
+and add any \cs{biblerefmap} commands that are required. Then set
+your new style as the current style, if appropriate:
+\begin{verbatim}
+\biblerefstyle{mystyle}
+\end{verbatim}
+On the last line of the file add:
+\begin{verbatim}
+\endinput
+\end{verbatim}
+
+Next you need to create a file called ``README'' that contains some
+information about your new package, including what license you want
+to distribute it under. (If you don't know anything about licenses, 
+I recommend you choose the \LaTeX\ Project Public License, LPPL.)
+
+It's worth adding a sample file or a little bit of documentation
+that illustrates how the references appear.
+
+Put your .sty file, README file and samples or documentation into a
+zip archive. You're now ready to upload it. There are several upload
+pages. The main one is at \url{http://www.ctan.org/upload.html}.
+The name of your contribution is the name of your package
+(``bibleref-mystyle'' in this example). Remember to put your name
+and email in the relevant input boxes. Sometime after you've
+uploaded your zip file, you'll get a copy of the announcement from
+one of the CTAN maintainers. It usually takes a day to establish
+itself. After that people can download and use it.
+
 \section{Acknowledgements}
-Many thanks to all the useful comments from comp.text.tex,
+Many thanks to all the useful comments from comp.text.tex, 
 especially from Jesse~Billett, Brooks~Moses and Ulrich~M.~Schwarz.
 
-\StopEventually{\phantomsection
+\StopEventually{\clearpage\phantomsection
 \addcontentsline{toc}{section}{Index}
 \PrintIndex
 }
 
 \end{document}
-\endinput
-%%
-%% End of file `bibleref-manual.tex'.
diff --git a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf
index fea95fb2d67..0b3296523dd 100644
Binary files a/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf and b/Master/texmf-dist/doc/latex/bibleref/bibleref.pdf differ
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf
new file mode 100644
index 00000000000..1c0f79876e2
Binary files /dev/null and b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.pdf differ
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.tex b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.tex
new file mode 100644
index 00000000000..ef1e3fbd302
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample-categories.tex
@@ -0,0 +1,90 @@
+%%
+%% This is file `sample-categories.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bibleref.dtx  (with options: `sample-categories.tex,package')
+%% 
+%%  bibleref.dtx
+%%  Copyright 2011 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-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, 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         \~}
+\documentclass{article}
+
+\usepackage{makeidx}
+\usepackage{bibleref}
+\makeindex
+
+\begin{document}
+\biblerefcategory{NIV}
+
+\begin{tabular}{ll}
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(20:)| & \ibibleverse{Exodus}(20:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IChronicles}(1:)-(4:)| &
+\ibibleverse{IChronicles}(1:)-(4:)\\
+\verb|\ibibleverse{IChronicles}(1-4:)| &
+\ibibleverse{IChronicles}(1-4:)
+\end{tabular}
+
+\biblerefcategory{Jerusalem}
+
+\begin{tabular}{ll}
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(20:)| & \ibibleverse{Exodus}(20:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IChronicles}(1:)-(4:)| &
+\ibibleverse{IChronicles}(1:)-(4:)\\
+\verb|\ibibleverse{IChronicles}(1-4:)| &
+\ibibleverse{IChronicles}(1-4:)
+\end{tabular}
+
+\printindex
+\end{document}
+\endinput
+%%
+%% End of file `sample-categories.tex'.
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.pdf
new file mode 100644
index 00000000000..ae5cb1e4c20
Binary files /dev/null and b/Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.pdf differ
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.tex b/Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.tex
new file mode 100644
index 00000000000..d3b2c1a01ca
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample-multind.tex
@@ -0,0 +1,85 @@
+%%
+%% This is file `sample-multind.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bibleref.dtx  (with options: `sample-multind.tex,package')
+%% 
+%%  bibleref.dtx
+%%  Copyright 2011 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-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, 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         \~}
+\documentclass{article}
+
+\usepackage{bibleref}
+\usepackage{multind}
+
+\makeindex{scripture}
+\makeindex{general}
+
+\renewcommand{\biblerefindex}{\index{scripture}}
+
+\biblerefmap{Genesis}{1@Old Testament!1}
+\biblerefmap{Exodus}{1@Old Testament!2}
+\biblerefmap{Leviticus}{1@Old Testament!3}
+\biblerefmap{Numbers}{1@Old Testament!4}
+\biblerefmap{Deuteronomy}{1@Old Testament!5}
+
+\biblerefmap{Tobit}{2@Apocrypha!3}
+
+\biblerefmap{Matthew}{3@New Testament!1}
+\biblerefmap{Mark}{3@New Testament!2}
+\biblerefmap{Luke}{3@New Testament!3}
+\biblerefmap{John}{3@New Testament!4}
+\biblerefmap{Acts}{3@New Testament!5}
+\biblerefmap{Romans}{3@New Testament!6}
+\biblerefmap{Corinthians1}{3@New Testament!7}
+
+\begin{document}
+Something for the general index\index{general}{something}.
+
+An old testament reference \ibibleverse{Genesis}(1:1-10).
+A new testament reference \ibibleverse{ICor}.
+
+Something else for the general index\index{general}{another}.
+
+Another old testament reference \ibibleverse{Ex}.
+Another new testament reference \ibibleverse{Matt}.
+
+\ibibleverse{Tobit}
+
+\printindex{scripture}{Scripture Index}
+\printindex{general}{General Index}
+\end{document}
+\endinput
+%%
+%% End of file `sample-multind.tex'.
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf
new file mode 100644
index 00000000000..46af5cc7652
Binary files /dev/null and b/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.pdf differ
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.tex b/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.tex
new file mode 100644
index 00000000000..437398f9663
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample-xidx.tex
@@ -0,0 +1,75 @@
+%%
+%% This is file `sample-xidx.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bibleref.dtx  (with options: `sample-xidx.tex,package')
+%% 
+%%  bibleref.dtx
+%%  Copyright 2011 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-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, 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         \~}
+\documentclass{article}
+
+\usepackage{bibleref-xidx}
+\usepackage{makeidx}
+\makeindex
+
+\biblerefstyle{MHRA}
+
+\begin{document}
+\title{Sample Document Using bibleref-xidx}
+\author{Nicola Talbot}
+\maketitle
+
+\begin{tabular}{ll}
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(20:)| & \ibibleverse{Exodus}(20:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IChronicles}(1:)-(4:)| &
+\ibibleverse{IChronicles}(1:)-(4:)\\
+\verb|\ibibleverse{IChronicles}(1-4:)| &
+\ibibleverse{IChronicles}(1-4:)
+\end{tabular}
+
+\printindex
+\end{document}
+\endinput
+%%
+%% End of file `sample-xidx.tex'.
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample.ist b/Master/texmf-dist/doc/latex/bibleref/samples/sample.ist
new file mode 100644
index 00000000000..b9f2579db4e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample.ist
@@ -0,0 +1,46 @@
+%%
+%% This is file `sample.ist',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bibleref.dtx  (with options: `sample.ist,package')
+%% 
+%%  bibleref.dtx
+%%  Copyright 2011 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-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, 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         \~}
+delim_0 "\\dotfill "
+delim_1 "\\dotfill "
+delim_2 "\\dotfill "
+\endinput
+%%
+%% End of file `sample.ist'.
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf b/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf
new file mode 100644
index 00000000000..785f7bd6eac
Binary files /dev/null and b/Master/texmf-dist/doc/latex/bibleref/samples/sample.pdf differ
diff --git a/Master/texmf-dist/doc/latex/bibleref/samples/sample.tex b/Master/texmf-dist/doc/latex/bibleref/samples/sample.tex
new file mode 100644
index 00000000000..32043d11fe4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bibleref/samples/sample.tex
@@ -0,0 +1,294 @@
+%%
+%% This is file `sample.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bibleref.dtx  (with options: `sample.tex,package')
+%% 
+%%  bibleref.dtx
+%%  Copyright 2011 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-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, 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         \~}
+\documentclass{article}
+
+\usepackage{bibleref}
+\usepackage{makeidx}
+\makeindex
+
+\renewcommand{\bvidxpgformat}{textit}
+
+\begin{document}
+
+\title{Sample Document}
+\author{Nicola Talbot}
+\maketitle
+
+Long citation in text:
+\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) and
+\bibleverse{Jeremiah}}.
+
+\section{Default Style}
+
+\biblerefstyle{default}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Jerusalem Style}
+This is the style used in the Jerusalem bible.
+\biblerefstyle{jerusalem}
+
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Anglo-Saxon Style}
+
+\biblerefstyle{anglosaxon}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Journal of Ecclesiastical History}
+
+\biblerefstyle{JEH}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Modern Humanities Research Association}
+
+\biblerefstyle{MHRA}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Novum Testamentum Graece (Nestle-Aland)}
+
+\biblerefstyle{NTG}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{MLA Style}
+
+\biblerefstyle{MLA}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Chicago Style}
+
+\biblerefstyle{chicago}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Text Style}
+This style prints the citation out in full. It's based
+on `default', and uses the fmtcount package to convert
+the numbers into words.
+
+\biblerefstyle{text}
+\raggedright
+
+\begin{itemize}
+\item \verb|\bibleverse{Ex}| \bibleverse{Ex}
+\item \verb|\bibleverse{Exodus}(20:)| \bibleverse{Exodus}(20:)
+\item \verb|\bibleverse{Exod}(20:17)| \bibleverse{Exod}(20:17)
+\item \verb|\bibleverse{IICo}(12:21)| \bibleverse{IICo}(12:21)
+\item \verb|\bibleverse{IICor}(12:21-32)| \bibleverse{IICor}(12:21-32)
+\item \verb|\bibleverse{Ex}(20:17)(21:3)| \bibleverse{Ex}(20:17)(21:3)
+\item \verb|\bibleverse{Ex}(15:)(17:)(20:)| \bibleverse{Ex}(15:)(17:)(20:)
+\item \verb|\bibleverse{Rev}(1:2,5,7-9,11)| \bibleverse{Rev}(1:2,5,7-9,11)
+\item \verb|\bibleverse{IChronicles}(1:3)-(2:7)|
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{itemize}
+
+\section{MHRA Style---Indexed}
+
+\biblerefstyle{MHRA}
+\noindent
+\begin{tabular}{ll}
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(9:)| & \ibibleverse{Exodus}(9:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{Exod}(20:)| & \ibibleverse{Exod}(20:)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IIPeter}(3:8-15a)| &
+\ibibleverse{IIPeter}(3:8-15a)
+\end{tabular}
+
+\section{New Style}
+
+This new style is based on the `default' style, but
+has verses in lower case Roman numerals, and redefines
+``Revelation'' as ``Apocalypse''.
+
+\begin{verbatim}
+\newbiblerefstyle{sample}{%
+\biblerefstyle{default}%
+\renewcommand{\BRversestyle}[1]{\romannumeral##1}%
+\setbooktitle{Revelation}{Apocalyse}%
+}
+\end{verbatim}
+\newbiblerefstyle{sample}{%
+\biblerefstyle{default}%
+\renewcommand{\BRversestyle}[1]{\romannumeral##1}%
+\setbooktitle{Revelation}{Apocalyse}%
+}
+
+\biblerefstyle{sample}
+\noindent
+\begin{tabular}{ll}
+\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
+\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
+\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
+\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
+\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
+\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
+\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
+\bibleverse{IChronicles}(1:3)-(2:7)
+\end{tabular}
+
+\section{Partial References}
+
+Only display verse numbers, but index under book and chapter:
+\ibiblevs{Gen}(19:3-4).
+
+Display only chapter and verses, but index under book:
+\ibiblechvs{Gen}(4:1-5).
+
+Complete indexed reference: \ibibleverse{Gen}(20:1-4).
+
+Display chapter range with no verses: \ibibleverse{Gen}(1,4-6,8-9,11:).
+
+Display chapter range with no verses (no index): \bibleverse{John}(1,3,4-6,8:).
+
+\printindex
+
+\end{document}
+\endinput
+%%
+%% End of file `sample.tex'.
diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
index 0703a983c5d..f6b6d2d1a79 100644
--- a/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
+++ b/Master/texmf-dist/source/latex/bibleref/bibleref.dtx
@@ -2,16 +2,19 @@
 % bibleref.dtx generated using makedtx version 0.94b (c) Nicola Talbot
 % Command line args:
 %   -macrocode "bibleref.perl"
+%   -macrocode ".+\.ist"
 %   -setambles ".*\.perl=>\nopreamble\nopostamble"
 %   -comment "bibleref.perl"
 %   -comment ".+\.tex"
+%   -comment ".+\.ist"
 %   -src "(.+)\.(sty)=>\1.\2"
-%   -src "(.+)\.(tex)=>\1.\2"
+%   -src "(sample.*)\.(tex)=>\1.\2"
+%   -src "(.+)\.(ist)=>\1.\2"
 %   -src "bibleref.perl\Z=>bibleref.perl"
 %   -doc "bibleref-manual.tex"
 %   -author "Nicola Talbot"
 %   bibleref
-% Created on 2010/7/7 10:21
+% Created on 2011/1/19 22:37
 %\fi
 %\iffalse
 %<*package>
@@ -34,7 +37,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2010 Nicola Talbot, all rights reserved.
+% Copyright (C) 2011 Nicola Talbot, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -48,14 +51,15 @@
 
 
 
-\CheckSum{1893}
+\CheckSum{2503}
+\OnlyDescription
 
 \begin{document}
 \DocInput{bibleref.dtx}
 \end{document}
 %</driver>
 %\fi
-%\title{bibleref.sty v1.13:
+%\title{bibleref.sty v1.14:
 %a \LaTeXe\ package for typesetting bible references}
 %\author{Nicola Talbot\\[10pt]
 %School of Computing Sciences\\
@@ -63,7 +67,7 @@
 %Norwich. Norfolk. NR4 7TJ.\\
 %United Kingdom\\
 %\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
-%\date{2010-07-07}
+%\date{2011-01-19}
 %
 %\maketitle
 %\tableofcontents
@@ -79,11 +83,19 @@
 %This command can be used to cite a bible book, chapter or verse 
 %or range of chapters or verses.
 %
+%\begin{important}
+%Be careful if you use \sty{bibleref} with \sty{babel} as some of 
+%\styfmt{babel}'s language options make the colon character active,
+%which will cause a problem for \cs{bibleverse} (and \ics{ibibleverse},
+%described later). Check the \styfmt{babel} documentation to find out
+%how to make the colon non-active.
+%\end{important}
+%
 %The book title, \meta{book title}, may be given either as the
 %full title (e.g.\ \texttt{Matthew}) or as an abbreviation (e.g.\
 %\texttt{Mt} or \texttt{Matt}), most standard abbreviations are
 %recognised.  Books with multiple parts should be preceded by the
-%book number in uppercase roman numerals. For example, the second
+%book number in uppercase Roman numerals. For example, the second
 %book of Kings should be entered as \verb|\bibleverse{IIKings}|
 %
 %You may have any number, or zero, sets of parenthesis
@@ -104,6 +116,11 @@
 %be entered as \texttt(\meta{ch}\texttt:\meta{v}\texttt{)-(}\meta
 %{ch}\texttt:\meta{v}\texttt)
 %
+%If there is no verse, but there are multiple chapters or chapter
+%ranges, these may be specified in the \meta{chapter} part, using a
+%comma to separate individual chapters and a hyphen to separate
+%ranges. Note that you still need a colon at the end of the list.
+%
 %Examples:
 %\begin{center}
 %\begin{tabular}{ll}
@@ -116,7 +133,8 @@
 %\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
 %\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
 %\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
-%\bibleverse{IChronicles}(1:3)-(2:7)
+%\bibleverse{IChronicles}(1:3)-(2:7)\\
+%\verb|\bibleverse{Luke}(1,4-5,8:)| &\bibleverse{Luke}(1,4-5,8:)
 %\end{tabular}
 %\end{center}
 %
@@ -205,10 +223,13 @@
 %\end{verbatim}
 %Note the use of \verb|##1| instead of \verb|#1|.
 %
+%If you want to distribute a new style, see
+%section~\ref{sec:distnewstyles}.
+%
 %\section{Indexing Bible References}
 %
 %\begin{definition}[\DescribeMacro{\ibibleverse}]
-%\cs{ibibleverse}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
+%\cs{ibibleverse}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
 %\end{definition}
 %This does the same as \cs{bibleverse}
 %but also adds an index entry (provided you have used 
@@ -225,6 +246,19 @@
 %\end{verbatim}
 %(Note there is no backslash.)
 %
+%\begin{definition}[\DescribeMacro{\ibiblechvs}]
+%\cs{ibiblechvs}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
+%\end{definition}
+%This is similar to \cs{ibibleverse} except that it doesn't display
+%the book name in the text. The reference is indexed under the book
+%title in the same way as \cs{ibibleverse}.
+%
+%\begin{definition}[\DescribeMacro{\ibiblevs}]
+%\cs{ibiblevs}\oarg{format}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
+%\end{definition}
+%This is similar to \cs{ibiblechvs} except that it only displays the 
+%verse(s) in the text.
+%
 %You may need to create your own custom \app{makeindex} style file
 %as the default uses a comma and space to separate the item from
 %the page number, which may cause confusion. For example, you
@@ -237,6 +271,67 @@
 %\end{verbatim}
 %See the \app{makeindex} documentation for further details.
 %
+%\subsection{Index Categories}
+%
+%You may prefer to index the bible reference under a category with
+%the book title as a sub item of that category. This can be achieved
+%using:
+%\begin{definition}[\DescribeMacro{\biblerefcategory}]
+%\cs{biblerefcategory}\oarg{sort key}\marg{category title}
+%\end{definition}
+%The optional argument is the sort key to be used by
+%\app{makeindex} or \app{xindy}. If omitted \meta{category title} is
+%used.
+%
+%Note that \ics{ibibleverse}, \ics{ibiblechvs} and \ics{ibiblevs} 
+%use the category that is currently set. If you need to keep
+%switching categories, you may find it easier to define a shortcut
+%command. For example, suppose you're discussing the differences
+%between the King James and the New Jerusalem versions, you could
+%define the following:
+%\begin{verbatim}
+%\newcommand{\kjref}{\biblerefcategory{King James}\ibibleverse}
+%\newcommand{\njref}{\biblerefcategory{New Jerusalem}\ibibleverse}
+%\end{verbatim}
+%You can now use \cs{kjref} and \cs{njref} in the same way that you
+%would use \cs{ibibleverse}
+%
+%You can disable the category by setting it to nothing:
+%\begin{verbatim}
+%\biblerefcategory{}
+%\end{verbatim}
+%
+%\subsection{The \sty{bibleref-xidx} Package}
+%
+%The \sty{bibleref} package comes with a supplementary package
+%\sty{bibleref-xidx} that modifies the way bible references are added to 
+%the index. With no package options, i.e., just
+%\begin{verbatim}
+%\usepackage{bibleref-xidx}
+%\end{verbatim}
+%the verses will appear as sub-items of the chapters. Note that a
+%verse range will be considered a single item so, for example,
+%\begin{verbatim}
+%\ibibleverse{Ex}(9:1)
+%\ibibleverse{Ex}(9:4)
+%\ibibleverse{Ex}(9:1-4)
+%\end{verbatim}
+%will occur as three separate entries under Exodus chapter~9.
+%Also note that \verb|(9-14:)| and \verb|(9:)-(14:)| will be treated
+%differently.
+%
+%The \sty{bibleref-xidx} package can be loaded with the following options:
+%\begin{description}
+%\item[\pkgopt{noverses}] Don't show the verses in the index.
+%\item[\pkgopt{verses}] Show the verses (and chapters) in the index
+%(default).
+%\item[\pkgopt{nochapters}] Don't show the chapters (and verses) in the 
+%index.
+%\item[\pkgopt{chapters}] Show the chapters in the index (default).
+%\end{description}
+%All other package options will be passed to the \sty{bibleref}
+%package, which \sty{bibleref-xidx} automatically loads.
+%
 %\subsection{Separate Scripture Index}
 %
 %If you want a separate index for bible verses, in addition to
@@ -305,11 +400,77 @@
 %...
 %\end{verbatim}
 %
+%\section{Distributing New Styles}
+%\label{sec:distnewstyles}
+%
+%If you want a new bible reference style (or translation) publicly
+%available, then it's a good idea to upload it to CTAN
+%(\url{www.ctan.org}). If you've never done this before, you might
+%find it a bit daunting, so here are a few pointers.
+%
+%I suggest that you give the name of your new package the prefix \texttt{bibleref-} as
+%then it will appear close to \sty{bibleref} in the alphabetical list
+%in the catalogue. Suppose your new style is called
+%``mystyle''\footnote{Choose a more descriptive name than this.},
+%then create a file called \texttt{bibleref-mystyle.sty}. At the
+%start of the file, do:
+%\begin{verbatim}
+%\NeedsTeXFormat{LaTeX2e}
+%\ProvidesPackage{bibleref-mystyle}[2011/01/19 v1.0 Bible reference
+%style conforming to something or other]
+%\end{verbatim}
+%(Change the date and the brief description in the line above to 
+%something more appropriate.) Next you need to load \sty{bibleref}:
+%\begin{verbatim}
+%\RequirePackage{bibleref}
+%\end{verbatim}
+%Now do the new style stuff (or redefine styles to provide
+%translations):
+%\begin{verbatim}
+%\newbiblerefstyle{mystyle}{%
+%\biblerefstyle{default}%
+%\renewcommand{\BRversestyle}[1]{\romannumeral##1}%
+%\setbooktitle{Revelation}{Apocalypse}%
+%}
+%\end{verbatim}
+%(Again change the above to whatever is appropriate.) Put any new
+%book definitions that your style may require, for example:
+%\begin{verbatim}
+%\addbiblebook{Susanna}{Story of Susanna}
+%\end{verbatim}
+%and add any \cs{biblerefmap} commands that are required. Then set
+%your new style as the current style, if appropriate:
+%\begin{verbatim}
+%\biblerefstyle{mystyle}
+%\end{verbatim}
+%On the last line of the file add:
+%\begin{verbatim}
+%\endinput
+%\end{verbatim}
+%
+%Next you need to create a file called ``README'' that contains some
+%information about your new package, including what license you want
+%to distribute it under. (If you don't know anything about licenses, 
+%I recommend you choose the \LaTeX\ Project Public License, LPPL.)
+%
+%It's worth adding a sample file or a little bit of documentation
+%that illustrates how the references appear.
+%
+%Put your .sty file, README file and samples or documentation into a
+%zip archive. You're now ready to upload it. There are several upload
+%pages. The main one is at \url{http://www.ctan.org/upload.html}.
+%The name of your contribution is the name of your package
+%(``bibleref-mystyle'' in this example). Remember to put your name
+%and email in the relevant input boxes. Sometime after you've
+%uploaded your zip file, you'll get a copy of the announcement from
+%one of the CTAN maintainers. It usually takes a day to establish
+%itself. After that people can download and use it.
+%
 %\section{Acknowledgements}
 %Many thanks to all the useful comments from comp.text.tex, 
 %especially from Jesse~Billett, Brooks~Moses and Ulrich~M.~Schwarz.
 %
-%\StopEventually{\phantomsection
+%\StopEventually{\clearpage\phantomsection
 %\addcontentsline{toc}{section}{Index}
 %\PrintIndex
 %}
@@ -319,13 +480,468 @@
 %\section{The Code}
 %\iffalse
 %    \begin{macrocode}
+%<*bibleref-xidx.sty>
+%    \end{macrocode}
+%\fi
+% Declare \sty{bibleref-xidx} package
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bibleref-xidx}[2011/01/19 v1.0 (NLCT) Extended indexing support for bibleref]
+%    \end{macrocode}
+%\begin{macro}{\if@br@indexchapters}
+% Provide switch to determine whether or not to add chapters to the
+% index
+%    \begin{macrocode}
+\newif\if@br@indexchapters
+\@br@indexchapterstrue
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\if@br@indexverses}
+% Provide switch to determine whether or not to add verses to the
+% index
+%    \begin{macrocode}
+\newif\if@br@indexverses
+\@br@indexversestrue
+%    \end{macrocode}
+%\end{macro}
+% Declare package options:
+%    \begin{macrocode}
+\DeclareOption{verses}{\@br@indexchapterstrue\@br@indexversestrue}
+\DeclareOption{noverses}{\@br@indexversesfalse}
+\DeclareOption{chapters}{\@br@indexchaptersfalse}
+\DeclareOption{nochapters}{\@br@indexchaptersfalse\@br@indexversesfalse}
+%    \end{macrocode}
+% Pass remaining options to \sty{bibleref}:
+%    \begin{macrocode}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{bibleref}}
+%    \end{macrocode}
+% Process options
+%    \begin{macrocode}
+\ProcessOptions
+%    \end{macrocode}
+% Load \sty{bibleref} package:
+%    \begin{macrocode}
+\RequirePackage{bibleref}
+%    \end{macrocode}
+%
+%\begin{macro}{\@bibleverse}
+% Redefine \cs{@bibleverse} (processes chapter number).
+%    \begin{macrocode}
+\def\@bibleverse(#1:{%
+  \def\@bv@chidxsort{}%
+  \def\@bv@chidxentry{}%
+  \@br@chsty{#1}%
+  \@@bibleverse
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bibleverser}
+% Redefine \cs{@bibleverser} (end of range).
+%    \begin{macrocode}
+\def\@bibleverser-(#1:{%
+  \def\@bv@chidxsort{}%
+  \def\@bv@chidxentry{}%
+  \@br@chsty{#1}%
+  \@@bibleverse
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@@bibleverse}
+% Redefine \cs{@@bibleverse} (processes verse list)
+%    \begin{macrocode}
+\def\@@bibleverse#1){%
+  \def\@bv@tmp{#1}%
+  \ifx\@bv@tmp\@empty
+%    \end{macrocode}
+% If no verses specified, do the index for the current
+% chapter.
+%    \begin{macrocode}
+    \@bvx@dochindex
+  \else
+    \BRchvsep
+    \@br@vrsty{#1}%
+  \fi
+  \new@ifnextchar(%
+    {\BRchsep\@bibleverse}%
+    {\new@ifnextchar-%
+       {\protect\BRvrsep\@bibleverser}%
+       {\@end@@bibleverse}%
+    }%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@brx@dochsep}
+% Define what to do between chapters in a list.
+%    \begin{macrocode}
+\newcommand*{\@brx@dochsep}{%
+  \@bvx@chdo{\protect\BRvsep}%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@br@chsty}
+%    \begin{macrocode}
+\renewcommand*{\@br@chsty}[1]{%
+  \let\@brx@chsep\@empty
+  \@for\@brx@thisch:=#1\do{%
+%    \end{macrocode}
+% Index previous chapter entry in current list, if it exists
+%    \begin{macrocode}
+    \@bvx@dochindex
+    \@brx@chsep
+    \expandafter\@@br@chsty\@brx@thisch-\@nil\end
+    \let\@brx@chsep\@brx@dochsep
+  }%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@brx@dovssep}
+% Define what to do between verses in a list.
+%    \begin{macrocode}
+\newcommand*{\@brx@dovssep}{%
+  \@bvx@vsdo{\protect\BRvsep}%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@br@vrsty}
+% Redefine \cs{@br@vrsty} (processes verses).
+%    \begin{macrocode}
+\renewcommand*{\@br@vrsty}[1]{%
+  \let\@brx@vssep\@empty
+  \@for\@brx@thisvs:=#1\do{%
+    \def\@bv@vsidxentry{}%
+    \def\@bv@vsidxsort{}%
+    \@brx@vssep
+    \expandafter\@@br@vrsty\@brx@thisvs-\@nil\end
+    \let\@brx@vssep\@brx@dovssep
+    \@bvx@dovsindex
+  }%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@@br@vrsty}
+% Process individual verse or verse range.
+%    \begin{macrocode}
+\def\@@br@vrsty#1-#2\end{%
+  \ifx\@nil#2\relax
+    \@do@verse{#1}%
+  \else
+    \@do@verserange{#1}#2%
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@do@verse}
+% Process individual verse.
+%    \begin{macrocode}
+\renewcommand{\@do@verse}[1]{%
+  \@nodo@verse{#1}%
+  \expandafter\@bvx@vsdo\expandafter{\@br@tmp}%
+  \@bv@addtovsidxsort{-000}%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@@br@chsty}
+% Process individual chapter or chapter range.
+%    \begin{macrocode}
+\def\@@br@chsty#1-#2\end{%
+  \ifx\@nil#2\relax
+    \@do@chapter{#1}%
+  \else
+    \@do@chapterrange{#1}#2%
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@do@chapter}
+% Process individual chapter.
+%    \begin{macrocode}
+\newcommand{\@do@chapter}[1]{%
+  \@nodo@chapter{#1}%
+  \@bvx@chdo{\protect\BRchapterstyle{#1}}%
+  \@bv@addtochidxsort{-000}%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@do@chapter}
+% Process chapter sort info.
+%    \begin{macrocode}
+\renewcommand*{\@nodo@chapter}[1]{%
+  \ifnum0#1<10\relax
+    \@bv@setchidxsort{00#1}%
+  \else
+    \ifnum0#1<100\relax
+      \@bv@setchidxsort{0#1}%
+    \else
+      \@bv@setchidxsort{#1}%
+    \fi
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@do@chapterrange}
+% Process chapter range.
+%    \begin{macrocode}
+\def\@do@chapterrange#1#2-\@nil{%
+  \@nodo@chapter{#1}%
+  \@bvx@chdo{\protect\BRchapterstyle{#1}}%
+  \@bv@addtochidxsort{-}%
+  \@bvx@chadddo{\protect\BRvrsep}%
+  \@nodo@chapter{#2}%
+  \@bvx@chadddo{\protect\BRchapterstyle{#2}}%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@nodo@verse}
+% Process verse sort info and stores style in \cs{@br@tmp}.
+%    \begin{macrocode}
+\renewcommand*{\@nodo@verse}[1]{%
+  \br@stripverse{#1}%
+  \ifnum\@br@versenum<10\relax
+    \@bv@addtovsidxsort{00#1}%
+  \else
+    \ifnum\@br@versenum<100\relax
+      \@bv@addtovsidxsort{0#1}%
+    \else
+      \@bv@addtovsidxsort{#1}%
+    \fi
+  \fi
+  \ifx\@br@versesuffix\@empty
+    \protected@edef\@br@tmp{%
+       \protect\BRversestyle{\@br@versenum}%
+    }%
+  \else
+    \protected@edef\@br@tmp{%
+       \protect\BRversestyle{\@br@versenum}%
+       \protect\BRversesuffixstyle{\@br@versesuffix}%
+    }%
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@do@verserange}
+% Process verse range.
+%    \begin{macrocode}
+\def\@do@verserange#1#2-\@nil{%
+  \@nodo@verse{#1}%
+  \expandafter\@bvx@vsdo\expandafter{\@br@tmp}%
+  \@bv@addtovsidxsort{-}%
+  \@bvx@vsadddo{\protect\BRvrsep}%
+  \@nodo@verse{#2}%
+  \expandafter\@bvx@vsadddo\expandafter{\@br@tmp}%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@setvsidxsort}
+% Set the verse sort information.
+%    \begin{macrocode}
+\newcommand*{\@bv@setvsidxsort}[1]{%
+\if@bv@idx
+  \protected@edef\@bv@vsidxsort{#1}%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@addtovsidxsort}
+% Add to the verse sort information.
+%    \begin{macrocode}
+\newcommand*{\@bv@addtovsidxsort}[1]{%
+\if@bv@idx
+  \@bv@tmpa={#1}%
+  \@bv@tmpb=\expandafter{\@bv@vsidxsort}%
+  \protected@edef\@bv@vsidxsort{\the\@bv@tmpb\the\@bv@tmpa}%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@setvsidx}
+% Set the verse entry information.
+%    \begin{macrocode}
+\newcommand*{\@bv@setvsidx}[1]{%
+\if@bv@idx
+  \def\@bv@vsidxentry{#1}%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@addtovsidx}
+% Add to the verse entry information.
+%    \begin{macrocode}
+\newcommand*{\@bv@addtovsidx}[1]{%
+\if@bv@idx
+  \@bv@tmpa={#1}%
+  \@bv@tmpb=\expandafter{\@bv@vsidxentry}%
+  \protected@edef\@bv@vsidxentry{\the\@bv@tmpb\the\@bv@tmpa}%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@setchidx}
+% Set the chapter entry information.
+%    \begin{macrocode}
+\newcommand*{\@bv@setchidx}[1]{%
+\if@bv@idx
+  \def\@bv@chidxentry{#1}%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@addtochidx}
+% Add to the chapter entry information.
+%    \begin{macrocode}
+\newcommand*{\@bv@addtochidx}[1]{%
+\if@bv@idx
+  \@bv@tmpa={#1}%
+  \@bv@tmpb=\expandafter{\@bv@chidxentry}%
+  \protected@edef\@bv@chidxentry{\the\@bv@tmpb\the\@bv@tmpa}%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@setchidxsort}
+% Set the chapter sort information.
+%    \begin{macrocode}
+\newcommand*{\@bv@setchidxsort}[1]{%
+\if@bv@idx
+  \protected@edef\@bv@chidxsort{#1}%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bvx@chdo}
+% Display argument and set as chapter entry information
+%    \begin{macrocode}
+\newcommand*{\@bvx@chdo}[1]{#1\@bv@setchidx{#1}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bvx@vsdo}
+% Display argument and set as verse entry information
+%    \begin{macrocode}
+\newcommand*{\@bvx@vsdo}[1]{#1\@bv@setvsidx{#1}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bvx@chadddo}
+% Display argument and adds to chapter entry information
+%    \begin{macrocode}
+\newcommand*{\@bvx@chadddo}[1]{#1\@bv@addtochidx{#1}}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bvx@vsadddo}
+% Display argument and adds to verse entry information
+%    \begin{macrocode}
+\newcommand*{\@bvx@vsadddo}[1]{#1\@bv@addtovsidx{#1}}
+%    \end{macrocode}
+%\end{macro}
+% Store original definition of \cs{@bible@verse}
+%    \begin{macrocode}
+\let\@bv@org@bible@verse\@bible@verse
+%    \end{macrocode}
+%
+%\begin{macro}{\@bible@verse}
+% Redefine \cs{@bible@verse}
+%    \begin{macrocode}
+\renewcommand*{\@bible@verse}{%
+  \def\@bv@chidxentry{}%
+  \@bv@org@bible@verse
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@end@@bibleverse}
+% Redefine \cs{@end@@bibleverse}
+%    \begin{macrocode}
+\renewcommand*{\@end@@bibleverse}{%
+%    \end{macrocode}
+% If no chapters specified, index just the book.
+%    \begin{macrocode}
+  \ifx\@bv@chidxentry\@empty
+    \@bvx@dobkindex
+  \else
+    \if@br@indexchapters
+    \else
+%    \end{macrocode}
+% Only indexing book, so index hasn't been done yet.
+%    \begin{macrocode}
+       \@bvx@dobkindex
+    \fi
+  \fi
+  \@bv@idxfalse
+  \@bv@restore
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@bvx@dochindex}
+% Writes the indexing information for the current bible chapter (no
+% verse information specified).
+%    \begin{macrocode}
+\newcommand*{\@bvx@dochindex}{%
+\if@br@indexchapters
+  \ifx\@bv@chidxentry\@empty
+  \else
+    \if@bv@idx
+      \expandafter\@do@bibleref@map\@@bv@idxsort\relax
+      \@do@biblerefindex
+        {\@@bv@idxsort\relax @\@bv@mainidxentry
+           !\@bv@chidxsort @\@bv@chidxentry
+           |\@bv@idxpgformat}%
+    \fi
+  \fi
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@bvx@dovsindex}
+% Writes the indexing information for the current bible chapter and
+% verse.
+%    \begin{macrocode}
+\newcommand*{\@bvx@dovsindex}{%
+\if@br@indexverses
+  \ifx\@bv@vsidxentry\@empty
+  \else
+    \if@bv@idx
+      \expandafter\@do@bibleref@map\@@bv@idxsort\relax
+      \@do@biblerefindex
+        {\@@bv@idxsort\relax @\@bv@mainidxentry
+           !\@bv@chidxsort @\@bv@chidxentry
+           !\@bv@vsidxsort @\@bv@vsidxentry
+           |\@bv@idxpgformat}%
+    \fi
+  \fi
+\else
+  \@bvx@dochindex
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@bvx@dobkindex}
+% Writes the indexing information for the current book (no chapter
+% or verses specified).
+%    \begin{macrocode}
+
+\newcommand*{\@bvx@dobkindex}{%
+  \if@bv@idx
+    \expandafter\@do@bibleref@map\@@bv@idxsort\relax
+    \@do@biblerefindex
+      {\@@bv@idxsort\relax @\@bv@mainidxentry|\@bv@idxpgformat}%
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%\iffalse
+%    \begin{macrocode}
+%</bibleref-xidx.sty>
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
 %<*bibleref.sty>
 %    \end{macrocode}
 %\fi
 % Declare package
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2010/07/07 1.13 (NLCT)]
+\ProvidesPackage{bibleref}[2011/01/19 1.14 (NLCT)]
 %    \end{macrocode}
 % Need to do some conditional stuff
 %    \begin{macrocode}
@@ -1043,22 +1659,22 @@
 \newcommand*{\brs@text}{%
 \biblerefstyle{default}%
 \renewcommand{\BRbooknumberstyle}[1]{%
-\Ordinalstringnum{##1}\ }%
+\protect\Ordinalstringnum{##1}\ }%
 \renewcommand{\BRepistlenumberstyle}[1]{%
-\Ordinalstringnum{##1}\ }%
+\protect\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}}%
+chapter \protect\numberstringnum{##1}}%
 \renewcommand{\BRbkchsep}{, }%
 \renewcommand{\BRchvsep}{ verse }%
 \renewcommand{\BRchsep}{, }%
 \renewcommand{\BRvrsep}{ to }%
 \renewcommand{\BRvsep}{, }%
-\renewcommand{\BRversestyle}[1]{\numberstringnum{##1}}%
+\renewcommand{\BRversestyle}[1]{\protect\numberstringnum{##1}}%
 \renewcommand*{\BRversesuffixstyle}[1]{##1}%
 }
 %    \end{macrocode}
@@ -1163,6 +1779,81 @@ defined}{}}}
 %    \end{macrocode}
 %\end{macro}
 %
+%\begin{macro}{\@br@chsty}
+%\changes{1.14}{2011/01/19}{new}
+% Chapters may be supplied as a range. Provide a command
+% to detect whether single number or range supplied.
+%    \begin{macrocode}
+\newcommand*{\@br@chsty}[1]{\@@br@chsty#1-\@nil\end}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@@br@chsty}
+% Pick up a range
+%    \begin{macrocode}
+\def\@@br@chsty#1-#2\end{%
+\@do@chapters#1,\relax\end
+\ifx\@nil#2\relax
+\else
+  \@bv@addtochidxsort{-}%
+  \@bv@do{\protect\BRvrsep}%
+  \@@br@chsty#2\end%
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@dochapters}
+% Pick up a list
+%    \begin{macrocode}
+\def\@do@chapters#1,#2\end{%
+\def\@br@tmp{#1}%
+\ifx\@br@tmp\@empty
+\else
+  \@biblech{#1}%
+\fi
+\ifx\relax#2\relax
+\else
+  \@bv@addtochidxsort{,}%
+  \@bv@do{\protect\BRvsep}%
+  \@do@chapters#2\end
+\fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%
+%\begin{macro}{\@biblech}
+%\changes{1.14}{2011/01/19}{new}
+% Deal with individual chapter.
+%    \begin{macrocode}
+\newcommand*{\@biblech}[1]{%
+  \def\@bv@tmp{#1}%
+  \ifx\@bv@tmp\@empty
+  \else
+    \@nodo@chapter{#1}%
+    \@bv@do{\protect\BRchapterstyle{#1}}%
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@nodo@chapter}
+%\changes{1.14}{2011/01/19}{new}
+%    \begin{macrocode}
+\newcommand*{\@nodo@chapter}[1]{%
+  \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
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\@br@vrsty}
 % Verses may be supplied as a range. Provide a command
 % to detect whether single number or range supplied.
@@ -1181,7 +1872,7 @@ defined}{}}}
 \ifx\@nil#2\relax
 \else
   \@bv@addtochidxsort{-}%
-  \@bv@do{\BRvrsep}%
+  \@bv@do{\protect\BRvrsep}%
   \@@br@vrsty#2\end%
 \fi
 }
@@ -1258,15 +1949,18 @@ defined}{}}}
   \fi
 }
 %    \end{macrocode}
-%\end{macro}
-%
-%\begin{macro}{\@@br@vrsty}
-% Pick up a list
+%\end{macro}
+%
+%\begin{macro}{\@do@verse}
+% Process individual verse
+%    \begin{macrocode}
+\newcommand*{\@do@verse}[1]{%
+  \@nodo@verse{#1}%
+  \expandafter\@bv@do\expandafter{\@br@tmp}%
+}
+%    \end{macrocode}
 %    \begin{macrocode}
-\def\@do@verses#1,#2\end{%
-\def\@br@tmp{#1}%
-\ifx\@br@tmp\@empty
-\else
+\newcommand*{\@nodo@verse}[1]{%
 %    \end{macrocode}
 % Strip suffix, if it exists.
 %    \begin{macrocode}
@@ -1283,31 +1977,85 @@ defined}{}}}
       \@bv@addtochidxsort{#1}%
     \fi
   \fi
-  \edef\@br@tmp{%
-     \noexpand\BRversestyle{\@br@versenum}%
-     \noexpand\BRversesuffixstyle{\@br@versesuffix}}%
-  \expandafter\@bv@do\expandafter{\@br@tmp}%
+  \ifx\@br@versesuffix\@empty
+    \protected@edef\@br@tmp{%
+       \protect\BRversestyle{\@br@versenum}%
+    }%
+  \else
+    \protected@edef\@br@tmp{%
+       \protect\BRversestyle{\@br@versenum}%
+       \protect\BRversesuffixstyle{\@br@versesuffix}%
+    }%
+  \fi
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@do@verses}
+% Pick up a list
+%    \begin{macrocode}
+\def\@do@verses#1,#2\end{%
+\def\@br@tmp{#1}%
+\ifx\@br@tmp\@empty
+\else
+  \expandafter\@do@verse\expandafter{\@br@tmp}%
 \fi
 \ifx\relax#2\relax
 \else
   \@bv@addtochidxsort{,}%
-  \@bv@do{\BRvsep}%
+  \@bv@do{\protect\BRvsep}%
   \@do@verses#2\end
 \fi
 }
 %    \end{macrocode}
 %\end{macro}
 %
+%\begin{macro}{\@bv@category}
+%\changes{1.14}{2011/01/19}{new}
+% Stores the current bible ref category.
+%    \begin{macrocode}
+\newcommand*{\@bv@category}{}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@bv@categorysort}
+%\changes{1.14}{2011/01/19}{new}
+% Stores the current bible ref category sort key.
+%    \begin{macrocode}
+\newcommand*{\@bv@categorysort}{}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\biblerefcategory}
+% Sets the bible ref category and sort key.
+%    \begin{macrocode}
+\newcommand*{\biblerefcategory}[2][\@bv@category]{%
+  \renewcommand*{\@bv@category}{#2}%
+  \renewcommand*{\@bv@categorysort}{#1}%
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\bibleverse}
 %\begin{definition}
 %\cs{bibleverse}\marg{name}
 %\end{definition}
+% Displays references using current style.
+%    \begin{macrocode}
+\newcommand*{\bibleverse}{%
+  \let\@bv@restore\relax
+  \@bible@verse
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@bible@verse}
+%    \begin{macrocode}
+\newcommand*{\@bible@verse}[1]{%
+%    \end{macrocode}
 % This looks for a command called
 % \cs{br@}\meta{name} (defined earlier). 
 % After the book title, it then checks
 % to see if there is a bracket \verb|(| immediately following it.
 %    \begin{macrocode}
-\newcommand*{\bibleverse}[1]{%
   \@ifundefined{br@#1}%
   {%
     \PackageError{bibleref}{Unknown book '#1'}{}%
@@ -1316,13 +2064,30 @@ defined}{}}}
     \@bv@idxsort{\csname br@#1\endcsname}%
     \def\@bv@chidxsort{}%
     \BRbooktitlestyle{\csname br@#1\endcsname}%
+    \let\@bv@org@bookof\BRbookof
+    \let\@bv@org@booknumberstyle\BRbooknumberstyle
+    \let\@bv@org@epistletothe\BRepistletothe
+    \let\@bv@org@epistlenumberstyle\BRepistlenumberstyle
+    \def\BRbookof{\string\BRbookof\space}%
+    \def\BRbooknumberstyle{\string\BRbooknumberstyle\space}%
+    \def\BRepistletothe{\string\BRepistletothe\space}%
+    \def\BRepistlenumberstyle{\string\BRepistlenumberstyle\space}%
     \@ifundefined{bri@#1}%
     {%
-      \def\@bv@mainidxentry{\BRbooktitlestyle{\csname br@#1\endcsname}}%
+      \protected@edef\@bv@mainidxentry{%
+         \protect\BRbooktitlestyle{\csname br@#1\endcsname}}%
     }%
     {%
-      \def\@bv@mainidxentry{\BRbooktitlestyle{\csname bri@#1\endcsname}}%
+      \protected@edef\@bv@mainidxentry{%
+         \protect\BRbooktitlestyle{\csname bri@#1\endcsname}}%
     }%
+%    \end{macrocode}
+% Restore definitions.
+%    \begin{macrocode}
+    \let\BRbookof\@bv@org@bookof
+    \let\BRbooknumberstyle\@bv@org@booknumberstyle
+    \let\BRepistletothe\@bv@org@epistletothe
+    \let\BRepistlenumberstyle\@bv@org@epistlenumberstyle
   }%
 %    \end{macrocode}
 %\changes{1.13}{2010/07/07}{changed \cs{@ifnextchar} to
@@ -1339,24 +2104,12 @@ defined}{}}}
 % This gets the chapter number.
 %    \begin{macrocode}
 \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
+  \@br@chsty{#1}%
   \@@bibleverse
 }
 %    \end{macrocode}
 %\end{macro}
+%
 %\begin{macro}{\@bibleverser}
 % This gets the second part of a range spanning chapters.
 %    \begin{macrocode}
@@ -1373,7 +2126,7 @@ defined}{}}}
         \@bv@addtochidxsort{#1:}%
       \fi
     \fi
-    \@bv@do{\BRchapterstyle{#1}}%
+    \@bv@do{\protect\BRchapterstyle{#1}}%
   \fi
   \@@bibleverse
 }
@@ -1389,16 +2142,16 @@ defined}{}}}
   \def\@bv@tmp{#1}%
   \ifx\@bv@tmp\@empty
   \else
-    \@bv@do{\BRchvsep}\@br@vrsty{#1}%
+    \@bv@do{\protect\BRchvsep}\@br@vrsty{#1}%
   \fi
 %    \end{macrocode}
 %\changes{1.13}{2010/07/07}{changed \cs{@ifnextchar} to
 %\cs{new@ifnextchar}}
 %    \begin{macrocode}
   \new@ifnextchar(%
-    {\@bv@do{\BRchsep}\@bibleverse}%
+    {\@bv@do{\protect\BRchsep}\@bibleverse}%
     {\new@ifnextchar-%
-       {\@bv@do{\BRvrsep}\@bibleverser}%
+       {\@bv@do{\protect\BRvrsep}\@bibleverser}%
        {\@end@@bibleverse}%
     }%
 }
@@ -1419,13 +2172,35 @@ defined}{}}}
   \else
     \def\@bv@tmp{\@bv@mainidxentry!\@bv@chidxsort @\@bv@idxentry}%
   \fi
-  \biblerefindex
-    {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
+  \@do@biblerefindex
+      {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
+%    \begin{macrocode}
   \@bv@idxfalse
 \fi
+%    \end{macrocode}
+%\changes{1.14}{2011/01/19}{added \cs{@bv@restore}}
+%    \begin{macrocode}
+\@bv@restore
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@do@biblerefindex}
+% If category has been set prepend information to
+% \cs{@bv@mainidxentry}.
+%\changes{1.14}{2011/01/19}{new}
+%    \begin{macrocode}
+\newcommand*{\@do@biblerefindex}[1]{%
+  \ifx\@bv@category\@empty
+    \biblerefindex{#1}%
+  \else
+    \biblerefindex
+      {\@bv@categorysort @\@bv@category!#1}%
+  \fi
 }
 %    \end{macrocode}
 %\end{macro}
+%
 %\begin{macro}{\biblerefindex}
 % Allow user to modify index command in case multiple indices
 % are required.
@@ -1469,7 +2244,7 @@ defined}{}}}
 %    \begin{macrocode}
 \newtoks\@bv@tmpa
 \newtoks\@bv@tmpb
-\newcommand{\@bv@addtoidx}[1]{%
+\newcommand*{\@bv@addtoidx}[1]{%
 \if@bv@idx
   \@bv@tmpa={#1}%
   \@bv@tmpb=\expandafter{\@bv@idxentry}%
@@ -1517,7 +2292,7 @@ defined}{}}}
 %\begin{macro}{\ibibleverse}
 % This is like \cs{bibleverse},
 % but also adds an index entry. The optional argument indicates
-% how to format the page number (without the preceeding backslash)
+% how to format the page number (without the preceding backslash)
 % e.g. \verb|\ibibleref[textit]{Romans}|.
 %    \begin{macrocode}
 \newcommand*{\ibibleverse}[1][\bvidxpgformat]{%
@@ -1525,6 +2300,51 @@ defined}{}}}
 \@bv@idxtrue\def\@bv@idxentry{}\bibleverse}
 %    \end{macrocode}
 %\end{macro}
+%
+%\begin{macro}{\ibiblechvs}
+%\changes{1.14}{2011/01/19}{new}
+% Only displays chapter and verses but indexes under the book.
+%    \begin{macrocode}
+\newcommand*{\ibiblechvs}[1][\bvidxpgformat]{%
+  \let\@bv@current@bkchsep\BRbkchsep
+  \let\@bv@current@titlestyle\BRbooktitlestyle
+  \def\@bv@restore{%
+    \let\BRbkchsep\@bv@current@bkchsep
+    \let\BRbooktitlestyle\@bv@current@titlestyle
+  }%
+  \def\BRbkchsep{}%
+  \def\BRbooktitlestyle##1{}%
+  \def\@bv@idxpgformat{#1}%
+  \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\ibiblevs}
+%\changes{1.14}{2011/01/19}{new}
+% Only displays verse(s) but indexes under the book and chapters.
+%    \begin{macrocode}
+\newcommand*{\ibiblevs}[1][\bvidxpgformat]{%
+  \let\@bv@current@titlestyle\BRbooktitlestyle
+  \let\@bv@current@chapterstyle\BRchapterstyle
+  \let\@bv@current@bkchsep\BRbkchsep
+  \let\@bv@current@chvsep\BRchvsep
+  \def\@bv@restore{%
+    \let\BRbooktitlestyle\@bv@current@titlestyle
+    \let\BRchapterstyle\@bv@current@chapterstyle
+    \let\BRbkchsep\@bv@current@bkchsep
+    \let\BRchvsep\@bv@current@chvsep
+  }%
+  \def\BRbooktitlestyle##1{}%
+  \def\BRchapterstyle##1{}%
+  \def\BRbkchsep{}%
+  \def\BRchvsep{}%
+  \def\@bv@idxpgformat{#1}%
+  \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse
+}
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\bvidxpgformat}
 % Default page number format for bible verse index entries
 %    \begin{macrocode}
@@ -1538,287 +2358,63 @@ defined}{}}}
 %\fi
 %\iffalse
 %    \begin{macrocode}
-%<*bibleref-manual.tex>
+%<*sample-categories.tex>
 %    \end{macrocode}
 %\fi
 %\iffalse
-\documentclass{nlctdoc}
+%    \begin{macrocode}
+\documentclass{article}
 
+\usepackage{makeidx}
 \usepackage{bibleref}
-\usepackage[colorlinks,bookmarks,pdfauthor={Nicola L.C. Talbot},
-            hyperindex=false,
-            pdftitle={bibleref.sty: a LaTeX package for 
-            typesetting bible references}]{hyperref}
-
-\usepackage{creatdtx}
-
-\CheckSum{1893}
+\makeindex
 
 \begin{document}
-\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{2010-07-07}
+\biblerefcategory{NIV}
 
-\maketitle
-\tableofcontents
-
-\section{Introduction}
-
-The \sty{bibleref} package was designed to provide consistent formatting for referencing
-parts of the bible.
-
-\begin{definition}[\DescribeMacro{\bibleverse}]
-\cs{bibleverse}\marg{book title}\texttt(\meta{chapter}\texttt{:}\meta{verse(s)}\texttt)
-\end{definition}
-This command can be used to cite a bible book, chapter or verse 
-or range of chapters or verses.
-
-The book title, \meta{book title}, may be given either as the
-full title (e.g.\ \texttt{Matthew}) or as an abbreviation (e.g.\
-\texttt{Mt} or \texttt{Matt}), most standard abbreviations are
-recognised.  Books 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 \verb|\bibleverse{IIKings}|
-
-You may have any number, or zero, sets of parenthesis
-\verb|(|\meta{chapter}\texttt{:}\meta{verse(s)}\verb|)|,
-indicating the chapter and verse or verses. Verses can be
-specified as a comma separated list of individual verses or range
-of verses. A range of verses should be written with a single
-hyphen, e.g.\ \verb|2-4|. In the typeset output the verses will
-be separated with
-\begin{definition}[\DescribeMacro{\BRvsep}]
-\cs{BRvsep}
-\end{definition}
-(an en-dash by default.) A chapter may be referenced without a
-verse, but the colon must remain, e.g.\ \verb|(12:)| simply
-indicates chapter 12.
-
-A range of verses spanning more than one chapter can
-be entered as \texttt(\meta{ch}\texttt:\meta{v}\texttt{)-(}\meta
-{ch}\texttt:\meta{v}\texttt)
-
-Examples:
-\begin{center}
 \begin{tabular}{ll}
-\verb|\bibleverse{Ex}| & \bibleverse{Ex}\\
-\verb|\bibleverse{Exodus}(20:)| & \bibleverse{Exodus}(20:)\\
-\verb|\bibleverse{Exod}(20:17)| & \bibleverse{Exod}(20:17)\\
-\verb|\bibleverse{IICo}(12:21)| & \bibleverse{IICo}(12:21)\\
-\verb|\bibleverse{IICor}(12:21-32)| & \bibleverse{IICor}(12:21-32)\\
-\verb|\bibleverse{Ex}(20:17)(21:3)| & \bibleverse{Ex}(20:17)(21:3)\\
-\verb|\bibleverse{Ex}(15:)(17:)(20:)| & \bibleverse{Ex}(15:)(17:)(20:)\\
-\verb|\bibleverse{Rev}(1:2,5,7-9,11)| & \bibleverse{Rev}(1:2,5,7-9,11)\\
-\verb|\bibleverse{IChronicles}(1:3)-(2:7)| &
-\bibleverse{IChronicles}(1:3)-(2:7)
-\end{tabular}
-\end{center}
-
-The style of the reference can be specified either by 
-package option or as the argument to the command
-\begin{definition}[\DescribeMacro{\biblerefstyle}]
-\cs{biblerefstyle}\marg{style}
-\end{definition}
-Styles are listed in Table~\ref{tab:styles}.
-
-\begin{table}[tbh]
-\caption{Bible Citation Styles (can be used as package option or in the argument to 
-\cs{biblerefstyle})}
-\label{tab:styles}
-\vspace{10pt}
-\begin{center}
-\begin{tabular}{lp{0.5\textwidth}}
-\bfseries Style & \bfseries Example\\
-default & \biblerefstyle{default}\bibleverse{IICor}(12:1-5)\\
-jerusalem & \biblerefstyle{jerusalem}\bibleverse{IICor}(12:1-5)\\
-anglosaxon & \biblerefstyle{anglosaxon}\bibleverse{IICor}(12:1-5)\\
-JEH & \biblerefstyle{JEH}\bibleverse{IICor}(12:1-5)\\
-NTG & \biblerefstyle{NTG}\bibleverse{IICor}(12:1-5)\\
-MLA & \biblerefstyle{MLA}\bibleverse{IICor}(12:1-5)\\
-chicago & \biblerefstyle{chicago}\bibleverse{IICor}(12:1-5)\\
-text & \biblerefstyle{text}\bibleverse{IICor}(12:1-5)
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(20:)| & \ibibleverse{Exodus}(20:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IChronicles}(1:)-(4:)| &
+\ibibleverse{IChronicles}(1:)-(4:)\\
+\verb|\ibibleverse{IChronicles}(1-4:)| &
+\ibibleverse{IChronicles}(1-4:)
 \end{tabular}
-\end{center}
-\end{table}
-
-You can change the name of a book using 
-\begin{definition}[\DescribeMacro{\setbooktitle}]
-\cs{setbooktitle}\marg{name}\marg{new title}
-\end{definition}
-Note that \meta{name} must be the full name, not the
-abbreviated name of the book. For example, to change
-Revelation to Apoc, do 
-\verb|\setbookname{Revelation}{Apoc}|
-(\textbf{Note} that you shouldn't do 
-\verb|\setbookname{Rev}{Apoc}|)
-
-If you want a different title for a book depending on whether it's
-in the main body of the document or in the index, you can set the
-index version using:
-\begin{definition}[\DescribeMacro{\setindexbooktitle}]
-\cs{setindexbooktitle}\marg{name}\marg{title}
-\end{definition}
-In this case, \meta{name} should be the name you'll use in 
-\cs{ibibleverse}. For example, if you do:
-\begin{verbatim}
-\setbooktitle{Psalms}{Psalm}
-\setindexbooktitle{Psalms}{Psalms}
-\end{verbatim}
-Then \verb|\ibibleverse{Psalms}(2:)| will print Psalm the
-document and Psalms in the index, but \verb|\ibibleverse{Ps}(2:)|
-will print Psalms in both the document and the index.
-
-You can add a book using
-\begin{definition}[\DescribeMacro{\addbiblebook}]
-\cs{addbiblebook}\marg{name}\marg{title}
-\end{definition}
-For example:
-\begin{verbatim}
-\addbiblebook{Susanna}{Story of Susanna}
-\end{verbatim}
-
-\section{Defining New Styles}
-
-You can define a new style using the command
-\begin{definition}[\DescribeMacro{\newbiblerefstyle}]
-\cs{newbiblerefstyle}\marg{style-name}\marg{commands}
-\end{definition}\noindent
-where \meta{commands} are
-the commands needed to modify the citation style.
-
-Example: 
-This new style is based on the \qt{default} style, but
-has verses in lower case Roman numerals, and redefines
-\qt{Revelation} as \qt{Apocalypse}.
-\begin{verbatim}
-\newbiblerefstyle{sample}{%
-\biblerefstyle{default}%
-\renewcommand{\BRversestyle}[1]{\romannumeral##1}%
-\setbooktitle{Revelation}{Apocalypse}%
-}
-\end{verbatim}
-Note the use of \verb|##1| instead of \verb|#1|.
-
-\section{Indexing Bible References}
-
-\begin{definition}[\DescribeMacro{\ibibleverse}]
-\cs{ibibleverse}\marg{book title}\texttt(\marg{chapter}\texttt{:}\meta{verse(s)}\texttt)
-\end{definition}
-This does the same as \cs{bibleverse}
-but also adds an index entry (provided you have used 
-\cs{makeindex} in the preamble.) The default page number 
-format is given by the command 
-\begin{definition}[\DescribeMacro{\bvidxpgformat}]
-\cs{bvidxpgformat}
-\end{definition}
-This is \texttt{textrm} by default, but can be redefined. To 
-override the page number format for a particular entry you can
-use the optional argument to \cs{ibibleverse}. For example:
-\begin{verbatim}
-\ibibleverse[textit]{Exodus}
-\end{verbatim}
-(Note there is no backslash.)
-
-You may need to create your own custom \app{makeindex} style file
-as the default uses a comma and space to separate the item from
-the page number, which may cause confusion. For example, you
-could create a file called \texttt{sample.ist} and write in the
-lines:
-\begin{verbatim}
-delim_0 "\\dotfill "
-delim_1 "\\dotfill "
-delim_2 "\\dotfill "
-\end{verbatim}
-See the \app{makeindex} documentation for further details.
-
-\subsection{Separate Scripture Index}
-
-If you want a separate index for bible verses, in addition to
-a general index, you can redefine
-\begin{definition}[\DescribeMacro{\biblerefindex}]
-\cs{biblerefindex}
-\end{definition}
-This command defaults to \cs{index}, but can be changed to
-the appropriate indexing command. For example, suppose you
-are using the \sty{multind} package and you want a general
-index and a scripture index, you can do something like:
-\begin{verbatim}
-\documentclass{article}
-\usepackage{bibleref}
-\usepackage{multind}
-
-\makeindex{scripture}
-\makeindex{general}
-
-\renewcommand{\biblerefindex}{\index{scripture}}
-\end{verbatim}
-In the document, you can use \cs{ibibleverse} as before, and
-the scripture index is displayed using
-\begin{verbatim}
-\printindex{scripture}{Scripture Index}
-\end{verbatim}
-You will then need to run \app{makeindex} on the file
-\texttt{scripture.idx}. See the \sty{multind} documentation
-for further details.
-
-\subsection{Changing the Sort Order}
-
-The bible reference entries will be sorted alphabetically by
-\app{makeindex}. However you may prefer the entries to be sorted
-according to their order in the bible. This can either be done
-using \app{xindy} instead of \app{makeindex} and creating your
-own custom alphabet (see \app{xindy} manual for details) or you
-can use \sty{bibleref}'s mapping command.
-
-\begin{definition}[\DescribeMacro{\biblerefmap}]
-\cs{biblerefmap}\marg{label}\marg{new sort key}
-\end{definition}
-For example, in the preamble:
-\begin{verbatim}
-\biblerefmap{Genesis}{01}
-\biblerefmap{Exodus}{02}
-\biblerefmap{Leviticus}{03}
-\biblerefmap{Numbers}{04}
-\biblerefmap{Deuteronomy}{05}
-...
-\end{verbatim}
-When you run \app{makeindex}, the references will now be sorted
-in numerical order.
 
-If you want to subdivide the index into, say, old and new 
-testament, you can add this to the mapping. For example:
-\begin{verbatim}
-\biblerefmap{Genesis}{1@Old Testament!01}
-\biblerefmap{Exodus}{1@Old Testament!02}
-\biblerefmap{Leviticus}{1@Old Testament!03}
-\biblerefmap{Numbers}{1@Old Testament!04}
-\biblerefmap{Deuteronomy}{1@Old Testament!05}
-...
-\biblerefmap{Matthew}{2@New Testament!01}
-\biblerefmap{Mark}{2@New Testament!02}
-...
-\end{verbatim}
+\biblerefcategory{Jerusalem}
 
-\section{Acknowledgements}
-Many thanks to all the useful comments from comp.text.tex, 
-especially from Jesse~Billett, Brooks~Moses and Ulrich~M.~Schwarz.
-
-\StopEventually{\phantomsection
-\addcontentsline{toc}{section}{Index}
-\PrintIndex
-}
+\begin{tabular}{ll}
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(20:)| & \ibibleverse{Exodus}(20:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IChronicles}(1:)-(4:)| &
+\ibibleverse{IChronicles}(1:)-(4:)\\
+\verb|\ibibleverse{IChronicles}(1-4:)| &
+\ibibleverse{IChronicles}(1-4:)
+\end{tabular}
 
+\printindex
 \end{document}
+%    \end{macrocode}
 %\fi
 %\iffalse
 %    \begin{macrocode}
-%</bibleref-manual.tex>
+%</sample-categories.tex>
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -1880,6 +2476,53 @@ Another new testament reference \ibibleverse{Matt}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
+%<*sample-xidx.tex>
+%    \end{macrocode}
+%\fi
+%\iffalse
+%\subsection{Sample document using bibleref-xidx}
+%    \begin{macrocode}
+\documentclass{article}
+
+\usepackage{bibleref-xidx}
+\usepackage{makeidx}
+\makeindex
+
+\biblerefstyle{MHRA}
+
+\begin{document}
+\title{Sample Document Using bibleref-xidx}
+\author{Nicola Talbot}
+\maketitle
+
+\begin{tabular}{ll}
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(20:)| & \ibibleverse{Exodus}(20:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IChronicles}(1:)-(4:)| &
+\ibibleverse{IChronicles}(1:)-(4:)\\
+\verb|\ibibleverse{IChronicles}(1-4:)| &
+\ibibleverse{IChronicles}(1-4:)
+\end{tabular}
+
+\printindex
+\end{document}
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
+%</sample-xidx.tex>
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
 %<*sample.tex>
 %    \end{macrocode}
 %\fi
@@ -2068,6 +2711,26 @@ the numbers into words.
 \bibleverse{IChronicles}(1:3)-(2:7)
 \end{itemize}
 
+\section{MHRA Style---Indexed}
+
+\biblerefstyle{MHRA}
+\noindent
+\begin{tabular}{ll}
+\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
+\verb|\ibibleverse{Exodus}(9:)| & \ibibleverse{Exodus}(9:)\\
+\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
+\verb|\ibibleverse{Exod}(20:)| & \ibibleverse{Exod}(20:)\\
+\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
+\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
+\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
+\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
+\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
+\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
+\ibibleverse{IChronicles}(1:3)-(2:7)\\
+\verb|\ibibleverse{IIPeter}(3:8-15a)| &
+\ibibleverse{IIPeter}(3:8-15a)
+\end{tabular}
+
 \section{New Style}
 
 This new style is based on the `default' style, but
@@ -2102,25 +2765,19 @@ has verses in lower case Roman numerals, and redefines
 \bibleverse{IChronicles}(1:3)-(2:7)
 \end{tabular}
 
-\section{MHRA Style---Indexed}
+\section{Partial References}
 
-\biblerefstyle{MHRA}
-\noindent
-\begin{tabular}{ll}
-\verb|\ibibleverse{Ex}| & \ibibleverse{Ex}\\
-\verb|\ibibleverse{Exodus}(9:)| & \ibibleverse{Exodus}(9:)\\
-\verb|\ibibleverse{Exod}(20:17)| & \ibibleverse{Exod}(20:17)\\
-\verb|\ibibleverse{Exod}(20:)| & \ibibleverse{Exod}(20:)\\
-\verb|\ibibleverse{IICo}(12:21)| & \ibibleverse{IICo}(12:21)\\
-\verb|\ibibleverse{IICor}(12:21-32)| & \ibibleverse{IICor}(12:21-32)\\
-\verb|\ibibleverse{Ex}(20:17)(21:3)| & \ibibleverse{Ex}(20:17)(21:3)\\
-\verb|\ibibleverse{Ex}(15:)(17:)(20:)| & \ibibleverse{Ex}(15:)(17:)(20:)\\
-\verb|\ibibleverse{Rev}(1:2,5,7-9,11)| & \ibibleverse{Rev}(1:2,5,7-9,11)\\
-\verb|\ibibleverse{IChronicles}(1:3)-(2:7)| &
-\ibibleverse{IChronicles}(1:3)-(2:7)\\
-\verb|\ibibleverse{IIPeter}(3:8-15a)| &
-\ibibleverse{IIPeter}(3:8-15a)
-\end{tabular}
+Only display verse numbers, but index under book and chapter:
+\ibiblevs{Gen}(19:3-4).
+
+Display only chapter and verses, but index under book:
+\ibiblechvs{Gen}(4:1-5).
+
+Complete indexed reference: \ibibleverse{Gen}(20:1-4).
+
+Display chapter range with no verses: \ibibleverse{Gen}(1,4-6,8-9,11:).
+
+Display chapter range with no verses (no index): \bibleverse{John}(1,3,4-6,8:).
 
 \printindex
 
@@ -2134,6 +2791,23 @@ has verses in lower case Roman numerals, and redefines
 %\fi
 %\iffalse
 %    \begin{macrocode}
+%<*sample.ist>
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
+delim_0	"\\dotfill "
+delim_1	"\\dotfill "
+delim_2	"\\dotfill "
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
+%</sample.ist>
+%    \end{macrocode}
+%\fi
+%\iffalse
+%    \begin{macrocode}
 %<*bibleref.perl>
 %    \end{macrocode}
 %\fi
diff --git a/Master/texmf-dist/source/latex/bibleref/bibleref.ins b/Master/texmf-dist/source/latex/bibleref/bibleref.ins
index 6c8d41369dd..1c4778bf014 100644
--- a/Master/texmf-dist/source/latex/bibleref/bibleref.ins
+++ b/Master/texmf-dist/source/latex/bibleref/bibleref.ins
@@ -1,10 +1,10 @@
-% bibleref.ins generated using makedtx version 0.94b 2010/7/7 10:21
+% bibleref.ins generated using makedtx version 0.94b 2011/1/19 22:37
 \input docstrip
 
 \preamble
 
  bibleref.dtx
- Copyright 2010 Nicola Talbot
+ Copyright 2011 Nicola Talbot
 
  This work may be distributed and/or modified under the
  conditions of the LaTeX Project Public License, either version 1.3
@@ -18,20 +18,26 @@
 
  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.
+ This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, bibleref.perl.
 
 \endpreamble
 
 \askforoverwritefalse
 
-\generate{\file{bibleref.sty}{\usepreamble\defaultpreamble
+\generate{\file{bibleref-xidx.sty}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{bibleref.dtx}{bibleref-xidx.sty,package}}
+\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-categories.tex}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{bibleref.dtx}{sample-categories.tex,package}}
 \file{sample-multind.tex}{\usepreamble\defaultpreamble
 \usepostamble\defaultpostamble\from{bibleref.dtx}{sample-multind.tex,package}}
+\file{sample-xidx.tex}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{bibleref.dtx}{sample-xidx.tex,package}}
 \file{sample.tex}{\usepreamble\defaultpreamble
 \usepostamble\defaultpostamble\from{bibleref.dtx}{sample.tex,package}}
+\file{sample.ist}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{bibleref.dtx}{sample.ist,package}}
 \file{bibleref.perl}{\nopreamble\nopostamble\from{bibleref.dtx}{bibleref.perl}}
 }
 
diff --git a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
index 725444ad9ea..9a60b44749a 100644
--- a/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
+++ b/Master/texmf-dist/tex/latex/bibleref/bibleref.sty
@@ -7,7 +7,7 @@
 %% bibleref.dtx  (with options: `bibleref.sty,package')
 %% 
 %%  bibleref.dtx
-%%  Copyright 2010 Nicola Talbot
+%%  Copyright 2011 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
 %% 
 %%  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.
+%%  This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, 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
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2010/07/07 1.13 (NLCT)]
+\ProvidesPackage{bibleref}[2011/01/19 1.14 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{fmtcount}
 \RequirePackage{amsgen}
@@ -568,22 +568,22 @@
 \newcommand*{\brs@text}{%
 \biblerefstyle{default}%
 \renewcommand{\BRbooknumberstyle}[1]{%
-\Ordinalstringnum{##1}\ }%
+\protect\Ordinalstringnum{##1}\ }%
 \renewcommand{\BRepistlenumberstyle}[1]{%
-\Ordinalstringnum{##1}\ }%
+\protect\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}}%
+chapter \protect\numberstringnum{##1}}%
 \renewcommand{\BRbkchsep}{, }%
 \renewcommand{\BRchvsep}{ verse }%
 \renewcommand{\BRchsep}{, }%
 \renewcommand{\BRvrsep}{ to }%
 \renewcommand{\BRvsep}{, }%
-\renewcommand{\BRversestyle}[1]{\numberstringnum{##1}}%
+\renewcommand{\BRversestyle}[1]{\protect\numberstringnum{##1}}%
 \renewcommand*{\BRversesuffixstyle}[1]{##1}%
 }
 \DeclareOption{default}{\brs@default}
@@ -635,13 +635,55 @@ defined}{}}}
   }%
   {\csname brs@#1\endcsname}%
 }
+\newcommand*{\@br@chsty}[1]{\@@br@chsty#1-\@nil\end}
+\def\@@br@chsty#1-#2\end{%
+\@do@chapters#1,\relax\end
+\ifx\@nil#2\relax
+\else
+  \@bv@addtochidxsort{-}%
+  \@bv@do{\protect\BRvrsep}%
+  \@@br@chsty#2\end%
+\fi
+}
+\def\@do@chapters#1,#2\end{%
+\def\@br@tmp{#1}%
+\ifx\@br@tmp\@empty
+\else
+  \@biblech{#1}%
+\fi
+\ifx\relax#2\relax
+\else
+  \@bv@addtochidxsort{,}%
+  \@bv@do{\protect\BRvsep}%
+  \@do@chapters#2\end
+\fi
+}
+\newcommand*{\@biblech}[1]{%
+  \def\@bv@tmp{#1}%
+  \ifx\@bv@tmp\@empty
+  \else
+    \@nodo@chapter{#1}%
+    \@bv@do{\protect\BRchapterstyle{#1}}%
+  \fi
+}
+\newcommand*{\@nodo@chapter}[1]{%
+  \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
+}
 \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}%
+  \@bv@do{\protect\BRvrsep}%
   \@@br@vrsty#2\end%
 \fi
 }
@@ -703,10 +745,11 @@ defined}{}}}
     \fi
   \fi
 }
-\def\@do@verses#1,#2\end{%
-\def\@br@tmp{#1}%
-\ifx\@br@tmp\@empty
-\else
+\newcommand*{\@do@verse}[1]{%
+  \@nodo@verse{#1}%
+  \expandafter\@bv@do\expandafter{\@br@tmp}%
+}
+\newcommand*{\@nodo@verse}[1]{%
   \br@stripverse{#1}%
   \ifnum\@br@versenum<10\relax
     \@bv@addtochidxsort{00#1}%
@@ -717,19 +760,41 @@ defined}{}}}
       \@bv@addtochidxsort{#1}%
     \fi
   \fi
-  \edef\@br@tmp{%
-     \noexpand\BRversestyle{\@br@versenum}%
-     \noexpand\BRversesuffixstyle{\@br@versesuffix}}%
-  \expandafter\@bv@do\expandafter{\@br@tmp}%
+  \ifx\@br@versesuffix\@empty
+    \protected@edef\@br@tmp{%
+       \protect\BRversestyle{\@br@versenum}%
+    }%
+  \else
+    \protected@edef\@br@tmp{%
+       \protect\BRversestyle{\@br@versenum}%
+       \protect\BRversesuffixstyle{\@br@versesuffix}%
+    }%
+  \fi
+}
+\def\@do@verses#1,#2\end{%
+\def\@br@tmp{#1}%
+\ifx\@br@tmp\@empty
+\else
+  \expandafter\@do@verse\expandafter{\@br@tmp}%
 \fi
 \ifx\relax#2\relax
 \else
   \@bv@addtochidxsort{,}%
-  \@bv@do{\BRvsep}%
+  \@bv@do{\protect\BRvsep}%
   \@do@verses#2\end
 \fi
 }
-\newcommand*{\bibleverse}[1]{%
+\newcommand*{\@bv@category}{}
+\newcommand*{\@bv@categorysort}{}
+\newcommand*{\biblerefcategory}[2][\@bv@category]{%
+  \renewcommand*{\@bv@category}{#2}%
+  \renewcommand*{\@bv@categorysort}{#1}%
+}
+\newcommand*{\bibleverse}{%
+  \let\@bv@restore\relax
+  \@bible@verse
+}
+\newcommand*{\@bible@verse}[1]{%
   \@ifundefined{br@#1}%
   {%
     \PackageError{bibleref}{Unknown book '#1'}{}%
@@ -738,33 +803,34 @@ defined}{}}}
     \@bv@idxsort{\csname br@#1\endcsname}%
     \def\@bv@chidxsort{}%
     \BRbooktitlestyle{\csname br@#1\endcsname}%
+    \let\@bv@org@bookof\BRbookof
+    \let\@bv@org@booknumberstyle\BRbooknumberstyle
+    \let\@bv@org@epistletothe\BRepistletothe
+    \let\@bv@org@epistlenumberstyle\BRepistlenumberstyle
+    \def\BRbookof{\string\BRbookof\space}%
+    \def\BRbooknumberstyle{\string\BRbooknumberstyle\space}%
+    \def\BRepistletothe{\string\BRepistletothe\space}%
+    \def\BRepistlenumberstyle{\string\BRepistlenumberstyle\space}%
     \@ifundefined{bri@#1}%
     {%
-      \def\@bv@mainidxentry{\BRbooktitlestyle{\csname br@#1\endcsname}}%
+      \protected@edef\@bv@mainidxentry{%
+         \protect\BRbooktitlestyle{\csname br@#1\endcsname}}%
     }%
     {%
-      \def\@bv@mainidxentry{\BRbooktitlestyle{\csname bri@#1\endcsname}}%
+      \protected@edef\@bv@mainidxentry{%
+         \protect\BRbooktitlestyle{\csname bri@#1\endcsname}}%
     }%
+    \let\BRbookof\@bv@org@bookof
+    \let\BRbooknumberstyle\@bv@org@booknumberstyle
+    \let\BRepistletothe\@bv@org@epistletothe
+    \let\BRepistlenumberstyle\@bv@org@epistlenumberstyle
   }%
   \new@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
+  \@br@chsty{#1}%
   \@@bibleverse
 }
 \def\@bibleverser-(#1:{%
@@ -780,7 +846,7 @@ defined}{}}}
         \@bv@addtochidxsort{#1:}%
       \fi
     \fi
-    \@bv@do{\BRchapterstyle{#1}}%
+    \@bv@do{\protect\BRchapterstyle{#1}}%
   \fi
   \@@bibleverse
 }
@@ -788,12 +854,12 @@ defined}{}}}
   \def\@bv@tmp{#1}%
   \ifx\@bv@tmp\@empty
   \else
-    \@bv@do{\BRchvsep}\@br@vrsty{#1}%
+    \@bv@do{\protect\BRchvsep}\@br@vrsty{#1}%
   \fi
   \new@ifnextchar(%
-    {\@bv@do{\BRchsep}\@bibleverse}%
+    {\@bv@do{\protect\BRchsep}\@bibleverse}%
     {\new@ifnextchar-%
-       {\@bv@do{\BRvrsep}\@bibleverser}%
+       {\@bv@do{\protect\BRvrsep}\@bibleverser}%
        {\@end@@bibleverse}%
     }%
 }
@@ -805,10 +871,19 @@ defined}{}}}
   \else
     \def\@bv@tmp{\@bv@mainidxentry!\@bv@chidxsort @\@bv@idxentry}%
   \fi
-  \biblerefindex
-    {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
+  \@do@biblerefindex
+      {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}%
   \@bv@idxfalse
 \fi
+\@bv@restore
+}
+\newcommand*{\@do@biblerefindex}[1]{%
+  \ifx\@bv@category\@empty
+    \biblerefindex{#1}%
+  \else
+    \biblerefindex
+      {\@bv@categorysort @\@bv@category!#1}%
+  \fi
 }
 \newcommand*{\biblerefindex}{\index}
 \newcommand*{\biblerefmap}[2]{%
@@ -823,7 +898,7 @@ defined}{}}}
 \newcommand{\@bv@do}[1]{#1\@bv@addtoidx{#1}}
 \newtoks\@bv@tmpa
 \newtoks\@bv@tmpb
-\newcommand{\@bv@addtoidx}[1]{%
+\newcommand*{\@bv@addtoidx}[1]{%
 \if@bv@idx
   \@bv@tmpa={#1}%
   \@bv@tmpb=\expandafter{\@bv@idxentry}%
@@ -850,6 +925,36 @@ defined}{}}}
 \newcommand*{\ibibleverse}[1][\bvidxpgformat]{%
 \def\@bv@idxpgformat{#1}%
 \@bv@idxtrue\def\@bv@idxentry{}\bibleverse}
+\newcommand*{\ibiblechvs}[1][\bvidxpgformat]{%
+  \let\@bv@current@bkchsep\BRbkchsep
+  \let\@bv@current@titlestyle\BRbooktitlestyle
+  \def\@bv@restore{%
+    \let\BRbkchsep\@bv@current@bkchsep
+    \let\BRbooktitlestyle\@bv@current@titlestyle
+  }%
+  \def\BRbkchsep{}%
+  \def\BRbooktitlestyle##1{}%
+  \def\@bv@idxpgformat{#1}%
+  \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse
+}
+\newcommand*{\ibiblevs}[1][\bvidxpgformat]{%
+  \let\@bv@current@titlestyle\BRbooktitlestyle
+  \let\@bv@current@chapterstyle\BRchapterstyle
+  \let\@bv@current@bkchsep\BRbkchsep
+  \let\@bv@current@chvsep\BRchvsep
+  \def\@bv@restore{%
+    \let\BRbooktitlestyle\@bv@current@titlestyle
+    \let\BRchapterstyle\@bv@current@chapterstyle
+    \let\BRbkchsep\@bv@current@bkchsep
+    \let\BRchvsep\@bv@current@chvsep
+  }%
+  \def\BRbooktitlestyle##1{}%
+  \def\BRchapterstyle##1{}%
+  \def\BRbkchsep{}%
+  \def\BRchvsep{}%
+  \def\@bv@idxpgformat{#1}%
+  \@bv@idxtrue\def\@bv@idxentry{}\@bible@verse
+}
 \newcommand*{\bvidxpgformat}{textrm}
 \endinput
 %%
-- 
cgit v1.2.3