Merge branch 'master' of nlp.pwr.wroc.pl:corpus2

CMakeLists.txt

@@ -69,10 +69,6 @@ FIND_PATH(LIBCORPUS2_SRC_DATA_DIR
 )
 MARK_AS_ADVANCED(LIBCORPUS2_SRC_DATA_DIR)
 
-add_subdirectory(libpwrutils)
-add_subdirectory(libcorpus2)
-add_subdirectory(libcorpus2_whole)
-
 if(CORPUS2_BUILD_POLIQARP)
 	add_subdirectory(poliqarp-library)
 	add_subdirectory(poliqarp)
@@ -81,6 +77,9 @@ else()
 	message(STATUS "Not building Poliqarp library and wrapper")
 endif(CORPUS2_BUILD_POLIQARP)
 
+add_subdirectory(libpwrutils)
+add_subdirectory(libcorpus2)
+add_subdirectory(libcorpus2_whole)
 add_subdirectory(corpus2tools)
 add_subdirectory(tests)
 

corpus2data/nkjp.tagset

@@ -35,8 +35,8 @@ depr	nmb cas gnd
 ger	nmb cas gnd asp ngt
 ppron12	nmb cas gnd per [acn]
 ppron3	nmb cas gnd per [acn] [ppr]
-num	nmb cas gnd acm
-numcol	nmb cas gnd acm
+num	nmb cas gnd [acm]
+numcol	nmb cas gnd [acm]
 adj	nmb cas gnd deg
 pact	nmb cas gnd asp ngt
 ppas	nmb cas gnd asp ngt

corpus2data/sgjp.tagset

@@ -35,8 +35,8 @@ depr	nmb cas gnd
 ger	nmb cas gnd asp ngt
 ppron12	nmb cas gnd per [acn]
 ppron3	nmb cas gnd per [acn] [ppr]
-num	nmb cas gnd acm
-numcol	nmb cas gnd acm
+num	nmb cas gnd [acm]
+numcol	nmb cas gnd [acm]
 adj	nmb cas gnd deg
 pact	nmb cas gnd asp ngt
 ppas	nmb cas gnd asp ngt