Make module compatible with Lua 5.2, finally.

Makefile

@@ -2,17 +2,19 @@
 # --- the build documentation for more details. ---
 
 PREFIX=/usr/local
-MODDIR=$(PREFIX)/lib/lua/5.1
+MODDIR=$(PREFIX)/lib/lua/5.2
 DOCDIR=$(PREFIX)/share/doc/luahpdf
-LUALIB=-llua5.1
-LUAINC=-I/usr/include/lua5.1
+LUALIB=-llua5.2
+LUAINC=-I/usr/include/lua5.2
 HPDFLIB=-lhpdf
 HPDFINC=
+LUA=lua
+LUAC=luac
 
 # --- End of user settings, no need to change anything below this line. ---
 
 TARGET=hpdf.so
-PACKAGE=luahpdf-1.3
+PACKAGE=luahpdf-1.4
 TAR=$(PACKAGE).tar.gz
 ZIP=$(PACKAGE).zip
 
@@ -51,7 +53,7 @@ dump :
 	cc -E -dM -ansi -DHPDF_SHARED -pedantic -Wall -O2 $(CFLAGS) $(LUAINC) $(HPDFINC) -shared hpdf.c > $@
 
 test : $(TARGET)
-	@lua -e "package.path=[[]] package.cpath=[[./?.so;./?.dll]] require [[hpdf]] print(hpdf.VERSION_TEXT)"
+	$(LUA) -e "package.path=[[]] package.cpath=[[./?.so;./?.dll]] local hpdf = require [[hpdf]] print(hpdf.VERSION_TEXT)"
 
 all : test
 
@@ -83,13 +85,13 @@ package : clean doc
 	rm -fr $(PACKAGE)
 
 clean :
-	rm -f $(PDF) $(HTML) $(TARGET) $(TAR) $(ZIP) *.o
+	rm -f $(PDF) $(HTML) $(TARGET) $(TAR) $(ZIP) *.o dump
 
 .PHONY : main doc demo clean lib package test install
 
 $(HTML): doc/html/%.html: doc/text/%.txt
-	lua doc/txt2html.lua < $< > $@
+	$(LUA) doc/txt2html.lua < $< > $@
 
 $(PDF): %.pdf: %.lua $(TARGET)
-	@luac -l -p $< | grep SETGLOBAL; true
-	lua -e 'package.path="demo/?.lua;./?.lua" package.cpath="./?.so"' $<
+	@$(LUAC) -l -p $< | grep SETGLOBAL; true
+	$(LUA) -e 'package.path="demo/?.lua;./?.lua" package.cpath="./?.so"' $<

README

@@ -2,8 +2,8 @@ See documentation in doc/text (or equivalent documentation in HTML format in
 doc/html) for an explanation of what LuaHPDF is and how to compile and use it
 on your system.
 
-Developers on the Windows platform, please see notes provided by Clerk Ma in
-the windows directory.
+In order to build the library on the Windows platform, please see notes
+provided by Clerk Ma in the windows directory.
 
 Quick summary:
 

demo/arc_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local pdf = hpdf.New()

demo/common.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 
 function hpdf.print_grid(pdf, page)
   local height = hpdf.Page_GetHeight(page)
@@ -113,4 +113,4 @@ function save_to_file(pdf, script_name)
     io.stderr:write('Error writing to ', script_name, '\n')
   end
 end
- 
+

demo/encryption_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local pdf = hpdf.New()

demo/ext_gstate_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local function draw_circles(page, description, x, y)

demo/font_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local font_list = {

demo/grid_demo.lua

@@ -1,4 +1,4 @@
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local pdf = hpdf.New()

demo/hello_demo.lua

@@ -1,4 +1,4 @@
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local pdf = hpdf.New()

demo/line_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local function draw_line(page, x, y, label)

demo/link_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local function print_page(pdf, font, page_num)

demo/logo_demo.lua

@@ -1,4 +1,4 @@
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local function logodraw(pdf, page, width, left, bottom)

demo/outline_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local function print_page(page, page_num)

demo/permission_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local text = "User cannot print and copy this document."

demo/slide_show_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local function print_page(page, style, font, page_prev, page_next)

demo/text_demo.lua

@@ -15,7 +15,7 @@ It is provided "as is" without express or implied warranty.
 
 --]]--
 
-require "hpdf"
+local hpdf = require "hpdf"
 require "common"
 
 local function show_stripe_pattern(page, x, y)