testdata changed

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

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)

samples/jo.xml.ref

@@ -1169,20 +1169,20 @@
 </text>
 </textline>
 </textbox>
-</page>
 <layout>
 <textgroup bbox="74.836,46.684,727.149,556.917">
-<textgroup bbox="168.846,277.813,727.149,556.917">
 <textgroup bbox="715.703,277.813,727.149,547.331">
 <textbox id="0" bbox="715.703,518.573,727.149,547.331" />
 <textbox id="1" bbox="715.703,277.813,727.149,287.399" />
 </textgroup>
+<textgroup bbox="74.836,46.684,671.450,556.917">
 <textbox id="2" bbox="168.846,346.025,671.450,556.917" />
-</textgroup>
 <textgroup bbox="74.836,46.684,638.212,287.399">
 <textbox id="3" bbox="101.735,95.679,638.212,287.399" />
 <textbox id="4" bbox="74.836,46.684,86.282,190.474" />
 </textgroup>
 </textgroup>
+</textgroup>
 </layout>
+</page>
 </pages>

samples/nonfree/dmca.xml.ref

@@ -2178,7 +2178,6 @@
 <figure name="im1" bbox="285.360,636.480,329.760,678.720">
 <image width="44" height="42" />
 </figure>
-</page>
 <layout>
 <textgroup bbox="72.000,78.240,504.108,728.163">
 <textbox id="0" bbox="138.240,695.179,473.675,728.163" />
@@ -2227,4 +2226,5 @@
 </textgroup>
 </textgroup>
 </layout>
+</page>
 </pages>

samples/nonfree/f1040nr.txt.ref

@@ -18,6 +18,42 @@ 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
 
@@ -26,17 +62,26 @@ Yourself
 Spouse
 
 
+兵 
+
 䊳
-
 
 䊳
-
 
 䊳
- 
+
 䊳
- 
+
 䊳
+
+
+
+
+
+
+
+
+
 
 
 No.  of  boxes  checked
@@ -62,58 +107,28 @@ on  lines  above
 
  A
 
-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.”
-
-
-
-  P
-
-
+10a 
 
-Please print or type.
+11 
+12 
+13 
+14 
+15 
+16b 
+17b 
+18 
+19 
+20 
+21 
 
-
+23 
 
-Also attach Form(s) 1099-R if tax was withheld.
-Attach Forms W-2 here.
+34 
+35 
 
+Form 1040NR  (2007)
 
 
-兵 
-
-If  you  check  box  7b,  enter  your  spouse’s
-identifying  number 䊳
-
 (3) Dependent’s
 relationship
 to  you
@@ -126,6 +141,8 @@ credit  (see  page  9)
 
 
 
+If  you  check  box  7b,  enter  your  spouse’s
+identifying  number 䊳
 
 
 
@@ -207,28 +224,6 @@ identifying  number
 
 
 
-10a 
-
-11 
-12 
-13 
-14 
-15 
-16b 
-17b 
-18 
-19 
-20 
-21 
-
-23 
-
-34 
-35 
-
-d
-
-
 
 
 
@@ -340,8 +335,8 @@ Domestic  production  activities  deduction.  Attach  Form  8903
 
 34 
 Add  lines  24  through  33
-35 
 Subtract  line  34  from  line  23.  Enter  here  and  on  line  36.  This  is  your adjusted  gross  income 䊳
+35 
 
 
 For Disclosure,  Privacy  Act,  and  Paperwork Reduction  Act Notice,  see  page  32.
@@ -372,7 +367,18 @@ Adjusted Gross Income
 
 
 
-Form 1040NR  (2007)
+d
+
+
+  P
+
+Please print or type.
+
+
+
+Also attach Form(s) 1099-R if tax was withheld.
+Attach Forms W-2 here.
+