diff options
Diffstat (limited to 'macros/latex/contrib/fetchbibpes')
| -rw-r--r-- | macros/latex/contrib/fetchbibpes/README.md | 14 | ||||
| -rw-r--r-- | macros/latex/contrib/fetchbibpes/docs/fetchbibpes.pdf | bin | 252788 -> 291257 bytes | |||
| -rw-r--r-- | macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.pdf | bin | 493219 -> 703853 bytes | |||
| -rw-r--r-- | macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.tex | 125 | ||||
| -rw-r--r-- | macros/latex/contrib/fetchbibpes/examples/bibpes_tst.pdf | bin | 73912 -> 216945 bytes | |||
| -rw-r--r-- | macros/latex/contrib/fetchbibpes/fetchbibpes.dtx | 60 | ||||
| -rw-r--r-- | macros/latex/contrib/fetchbibpes/fetchbibpes.ins | 2 |
7 files changed, 110 insertions, 91 deletions
diff --git a/macros/latex/contrib/fetchbibpes/README.md b/macros/latex/contrib/fetchbibpes/README.md index ab1385950f..334218d79a 100644 --- a/macros/latex/contrib/fetchbibpes/README.md +++ b/macros/latex/contrib/fetchbibpes/README.md @@ -1,10 +1,10 @@ The fetchbibpes Bundle Author: D. P. Story -Dated: 2018/07/30 +Dated: 2021-03-08 This bundle provides two packages, bibpes and fetchbibpes. This pair of packages was motivated by a friend, who was preparing Bible studies lessons -using a combination of the application e-Sword (http://www.e-sword.net/) and +using a combination of the application e-Sword (http:--www.e-sword.net-) and LaTeX. He wanted a `database' of Bible packages from which he could simply `fetch' passages into the LaTeX source file. @@ -23,24 +23,26 @@ LaTeX. He wanted a `database' of Bible packages from which he could simply Unpack the distribution by latexing fetchbibpes.ins. -What's new (2018/07/30) Bug fixes. Added the cfg option for specifying a +What's new (2021-03-08) Minor changes that support the eq-fetchbbl package. + +What's new (2018-07-30) Bug fixes. Added the cfg option for specifying a custom contiguration file. New commands \showTranslAlways, \showTranslDecld, \translFmt, \translTxtFmt, and \cobblevrs. All documented in the manual. NOTE: The format for the CFG file has changes, you will need to update to this new syntax; refer to Section 3.8 of the manual and to fbpes.cfg for an example. -What's new (2018/07/12) Defined a new command \fetchversestxt; the command +What's new (2018-07-12) Defined a new command \fetchversestxt; the command has the same arguments as \fetchverses, but it does not expand to typeset content. Rather, it defines two commands \versetxt and \passagetxt. These two are the passage reference and the passage for that verse but with all \LaTeX styling and font changes. -What's new (2018/03/21): Implemented open ended ranges, for example, +What's new (2018-03-21): Implemented open ended ranges, for example, \fetchverses{Joh 3:27-} fetches all passages from John, chapter 3, starting with verse 27 until the end of the chapter. -What's new (2016/09/24): Changed behavior of the alt key. Added an alt* key. +What's new (2016-09-24): Changed behavior of the alt key. Added an alt* key. Enjoy. diff --git a/macros/latex/contrib/fetchbibpes/docs/fetchbibpes.pdf b/macros/latex/contrib/fetchbibpes/docs/fetchbibpes.pdf Binary files differindex b696fd547f..f19ac00c54 100644 --- a/macros/latex/contrib/fetchbibpes/docs/fetchbibpes.pdf +++ b/macros/latex/contrib/fetchbibpes/docs/fetchbibpes.pdf diff --git a/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.pdf b/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.pdf Binary files differindex 9e8d6a7844..96bdd7e097 100644 --- a/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.pdf +++ b/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.pdf diff --git a/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.tex b/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.tex index 25690bb4ce..ccbd47878e 100644 --- a/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.tex +++ b/macros/latex/contrib/fetchbibpes/docs/fetchbibpes_man.tex @@ -62,6 +62,8 @@ %\usepackage{makeidx} %\makeindex \usepackage{acroman} +\edef\amtIndent{\the\parindent} +\setlength{\leftmargini}{\the\parindent} \usepackage[active]{srcltx} \urlstyle{tt} @@ -78,7 +80,7 @@ email={dpstory@acrotex.net}, subject=Documentation for the fetchbibpes and bibpes packages, talksite={\url{www.acrotex.net}}, - version={2.4.9, 2018/07/30}, + version={2.4.10, 2021/03/08}, Keywords={LaTeX, e-sword, Bible passages, AcroTeX}, copyrightStatus=True, copyrightNotice={Copyright (C) \the\year, D. P. Story}, @@ -187,11 +189,11 @@ were written. \paragraph*{Package options} The package has several options, listed in display that follows. \begin{Verbatim}[xleftmargin=\amtIndent,commandchars=*()] \usepackage[% - infolder=*ameta(infolder), - outfolder=*ameta(outfolder), - txtfilein=*ameta(base_name_txt), - deffileout=*ameta(base_name_def), - build|!build + infolder=*ameta(infolder), + outfolder=*ameta(outfolder), + txtfilein=*ameta(base_name_txt), + deffileout=*ameta(base_name_def), + build|!build ]{bibpes} \end{Verbatim} \paragraph*{Description of options} @@ -313,15 +315,15 @@ were written. In some translations, Jesus' words are quoted in red and are not set off by quotation marks. You'll have to hand edit the \EXT{TXT} file. -\begin{Verbatim} - (Mat 11:4) Jesus answered and said unto them, Go and shew John - again those things which ye do hear and see: +\begin{Verbatim}[xleftmargin=\amtIndent] +(Mat 11:4) Jesus answered and said unto them, Go and shew John +again those things which ye do hear and see: \end{Verbatim} can be changed to, -\begin{Verbatim} - (Mat 11:4) Jesus answered and said unto them, - \textcolor{red}{Go and shew John again those things which ye do - hear and see:} +\begin{Verbatim}[xleftmargin=\amtIndent] +(Mat 11:4) Jesus answered and said unto them, +\textcolor{red}{Go and shew John again those things which ye do +hear and see:} \end{Verbatim} to be typeset as \begin{quote} @@ -338,7 +340,7 @@ to be typeset as After you have created your \EXT{TXT} file, open the file \texttt{makebibpes.tex}, which is found in the \texttt{examples} folder. - This is a short file, it reads: + This is a short file that reads: \begin{equation} \begin{minipage}{100pt} \begin{Verbatim}[numbers=left,commandchars=!()] @@ -351,15 +353,15 @@ After you have created your \EXT{TXT} file, open the file \end{Verbatim} \end{minipage}\label{display:bibpes1} \end{equation} - The \texttt{makebibpes.tex} file, found in the root folder of this + The \texttt{makebibpes.tex} file, also found in the root folder of this distribution, is used to convert a \texttt{TXT} file of Bible verses to a - \EXT{DEF} file of Bible verses. The action of this package is to take - each line of Bible verse in the \EXT{TXT} file, for example, the verse - in the \EXT{TXT} file, + \EXT{DEF} file of Bible verses. The action of this package is to take each + line of Bible verse in the \EXT{TXT} file, for example, the verse in the + \EXT{TXT} file, \begin{Verbatim}[xleftmargin=0pt,fontsize=\small] (Gen 1:1 KJV) In the beginning God created the heaven and the earth. \end{Verbatim} -is transformed the following verse in the \EXT{DEF} file, +and to transformed it to the following verse in the \EXT{DEF} file, \begin{Verbatim}[xleftmargin=0pt,fontsize=\small] \BV(Gen 1:1 KJV) In the beginning God created the heaven and the earth.\null \end{Verbatim} @@ -379,9 +381,9 @@ The first command expands to the input and output information given by the optio \begin{Verbatim}[xleftmargin=\amtIndent,commandchars=!()] \documentclass{article} \usepackage[!textbf(build), - infolder=mytxts, - outfolder=mydefs, - txtfilein=Gen1-KJV + infolder=mytxts, + outfolder=mydefs, + txtfilein=Gen1-KJV ]{bibpes} \begin{document} \reportOnBibPes @@ -439,10 +441,11 @@ given previously. {TXT and DEF} files} The file \texttt{makebibpes.tex} is found in the root folder of the -\pkg{fetchbibpes} distribution. Modern {\LaTeX} systems, {MiK\TeX} comes do +\pkg{fetchbibpes} distribution. Modern {\LaTeX} systems, {MiK\TeX} comes to mind, do not allow you to compile a source file from their application folder, and the folder itself is readonly. Therefore, you must move -\texttt{makebibpes.tex} to another folder. +\texttt{makebibpes.tex} to another folder.\footnote{That is why another copy +of \texttt{makebibpes.tex} is in the \texttt{examples} folder.} \paragraph*{Production and organization.} There are two thoughts that come to mind for producing \texttt{DEF} files. @@ -460,11 +463,11 @@ There are two thoughts that come to mind for producing \texttt{DEF} files. For example, \begin{equation} \begin{minipage}{100pt} -\begin{Verbatim} +\begin{Verbatim}[xleftmargin=\amtIndent] \usepackage[% - infolder=mytxtfiles, - outfolder=mydeffiles, - txtfilein=1Cor1 + infolder=mytxtfiles, + outfolder=mydeffiles, + txtfilein=1Cor1 ]{bibpes} \end{Verbatim} \end{minipage}\label{display:bibpes} @@ -512,8 +515,8 @@ can specify your only file (\texttt{lession1}) in the option list of \pkg{fetchbibpes}: \begin{Verbatim}[xleftmargin=\amtIndent] \usepackage[% - useverses=lesson1, - deffolder=mydeffiles + useverses=lesson1, + deffolder=mydeffiles ]{fetchbibpes} \end{Verbatim} Here, \pkg{fetchbibpes} looks for \texttt{lession1.def} in the subfolder @@ -527,8 +530,8 @@ Another choice is to use several \EXT{DEF} files, perhaps from your `data\-base' collection. \begin{Verbatim}[xleftmargin=\amtIndent] \usepackage[% - useverses={Gen1,Mat2,Rom1,1Cor1}, - deffolder=mydeffiles + useverses={Gen1,Mat2,Rom1,1Cor1}, + deffolder=mydeffiles ]{fetchbibpes} \end{Verbatim} Here, you plan to reference verses in the \texttt{Gen1.def} file (containing @@ -782,9 +785,9 @@ It is perhaps always better to use \cs{fetchverses} for single and multiple vers \texttt{Gen 1:1 KJV} and add a line: \begin{Verbatim}[xleftmargin=\amtIndent] \BV(Gen 1:1 KJV) In the beginning - God created the heaven and the earth.\null + God created the heaven and the earth.\null \BV(Gen 1:1 KJV Alt) \dots - \emph{God created the heaven and the earth}.\null + \emph{God created the heaven and the earth}.\null \end{Verbatim} (Lines are wrapped around above to fit within the margins, this \emph{should not be done} in the \EXT{DEF} file itself.) To access this alternate version @@ -1256,12 +1259,12 @@ how to create alternate passages, refer to the \opt{alt} key on global declaration, use the \opt{localdefs} key. \begin{Verbatim}[xleftmargin=\leftmargini] \fetchverses*[from=NKJV, - localdefs={\gobbleto{and}{\gobbletoand}% - \gobbleto{blood,}{\gobbletoblood}}, - replace= - {But when}{\leavevmode\ldots when} - {who separated me from my}{who\gobbletoand} - {, that I might preach Him}{ \ldots\gobbletoblood} + localdefs={\gobbleto{and}{\gobbletoand}% + \gobbleto{blood,}{\gobbletoblood}}, + replace= + {But when}{\leavevmode\ldots when} + {who separated me from my}{who\gobbletoand} + {, that I might preach Him}{ \ldots\gobbletoblood} ]{Gal 1:15-16} \end{Verbatim} This code expands to: @@ -1353,12 +1356,12 @@ primitive \cs{expandafter}, which is a limited kind of expansion. The basic syntax for \pkg{fetchbibpes} is as follows: \begin{Verbatim}[xleftmargin=\amtIndent,commandchars=!()] \usepackage[% - useverses={!ameta(list)}, - deffolder=!ameta(path), - useselverses, - usesr, - ignorecfg, - cfg=!ameta(name) + useverses={!ameta(list)}, + deffolder=!ameta(path), + useselverses, + usesr, + ignorecfg, + cfg=!ameta(name) ]{fetchbibpes} \end{Verbatim} @@ -1399,8 +1402,8 @@ in the folder of the source file, or in the search path of your {\LaTeX} system. only if \ameta{path} is nonempty. \begin{Verbatim} \usepackage[% - useverses={Gen1,Mat2,Rom1,1Cor1}, - deffolder=mydeffiles + useverses={Gen1,Mat2,Rom1,1Cor1}, + deffolder=mydeffiles ]{fetchbibpes} \end{Verbatim} Here, {\LaTeX} looks for the listed files (\texttt{Gen1.def}, @@ -2032,11 +2035,11 @@ a verse. For example, the following declaration is used in the example below. \begin{Verbatim}[xleftmargin=\amtIndent] \verseCmts{% - {In the beginning God creates\dots} % v1 - {Earth void} % v2 - {Light!} % v3 - {} % v4 - {First day} % v5 + {In the beginning God creates\dots} % v1 + {Earth void} % v2 + {Light!} % v3 + {} % v4 + {First day} % v5 } \end{Verbatim} Its argument is a series of tokens (comments enclosed in braces), the first token is the comment @@ -2130,10 +2133,10 @@ enclosed in braces. Within the argument, three keys are recognized, \texttt{from \begin{Verbatim}[xleftmargin=\amtIndent] \selectedVersesFrom { - {onlyverses={1Jn 1:1-5,3:3-8}} - {from=ISV,onlyverses={Gen 1:1-5}} - {from=ISV,alt=Alt,onlyverses={Gen 1:1}} - {onlyverses=Mat} + {onlyverses={1Jn 1:1-5,3:3-8}} + {from=ISV,onlyverses={Gen 1:1-5}} + {from=ISV,alt=Alt,onlyverses={Gen 1:1}} + {onlyverses=Mat} } \end{Verbatim} It is assumed the required \EXT{DEF} files are listed in the value of @@ -2364,15 +2367,15 @@ Declare, \begin{Verbatim}[xleftmargin=\amtIndent] \begin{declareBVs*} \BV(Mat 6:31 NKJV) ``Therefore do not worry, saying, - `What shall we eat?' or `What shall we drink?' or - `What shall we wear?'\null + `What shall we eat?' or `What shall we drink?' or + `What shall we wear?'\null \end{declareBVs*} \end{Verbatim} Note the presence of quote marks, hence, we declare this verse using \env{declareBVs*}. We emit our \cs{markverse} command: \begin{Verbatim}[xleftmargin=\amtIndent,commandchars=!()] \markverse[name=Mat6:31-,from=NKJV, -!qquad(marks={}{eat?'}{}{drink?'}{}{wear?'}]{Mat 6:31}) +!quad(marks={}{eat?'}{}{drink?'}{}{wear?'}]{Mat 6:31}) \end{Verbatim} \markverse[name=Mat6:31-,marks={}{eat?'}{}{drink?'}{}{wear?'},from=NKJV]{Mat 6:31} Now, let's read out the substrings: @@ -2397,7 +2400,7 @@ the markers \ameta{bfind} and \ameta{efind} should \emph{occur once and only once} in the verse. For example the line \begin{Verbatim}[xleftmargin=\amtIndent,commandchars=!()] \markverse[name=multihits,from=NKJV, -!qquad(marks={`What}{wear?'}]{Mat 6:31}) +!quad(marks={`What}{wear?'}]{Mat 6:31}) \end{Verbatim} produces the following \cs{BV} definition in the \texttt{\jobname-bv.cut} file: \begin{quote}\ttfamily\raggedright diff --git a/macros/latex/contrib/fetchbibpes/examples/bibpes_tst.pdf b/macros/latex/contrib/fetchbibpes/examples/bibpes_tst.pdf Binary files differindex c6ecb54b88..4d3b713919 100644 --- a/macros/latex/contrib/fetchbibpes/examples/bibpes_tst.pdf +++ b/macros/latex/contrib/fetchbibpes/examples/bibpes_tst.pdf diff --git a/macros/latex/contrib/fetchbibpes/fetchbibpes.dtx b/macros/latex/contrib/fetchbibpes/fetchbibpes.dtx index 078144ee6d..ed80dc19f6 100644 --- a/macros/latex/contrib/fetchbibpes/fetchbibpes.dtx +++ b/macros/latex/contrib/fetchbibpes/fetchbibpes.dtx @@ -16,7 +16,7 @@ %</copyright> %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01] %<package>\ProvidesPackage{fetchbibpes} -%<package> [2018/07/30 v2.4.9 fetchbibpes: Fetch Bible passages from DEF files (dps)] +%<package> [2021/03/08 v2.4.10 fetchbibpes: Fetch Bible passages from DEF files (dps)] %<*driver> \documentclass{ltxdoc} \usepackage[colorlinks,hyperindex=false]{hyperref} @@ -59,18 +59,6 @@ \def\meta#1{\textsl{\texttt{#1}}} \def\SUB#1{\ensuremath{{}_{\mbox{\scriptsize\ttfamily#1}}}} \def\cs#1{\texttt{\bslash#1}} -\DeclareRobustCommand{\tmspace}[3]{% - \ifmmode\mskip#1#2\else\kern#1#3\fi\relax} -\renewcommand{\,}{\tmspace+\thinmuskip{.1667em}} -\let\thinspace\, -\renewcommand{\!}{\tmspace-\thinmuskip{.1667em}} -\let\negthinspace\! -\renewcommand{\:}{\tmspace+\medmuskip{.2222em}} -\let\medspace\: -\newcommand{\negmedspace}{\tmspace-\medmuskip{.2222em}} -\renewcommand{\;}{\tmspace+\thickmuskip{.2777em}} -\let\thickspace\; -\newcommand{\negthickspace}{\tmspace-\thickmuskip{.2777em}} \makeatletter \renewcommand{\paragraph} {\@startsection{paragraph}{4}{0pt}{6pt}{-3pt} @@ -681,7 +669,7 @@ % the second after; this results in a phrase that leads up to the passage itself. % %\medskip\noindent -% The value of \IndexKey{enclosewith}\cs{enclosewith} key is a set of two tokens. +% The value of \IndexKey{enclosewith}\texttt{enclosewith} key is a set of two tokens. % The first token is placed at the beginning of the passage, and the second one at the % end of the passage. A special value of \cs{quote} is recognized, this places quotation % marks around the passage. @@ -849,12 +837,14 @@ % \medskip\noindent % With the \IndexKey{caps}\texttt{caps}, you can make the display the chapter name in capital % letters `GENESIS' versus `Genesis'. +% \changes{v2.4.10}{2021/03/08}{Changed default definition of \string\cs{fbpes@case} from +% \string\cs{relax} to \string\cs{@empty} so \string\cs{versetxt} can be used in a label name.} % \begin{macrocode} \define@boolkey{fbpes}{caps}[true]{\ifKV@fbpes@caps \def\fbpes@case{\uppercase}\else - \let\fbpes@case\relax\fi + \let\fbpes@case\@empty\fi } -\let\fbpes@case\relax +\let\fbpes@case\@empty % \end{macrocode} %\paragraph*{Example} We capitalize the full book name: %\begin{quote}\small @@ -954,7 +944,7 @@ % The \texttt{typeset} key is used with \cs{fetchversestxt}. If true, % we assume the \cs{passagetxt} command is meant to be typeset and, as a result, the normal % behavior of \cs{fetchverses} is followed; if false, certain special definitions are activated -% that allows \cs{passagetxt} to pass to another macro, such as \cs{pdfcomment}. This option is +% that allow \cs{passagetxt} to pass to another macro, such as \cs{pdfcomment}. This option is % ignored within the optional list of \cs{fetchverses}. % \par\medskip\noindent Added a value to the key \texttt{typeset}, which was a boolean key. % Now, it is a combination, both a Boolean and a regular key. @@ -1330,9 +1320,13 @@ \fp@looptoreplace\fi \r@fbp@enclose \egroup}% +% \end{macrocode} +% \changes{v2.4.10}{2021/03/08}{Inserted \string\cs{if@versetxt} conditional} +% \begin{macrocode} + \if@versetxt\else \ifKV@fbpes@citeatend \fbp@priorRefSpc{\ifKV@fbpes@nocite\else - \book@passage\fi}\fi + \book@passage\fi}\fi\fi \egroup } % \end{macrocode} @@ -1484,7 +1478,7 @@ \ifbookexists % \end{macrocode} % We get the book abbreviation early, needed to get the proper expansion -% for \cs{fetchversestext}. +% for \cs{fetchversestxt}. % \changes{v2.4.9}{2018/07/30}{Expand book abbr early} % \begin{macrocode} \edef\expBkAbbrChoices{\@nameuse{bkfmt\bib@book}}% dpsjul30 @@ -1596,8 +1590,24 @@ \@tempcnta\fb@verseEnd \else \ifKV@fbpes@typeset -% \fb@insrtvn - \fb@insrtvn\fb@qq(\bib@ver)\fb@qq +% \end{macrocode} +% (2021/03/08) Insert \cs{if@versetxt} conditional +% when \\cs{fetchversestxt[typeset]} is used, \cs{fetchversestxt[typeset]} +% typesets the error reference when the reference is not defined. +% \changes{v2.4.10}{2021/03/08}{Insert \string\cs{if@versetxt} conditional +% when \string\cs{fetchversestxt[typeset]} is used.} +% \begin{macrocode} + \if@versetxt + \PackageInfo{fetchbibpes}{For \string\fetchversestxt\space + with the typeset option:\MessageBreak + \bib@ver\space is not defined. + Expand \string\passagetxt\MessageBreak + to see the error message}% + \edef\x{\noexpand\g@addto@macro\noexpand + \passagetxt{\fb@insrtvn ??(\bib@ver)??}}\x + \else + \fb@insrtvn\fb@qq(\bib@ver)\fb@qq + \fi \else \edef\x{\noexpand\g@addto@macro\noexpand \passagetxt{\fb@insrtvn ??(\bib@ver)??}}\x @@ -1639,8 +1649,12 @@ \iffound@ltstarstop\let\fbpes@alt\@empty\fi }\ifKV@fbpes@typeset\r@fbp@enclose\fi % dps \egroup +% \end{macrocode} +% \changes{v2.4.10}{2021/03/08}{Inserted \string\cs{if@versetxt} conditional} +% \begin{macrocode} + \if@versetxt\else \ifKV@fbpes@citeatend - \fbp@priorRefSpc{\book@passage}\fi + \fbp@priorRefSpc{\book@passage}\fi\fi \egroup } % \end{macrocode} @@ -2522,7 +2536,7 @@ % Using these markers, we extract the substrings. % % We begin by defining new keys and supporting commands. We rely heavily on the earlier replace code. -% \changes{v2.3}{2016/12/17}{} +% \changes{v2.3}{2016/12/17}{Added new keys and supporting commands} % \begin{macrocode} \define@key{fbpesvprts}{marks}[]{\fp@cntArgs#1\stop@rg \xdef\nMarks{\fp@nReplace}\def\fbpesvprts@marks{#1}% diff --git a/macros/latex/contrib/fetchbibpes/fetchbibpes.ins b/macros/latex/contrib/fetchbibpes/fetchbibpes.ins index 1a9c12aece..0fad5c36fa 100644 --- a/macros/latex/contrib/fetchbibpes/fetchbibpes.ins +++ b/macros/latex/contrib/fetchbibpes/fetchbibpes.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 2016--2018 D. P. Story +%% Copyright 2016--2021 D. P. Story %% ------------------------------------------- %% %% It may be distributed under the conditions of the LaTeX Project Public |