aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2020-02-21 10:12:30 +0100
committerRobert Alessi <alessi@robertalessi.net>2020-02-21 10:12:30 +0100
commitbe0d79c762cdf06895110e3a623fef28a6773054 (patch)
tree93f25b11828fa3f96f127a08f7a3f60912cc1d9c
parente2e5367e1259dc26656ccecaa155f60ee7addd4a (diff)
downloadekdosis-be0d79c762cdf06895110e3a623fef28a6773054.tar.gz
better handling of hspace between the margin and the first unit (still needs improvement though)
-rw-r--r--ekdosis.dtx32
1 files changed, 16 insertions, 16 deletions
diff --git a/ekdosis.dtx b/ekdosis.dtx
index 927866e..28b25a3 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -570,7 +570,7 @@ Running "make install" installs the files in the local TeX tree.
570 \nobreak% 570 \nobreak%
571 \vspace{-\parskip}% 571 \vspace{-\parskip}%
572 \noindent% 572 \noindent%
573 \ignorespaces } 573 \ignorespaces}
574\NewDocumentCommand{\SetDefaultRule}{m}{% 574\NewDocumentCommand{\SetDefaultRule}{m}{%
575 \def\@tempa{#1} 575 \def\@tempa{#1}
576 \ifx\@tempa\empty\def\ekd@default@rule{\mbox{}}% 576 \ifx\@tempa\empty\def\ekd@default@rule{\mbox{}}%
@@ -659,7 +659,7 @@ Running "make install" installs the files in the local TeX tree.
659 \getrefnumber{#1}% 659 \getrefnumber{#1}%
660 \fi% 660 \fi%
661 }% 661 }%
662 {\getrefnumber{#1}} 662 {\getrefnumber{#1}}%
663 \else 663 \else
664 \ifsubsq@unit% 664 \ifsubsq@unit%
665 % 665 %
@@ -685,7 +685,7 @@ Running "make install" installs the files in the local TeX tree.
685 \getpagerefnumber{#2}.% 685 \getpagerefnumber{#2}.%
686 \getrefnumber{#2}% 686 \getrefnumber{#2}%
687 \fi% 687 \fi%
688 } 688 }%
689 }% 689 }%
690\def\current@ref{{\textdir TLT\noexpand\bfseries% 690\def\current@ref{{\textdir TLT\noexpand\bfseries%
691 \ifnum% 691 \ifnum%
@@ -706,7 +706,7 @@ Running "make install" installs the files in the local TeX tree.
706 \else 706 \else
707 \getrefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-b}% 707 \getrefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-b}%
708 \fi% 708 \fi%
709 }{\getrefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-b}} 709 }{\getrefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-b}}%
710 \else 710 \else
711 \ifsubsq@unit% 711 \ifsubsq@unit%
712 % 712 %
@@ -732,7 +732,7 @@ Running "make install" installs the files in the local TeX tree.
732 \getpagerefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-e}.% 732 \getpagerefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-e}.%
733 \getrefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-e}% 733 \getrefnumber{\luadirect{tex.sprint(ekdosis.getlnlab())}-e}%
734 \fi% 734 \fi%
735 } 735 }%
736 }% 736 }%
737\define@cmdkeys[ekd]{lemrdg}[ekdlr@]{wit, alt, pre, post, prewit, 737\define@cmdkeys[ekd]{lemrdg}[ekdlr@]{wit, alt, pre, post, prewit,
738 postwit} 738 postwit}
@@ -763,7 +763,7 @@ Running "make install" installs the files in the local TeX tree.
763 \else% 763 \else%
764 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% 764 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi%
765 \fi% 765 \fi%
766 \current@ref}%\hskip .25em}% 766 \current@ref{} }%\hskip .25em}%
767 \else% 767 \else%
768 \ifbool{al@rlmode}{% 768 \ifbool{al@rlmode}{%
769 \edef\lem@app{% 769 \edef\lem@app{%
@@ -774,7 +774,7 @@ Running "make install" installs the files in the local TeX tree.
774 \else% 774 \else%
775 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% 775 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi%
776 \fi% 776 \fi%
777 \current@ref%\hskip .25em 777 \current@ref{} %\hskip .25em
778 \ifdefined\ekdlr@alt% 778 \ifdefined\ekdlr@alt%
779 \ifdefined\ekdlr@post% 779 \ifdefined\ekdlr@post%
780 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi 780 \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
@@ -805,7 +805,7 @@ Running "make install" installs the files in the local TeX tree.
805 \else% 805 \else%
806 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% 806 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi%
807 \fi% 807 \fi%
808 \current@ref%\hskip .25em 808 \current@ref{} %\hskip .25em
809 \ifdefined\ekdlr@alt% 809 \ifdefined\ekdlr@alt%
810 \ifdefined\ekdlr@pre% 810 \ifdefined\ekdlr@pre%
811 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi 811 \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
@@ -951,7 +951,7 @@ Running "make install" installs the files in the local TeX tree.
951 \else% 951 \else%
952 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% 952 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi%
953 \fi% 953 \fi%
954 \current@ref@arg{\ekdn@labelb}{\ekdn@labele}%\hskip .25em 954 \current@ref@arg{\ekdn@labelb}{\ekdn@labele} %\hskip .25em
955 \ifdefined\ekdn@lem% 955 \ifdefined\ekdn@lem%
956 {\textdir TRT\unexpanded\expandafter{\ekdn@lem}}% 956 {\textdir TRT\unexpanded\expandafter{\ekdn@lem}}%
957 \unexpanded\expandafter{\ekdn@sep}\else\fi% 957 \unexpanded\expandafter{\ekdn@sep}\else\fi%
@@ -964,7 +964,7 @@ Running "make install" installs the files in the local TeX tree.
964 \else% 964 \else%
965 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% 965 \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi%
966 \fi% 966 \fi%
967 \current@ref@arg{\ekdn@labelb}{\ekdn@labele}%\hskip .25em 967 \current@ref@arg{\ekdn@labelb}{\ekdn@labele} %\hskip .25em
968 \ifdefined\ekdn@lem 968 \ifdefined\ekdn@lem
969 \ltx@ifpackageloaded{babel}% 969 \ltx@ifpackageloaded{babel}%
970 {\noexpand\selectlanguage{\languagename}% 970 {\noexpand\selectlanguage{\languagename}%
@@ -1970,7 +1970,7 @@ function ekdosis.appout()
1970 local output = {} 1970 local output = {}
1971 if next(apparatuses) == nil then 1971 if next(apparatuses) == nil then
1972 -- table.insert(output, "BEGIN") 1972 -- table.insert(output, "BEGIN")
1973 table.insert(output, "\\noindent\\csname ekd@default@rule\\endcsname\\NLS\\noindent ") 1973 table.insert(output, "\\noindent\\csname ekd@default@rule\\endcsname\\NLS{}")
1974-- table.insert(output, "\\noindent ") 1974-- table.insert(output, "\\noindent ")
1975 for i in string.gmatch(t, 1975 for i in string.gmatch(t,
1976 "<"..cur_abs_pg.."%-0>.-</"..cur_abs_pg.."%-0>") 1976 "<"..cur_abs_pg.."%-0>.-</"..cur_abs_pg.."%-0>")
@@ -1997,7 +1997,7 @@ function ekdosis.appout()
1997 then 1997 then
1998 if n > 1 1998 if n > 1
1999 then 1999 then
2000 table.insert(output, "\\NLS\\noindent ") 2000 table.insert(output, "\\NLS{}")
2001 else 2001 else
2002 table.insert(output, "\\noindent ") 2002 table.insert(output, "\\noindent ")
2003 end 2003 end
@@ -2005,18 +2005,18 @@ function ekdosis.appout()
2005 then 2005 then
2006 if n > 1 2006 if n > 1
2007 then 2007 then
2008 table.insert(output, "\\NLS{}" .. apparatuses[n].rule .. "\\NLS\\noindent ") 2008 table.insert(output, "\\NLS{}" .. apparatuses[n].rule .. "\\NLS{}")
2009 else 2009 else
2010-- table.insert(output, "\\noindent ") 2010-- table.insert(output, "\\noindent ")
2011 table.insert(output, apparatuses[n].rule .. "\\NLS\\noindent ") 2011 table.insert(output, apparatuses[n].rule .. "\\NLS{}")
2012 end 2012 end
2013 else 2013 else
2014 if n > 1 2014 if n > 1
2015 then 2015 then
2016 table.insert(output, "\\NLS\\csname ekd@default@rule\\endcsname\\NLS\\noindent ") 2016 table.insert(output, "\\NLS\\csname ekd@default@rule\\endcsname\\NLS{}")
2017 else 2017 else
2018-- table.insert(output, "\\noindent ") 2018-- table.insert(output, "\\noindent ")
2019 table.insert(output, "\\csname ekd@default@rule\\endcsname\\NLS\\noindent ") 2019 table.insert(output, "\\csname ekd@default@rule\\endcsname\\NLS{}")
2020 end 2020 end
2021 end 2021 end
2022 if apparatuses[n].sep ~= "" 2022 if apparatuses[n].sep ~= ""