aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2019-08-25 11:10:41 +0200
committerRobert Alessi <alessi@robertalessi.net>2019-08-25 11:10:41 +0200
commit3e4e2ad21bc51bf48c71a8a42dc818b0d0cb01c4 (patch)
tree563710900e7ae3a57f85ce3c76d8e299da9e9bc5
parent75b5c9579fcaaa9531b87c161928ce6657c5a074 (diff)
downloadekdosis-3e4e2ad21bc51bf48c71a8a42dc818b0d0cb01c4.tar.gz
rewrote \rdg
-rw-r--r--ekdosis.dtx65
1 files changed, 61 insertions, 4 deletions
diff --git a/ekdosis.dtx b/ekdosis.dtx
index 5a585a0..8a7c4e0 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -494,7 +494,7 @@ idno={}, msName={}, origDate={}][3]{%
494 \luadirect{ekdosis.appin( 494 \luadirect{ekdosis.appin(
495 \luastring{<\zref@extract{ekd:\theekd@lab}{abspage}>}, 495 \luastring{<\zref@extract{ekd:\theekd@lab}{abspage}>},
496 "no")}% 496 "no")}%
497 \luadirect{ekdosis.appin(\luastringN{#1}, "no")}% 497 \luadirect{ekdosis.appin(\luastringO{#1}, "no")}%
498 \luadirect{ekdosis.appin( 498 \luadirect{ekdosis.appin(
499 \luastring{</\zref@extract{ekd:\theekd@lab}{abspage}>}, 499 \luastring{</\zref@extract{ekd:\theekd@lab}{abspage}>},
500 "yes")}% 500 "yes")}%
@@ -518,6 +518,7 @@ idno={}, msName={}, origDate={}][3]{%
518\define@cmdkey[ekd]{lem}[ekdl@]{sep}{} 518\define@cmdkey[ekd]{lem}[ekdl@]{sep}{}
519\presetkeys[ekd]{lem}{sep=\ekdsep}{} 519\presetkeys[ekd]{lem}{sep=\ekdsep}{}
520\define@boolkeys[ekd]{lem}[ekdl@]{nolem, nosep}[true] 520\define@boolkeys[ekd]{lem}[ekdl@]{nolem, nosep}[true]
521\define@boolkeys[ekd]{rdg}[ekdr@]{nordg}[true]
521\NewDocumentCommand{\lem}{O{} m}{% 522\NewDocumentCommand{\lem}{O{} m}{%
522 #2% 523 #2%
523 \bgroup% 524 \bgroup%
@@ -534,7 +535,7 @@ idno={}, msName={}, origDate={}][3]{%
534 \else 535 \else
535 \ifdefined\ekdlr@post% 536 \ifdefined\ekdlr@post%
536 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi 537 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
537 {\textdir TRT#2}% 538 {\textdir TRT\unexpanded{#2}}%
538 \ifdefined\ekdlr@pre% 539 \ifdefined\ekdlr@pre%
539 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi 540 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
540 \fi 541 \fi
@@ -561,7 +562,7 @@ idno={}, msName={}, origDate={}][3]{%
561 \ifdefined\ekdlr@pre% 562 \ifdefined\ekdlr@pre%
562 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi 563 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
563 \ltx@ifpackageloaded{babel}% 564 \ltx@ifpackageloaded{babel}%
564 {{\noexpand\selectlanguage{\languagename}#2}}{#2}% 565 {{\noexpand\selectlanguage{\languagename}\unexpanded{#2}}}{#2}%
565 \ifdefined\ekdlr@post% 566 \ifdefined\ekdlr@post%
566 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi 567 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
567 \fi 568 \fi
@@ -577,6 +578,62 @@ idno={}, msName={}, origDate={}][3]{%
577 \fi% 578 \fi%
578 \egroup% 579 \egroup%
579} 580}
581\NewDocumentCommand{\rdg}{O{} m}{%
582 \bgroup%
583 \setkeys[ekd]{lemrdg,rdg}{#1}%
584 \ifekdr@nordg\append@app{}\else%
585 \ifbool{al@rlmode}{%
586 \edef\rdg@app{%
587 \ifdefined\ekdlr@alt
588 \ifdefined\ekdlr@post%
589 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
590 {\textdir TRT\unexpanded\expandafter{\ekdlr@alt}}
591 \ifdefined\ekdlr@pre%
592 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
593 \else
594 \ifdefined\ekdlr@post%
595 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
596 {\textdir TRT\unexpanded{#2}}%
597 \ifdefined\ekdlr@pre%
598 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
599 \fi
600 \ifdefined\ekdlr@postwit%
601 \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi
602 \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi
603 \ifdefined\ekdlr@prewit%
604 \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi
605 }%
606 }%
607 {%
608 \edef\rdg@app{%
609 \ifdefined\ekdlr@alt
610 \ifdefined\ekdlr@pre%
611 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
612 \ltx@ifpackageloaded{babel}%
613 {{\noexpand\selectlanguage{\languagename}%
614 \unexpanded\expandafter{\ekdlr@alt}}}%
615 {\unexpanded\expandafter{\ekdlr@alt}}
616 \ifdefined\ekdlr@post%
617 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
618 \else
619 \ifdefined\ekdlr@pre%
620 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
621 \ltx@ifpackageloaded{babel}%
622 {{\noexpand\selectlanguage{\languagename}\unexpanded{#2}}}{#2}%
623 \ifdefined\ekdlr@post%
624 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
625 \fi
626 \ifdefined\ekdlr@prewit%
627 \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi
628 \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi
629 \ifdefined\ekdlr@postwit%
630 \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi
631 }%
632 }%
633 \append@app{\rdg@app}%
634 \fi%
635 \egroup%
636}
580\newkeycommand+[\|]{\lemout}[wit, alt, pre, post, prewit, postwit, 637\newkeycommand+[\|]{\lemout}[wit, alt, pre, post, prewit, postwit,
581sep={\ekdsep}, choice nosep={false,,true}, 638sep={\ekdsep}, choice nosep={false,,true},
582choice nolem={false,,true}][1]{% 639choice nolem={false,,true}][1]{%
@@ -628,7 +685,7 @@ choice nolem={false,,true}][1]{%
628 |\fi|% 685 |\fi|%
629 }}% 686 }}%
630 |\fi|} 687 |\fi|}
631\newkeycommand+[\|]{\rdg}[wit, alt, pre, post, prewit, postwit, 688\newkeycommand+[\|]{\rdgout}[wit, alt, pre, post, prewit, postwit,
632choice nordg={false,,true}][1]{% 689choice nordg={false,,true}][1]{%
633 |\ifnum|% 690 |\ifnum|%
634 \commandkey{nordg}>0% 691 \commandkey{nordg}>0%