From dbd8aabd96c560c57b1f6bce21b484468eb729e4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 Sep 2017 21:42:48 +0000 Subject: bibletext (2sep17) git-svn-id: svn://tug.org/texlive/trunk@45196 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/bibletext/bibletext.sty | 80 ++++++++++++++-------- 1 file changed, 50 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bibletext') diff --git a/Master/texmf-dist/tex/latex/bibletext/bibletext.sty b/Master/texmf-dist/tex/latex/bibletext/bibletext.sty index af777ac6784..21abb5a97de 100644 --- a/Master/texmf-dist/tex/latex/bibletext/bibletext.sty +++ b/Master/texmf-dist/tex/latex/bibletext/bibletext.sty @@ -1,41 +1,61 @@ \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{bibletext} - [2016/02/18 v0.1 Insert Bible texts] + [2017/09/01 v0.1.2 Insert Bible texts] -\DeleteShortVerb{\|} +\newif\ifbibletext@defined +\bibletext@definedfalse +\newcommand{\bibletext@checkdefined}[1]{% + \ifcsname#1\endcsname% + \bibletext@definedtrue% + \else% + \bibletext@definedfalse% + \fi% +} + +\bibletext@checkdefined{DeleteShortVerb} +\ifbibletext@defined% + \DeleteShortVerb{\|}% +\fi \RequirePackage{pgfkeys} +\RequirePackage{pdftexcmds} -\newif\ifbibletextRef -\newif\ifbibletextOmitChapter -\newif\ifbibletextOmitRepeatedChapter +\newif\ifbibletext@Ref +\newif\ifbibletext@OmitChapter +\newif\ifbibletext@OmitRepeatedChapter \pgfkeys{ - /bibletext/.is family, /bibletext, - default/.style={ - translation=kjv, - ref=false, - omitchapter=false, - }, - translation/.estore in = \bibletextTranslation, % unused for now - ref/.is if=bibletextRef, - omitchapter/.is if=bibletextOmitChapter, - omitrepeatedchapter/.is if=bibletextOmitRepeatedChapter, + /bibletext/.is family, /bibletext, + default/.style={ + translation=kjv, + ref=false, + omitchapter=false, + }, + translation/.estore in = \bibletext@Translation, % unused for now + ref/.is if=bibletext@Ref, + omitchapter/.is if=bibletext@OmitChapter, + omitrepeatedchapter/.is if=bibletext@OmitRepeatedChapter, } \newcommand\bibletext[2][]{% - \pgfkeys{/bibletext, default, #1}% - \ifbibletextRef% - \ifbibletextOmitRepeatedChapter% - \input{|"bible -f '#2' | grep -o '[[:digit:]].*' | head -n1"}% - \input{|"bible -f '#2' | grep -o '[[:digit:]][[:digit:]]*[[:space:]].*' | tail -n+2"}% - \else\ifbibletextOmitChapter% - \input{|"bible -f '#2' | grep -o '[[:digit:]][[:digit:]]*[[:space:]].*'"}% - \else% - \input{|"bible -f '#2' | grep -o '[[:digit:]].*'"}% - \fi\fi% - \else% - \input{|"bible -f '#2' | cut -d' ' -f2-"}% - \fi% + \pgfkeys{/bibletext, default, #1}% + \ifbibletext@Ref% + \ifbibletext@OmitRepeatedChapter% + \input{|"bible -f '#2' | grep -o '[[:digit:]].*' | head -n1"}% + \input{|"bible -f '#2' | grep -o '[[:digit:]][[:digit:]]*[[:space:]].*' | tail -n+2"}% + \else\ifbibletext@OmitChapter% + \input{|"bible -f '#2' | grep -o '[[:digit:]][[:digit:]]*[[:space:]].*'"}% + \else% + \input{|"bible -f '#2' | grep -o '[[:digit:]].*'"}% + \fi\fi% + \else% + \input{|"bible -f '#2' | cut -d' ' -f2-"}% + \fi% + \unskip% } - +\AtEndOfPackage{ + \ifnum\pdf@shellescape=1\relax\else + \PackageError{bibletext} + {You must invoke LaTeX with the -shell-escape flag} + {Pass the -shell-escape flag to LaTeX. Refer to the bibletext.sty + documentation for more information.} + \fi} \endinput - -- cgit v1.2.3