--- parser3/src/classes/op.C	2020/06/27 09:45:49	1.255
+++ parser3/src/classes/op.C	2020/11/10 22:42:24	1.258
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.255 2020/06/27 09:45:49 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.258 2020/11/10 22:42:24 moko Exp $";
 
 // defines
 
@@ -200,7 +200,7 @@ static void _process(Request& r, MethodP
 					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			}
 
-		uint processe_file_no=file_alias ? r.register_file(r.absolute(*file_alias)) : pseudo_file_no__process;
+		uint processe_file_no=file_alias ? r.register_file(r.full_disk_path(*file_alias)) : pseudo_file_no__process;
 		// process...{string}
 		Value& vjunction=params.as_junction(index, "body must be code");
 		// evaluate source to process
@@ -281,8 +281,9 @@ static void _while(Request& r, MethodPar
 static void _use(Request& r, MethodParams& params) {
 	Value& vfile=params.as_no_junction(0, FILE_NAME_MUST_NOT_BE_CODE);
 
-	bool allow_class_replace=false;
 	const String* use_origin=0;
+	bool allow_class_replace=false;
+	bool load_auto_p=false;
 
 	if(params.count()==2)
 		if(HashStringValue* options=params.as_hash(1)) {
@@ -292,14 +293,19 @@ static void _use(Request& r, MethodParam
 				String::Body key=i.key();
 				Value* value=i.value();
 
+				if(key == "origin") {
+					valid_options++;
+					use_origin=&value->as_string();
+				}
+
 				if(key == "replace") {
 					valid_options++;
 					allow_class_replace=r.process(*value).as_bool();
 				}
 
-				if(key == "origin") {
+				if(key == "main") {
 					valid_options++;
-					use_origin=&value->as_string();
+					load_auto_p=r.process(*value).as_bool();
 				}
 
 				if(valid_options!=options->count())
@@ -313,7 +319,7 @@ static void _use(Request& r, MethodParam
 
 	Temp_class_replace class_replace(r, allow_class_replace);
 
-	r.use_file(r.main_class, vfile.as_string(), use_origin);
+	r.use_file(vfile.as_string(), use_origin, load_auto_p);
 }
 
 static void set_skip(Request& r, Request::Skip askip) {
@@ -732,7 +738,7 @@ static time_t as_expires(Request& r, Met
 }
 
 static const String& as_file_spec(Request& r, MethodParams& params, int index) {
-	return r.absolute(params.as_string(index, "filespec must be string"));
+	return r.full_disk_path(params.as_string(index, "filespec must be string"));
 }
 
 static void _cache(Request& r, MethodParams& params) {