===================================================================
RCS file: /home/cvs/OpenXM/src/cfep/MyDocument.m,v
retrieving revision 1.1.1.1
retrieving revision 1.6
diff -u -p -r1.1.1.1 -r1.6
--- OpenXM/src/cfep/MyDocument.m	2006/03/03 23:31:12	1.1.1.1
+++ OpenXM/src/cfep/MyDocument.m	2006/03/12 07:09:51	1.6
@@ -18,7 +18,17 @@ static int myDocumentSaidTheMessageAboutX = 0;
 
 
 @implementation MyDocument
+static int NoEngine = 0; // experimental.
+static NSMenuItem *menuItemNoEngine = nil;  // NoEngine
+// For OnState or OffState in the execution menu
+static NSMenuItem *menuItemNotebookMode = nil;
+static NSMenuItem *menuItemBasicMode = nil;
+static  NSMenuItem *menuItemRisaAsir = nil;
+static  NSMenuItem *menuItemKanSm1 = nil;
+static  NSMenuItem *menuItemOutputDebugMessages = nil;  //cf. debugMyTunnel;
+static NSMenuItem *menuItemPrettyPrint = nil;  // prettyPrint.
 
+
 - (void)dealloc {
     MyOutputWindowController *mowc;
     if (myDebug) NSLog(@"dealloc of MyDocument.\n");
@@ -63,6 +73,7 @@ static int myDocumentSaidTheMessageAboutX = 0;
 	}
     [self addMenuExec]; // adding the execution menu. 
     [textViewIn setAllowsUndo:YES];
+	if ([textViewIn isContinuousSpellCheckingEnabled]) [textViewIn toggleContinuousSpellChecking: self]; // Turn off the spell checking.
 	[self sayTheMessageAboutX];
 	[self initAux]; 
 }
@@ -139,6 +150,7 @@ static int myDocumentSaidTheMessageAboutX = 0;
 	myDecoder = [[MyDecoder alloc] init]; [myDecoder retain];
 
 	[self openMyModel: myEnvironment ];
+	[MyOpenGLController initMyOpenGLController]; // For the second execution, it will do nothing.
 }
 -(int) getMyDocumentKey { return myDocumentKey; }
 
@@ -155,6 +167,8 @@ static int myDocumentSaidTheMessageAboutX = 0;
 	[peerEndEvaluteMark retain];
  
 	[self stopIndicator];
+    if (NoEngine && (!restartMode)) { task = nil; return; }
+
 	// Initialization to call /bin/bash
     outboundPipe = [NSPipe pipe];  // since autorelease is called in pipe.
 	inboundPipe   = [NSPipe pipe];
@@ -217,6 +231,7 @@ static int myDocumentSaidTheMessageAboutX = 0;
 
 -(id) restartMyModel: (enum peer_type)  peerType {
     MyEnvironment *myEnvironment;
+	restartMode = 1;
     [self closeMyModel]; 
 	myEnvironment = [[MyEnvironment alloc] initFor: peerType];  //BUG. leak memory?
 	[myEnvironment retain];
@@ -230,8 +245,11 @@ static int myDocumentSaidTheMessageAboutX = 0;
   NSLog(@"myDocumentSaidTheMessageAboutX=%d\n",myDocumentSaidTheMessageAboutX);
   if (!myDocumentSaidTheMessageAboutX) {
     if ([MyEnvironment checkX] != 1) 
-	   [self messageDialog: 
-	     NSLocalizedString(@"A few commands (plot, ...) cannot be used, because X11 is not running.",nil) with: 0];
+	  // [self messageDialog: 
+	  //    NSLocalizedString(@"A few commands (plot, ...) cannot be used, because X11 is not running.",nil) with: 0];
+	  [self changeOutputCounterFieldWithString:
+	    [NSLocalizedString(@"Output mini-view: ",nil) stringByAppendingString:  
+		 NSLocalizedString(@"A few commands (plot, ...) cannot be used, because X11 is not running.",nil)]];
 	myDocumentSaidTheMessageAboutX = 1;
   }
 }
@@ -241,6 +259,7 @@ static int myDocumentSaidTheMessageAboutX = 0;
   NSMutableString *cmd;
   NSRange r;
 
+  if (!task) return;
   if (inEvaluation) {
 	 NSLog(@"In evaluatioin. ");
      [self messageDialog: NSLocalizedString(@"Evaluating...",nil) with: 0];
@@ -273,7 +292,13 @@ static int myDocumentSaidTheMessageAboutX = 0;
           [textViewIn replaceCharactersInRange: NSMakeRange(pos,0) withString: @"\n"];
 		}
 		cmd0 = [cmd0 substringWithRange:r ]; 
-	}	
+	}
+	[self outputBorderLine: [NSColor magentaColor]];
+	[self outputString: cmd0];
+	if ([cmd0 length] > 0) {
+      if ([cmd0 characterAtIndex: ([cmd0 length]-1)] != 0xa) [self outputString: @"\n"];
+    }	  
+    [self outputBorderLine: [NSColor yellowColor]];
   }else{
     cmd0 = [textViewIn string];
     MyOutputWindowController *mc;
@@ -303,7 +328,7 @@ static int myDocumentSaidTheMessageAboutX = 0;
   [alert release];
 								 
   fprintf(stderr,"Trying to interrupt.\n");
-  [task interrupt];
+  if (task) [task interrupt];
   inputCounter = outputCounter = 0;
   [self stopIndicator];
   [myDecoder reset];
@@ -360,6 +385,7 @@ static int myDocumentSaidTheMessageAboutX = 0;
   NSLog(@"Evaluating...  ");
   NSLog(@"%@",cmd);
   // Evaluation is here.
+  if (!task) return -1;
   cmdInData = [cmd dataUsingEncoding: NSUTF8StringEncoding];
   @try { 
     //todo  if (yes) [outboundFileHandle writeData: peerStartEvaluateMark];
@@ -387,9 +413,15 @@ static int myDocumentSaidTheMessageAboutX = 0;
   else {
     MyOutputWindowController *mc;
     mc = [MyOutputWindowController sharedMyOutputWindowController: self];
-    [mc outputStringToOutputWindow: amt];
+    if (prettyPrint) [mc outputStringToOutputWindow: amt withColor: [NSColor blueColor]];
+	else [mc outputStringToOutputWindow: amt];
   }	
 }
+-(void)outputBorderLine: (NSColor *)color {
+    MyOutputWindowController *mc;
+    mc = [MyOutputWindowController sharedMyOutputWindowController: self];
+    [mc outputStringToOutputWindow: @"----------------------------------------\n" withColor: color];
+}
 - (void) outputErrorString: (NSString *) amt {
   int oldEnd;
   int newEnd;
@@ -481,7 +513,7 @@ static int myDocumentSaidTheMessageAboutX = 0;
    //bug. temporary.   
    path = [OpenXM_HOME stringByAppendingString: @"/doc/cfep/intro-ja.html"]; 
 
-   ans = [[NSWorkspace sharedWorkspace] openFile:path withApplication: @"Help Viewer"];
+   ans = [[NSWorkspace sharedWorkspace] openFile:path withApplication: @"Safari"]; //We do not use Help Viewer
    if (ans != YES) {
       [self messageDialog: NSLocalizedString(@"Help file is not found at cfep.app/OpenXM/doc/cfep",nil) with: 0];
    }
@@ -575,8 +607,10 @@ int debugInbound = 0;
 		  if (debugMyTunnel) [self outputErrorString: act]; // for debug.
           channel = [myDecoder getChannel];
           if (channel == 0) [self errorActionFor: act];
+		  // cf. MyDecode.h for the list of channel numbers.
 		  else if (channel == 1) [self openGLActionFor: act];
 		  else if (channel == 2) [self openGLInitActionFor: act];
+		  else if (channel == 10) [self pngActionFor: act];
         }
         state = 0; break;
       default:
@@ -973,6 +1007,8 @@ int debugInbound = 0;
 	  NSRange r;
 	  NSRange r3;
 	  int currentLine,i;
+	  [self outputErrorString: NSLocalizedString(@"Move to the line ",nil)];
+	  [self outputErrorString: [NSString stringWithFormat: @"%d\n",line]];
 	  // move the selection to the line line.   
 	  s = [textViewIn string];
 	  if (onlySelectedArea || notebookMode) r = [textViewIn selectedRange];
@@ -993,6 +1029,8 @@ int debugInbound = 0;
 }
 -(int) gotoNextError: (id) sender{
   int n;
+  if (onlySelectedArea || notebookMode) 
+    [self outputErrorString: NSLocalizedString(@"The next error action will not work properly in this mode.\n",nil)];
   n = [self nextLine: 0];
   if (n >= 0) { [self gotoLine: n]; return n;}
   else return -1;
@@ -1008,6 +1046,7 @@ int debugInbound = 0;
 	return -1;
   }
   gid = [[a objectAtIndex: 0] intValue];
+  if ([[a objectAtIndex: 1] hasPrefix: @"meta"]) {[self openGLMeta: [a objectAtIndex: 1] to: gid]; return; }
   [MyOpenGLController addOglComm: [a objectAtIndex: 1] to: gid from: self];
   return 0;
 }
@@ -1023,7 +1062,88 @@ int debugInbound = 0;
   [MyOpenGLController addOglInitComm: [a objectAtIndex: 1] to: gid from: self];
   return 0;
 }
+-(void)openGLMeta: (NSString *) cmd to: (int) gid{
+  MyOpenGLController *oglc;
+  oglc = [MyOpenGLController getOglWindow: gid];
+  if (!oglc) {[self printErrorMessage: 
+     [NSString stringWithFormat: @"Invalid gid %d in openGLMeta command %@\n",gid,cmd]]; return; }
+  if ([cmd hasPrefix: @"meta_showListOfOglComm"]) {
+    [self showListOfOglComm: gid]; return ;
+  }else if ([cmd hasPrefix: @"meta_removeAllInit"]) { // longer command must come first, because we use prefix.
+    [oglc removeAllOfOglInitComm]; 
+  }else if ([cmd hasPrefix: @"meta_removeLastInit"]) {
+    [oglc removeLastOfOglInitComm]; 
+  }else if ([cmd hasPrefix: @"meta_removeAll"]) {
+    [oglc removeAllOfOglComm]; 
+  }else if ([cmd hasPrefix: @"meta_removeLast"]) {
+    [oglc removeLastOfOglComm]; 
+  }else{
+    [self printErrorMessage: [NSString stringWithFormat: @"Unknown OpenGL meta command %@\n",cmd]];
+  }
+}
+-(void) showListOfOglComm: (int) gid {
+  MyDocument *md;
+  MyOpenGLController *oglc;
+  NSMutableArray *comm; 
+  int i,n;
+  md = self;
+  oglc = [MyOpenGLController getOglWindow: gid];
+  if (!oglc) {[self outputErrorString: @"Invalid gid in showListOfOglComm\n"]; return; }
+  comm = [oglc getListOfOglInitComm];
+  n = [comm count];
+  [md outputString: NSLocalizedString(@"OpenGL init commands\n",nil)];
+  for (i=0; i<n; i++) {
+    [md outputString: [NSString stringWithFormat: @"%04d: ",i]];
+    [md outputString: [[comm objectAtIndex: i] toString]];
+	[md outputString: @"\n"];
+  }
+  comm = [oglc getListOfOglComm];
+  n = [comm count];
+  [md outputString: NSLocalizedString(@"OpenGL redraw commands\n",nil)];
+  for (i=0; i<n; i++) {
+    [md outputString: [NSString stringWithFormat: @"%04d: ",i]];
+    [md outputString: [[comm objectAtIndex: i] toString]];
+	[md outputString: @"\n"];
+  }
+}
 
+
+-(void) pngActionFor: (NSString *)act {
+  NSArray *a;
+  id typesetExpression;
+  MyOutputWindowController *mowc;
+  NSString *path;
+  int n;
+  a=[act componentsSeparatedByString: @","];
+  n = [a count];
+  if (n < 1) {
+    [self printErrorMessage: @"Invalid format in pngActionFor: \n"];
+	return;
+  }	
+  // NSLog(@"%@",a);
+  if ([[a objectAtIndex: 0]  hasPrefix: @"notAvailable"]) {
+    [self messageDialog: 
+	  NSLocalizedString(@"Typeset the output by TeX is not available. latex, dvips, and pstoimg must be installed.",nil)  with: 0];
+	prettyPrint = 1; [self setPrettyPrint: nil];
+	return;
+  }	else if ([[a objectAtIndex: 0]  compare: @"showFile"] == NSOrderedSame) {
+    if (n < 2) [self printErrorMessage: @"showFile,filename  filename is missing.\n"];
+	path = [MyUtil pruneThings: [a objectAtIndex: 1]]; // for buggy componentsSeparatedByString
+	typesetExpression = [MyUtil attributedStringWithPath: path];
+	if (typesetExpression) {
+       if (notebookMode) [textViewIn insertText: typesetExpression];
+	   else {
+        mowc = [MyOutputWindowController sharedMyOutputWindowController: self];
+		[mowc insertText: typesetExpression];
+	   }
+	}
+	return;
+  } else {
+    NSLog(@"pngActionFor: %@\n",act);
+    [self printErrorMessage: @"Unknown command for pngActionFor:\n"];
+  }
+}
+
 -(void) setBasicStyle: (id) sender {
   notebookMode = 0;
   [self updateInterfaceStyleMenu];
@@ -1054,6 +1174,7 @@ int debugInbound = 0;
   [self updateSelectEngineMenu];
   [self oxEvaluateString: @"!sm1;" withMark: TRUE];
 }
+// BUG: update* must be called when the focus is changed to "setState:"
 -(void) updateSelectEngineMenu {
   if (!menuItemRisaAsir) return;
   if (!menuItemKanSm1) return;
@@ -1075,12 +1196,78 @@ int debugInbound = 0;
   }	
   [MyUtil setDebugMyUtil];
 }
+
+//BUG: [self setPrettyPrint: nil] or update must be called when focus is changed to "setState:" 
+-(void) setPrettyPrint: (id) sender {
+  if (prettyPrint) {
+    prettyPrint = 0;
+	[self oxEvaluateString: @"!verbatim;" withMark: TRUE];
+	if (menuItemPrettyPrint) [menuItemPrettyPrint setState: NSOffState];
+  } else {
+    prettyPrint = 1;
+	if (!asir_contrib) [self loadAsirContrib: nil];
+	[self oxEvaluateString: @"!cfep_png;" withMark: TRUE];
+	if (menuItemPrettyPrint) [menuItemPrettyPrint setState: NSOnState];
+  }	
+}
+-(void) setNoEngine: (id) sender {
+  if (NoEngine) {
+    NoEngine = 0;
+	if (menuItemNoEngine) [menuItemNoEngine setState: NSOffState];
+  } else {
+    NoEngine = 1;
+	if (menuItemNoEngine) [menuItemNoEngine setState: NSOnState];
+  }	
+}
+
+-(void) loadAsirContrib: (id) sender {
+  NSString *com;
+  if (inEvaluation) {    
+    [self messageDialog: NSLocalizedString(@"Evaluating...",nil) with: 0];
+    return;
+  }
+  asir_contrib = 1;
+  com = [@"load(\"" stringByAppendingString: OpenXM_HOME];
+  com = [com stringByAppendingString: @"/rc/asirrc\")$"];
+  if (notebookMode) { doInsertNewInputCell=0; [self getContentsOfInputCell]; [self prepareOutputCell];}
+  [self oxEvaluateString: com withMark: TRUE];
+}
 -(void) mytest: (id) sender {
-  // Add code here for testing.
-  int n;
-  n=[self gotoNextError: nil];
-  NSLog(@"error line=%d\n",n);
+  // Add any code here for testing.
+  id typesetExpression;
+  typesetExpression = [MyUtil attributedStringWithPath: @"/Users/nobuki/OpenXM_tmp/1/work1.png"];
+  if (typesetExpression) [textViewIn insertText: typesetExpression];
+  else NSLog(@"typesetExpression is nil.\n");
 }
+
+-(NSMenuItem *) menuItemLoadLibrary: (int) oxengine {
+  NSMenuItem *menuItemAsirContrib;
+  NSMenuItem *menuItemCohom;
+  NSMenu *submenuLoadLibrary = [[[NSMenu alloc] init] autorelease];
+  switch(oxengine) {
+  case 0: /* asir */
+    menuItemAsirContrib = [[[NSMenuItem alloc] init] autorelease];
+	[menuItemAsirContrib setTitle: NSLocalizedString(@"Load asir-contrib",nil)];
+	[menuItemAsirContrib setAction: @selector(loadAsirContrib:)];
+	[menuItemAsirContrib setTarget: [[NSApp mainWindow] document]];
+	[submenuLoadLibrary addItem: menuItemAsirContrib];
+	break;
+  case 1: /* sm1 */
+    menuItemCohom = [[[NSMenuItem alloc] init] autorelease];
+	[menuItemCohom setTitle: NSLocalizedString(@"Load cohom.sm1",nil)];
+	[menuItemCohom setAction: @selector(loadCohom:)];
+	[menuItemCohom setTarget: [[NSApp mainWindow] document]];
+	[submenuLoadLibrary addItem: menuItemCohom];
+    break;
+  default:
+    break;
+  }			
+
+  NSMenuItem *menuItemLoadLibrary = [[[NSMenuItem alloc] init] autorelease];
+  [menuItemLoadLibrary setTitle: NSLocalizedString(@"Load library",nil)];
+  [menuItemLoadLibrary setSubmenu: submenuLoadLibrary];
+  return menuItemLoadLibrary;
+}
 -(void) addMenuExec {
   static int done=0;
   NSMenu *menuItem;
@@ -1091,6 +1278,7 @@ int debugInbound = 0;
   NSMenuItem *menuItemSelectEngine;
   NSMenuItem *menuItemGotoNextError;
   NSMenuItem *menuItemForTest;
+  NSMenuItem *menuItemLoadLibrary;
   if (done) return;
   done = 1;
   // oxEvalute
@@ -1117,13 +1305,16 @@ int debugInbound = 0;
   [menuItemGotoNextError setTarget: [[NSApp mainWindow] document]]; 
   [menuExec addItem: menuItemGotoNextError];
 
-  // gotoNextError
-  menuItemOutputDebugMessages = [[[NSMenuItem alloc] init] autorelease];
-  [menuItemOutputDebugMessages setTitle: NSLocalizedString(@"Output debug messages",nil)];
-  [menuItemOutputDebugMessages setAction: @selector(setDebugMyTunnel:)];
-  [menuItemOutputDebugMessages setTarget: [[NSApp mainWindow] document]]; 
-  [menuExec addItem: menuItemOutputDebugMessages];
+  // pretty print
+  menuItemPrettyPrint = [[[NSMenuItem alloc] init] autorelease];  [menuItemPrettyPrint retain]; // it is the static variable.
+  [menuItemPrettyPrint setTitle: NSLocalizedString(@"Typeset the output by TeX",nil)];
+  [menuItemPrettyPrint setAction: @selector(setPrettyPrint:)];
+  [menuItemPrettyPrint setTarget: [[NSApp mainWindow] document]]; 
+  [menuExec addItem: menuItemPrettyPrint];
 
+  // loadLibrary
+  [menuExec addItem: [self menuItemLoadLibrary: oxEngine]]; //bug. dynamic change. 
+  
   // interface style
   NSMenu *submenuInterfaceItem = [[[NSMenu alloc] init] autorelease];
     // basic-like
@@ -1131,14 +1322,14 @@ int debugInbound = 0;
   [menuItemBasicLike setTitle: NSLocalizedString(@"BASIC-like",nil)];
   [menuItemBasicLike setAction: @selector(setBasicStyle:)];
   [menuItemBasicLike setTarget: [[NSApp mainWindow] document]];
-  menuItemBasicMode = menuItemBasicLike;
+  menuItemBasicMode = menuItemBasicLike;  [menuItemBasicMode retain];
   [submenuInterfaceItem addItem: menuItemBasicLike];
     // notebook-like
   NSMenuItem *menuItemNotebookLike = [[[NSMenuItem alloc] init] autorelease];
   [menuItemNotebookLike setTitle: NSLocalizedString(@"Notebook-like",nil)];
   [menuItemNotebookLike setAction: @selector(setNotebookStyle:)];
   [menuItemNotebookLike setTarget: [[NSApp mainWindow] document]];
-  menuItemNotebookMode = menuItemNotebookLike;
+  menuItemNotebookMode = menuItemNotebookLike; [menuItemNotebookMode retain];
   [submenuInterfaceItem addItem: menuItemNotebookLike];
   
   menuItemInterfaceStyle = [[[NSMenuItem alloc] init] autorelease];
@@ -1150,13 +1341,13 @@ int debugInbound = 0;
     // select engine
   NSMenu *submenuSelectEngineItem = [[[NSMenu alloc] init] autorelease];
     // asir
-  menuItemRisaAsir = [[[NSMenuItem alloc] init] autorelease];
+  menuItemRisaAsir = [[[NSMenuItem alloc] init] autorelease];  [menuItemRisaAsir retain];
   [menuItemRisaAsir setTitle: NSLocalizedString(@"Risa/Asir",nil)];
   [menuItemRisaAsir setAction: @selector(setEngineRisaAsir:)];
   [menuItemRisaAsir setTarget: [[NSApp mainWindow] document]];
   [submenuSelectEngineItem addItem: menuItemRisaAsir];
     // notebook-like
-  menuItemKanSm1 = [[[NSMenuItem alloc] init] autorelease];
+  menuItemKanSm1 = [[[NSMenuItem alloc] init] autorelease];  [menuItemKanSm1 retain];
   [menuItemKanSm1 setTitle: NSLocalizedString(@"Kan/sm1",nil)];
   [menuItemKanSm1 setAction: @selector(setEngineKanSm1:)];
   [menuItemKanSm1 setTarget: [[NSApp mainWindow] document]];
@@ -1168,6 +1359,19 @@ int debugInbound = 0;
   [menuExec addItem: menuItemSelectEngine];
   [self updateSelectEngineMenu];
 
+  // outputDebugMessage
+  menuItemOutputDebugMessages = [[[NSMenuItem alloc] init] autorelease]; [menuItemOutputDebugMessages retain];
+  [menuItemOutputDebugMessages setTitle: NSLocalizedString(@"Output debug messages",nil)];
+  [menuItemOutputDebugMessages setAction: @selector(setDebugMyTunnel:)];
+  [menuItemOutputDebugMessages setTarget: [[NSApp mainWindow] document]]; 
+  [menuExec addItem: menuItemOutputDebugMessages];
+
+  // NoEngine
+  menuItemNoEngine = [[[NSMenuItem alloc] init] autorelease];  [menuItemNoEngine retain]; // it is the static variable.
+  [menuItemNoEngine setTitle: NSLocalizedString(@"Do not start engine at startup",nil)];
+  [menuItemNoEngine setAction: @selector(setNoEngine:)];
+  [menuItemNoEngine setTarget: [[NSApp mainWindow] document]]; 
+  [menuExec addItem: menuItemNoEngine];
 
   // test
   menuItemForTest = [[[NSMenuItem alloc] init] autorelease];