Changeset 47

Timestamp:

05/09/06 11:13:01 (18 years ago)

Author:

pinsard

Message:

upgrade of TEXT2IDL/TEXtoIDL according to cerbere.lodyc.jussieu.fr: /usr/home/smasson/SAXO_RD/ : files

Location:

trunk

Files:

• TEXT2IDL (deleted)
• ToBeReviewed/TEXtoIDL/COPYRIGHT (added)
• ToBeReviewed/TEXtoIDL/DISCLAIMER (added)
• ToBeReviewed/TEXtoIDL/LOCAL_MODIFICATIONS (added)
• ToBeReviewed/TEXtoIDL/README (added)
• ToBeReviewed/TEXtoIDL/VERSIONS (added)
• ToBeReviewed/TEXtoIDL/matchdelim.pro (copied) (copied from trunk/TEXT2IDL/matchdelim.pro) (1 diff)
• ToBeReviewed/TEXtoIDL/nexttok.pro (copied) (copied from trunk/TEXT2IDL/nexttok.pro) (3 diffs)
• ToBeReviewed/TEXtoIDL/showtex.pro (copied) (copied from trunk/TEXT2IDL/showtex.pro) (3 diffs)
• ToBeReviewed/TEXtoIDL/textable.pro (copied) (copied from trunk/TEXT2IDL/textable.pro) (4 diffs)
• ToBeReviewed/TEXtoIDL/textoidl.pro (copied) (copied from trunk/TEXT2IDL/textoidl.pro) (4 diffs)
• ToBeReviewed/TEXtoIDL/translate_sub_super.pro (copied) (copied from trunk/TEXT2IDL/translate_sub_super.pro) (6 diffs)

trunk/ToBeReviewed/TEXtoIDL/matchdelim.pro

@@ -47 +47 @@
 ;
 ; RELEASE:
-;       $Name: Rel_1_2 $
+;       $Name: Rel_2_1_2 $
 ;
 ; COPYRIGHT:

trunk/ToBeReviewed/TEXtoIDL/nexttok.pro

@@ -29 +29 @@
 ;       $Id$
 ;       $Log: nexttok.pro,v $
+;       Revision 1.4  2004/06/15 17:25:54  mcraig
+;       Fixed bug in regular expression, changed array notation to square brackets
+;
 ;       Revision 1.3  1996/06/14 20:00:27  mcraig
 ;       Updated Copyright info.
@@ -40 +43 @@
 ;
 ; RELEASE:
-;       $Name: Rel_1_2 $
+;       $Name: Rel_2_1_2 $
 ;
 ; COPYRIGHT:
@@ -101 +104 @@
     ENDIF 
 
-    MatchIdx = MatchIdx(1:*)
-    Matches = Matches(1:*)
+    MatchIdx = MatchIdx[1:*]
+    Matches = Matches[1:*]
 
     SortInd = sort(Matches)
 
-    Position = Matches(SortInd(0))
+    Position = Matches[SortInd[0]]
 
-    Tok = string(TmpTok(MatchIdx(SortInd(0))))
+    Tok = string(TmpTok[MatchIdx[SortInd[0]]])
     
     return, Tok

trunk/ToBeReviewed/TEXtoIDL/showtex.pro

@@ -26 +26 @@
 ;       $Id$
 ;       $Log: showtex.pro,v $
+;       Revision 1.4  2004/06/15 17:25:54  mcraig
+;       Fixed bug in regular expression, changed array notation to square brackets
+;
 ;       Revision 1.3  1996/06/14 20:00:27  mcraig
 ;       Updated Copyright info.
@@ -36 +39 @@
 ;
 ; RELEASE:
-;       $Name: Rel_1_2 $
+;       $Name: Rel_2_1_2 $
 ;
 ; COPYRIGHT:
@@ -107 +110 @@
         x = .1
         FOR j = 1, 5 DO BEGIN
-            IF (count LT nseq ) THEN xyouts, x, y, DisplayString(count), align = .5, /norm
+            IF (count LT nseq ) THEN xyouts, x, y, DisplayString[count], align = .5, /norm
             count = count+1
             x = x + dx

trunk/ToBeReviewed/TEXtoIDL/textable.pro

@@ -30 +30 @@
 ;       $Id$
 ;       $Log: textable.pro,v $
+;       Revision 1.8  2004/06/15 17:25:54  mcraig
+;       Fixed bug in regular expression, changed array notation to square brackets
+;
 ;       Revision 1.7  1996/07/22 23:56:08  mcraig
 ;       Added \vartheta.
@@ -54 +57 @@
 ;
 ; RELEASE:
-;       $Name: Rel_1_2 $
+;       $Name: Rel_2_1_2 $
 ;
 ; COPYRIGHT:
@@ -94 +97 @@
 ;  Set IDL font sequence needed to switch to Greek letters.
     GreekFont = strarr(3)
-    GreekFont(VECFONT) = '!7'
-    GreekFont(PSFONT) = '!M'
+    GreekFont[VECFONT] = '!7'
+    GreekFont[PSFONT] = '!M'
 
 ;  Set IDL font sequence needed to switch to special symbol font.
     SymbolFont = strarr(3)
-    SymbolFont(VECFONT) = '!M'
-    SymbolFont(PSFONT) = '!M'
+    SymbolFont[VECFONT] = '!M'
+    SymbolFont[PSFONT] = '!M'
 
 ;  Set IDL font sequence needed to switch back to initial font.
     PreviousFont = strarr(3)
-    PreviousFont(VECFONT) = '!X'
-    PreviousFont(PSFONT) = '!X'
+    PreviousFont[VECFONT] = '!X'
+    PreviousFont[PSFONT] = '!X'
 
 ;lowercase Greek -- 
@@ -205 +208 @@
         [ '\circ',              "%"   ,  string(byte(176))  ]$
                           ]
-    LowercaseGreek(1,*) = $
-      GreekFont(FontSelection) $
-      + LowercaseGreek(FontSelection,*) $
-      + PreviousFont(FontSelection)
-    UppercaseGreek(1,*) = $
-      GreekFont(FontSelection) +$
-      UppercaseGreek(FontSelection,*) $
-      + PreviousFont(FontSelection)
-    Symbols(1,*) = $
-      SymbolFont(FontSelection) $
-      + Symbols(FontSelection,*) $
-      + PreviousFont(FontSelection)
+    LowercaseGreek[1,*] = $
+      GreekFont[FontSelection] $
+      + LowercaseGreek[FontSelection,*] $
+      + PreviousFont[FontSelection]
+    UppercaseGreek[1,*] = $
+      GreekFont[FontSelection] +$
+      UppercaseGreek[FontSelection,*] $
+      + PreviousFont[FontSelection]
+    Symbols[1,*] = $
+      SymbolFont[FontSelection] $
+      + Symbols[FontSelection,*] $
+      + PreviousFont[FontSelection]
 
     TranslationTable = [[LowercaseGreek],[UppercaseGreek],[Symbols]]
-    return,TranslationTable(0:1,*)
+    return,TranslationTable[0:1,*]
 
 END 

trunk/ToBeReviewed/TEXtoIDL/textoidl.pro

@@ -41 +41 @@
 ;       $Id$
 ;       $Log: textoidl.pro,v $
+;       Revision 1.7  2004/06/15 17:25:54  mcraig
+;       Fixed bug in regular expression, changed array notation to square brackets
+;
+;       Revision 1.6  2004/01/11 01:49:00  mcraig
+;       Changed format of one array to newer [] style to avoidf conflict with function name in astro library.
+;
+;       Revision 1.5  2001/11/23 21:10:55  mcraig
+;       Added backslash '\' to tex sequences in translation table to protect them during regexp search in strsplit.
+;
 ;       Revision 1.4  1996/06/14 20:00:27  mcraig
 ;       Updated Copyright info.
@@ -54 +63 @@
 ;
 ; RELEASE:
-;       $Name: Rel_1_2 $
+;       $Name: Rel_2_1_2 $
 ;
 ; COPYRIGHT:
@@ -91 +100 @@
     IF keyword_set (tex_seq) THEN BEGIN
         table=textable()
-        return,table(0,*)
+        return,table[0,*]
     ENDIF 
 
@@ -123 +132 @@
 ;   around them if they are unbraced.  This will have the result the
 ;   it will be difficult to use \ as a sub/superscript.  Get over it.
-    strn =  strtrans(strn, '^'+table(0, *), '^{'+table(0, *)+'}')
-    strn =  strtrans(strn, '_'+table(0, *), '_{'+table(0, *)+'}')
+
+;   V2.11 Must include the '\' in from of translation table TeX
+;   sequences to ensure that strsplit properly treats the '\' in the
+;   TeX sequence. Since strsplit is doing a regexp replace, and '\' is
+;   special in regexps, need to escape it.
+    strn =  strtrans(strn, '\^'+'\'+table[0, *], '^{'+table[0, *]+'}')
+    strn =  strtrans(strn, '\_'+'\'+table[0, *], '_{'+table[0, *]+'}')
 
 ;  First we translate Greek letters and the like.  This makes guessing
 ;  alignment of sub/superscripts easier, as all special characters will then
 ;  be one character long.
-    strn = strtrans(strn, table(0, *), table(1, *))
 
-    FOR i = 0L, n_elements(strn)-1 DO $
-      strn(i) = translate_sub_super(strn(i)) ; Take care of sub/superscripts
+;   V2.11 Must include the '\' in from of translation table TeX
+;   sequences to ensure that strsplit properly treats the '\' in the
+;   TeX sequence. Since strsplit is doing a regexp replace, and '\' is
+;   special in regexps, need to escape it.
+    strn = strtrans(strn, '\'+table[0, *], table[1, *])
+
+
+    FOR i = 0L, n_elements(strn)-1 DO BEGIN 
+        strn[i] = translate_sub_super(strn[i]) ; Take care of sub/superscripts
+    ENDFOR 
 
     return,strn

trunk/ToBeReviewed/TEXtoIDL/translate_sub_super.pro

@@ -47 +47 @@
 ;       $Id$
 ;       $Log: translate_sub_super.pro,v $
+;       Revision 1.5  2000/06/14 19:09:22  mcraig
+;       Changed name of strtok str_token to avoid conflict in IDL 5.3.
+;
 ;       Revision 1.4  1996/06/14 20:00:27  mcraig
 ;       Updated Copyright info.
@@ -59 +62 @@
 ;
 ; RELEASE:
-;       $Name: Rel_1_2 $
+;       $Name: Rel_2_1_2 $
 ; COPYRIGHT:
 ;  Copyright (C) 1996 The Regents of the University of California, All
@@ -131 +134 @@
 ;       display. 
 ; LIBRARY FUNCTIONS CALLED:
-;       strtok      -- Text/string (mcraig)
+;       str_token      -- Text/string (mcraig)
 ;       sub_sup_idl -- contained in this file
 ; MODIFICATION HISTORY:
 ;       $Id$
 ;       $Log: translate_sub_super.pro,v $
+;       Revision 1.5  2000/06/14 19:09:22  mcraig
+;       Changed name of strtok str_token to avoid conflict in IDL 5.3.
+;
 ;       Revision 1.4  1996/06/14 20:00:27  mcraig
 ;       Updated Copyright info.
@@ -152 +158 @@
 ;
 ; RELEASE:
-;       $Name: Rel_1_2 $
+;       $Name: Rel_2_1_2 $
 ;
 ; COPYRIGHT:
@@ -219 +225 @@
 ; Our approach will be to grab the input string up to the next '^' or
 ; '_', then process the script we've found.
-    NewString=strtok(strn,Token)
+    NewString=str_token(strn,Token)
 
     WHILE  strlen(strn) GT  0 DO  BEGIN
@@ -284 +290 @@
         IF ( pos NE -1 ) THEN BEGIN     ; more left to process     
             NewString = NewString $
-              + strtok(strn, Token)   
+              + str_token(strn, Token)   
         ENDIF ELSE BEGIN                ; we are done
             NewString = NewString + strn