diff --git a/samples/Makefile b/samples/Makefile index 6fb58ae..8a1befa 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -65,13 +65,13 @@ xmls: $(XMLS) .SUFFIXES: .pdf .html .xml .txt .pdf.html: - $(PDF2TXT) -t html $< > $@ + $(PDF2TXT) -t html -o $@ $< $(CMP) $@ $@.ref .pdf.xml: - $(PDF2TXT) -t xml $< > $@ + $(PDF2TXT) -t xml -o $@ $< $(CMP) $@ $@.ref .pdf.txt: - $(PDF2TXT) -t text $< > $@ + $(PDF2TXT) -t text -o $@ $< $(CMP) $@ $@.ref diff --git a/samples/nonfree/f1040nr.html.ref b/samples/nonfree/f1040nr.html.ref index 325d836..6fe7f16 100644 --- a/samples/nonfree/f1040nr.html.ref +++ b/samples/nonfree/f1040nr.html.ref @@ -18,21 +18,6 @@
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. @@ -47,6 +32,26 @@
If same as above, write “Same.”

+
U.S. Nonresident Alien Income Tax Return +
+
For the year January 1–December 31, 2007, or other tax year +
+
, 2007, and ending +
Last name +
+
1040NR +
+
Form +
Department of the Treasury +
beginning +
Internal Revenue Service +
+
Your first name and initial +
P +
Please print or type. +
+
Also attach Form(s) 1099-R if tax was withheld. +
Attach Forms W-2 here.
7a
Yourself
@@ -187,10 +192,10 @@
.

-

-
+

+


9b
Total number of exemptions claimed @@ -312,17 +317,12 @@

Adjusted Gross Income
-


+
+

d
-
P -
Please print or type. -
-
Also attach Form(s) 1099-R if tax was withheld. -
Attach Forms W-2 here. -

diff --git a/samples/nonfree/f1040nr.txt.ref b/samples/nonfree/f1040nr.txt.ref index a7c209e..aa51a59 100644 --- a/samples/nonfree/f1040nr.txt.ref +++ b/samples/nonfree/f1040nr.txt.ref @@ -18,24 +18,6 @@ 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. @@ -54,6 +36,33 @@ If same as above, write “Same.” +U.S. Nonresident Alien Income Tax Return + +For the year January 1–December 31, 2007, or other tax year + + +, 2007, and ending +Last name + + +1040NR + +Form +Department of the Treasury +beginning +Internal Revenue Service + +Your first name and initial + + P + +Please print or type. + + + +Also attach Form(s) 1099-R if tax was withheld. +Attach Forms W-2 here. + 7a Yourself @@ -367,18 +376,9 @@ Adjusted Gross Income + + d - P - -Please print or type. - - - -Also attach Form(s) 1099-R if tax was withheld. -Attach Forms W-2 here. - - - \ No newline at end of file diff --git a/samples/nonfree/f1040nr.xml.ref b/samples/nonfree/f1040nr.xml.ref index 2c90da3..b778aad 100644 --- a/samples/nonfree/f1040nr.xml.ref +++ b/samples/nonfree/f1040nr.xml.ref @@ -217,330 +217,7 @@ - - -1 -0 -4 -0 -N -R - - - - - - - - - -F -o -r -m - - - - - -D -e -p -a -r -t -m -e -n -t - - -o -f - - -t -h -e - - -T -r -e -a -s -u -r -y - - - - -b -e -g -i -n -n -i -n -g - - - - -I -n -t -e -r -n -a -l - - -R -e -v -e -n -u -e - - -S -e -r -v -i -c -e - - - - - - - - - -Y -o -u -r - - -f -i -r -s -t - - -n -a -m -e - - -a -n -d - - -i -n -i -t -i -a -l - - - - - - -U -. -S -. - - -N -o -n -r -e -s -i -d -e -n -t - - -A -l -i -e -n - - -I -n -c -o -m -e - - -T -a -x - - -R -e -t -u -r -n - - - - - - - - - -F -o -r - - -t -h -e - - -y -e -a -r - - -J -a -n -u -a -r -y - - -1 -– -D -e -c -e -m -b -e -r - - -3 -1 -, - - -2 -0 -0 -7 -, - - -o -r - - -o -t -h -e -r - - -t -a -x - - -y -e -a -r - - - - - - - - - - - -, - - -2 -0 -0 -7 -, - - -a -n -d - - -e -n -d -i -n -g - - - - - -L -a -s -t - - -n -a -m -e - - - - - - - - - - + r e @@ -668,14 +345,14 @@ - + - + C i @@ -793,7 +470,7 @@ - + C o @@ -1154,7 +831,452 @@ - + + +U +. +S +. + + +N +o +n +r +e +s +i +d +e +n +t + + +A +l +i +e +n + + +I +n +c +o +m +e + + +T +a +x + + +R +e +t +u +r +n + + + + + + + + + +F +o +r + + +t +h +e + + +y +e +a +r + + +J +a +n +u +a +r +y + + +1 +– +D +e +c +e +m +b +e +r + + +3 +1 +, + + +2 +0 +0 +7 +, + + +o +r + + +o +t +h +e +r + + +t +a +x + + +y +e +a +r + + + + + + + + + + + +, + + +2 +0 +0 +7 +, + + +a +n +d + + +e +n +d +i +n +g + + + + + +L +a +s +t + + +n +a +m +e + + + + + + + + + + + +1 +0 +4 +0 +N +R + + + + + + + + + +F +o +r +m + + + + + +D +e +p +a +r +t +m +e +n +t + + +o +f + + +t +h +e + + +T +r +e +a +s +u +r +y + + + + +b +e +g +i +n +n +i +n +g + + + + +I +n +t +e +r +n +a +l + + +R +e +v +e +n +u +e + + +S +e +r +v +i +c +e + + + + + + + + + +Y +o +u +r + + +f +i +r +s +t + + +n +a +m +e + + +a +n +d + + +i +n +i +t +i +a +l + + + + + + + + +P + + + + + + +P +l +e +a +s +e + +p +r +i +n +t + +o +r + +t +y +p +e +. + + + + + + + + + + + + + +A +l +s +o + +a +t +t +a +c +h + +F +o +r +m +( +s +) + +1 +0 +9 +9 +- +R + +i +f + +t +a +x + +w +a +s + +w +i +t +h +h +e +l +d +. + + + + +A +t +t +a +c +h + +F +o +r +m +s + +W +- +2 + +h +e +r +e +. + + + + + 7 a @@ -1180,7 +1302,7 @@ - + 7 b @@ -1204,7 +1326,7 @@ - + 兵 @@ -1212,77 +1334,77 @@ - + 䊳 - + 䊳 - + 䊳 - + 䊳 - + 䊳 - + - + - + - + - + - + N o @@ -1511,7 +1633,7 @@ - + d d @@ -1579,7 +1701,7 @@ - + A @@ -1587,7 +1709,7 @@ - + 1 0 @@ -1597,7 +1719,7 @@ - + 1 1 @@ -1678,7 +1800,7 @@ - + 2 3 @@ -1687,7 +1809,7 @@ - + 3 4 @@ -1703,7 +1825,7 @@ - + F o @@ -1733,7 +1855,7 @@ - + ( 3 @@ -1786,7 +1908,7 @@ - + ( 4 @@ -1871,7 +1993,7 @@ - + @@ -1954,14 +2076,14 @@ - + - + 其 @@ -1969,7 +2091,7 @@ - + F i @@ -2774,7 +2896,7 @@ - + ( 1 @@ -2801,7 +2923,7 @@ - + L a @@ -2822,7 +2944,7 @@ - + ( 2 @@ -3033,35 +3155,35 @@ - - - - - - - - + - - - + + + - + - + + + + + + + + @@ -3069,7 +3191,7 @@ - + 9 b @@ -3078,7 +3200,7 @@ - + T o @@ -5537,7 +5659,7 @@ - + I n @@ -5596,7 +5718,7 @@ - + E n @@ -5642,7 +5764,7 @@ - + 8 @@ -5689,7 +5811,7 @@ - + A d @@ -5716,35 +5838,42 @@ - + - - - - - - - - + - + - + + + + + + + + + + + + + + + d @@ -5756,141 +5885,12 @@ - - - - -P - - - - - - -P -l -e -a -s -e - -p -r -i -n -t - -o -r - -t -y -p -e -. - - - - - - - - - - - - - -A -l -s -o - -a -t -t -a -c -h - -F -o -r -m -( -s -) - -1 -0 -9 -9 -- -R - -i -f - -t -a -x - -w -a -s - -w -i -t -h -h -e -l -d -. - - - - -A -t -t -a -c -h - -F -o -r -m -s - -W -- -2 - -h -e -r -e -. - - - - - - - - - - - - - - - - - + + + + + + @@ -6001,8 +6001,8 @@ - - + + @@ -6017,27 +6017,26 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - @@ -6051,69 +6050,81 @@ - - - - - - - - + + - + - - + + + + + + + + + + + + + + - + + + + + + + - - + + - + - + - + - - + + - + - + - + - - + + - + - + - - + + @@ -6121,14 +6132,14 @@ - - + + - + - + - + @@ -6137,89 +6148,78 @@ - - + + - + - + - - + + - - + + - + - + - + + + + - + - + + - - - - - + - - + + - + - + - + - + + + + + + + - - - - - - - + + + - - - - - - - - - - - - - diff --git a/samples/nonfree/i1040nr.xml.ref b/samples/nonfree/i1040nr.xml.ref index 434d505..957bf67 100644 --- a/samples/nonfree/i1040nr.xml.ref +++ b/samples/nonfree/i1040nr.xml.ref @@ -6254,21 +6254,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + + diff --git a/samples/nonfree/kampo.xml.ref b/samples/nonfree/kampo.xml.ref index e38a0b3..845285e 100644 --- a/samples/nonfree/kampo.xml.ref +++ b/samples/nonfree/kampo.xml.ref @@ -3128,7 +3128,7 @@ - + diff --git a/samples/simple2.xml.ref b/samples/simple2.xml.ref index b8f948f..58d703a 100644 --- a/samples/simple2.xml.ref +++ b/samples/simple2.xml.ref @@ -4,6 +4,6 @@ - + diff --git a/samples/simple3.xml.ref b/samples/simple3.xml.ref index 027e933..bd8d5d2 100644 --- a/samples/simple3.xml.ref +++ b/samples/simple3.xml.ref @@ -58,15 +58,15 @@ - + - +