diff options
-rw-r--r-- | ekdosis.dtx | 68 |
1 files changed, 10 insertions, 58 deletions
diff --git a/ekdosis.dtx b/ekdosis.dtx index 80b4a81..9d5583f 100644 --- a/ekdosis.dtx +++ b/ekdosis.dtx | |||
@@ -638,9 +638,6 @@ Running "make install" installs the files in the local TeX tree. | |||
638 | \luadirect{ekdosis.storeabspg( | 638 | \luadirect{ekdosis.storeabspg( |
639 | \luastring{\zref@extract{ekd:\theekd@lab}{abspage}})}% | 639 | \luastring{\zref@extract{ekd:\theekd@lab}{abspage}})}% |
640 | \ifekd@state\add@apparatus\fi% | 640 | \ifekd@state\add@apparatus\fi% |
641 | % \luadirect{% | ||
642 | % ekdosis.storeabspg(\luastring{\zref@extract{ekd:\theekd@lab}{abspage}}, | ||
643 | % "pg_ii")}% | ||
644 | \luadirect{tex.sprint(ekdosis.removesp(\luastringN{#2}))}% | 641 | \luadirect{tex.sprint(ekdosis.removesp(\luastringN{#2}))}% |
645 | \ekd@isinappfalse} | 642 | \ekd@isinappfalse} |
646 | \def\current@ref@arg#1#2{{%\textdir TLT% | 643 | \def\current@ref@arg#1#2{{%\textdir TLT% |
@@ -930,9 +927,6 @@ Running "make install" installs the files in the local TeX tree. | |||
930 | \luadirect{ekdosis.storeabspg( | 927 | \luadirect{ekdosis.storeabspg( |
931 | \luastring{\zref@extract{ekd:\theekd@lab}{abspage}})}% | 928 | \luastring{\zref@extract{ekd:\theekd@lab}{abspage}})}% |
932 | \ifekd@state\add@apparatus\fi% | 929 | \ifekd@state\add@apparatus\fi% |
933 | % \luadirect{% | ||
934 | % ekdosis.storeabspg(\luastring{\zref@extract{ekd:\theekd@lab}{abspage}}, | ||
935 | % "pg_ii")}% | ||
936 | \ifekd@mapps% | 930 | \ifekd@mapps% |
937 | \ifnum% | 931 | \ifnum% |
938 | \luadirect{tex.sprint(ekdosis.get_bagunits(\luastringO{\ekdan@type}))} | 932 | \luadirect{tex.sprint(ekdosis.get_bagunits(\luastringO{\ekdan@type}))} |
@@ -1053,9 +1047,6 @@ Running "make install" installs the files in the local TeX tree. | |||
1053 | \NewDocumentCommand{\EkdosisStart}{}{% | 1047 | \NewDocumentCommand{\EkdosisStart}{}{% |
1054 | \stepcounter{ekd@lab}% | 1048 | \stepcounter{ekd@lab}% |
1055 | \zlabel{ekd:\theekd@lab}% | 1049 | \zlabel{ekd:\theekd@lab}% |
1056 | % \luadirect{% | ||
1057 | % ekdosis.storeabspg(\luastring{\zref@extract{ekd:\theekd@lab}{abspage}}, | ||
1058 | % "pg_i")}% | ||
1059 | } | 1050 | } |
1060 | \NewDocumentCommand{\EkdosisOn}{}{% | 1051 | \NewDocumentCommand{\EkdosisOn}{}{% |
1061 | \ekd@statetrue} | 1052 | \ekd@statetrue} |
@@ -1916,8 +1907,6 @@ function ekdosis.closestream() | |||
1916 | return true | 1907 | return true |
1917 | end | 1908 | end |
1918 | 1909 | ||
1919 | local pg_i = 0 | ||
1920 | local pg_ii = 0 | ||
1921 | local cur_abs_pg = 0 | 1910 | local cur_abs_pg = 0 |
1922 | 1911 | ||
1923 | function ekdosis.update_abspg(n) | 1912 | function ekdosis.update_abspg(n) |
@@ -1925,28 +1914,11 @@ function ekdosis.update_abspg(n) | |||
1925 | return true | 1914 | return true |
1926 | end | 1915 | end |
1927 | 1916 | ||
1928 | function ekdosis.get_abs_page() | 1917 | function ekdosis.storeabspg(n) |
1929 | return "i:" .. pg_i .. ", ii:" .. pg_ii .. ", abs:" .. cur_abs_pg | ||
1930 | end | ||
1931 | |||
1932 | function ekdosis.storeabspg(n, pg) | ||
1933 | if pg == "pg_i" then | ||
1934 | pg_i = n | ||
1935 | elseif pg == "pg_ii" then | ||
1936 | pg_ii = n | ||
1937 | end | ||
1938 | cur_abs_pg = n | 1918 | cur_abs_pg = n |
1939 | return true | 1919 | return true |
1940 | end | 1920 | end |
1941 | 1921 | ||
1942 | ekdosis.getabspg = function(pg) --not used | ||
1943 | if pg == "pg_i" then | ||
1944 | return pg_i | ||
1945 | elseif pg == "pg_ii" then | ||
1946 | return pg_ii | ||
1947 | end | ||
1948 | end | ||
1949 | |||
1950 | -- Build environments to be aligned | 1922 | -- Build environments to be aligned |
1951 | -- | 1923 | -- |
1952 | local aligned_texts = {} | 1924 | local aligned_texts = {} |
@@ -2213,36 +2185,16 @@ end | |||
2213 | local curcol_curabspg = {} | 2185 | local curcol_curabspg = {} |
2214 | 2186 | ||
2215 | function ekdosis.testapparatus() | 2187 | function ekdosis.testapparatus() |
2216 | -- if curcol ~= "x" | 2188 | if isfound(curcol_curabspg, curcol.."-"..cur_abs_pg) |
2217 | -- then | 2189 | then |
2218 | if isfound(curcol_curabspg, curcol.."-"..cur_abs_pg) | 2190 | return "\\boolfalse{do@app}" |
2219 | then | 2191 | else |
2220 | return "\\boolfalse{do@app}" | 2192 | table.insert(curcol_curabspg, curcol.."-"..cur_abs_pg) |
2221 | else | 2193 | if next(apparatuses) ~= nil then |
2222 | table.insert(curcol_curabspg, curcol.."-"..cur_abs_pg) | 2194 | reset_bagunits() |
2223 | if next(apparatuses) ~= nil then | ||
2224 | reset_bagunits() | ||
2225 | end | ||
2226 | return "\\booltrue{do@app}" | ||
2227 | end | 2195 | end |
2228 | -- else | 2196 | return "\\booltrue{do@app}" |
2229 | -- if tonumber(pg_ii) < tonumber(pg_i) | 2197 | end |
2230 | -- or tonumber(pg_ii) < tonumber(cur_abs_pg) then | ||
2231 | -- pg_i = cur_abs_pg | ||
2232 | -- if next(apparatuses) ~= nil then | ||
2233 | -- reset_bagunits() | ||
2234 | -- end | ||
2235 | -- return "\\booltrue{do@app}" | ||
2236 | -- elseif tonumber(pg_ii) == tonumber(pg_i) then | ||
2237 | -- return "\\boolfalse{do@app}" | ||
2238 | -- elseif tonumber(pg_ii) > tonumber(pg_i) then | ||
2239 | -- pg_i = cur_abs_pg | ||
2240 | -- if next(apparatuses) ~= nil then | ||
2241 | -- reset_bagunits() | ||
2242 | -- end | ||
2243 | -- return "\\booltrue{do@app}" | ||
2244 | -- end | ||
2245 | -- end | ||
2246 | end | 2198 | end |
2247 | 2199 | ||
2248 | local lnlabs = {} | 2200 | local lnlabs = {} |