diff --git a/Makefile b/Makefile
index b82a3af..8eb6f79 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,6 @@ $(CMAPDST)/to-unicode-Adobe-Korea1.pickle.gz:
$(CONV_CMAP) $(CMAPDST) Adobe-Korea1 $(CMAPSRC)/cid2code_Adobe_Korea1.txt cp949 euc-kr
test: cmap
- cd samples && $(MAKE) test CMP=cmp
+ cd samples && $(MAKE) test
test_clean:
-cd samples && $(MAKE) clean
diff --git a/samples/Makefile b/samples/Makefile
index aecabfb..6fb58ae 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -1,11 +1,10 @@
# GNUMakefile for test
RM=rm -f
-#CMP=cmp
CMP=:
PYTHON=python2
-PDF2TXT=PYTHONPATH=.. $(PYTHON) ../tools/pdf2txt.py -p1
+PDF2TXT=PYTHONPATH=.. $(PYTHON) ../tools/pdf2txt.py -p1 -V
HTMLS=$(HTMLS_FREE) $(HTMLS_NONFREE)
HTMLS_FREE= \
@@ -49,9 +48,10 @@ XMLS_NONFREE= \
nonfree/naacl06-shinyama.xml \
nonfree/nlp2004slides.xml
-all: test
+all: htmls texts xmls
-test: htmls texts xmls
+test:
+ $(MAKE) all CMP=cmp
clean:
-$(RM) $(HTMLS)
diff --git a/samples/jo.xml.ref b/samples/jo.xml.ref
index 5610191..a659c99 100644
--- a/samples/jo.xml.ref
+++ b/samples/jo.xml.ref
@@ -1169,20 +1169,20 @@
-
-
+
-
+
+
diff --git a/samples/nonfree/dmca.xml.ref b/samples/nonfree/dmca.xml.ref
index 6326320..1115971 100644
--- a/samples/nonfree/dmca.xml.ref
+++ b/samples/nonfree/dmca.xml.ref
@@ -2178,7 +2178,6 @@
-
@@ -2227,4 +2226,5 @@
+
diff --git a/samples/nonfree/f1040nr.html.ref b/samples/nonfree/f1040nr.html.ref
index d83b46b..325d836 100644
--- a/samples/nonfree/f1040nr.html.ref
+++ b/samples/nonfree/f1040nr.html.ref
@@ -18,22 +18,52 @@
Estate or Trust
Type of entry visa (see page 8)
䊳
+
1040NR
+
+ Form
+ Department of the Treasury
+ beginning
+ Internal Revenue Service
+
+ Your first name and initial
+
U.S. Nonresident Alien Income Tax Return
+
+ For the year January 1–December 31, 2007, or other tax year
+
+
, 2007, and ending
+ Last name
+
+
resent home address (number, street, and apt. no., or rural route). If you have a P.O. box, see page 8.
+
+
City, town or post office, state, and ZIP code. If you have a foreign address, see page 8.
+
+
Country 䊳
+ Of what country were you a citizen or national during the tax year? 䊳
+
+
+ Give address in the country where you are a permanent resident.
+ Give address outside the United States to which you want any
+ refund check mailed. If same as above, write “Same.”
+ If same as above, write “Same.”
+
+
7a
Yourself
7b
Spouse
-
䊳
-
-
䊳
-
-
䊳
-
- 䊳
-
- 䊳
-
+
兵
+
䊳
+
䊳
+
䊳
+
䊳
+
䊳
+
+
+
+
+
No. of boxes checked
on 7a and 7b
@@ -54,44 +84,23 @@
Form 1040NR (2007)
- Form
- Department of the Treasury
- beginning
- Internal Revenue Service
-
- Your first name and initial
-
U.S. Nonresident Alien Income Tax Return
-
- For the year January 1–December 31, 2007, or other tax year
-
-
, 2007, and ending
- Last name
-
-
resent home address (number, street, and apt. no., or rural route). If you have a P.O. box, see page 8.
-
City, town or post office, state, and ZIP code. If you have a foreign address, see page 8.
-
-
Country 䊳
- Of what country were you a citizen or national during the tax year? 䊳
-
-
- Give address in the country where you are a permanent resident.
- Give address outside the United States to which you want any
- refund check mailed. If same as above, write “Same.”
- If same as above, write “Same.”
-
-
-
34 Add lines 24 through 33
+ Subtract line 34 from line 23. Enter here and on line 36. This is your adjusted gross income 䊳
35
- Subtract line 34 from line 23. Enter here and on line 36. This is your adjusted gross income 䊳
For Disclosure, Privacy Act, and Paperwork Reduction Act Notice, see page 32.
@@ -317,12 +311,18 @@
b
retirement plan and your 2008 modified
AGI is less than $63,000 ($105,000) if a
diff --git a/samples/nonfree/i1040nr.txt.ref b/samples/nonfree/i1040nr.txt.ref
index 3d8a05c..83f3b0b 100644
--- a/samples/nonfree/i1040nr.txt.ref
+++ b/samples/nonfree/i1040nr.txt.ref
@@ -128,10 +128,10 @@ be able to deduct up to $5,000 ($6,000
the instructions for line 8 on page 10.
if age 50 or older at the end of the
Mailing your return.
- If you are filing
year). You may be able to take an IRA
-deduction if you were covered by a
+ If you are filing
the return for an estate or trust, you will
+deduction if you were covered by a
Cat. No. 11368V
diff --git a/samples/nonfree/i1040nr.xml.ref b/samples/nonfree/i1040nr.xml.ref
index 7aad6ef..434d505 100644
--- a/samples/nonfree/i1040nr.xml.ref
+++ b/samples/nonfree/i1040nr.xml.ref
@@ -4290,28 +4290,6 @@
-
-
-I
-f
-
-y
-o
-u
-
-a
-r
-e
-
-f
-i
-l
-i
-n
-g
-
-
-ye
@@ -4353,41 +4331,25 @@
-
-d
-e
-d
-u
-c
-t
-i
-o
-n
-
-i
-f
-
-y
-o
-u
-
-w
-e
-r
-e
-
-c
-o
-v
-e
-r
-e
-d
-
-b
-y
-
-a
+
+
+I
+f
+
+y
+o
+u
+
+a
+r
+e
+
+f
+i
+l
+i
+n
+g
@@ -4438,6 +4400,44 @@
+
+d
+e
+d
+u
+c
+t
+i
+o
+n
+
+i
+f
+
+y
+o
+u
+
+w
+e
+r
+e
+
+c
+o
+v
+e
+r
+e
+d
+
+b
+y
+
+a
+
+
+
@@ -6269,7 +6269,6 @@
-
@@ -6297,4 +6296,5 @@
+
diff --git a/samples/nonfree/kampo.html.ref b/samples/nonfree/kampo.html.ref
index d6ec1fd..b75bf29 100644
--- a/samples/nonfree/kampo.html.ref
+++ b/samples/nonfree/kampo.html.ref
@@ -25,29 +25,29 @@