Merge branch 'usfm3.0.6'

ubsicap · Mar 14, 2022 · 9337c48 · 9337c48
2 parents 67d4810 + 46ee6a3
commit 9337c48
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/sty/usfm.sty b/sty/usfm.sty
@@ -1,4 +1,4 @@
-# Version=3.0.5
+# Version=3.0.6
 # ********************************************************************
 # * usfm.sty is the default stylesheet for Paratext projects         *
 # *   using USFM markup.                                             *

diff --git a/sty/usfm_sb.sty b/sty/usfm_sb.sty
@@ -1,4 +1,4 @@
-# Version=3.0.5
+# Version=3.0.6
 # ********************************************************************
 # * usfm_sb.sty is the default stylesheet for Paratext (>=7.3)       *
 # *   combined study Bible projects using USFM markup.               *
@@ -2507,7 +2507,7 @@
 \Endmarker fr*
 \Name fr - Footnote - Reference
 \Description The origin reference for the footnote (basic)
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextType NoteText
 \TextProperties publishable vernacular note
 \StyleType Character
@@ -2518,7 +2518,7 @@
 \Endmarker ft*
 \Name ft - Footnote - Text
 \Description Footnote text, Protocanon (basic)
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2528,7 +2528,7 @@
 \Endmarker fk*
 \Name fk - Footnote - Keyword
 \Description A footnote keyword (basic)
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2540,7 +2540,7 @@
 \Endmarker fq*
 \Name fq - Footnote - Quotation or Alternate Rendering
 \Description A footnote scripture quote or alternate rendering (basic)
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2551,7 +2551,7 @@
 \Endmarker fqa*
 \Name fqa - Footnote - Alternate Translation Rendering
 \Description A footnote alternate rendering for a portion of scripture text
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2562,7 +2562,7 @@
 \Endmarker fl*
 \Name fl - Footnote - Label Text
 \Description A footnote label text item, for marking or "labelling" the type or alternate translation being provided in the note.
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2584,7 +2584,7 @@
 \Endmarker fp*
 \Name fp - Footnote Paragraph Mark
 \Description A Footnote additional paragraph marker
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2594,7 +2594,7 @@
 \Endmarker fs*
 \Name DEPRECATED fs - Footnote - Footnote Summary
 \Description A summary text for the concept/idea/quotation from the scripture translation for which the note is being provided.
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2605,7 +2605,7 @@
 \Endmarker fv*
 \Name fv...fv* - Footnote - Embedded Verse Number
 \Description A verse number within the footnote text
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2616,7 +2616,7 @@
 \Endmarker fdc*
 \Name DEPRECATED fdc...fdc* - Footnote - DC text
 \Description Footnote text, applies to Deuterocanon only
-\OccursUnder f fe ef
+\OccursUnder f fe ef efe
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2670,7 +2670,7 @@
 \Endmarker xt*
 \Name xt - Cross Reference - Target References
 \Description The cross reference target reference(s), protocanon only (basic)
-\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe x ef ex NEST
+\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe x ef efe ex NEST
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Character
@@ -2756,7 +2756,17 @@
 \Endmarker ef*
 \Name ef...ef* - Study - Extended Footnote
 \Description Study Bible extended footnote (basic)
-\OccursUnder c li li1 li2 li3 li4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr q q1 q2 q3 q4 qc qr qm qm1 qm2 qm3 qs sp tc1 tc2 tc3 tc4 mt mt1 mt2 mt3 ms ms1 ms2 ms3 s s1 s2 s3 d ip cp
+\OccursUnder c lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qm qm1 qm2 qm3 qs sp tc1 tc2 tc3 tc4 mt mt1 mt2 mt3 ms ms1 ms2 ms3 s s1 s2 s3 d ip cp
+\TextProperties publishable vernacular note
+\TextType NoteText
+\StyleType Note
+\FontSize 12
+
+\Marker efe
+\Endmarker efe*
+\Name efe...efe* - Study - Extended Endnote
+\Description Study Bible extended endnote
+\OccursUnder c lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qm qm1 qm2 qm3 qs sp tc1 tc2 tc3 tc4 mt mt1 mt2 mt3 ms ms1 ms2 ms3 s s1 s2 s3 d ip cp
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Note
@@ -2766,7 +2776,7 @@
 \Endmarker ex*
 \Name ex - Study - Extended Cross Reference
 \Description List of study Bible extended cross references
-\OccursUnder c li li1 li2 li3 li4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr q q1 q2 q3 q4 qc qr qm qm1 qm2 qm3 qs sp tc1 tc2 tc3 tc4 mt mt1 mt2 mt3 ms ms1 ms2 ms3 s s1 s2 s3 d ip cp
+\OccursUnder c lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qm qm1 qm2 qm3 qs sp tc1 tc2 tc3 tc4 mt mt1 mt2 mt3 ms ms1 ms2 ms3 s s1 s2 s3 d ip cp
 \TextProperties publishable vernacular note
 \TextType NoteText
 \StyleType Note
@@ -3129,7 +3139,7 @@
 \Endmarker w*
 \Name w...w* - Peripheral Ref - Wordlist Entry
 \Description A wordlist text item
-\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef erq esb x ex NEST
+\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef efe erq esb x ex NEST
 \TextType VerseText
 \TextProperties publishable vernacular
 \StyleType Character
@@ -3140,7 +3150,7 @@
 \Endmarker wh*
 \Name wh...wh* - Peripheral Ref - Hebrew Wordlist Entry
 \Description A Hebrew wordlist text item
-\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef erq esb x ex NEST
+\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef efe erq esb x ex NEST
 \TextType VerseText
 \TextProperties publishable vernacular
 \StyleType Character
@@ -3150,7 +3160,7 @@
 \Endmarker wg*
 \Name wg...wg* - Peripheral Ref - Greek Wordlist Entry
 \Description A Greek Wordlist text item
-\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef erq esb x ex NEST
+\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef efe erq esb x ex NEST
 \TextType VerseText
 \TextProperties publishable vernacular
 \StyleType Character
@@ -3160,7 +3170,7 @@
 \Endmarker wa*
 \Name wa...wa* - Peripheral Ref - Aramaic Wordlist Entry
 \Description An Aramaic Wordlist text item
-\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef erq esb x ex NEST
+\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef efe erq esb x ex NEST
 \TextType VerseText
 \TextProperties publishable vernacular
 \StyleType Character
@@ -3170,7 +3180,7 @@
 \Endmarker ndx*
 \Name ndx...ndx* - Peripheral Ref - Subject Index Entry 
 \Description A subject index text item
-\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef erq esb x ex NEST
+\OccursUnder ip im ipi imi ipq imq ipr iq iq1 iq2 iq3 io io1 io2 io3 io4 ms ms1 ms2 s s1 s2 s3 s4 cd sp d lh li li1 li2 li3 li4 lf lim lim1 lim2 lim3 lim4 m mi nb p pc ph phi pi pi1 pi2 pi3 pr pmo pm pmc pmr po q q1 q2 q3 q4 qc qr qd qm qm1 qm2 qm3 tr th1 th2 th3 th4 thr1 thr2 thr3 thr4 tc1 tc2 tc3 tc4 tcr1 tcr2 tcr3 tcr4 f fe ef efe erq esb x ex NEST
 \TextType VerseText
 \TextProperties publishable vernacular
 \StyleType Character