aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2018-10-01 14:38:32 +0200
committerRobert Alessi <alessi@robertalessi.net>2018-10-01 14:38:32 +0200
commita8382bef1137282b73746284ee16ea0228f492be (patch)
treebb1b2a94e3a2215c815d45cbcfcd25c88965de50
parent645fb1f4ce14786b70f2d9a3446b8fa407b4ea0f (diff)
downloadarabluatex-a8382bef1137282b73746284ee16ea0228f492be.tar.gz
fixed conflict between origin and master
-rw-r--r--arabluatex.lua7
1 files changed, 0 insertions, 7 deletions
diff --git a/arabluatex.lua b/arabluatex.lua
index 34f59e9..ab92174 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -832,18 +832,11 @@ function al_closestream()
832 end) 832 end)
833 if string.find(t, "\\begin%s?{document}.-\\arb%s?[%[%{]") or 833 if string.find(t, "\\begin%s?{document}.-\\arb%s?[%[%{]") or
834 string.find(t, "\\begin%s?{document}.-\\[Uu]c%s?%b{}") 834 string.find(t, "\\begin%s?{document}.-\\[Uu]c%s?%b{}")
835<<<<<<< HEAD
836 then 835 then
837 tex.print([[\unexpanded{\PackageWarningNoLine{arabluatex}{ 836 tex.print([[\unexpanded{\PackageWarningNoLine{arabluatex}{
838 There are still 'arabtex' strings to be converted. 837 There are still 'arabtex' strings to be converted.
839 Please open ]] .. tex.jobname .. utffilesuffix .. ".tex" .. 838 Please open ]] .. tex.jobname .. utffilesuffix .. ".tex" ..
840 [[ and compile it one more time}}]]) 839 [[ and compile it one more time}}]])
841=======
842 then
843 tex.print([[\unexpanded{\PackageWarningNoLine{arabluatex}{There are still 'arabtex' strings
844 to be converted. Please open ]] .. tex.jobname .. utffilesuffix .. ".tex" ..
845 [[ and compile it one more time}}]])
846>>>>>>> 71471d41f59ab197bd5004ab5f177e4d853da84e
847 else end 840 else end
848 t = t.."\n\\end{document}" 841 t = t.."\n\\end{document}"
849 io.write(t) 842 io.write(t)