Changeset 228 for trunk/lingosource

Timestamp:

03/20/09 18:08:22 (3 years ago)

Author:

alex

Message:

added handler to export only scripttext with metadata for the member and added new handler to svn quicklinks to update all castlibs

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (3 diffs)
• castlib1/alexUtilities.ls (modified) (1 diff)
• castlib1/memberInfo.xml (modified) (22 diffs)
• castlib1/subversion_version_field.txt (modified) (1 diff)
• castlib1/svn_Utilities.ls (modified) (3 diffs)
• castlib2/GetSetPrefs.ls (modified) (1 diff)
• castlib2/PseudoXMLPS.ls (modified) (19 diffs)
• castlib2/aleXtrasMovieScript.ls (modified) (2 diffs)
• castlib2/commonMovieScript.ls (modified) (4 diffs)
• castlib2/memberInfo.xml (modified) (8 diffs)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -186 +186 @@
   li.add(subli)
   
-  subli.add("Export selcetd text as...")
-  pLookUpCommandList.setaprop("Export selcetd text as...", ["mExportSelectedText me, theType_optional", "alexUtilities"])
+  subli.add("Export selected text as...")
+  pLookUpCommandList.setaprop("Export selected text as...", ["mExportSelectedText me, theType_optional", "alexUtilities"])
   
   subli.add("")
@@ -196 +196 @@
   pLookUpCommandList.setaprop("Export to bitmap...", ["mExportBM me, theMember, thePath_optional, theType_optional, compr_optional", "alexUtilities"])
   
+  subli.add("Export script-, text-, fieldmember...")
+  pLookUpCommandList.setaprop("Export script-, text-, fieldmember...", ["mExportScripttext me, skipIcons_optional, convertLineBreaksToUnix_optional, theFolder_optional", "alexUtilities"])
   
   
@@ -312 +314 @@
   subli = []
   svn_subli.add(subli)
+  
+  subli.add("SVN Update all castlibs")
+  pLookUpCommandList.setaprop("SVN Update all castlibs", ["mSVN_Update_AllCastlib_and_source me, chooseNewPath_optional, onlyUpdate_SVN_WorkingFolder_optional, revisionNumber_optional", "svn_Utilities"])
   
   subli.add("SVN Update selected castlib(s)...")

trunk/lingosource/castlib1/alexUtilities.ls

@@ -2432 +2432 @@
 end
 
-
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mExportScripttext me, skipIcons, convertLineBreaksToUnix, theFolder
+  
+  
+  theFolder = string(theFolder)
+  if length(theFolder) < 1 then theFolder = mGetFolderPathFromUser(me)
+  if length(theFolder) < 1 then exit
+  
+  if the last char of theFolder <> the last char of the moviepath then put the last char of the moviepath after theFolder
+  
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  firstCastNum = cl
+  lastCastNum = cl
+  
+  
+  DirectImageInstance = 0
+  if skipIcons <> 1 then
+    if mCheckForXtra(me, "SharpExport") = 1 then
+      SharpExportInst = new(xtra "SharpExport")
+    else
+      skipIcons = 1
+    end if
+  end if
+  
+  
+  isMac = (the platform contains "mac") -- we need the differentiation because of the dreaded 31 char limit
+  
+  -----------------------
+  resetUNames = 0
+  if isMac then
+    if baSysFolder("prefs") starts "/" then
+      baReturnUnixNames(0)
+      resetUNames = 1
+    end if
+  end if
+  -----------------------
+  
+  doit = 0
+  versionNum = mGetFloatVersionNumber(me, the productversion)
+  
+  repeat with m = firstCastNum to lastCastNum
+    
+    listOfAllFiles = []
+    
+    thisFolder = theFolder
+    
+    doit = 0
+    
+    sel = the selection of castlib m
+    
+    repeat with sub in sel
+      repeat with n = sub[1] to sub[2]   
+        
+        memref = member(n, m)
+        memtype = memref.type
+        
+        convertLineBreaksToUnixT = 0
+        
+        if [#script, #field, #text].getPos(memtype) > 0 then
+          
+          case memtype of
+              
+              -----------------------
+            #script:
+              ext = ".ls"
+              scrText = memref.scripttext
+              scrtype = memref.scripttype
+              
+              ------------------------------ meta data
+              infolist = [:]
+              infolist[#name] = memref.name
+              infolist[#scripttype] = memref.scripttype
+              if versionNum >= 10 then infolist[#scriptSyntax] = memref.scriptSyntax
+              comm = memref.comments
+              offs = offset(RETURN, comm)
+              repeat while offs
+                put QUOTE & " & RETURN & " & QUOTE into char offs of comm
+              end repeat
+              infolist[#comments] = comm
+              
+              offs2 = 0
+              export_meta_data = scrText&""
+              offs = offset("--!memberProperties:", export_meta_data)
+              if offs > 0 then
+                delete char 1 to offs of export_meta_data
+                offs2 = offset("]", export_meta_data)
+              end if
+              
+              if offs2 > 0 then
+                put "--!memberProperties:" && infolist into char offs to offs + offs2 of scrText
+              else
+                put "--!memberProperties:" && infolist & RETURN before scrText
+              end if
+              
+              ------------------------------
+              
+              -----------------------
+            #field:
+              ext = ".txt"
+              scrText = memref.text
+              scrtype = #field
+              -----------------------
+            #text:
+              ext = ".html"
+              scrText = memref.html
+              convertLineBreaksToUnixT = 0
+              scrtype = #text
+              -----------------------
+            otherwise:
+              ext = ".txt"
+              scrText = memref.text
+              scrtype = #field
+          end case
+          
+          memname = memref.name
+          
+          theDefaultName = memname
+          
+          doit = 1
+          
+          if length(theDefaultName) < 1 then
+            theDefaultName =  "member" & n & "_" & m
+            memref.name = theDefaultName
+            put "renamed member" && memref && "to member(" & QUOTE & theDefaultName & QUOTE & ") as member without names are not supported"
+          end if
+          
+          theDefaultName = mStripFunnyCharsFromFileName(me, theDefaultName)
+          
+          origname = theDefaultName&""
+          if length(theDefaultName) > 25 and isMac then
+            
+            ms = string(the milliseconds)
+            mlen = length(ms)
+            ms = char mlen - 6 to mlen of ms
+            
+            theDefaultName = char 1 to 18 of theDefaultName
+            theDefaultName = theDefaultName & ms -- trim filenames as the mac version of fileio wants to deal with 31 chars
+            
+          end if
+          
+          
+          
+          ------------------------------------------ trac subversion support works better with unix linebreaks...
+          if voidP(convertLineBreaksToUnix) then convertLineBreaksToUnix = 1
+          if convertLineBreaksToUnix = "" then convertLineBreaksToUnix = 1
+          
+          if convertLineBreaksToUnix = 1 then
+            if convertLineBreaksToUnixT <> 1 then
+              if mCheckForXtra(me, "Pregex") = 1 then
+                
+                scrTextLi = [scrText]
+                pregex_replace(scrTextLi, "\x0D\x0A?", "g", "\x0A")
+                scrText = scrTextLi[1]
+                
+              else
+                
+                fndStr = numToChar(13) & numToChar(10)
+                offs = offset(fndStr, scrText)
+                repeat while offs > 0
+                  delete char offs of scrText
+                  offs = offset(fndStr, scrText)
+                end repeat
+                
+                fndStr = numToChar(13)
+                offs = offset(fndStr, scrText)
+                repeat while offs > 0
+                  put numToChar(10) into char offs of scrText
+                  offs = offset(fndStr, scrText)
+                end repeat
+              end if 
+            end if
+          end if
+          -----------------------------------------
+          
+          if theDefaultName <> origname then
+            alterText = ""
+            snam = baShortFileName(thisFolder & origname & ext)
+            if length(snam) > 0 then
+              alterText = mGetTextFromFile(me, snam)
+            else
+              alterText = mGetTextFromFile(me, thisFolder & origname & ext)
+            end if
+          else
+            alterText = mGetTextFromFile(me, thisFolder & theDefaultName & ext)
+          end if
+          
+          listOfAllFiles.add(mLowerCase(me, origname))
+          
+          if alterText <> scrText then
+            
+            --------------------- compare without whitespaces:
+            noChanges = (mRemoveWhiteSpaces(me, scrText&"") = mRemoveWhiteSpaces(me, alterText&""))
+            
+            
+            if noChanges = 0 then
+              
+              mSaveToTextFile me, scrText, thisFolder & theDefaultName & ext
+              
+              bmexp = 0
+              if skipIcons <> 1 then
+                
+                thumbmember = new(#bitmap)
+                thumbmember.picture = memref.thumbnail
+                
+                if thumbmember.width > 0 then
+                  bmexp = 1
+                  if baFileExists(thisFolder & theDefaultName & ".png") then baDeleteFile(thisFolder & theDefaultName & ".png")
+                  
+                  if objectP(DirectImageInstance) then
+                    
+                    DirectImageInstance.imageLoadFromMember(thumbmember)
+                    DirectImageInstance.imageSaveToFile(thisFolder & theDefaultName & ".png", 100, 1,1)
+                    
+                  else if objectP(SharpExportInst) then
+                    mExportBM me, thumbmember, thisFolder & theDefaultName & ".png", "png", 100, SharpExportInst
+                    
+                  end if
+                end if
+                
+                thumbmember.erase()
+                
+              end if
+              
+              
+              if theDefaultName <> origname then
+                
+                snam = baShortFileName(thisFolder & origname & ext)
+                if length(snam) > 0 then baDeleteFile(snam)
+                erg = baRenameFile(thisFolder & theDefaultName & ext, thisFolder & origname & ext)
+                if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ext & " to " & thisFolder & origname & ext
+                if bmexp = 1 then
+                  snam = baShortFileName(thisFolder & origname & ".png")
+                  if length(snam) > 0 then baDeleteFile(snam)
+                  erg = baRenameFile(thisFolder & theDefaultName & ".png", thisFolder & origname & ".png")
+                  if erg <> 1 then put "Couldn't rename file " & thisFolder & theDefaultName & ".png to " & thisFolder & origname & ".png"
+                end if
+                
+              end if
+              
+              if origname <> memname then
+                put "Renamed member" && memref && "to" && origname & ". Scriptmember names must not be emoty or contain illegal characters (SPACE, /, :, \, &)"
+              end if
+              
+            end if
+          end if
+          
+        end if
+      end repeat
+    end repeat
+    
+  end repeat
+  
+  if resetUNames = 1 then baReturnUnixNames(1)
+  
+  DirectImageInstance = 0
+  SharpExportInst = 0
+  
+end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

trunk/lingosource/castlib1/memberInfo.xml

@@ -5 +5 @@
                 <comments>http://www.farbflash.de/cgi-bin/versionChecker.pl?movieName=HandlerMenu_OSC</comments>
                 <memberName>subversion_version_field</memberName>
-                <fName>subversion_version_field</fName>
+                <fname>subversion_version_field</fname>
         </subversion_version_field>
         <doCommandMovieScript>
@@ -11 +11 @@
                 <comments></comments>
                 <memberName>doCommandMovieScript</memberName>
-                <fName>doCommandMovieScript</fName>
+                <fname>doCommandMovieScript</fname>
         </doCommandMovieScript>
         <thisMoviesScript>
@@ -17 +17 @@
                 <comments></comments>
                 <memberName>thisMoviesScript</memberName>
-                <fName>thisMoviesScript</fName>
+                <fname>thisMoviesScript</fname>
         </thisMoviesScript>
         <keyboardNavigation_FrameLoop>
@@ -23 +23 @@
                 <comments></comments>
                 <memberName>keyboardNavigation_FrameLoop</memberName>
-                <fName>keyboardNavigation_FrameLoop</fName>
+                <fname>keyboardNavigation_FrameLoop</fname>
         </keyboardNavigation_FrameLoop>
         <menu1_button>
@@ -29 +29 @@
                 <comments></comments>
                 <memberName>menu1_button</memberName>
-                <fName>menu1_button</fName>
+                <fname>menu1_button</fname>
         </menu1_button>
         <menu2_button>
@@ -35 +35 @@
                 <comments></comments>
                 <memberName>menu2_button</memberName>
-                <fName>menu2_button</fName>
+                <fname>menu2_button</fname>
         </menu2_button>
         <simpleBMMenu>
@@ -41 +41 @@
                 <comments></comments>
                 <memberName>simpleBMMenu</memberName>
-                <fName>simpleBMMenu</fName>
+                <fname>simpleBMMenu</fname>
         </simpleBMMenu>
         <OSCmenu_Utilities>
@@ -47 +47 @@
                 <comments></comments>
                 <memberName>OSCmenu_Utilities</memberName>
-                <fName>OSCmenu_Utilities</fName>
+                <fname>OSCmenu_Utilities</fname>
         </OSCmenu_Utilities>
         <alexUtilities>
@@ -53 +53 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>alexUtilities</memberName>
-                <fName>alexUtilities</fName>
+                <fname>alexUtilities</fname>
         </alexUtilities>
         <bbedit_Utilities>
@@ -59 +59 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>bbedit_Utilities</memberName>
-                <fName>bbedit_Utilities</fName>
+                <fname>bbedit_Utilities</fname>
         </bbedit_Utilities>
         <svn_Utilities>
@@ -65 +65 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>svn_Utilities</memberName>
-                <fName>svn_Utilities</fName>
+                <fname>svn_Utilities</fname>
         </svn_Utilities>
         <custom_Utilities>
@@ -71 +71 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>custom_Utilities</memberName>
-                <fName>custom_Utilities</fName>
+                <fname>custom_Utilities</fname>
         </custom_Utilities>
         <convert_Lingo_2_CSS_Html>
@@ -77 +77 @@
                 <comments>~/Documents/Scripts/lingo/convert_Lingo_2_CSS_Html.ls</comments>
                 <memberName>convert_Lingo_2_CSS_Html</memberName>
-                <fName>convert_Lingo_2_CSS_Html</fName>
+                <fname>convert_Lingo_2_CSS_Html</fname>
         </convert_Lingo_2_CSS_Html>
         <OSCmenu_Handlers>
@@ -83 +83 @@
                 <comments></comments>
                 <memberName>OSCmenu_Handlers</memberName>
-                <fName>OSCmenu_Handlers</fName>
+                <fname>OSCmenu_Handlers</fname>
         </OSCmenu_Handlers>
         <pastefeld>
@@ -89 +89 @@
                 <comments></comments>
                 <memberName>pastefeld</memberName>
-                <fName>pastefeld</fName>
+                <fname>pastefeld</fname>
         </pastefeld>
         <oldclipboard>
@@ -95 +95 @@
                 <comments></comments>
                 <memberName>oldclipboard</memberName>
-                <fName>oldclipboard</fName>
+                <fname>oldclipboard</fname>
         </oldclipboard>
         <searchword>
@@ -101 +101 @@
                 <comments></comments>
                 <memberName>searchword</memberName>
-                <fName>searchword</fName>
+                <fname>searchword</fname>
         </searchword>
         <resizewindowfs>
@@ -107 +107 @@
                 <comments></comments>
                 <memberName>resizewindowfs</memberName>
-                <fName>resizewindowfs</fName>
+                <fname>resizewindowfs</fname>
         </resizewindowfs>
         <showHideHelp>
@@ -113 +113 @@
                 <comments></comments>
                 <memberName>showHideHelp</memberName>
-                <fName>showHideHelp</fName>
+                <fname>showHideHelp</fname>
         </showHideHelp>
         <helptext>
@@ -122 +122 @@
 rtf</comments>
                 <memberName>helptext</memberName>
-                <fName>helptext</fName>
+                <fname>helptext</fname>
         </helptext>
         <texthyperlinkBehavior>
@@ -128 +128 @@
                 <comments>/Users/alex/Documents/ALIEN/myLinkedScripts/texthyperlinkBehavior.ls</comments>
                 <memberName>texthyperlinkBehavior</memberName>
-                <fName>texthyperlinkBehavior</fName>
+                <fname>texthyperlinkBehavior</fname>
         </texthyperlinkBehavior>
         <statusOutput>
@@ -137 +137 @@
 rtf</comments>
                 <memberName>statusOutput</memberName>
-                <fName>statusOutput</fName>
+                <fname>statusOutput</fname>
         </statusOutput>
 </Untitled>

trunk/lingosource/castlib1/subversion_version_field.txt

@@ -1 @@
-r227
+r230

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -1393 +1393 @@
   
   if ilk(infolist) <> #proplist then
-    infolistPath = thePath & "memberInfo.xml"
-    infolist = mReadXML_2_List(me, infolistPath)
-    if ilk(infolist) <> #proplist then infolist = [:]
-    
-    infolist = infolist.getaprop(symbol(fname))
-    if ilk(infolist) <> #proplist then infolist = [:]
+    
+    offs = offset("--!memberProperties:", scrtext)
+    
+    if offs > 0 then
+      infolist = scrtext.char[offs + 20 .. length(scrtext)]
+      offs = offset("]", infolist)
+      if offs > 0 then
+        infolist = value(infolist.char[1 .. offs])
+      end if
+    end if
+    
+    if ilk(infolist) <> #proplist then
+      infolistPath = thePath & "memberInfo.xml"
+      infolist = mReadXML_2_List(me, infolistPath)
+      if ilk(infolist) <> #proplist then infolist = [:]
+      
+      infolist = infolist.getaprop(symbol(fname))
+      if ilk(infolist) <> #proplist then infolist = [:]
+    end if
+    
   end if
   
@@ -2549 +2563 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
+on mSVN_Update_AllCastlibs_and_source me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, selectionList, revisionNumber, dontShowAlert
+  mSVN_Update_Working_Copy_ScriptText me, revisionNumber, void, #all, 1
+  mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, #all, revisionNumber, dontShowAlert
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
 on mSVN_Update_SelectedCastlib_and_source me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, selectionList, revisionNumber, dontShowAlert
   mSVN_Update_Working_Copy_ScriptText me, revisionNumber, void, selectionList, 1
@@ -2560 +2581 @@
   castlibList = 0
   
-  selectionList = string(selectionList)
-  if length(selectionList) > 0 then
-    
-    offs = offset("'", selectionList)
-    repeat while offs > 0
-      put QUOTE into char offs of selectionList
+  if symbolP(selectionList) then
+    -- #all
+    clnum = the number of castlibs
+    castlibList = []
+    repeat with n = 1 to clnum
+      castlibList.add(n)
+    end repeat
+    
+  else
+    
+    selectionList = string(selectionList)
+    if length(selectionList) > 0 then
+      
       offs = offset("'", selectionList)
-    end repeat
-    
-    if char 1 of selectionList <> "[" then put "[" before selectionList
-    if the last char of selectionList <> "]" then put "]" after selectionList
-    
-    selectionList = value(selectionList)
-    if listP(selectionList) then
-      clnum = the number of castlibs + 1
-      castlibList = []
-      selectionListCnt = count(selectionList)
-      repeat with n = 1 to selectionListCnt
-        
-        cl = castlib(selectionList[n])
-        if ilk(cl) = #castlib then
-          int = cl.number
-          if castlibList.getPos(int) < 1 then
-            castlibList.add(int)
-          end if
-        else
-          int = integer(selectionList[n])
-          if integerP(int) then
-            if clnum > int then
-              if castlibList.getPos(int) < 1 then castlibList.add(int)
+      repeat while offs > 0
+        put QUOTE into char offs of selectionList
+        offs = offset("'", selectionList)
+      end repeat
+      
+      if char 1 of selectionList <> "[" then put "[" before selectionList
+      if the last char of selectionList <> "]" then put "]" after selectionList
+      
+      selectionList = value(selectionList)
+      if listP(selectionList) then
+        clnum = the number of castlibs + 1
+        castlibList = []
+        selectionListCnt = count(selectionList)
+        repeat with n = 1 to selectionListCnt
+          
+          cl = castlib(selectionList[n])
+          if ilk(cl) = #castlib then
+            int = cl.number
+            if castlibList.getPos(int) < 1 then
+              castlibList.add(int)
+            end if
+          else
+            int = integer(selectionList[n])
+            if integerP(int) then
+              if clnum > int then
+                if castlibList.getPos(int) < 1 then castlibList.add(int)
+              end if
             end if
           end if
-        end if
-      end repeat
+        end repeat
+      end if
     end if
   end if

trunk/lingosource/castlib2/GetSetPrefs.ls

@@ -179 +179 @@
 --    delete line 1 of prefsText
     
-    gPrefs = call(#mGetListFromXMLString, mGetXScript(#PseudoXMLPS), prefsText)
+    gPrefs = call(#mGetListFromXMLStringX, mGetXScript(#PseudoXMLPS), prefsText)
     if objectP(gPrefs) then globs[#gPrefs] = gPrefs
     

trunk/lingosource/castlib2/PseudoXMLPS.ls

@@ -2 +2 @@
 -----------------------------------
 -- CREATED:
--- 06.03.2008
+-- 2002
 --
 -- DESCRIPTION:
 --              Pseudo XML by Alex da Franca c2003
--- Convert a lingo list to a XML like string and back
+--              Convert a lingo list to a XML like string and back
 
 --
 -- REQUIRES:
--- (Prerequisites)
+--              only the functions mSaveList_2_XML() and mReadXML_2_List() require my system of library scripts
+--              in order to write and read text with fileio. All other functions have no dependencies
+--              Either get these scripts from my website, or replace the write/read stuff with your own fileIO handlers
+--                    That is:
+--                            * movie script "aleXtrasMovieScript"
+--                            * parent script "commonMovieScript"
+--                            * parent script "FileIOFunktionen"
 --
 -- USAGE:
+--              ---------- please see the comments for each handler for a how-to.
+--              ---------- nonetheless here are some fast start comments with the minimum amount of parameters
+--              PseudoXMLPS = new(script "PseudoXMLPS")
+--              -- Convert a list to an xml string:
+--              xmlString = PseudoXMLPS.mGetXMLStringFromList(["one", "two", [#prop: 3]])
+--              lingolist = PseudoXMLPS.mGetListFromXMLStringX(xmlString)
+--              ---------- basically that's it
+--
+--              ---------- another "hack" to be aware of is the following:
+--              ---------- linear lists get identified by having a nodename which starts with the exact string "item"
+--              ---------- so if an xml node like <item1>one</item1> is encountered, it is treated as linear list: ["one"]
+--              ---------- and NOT as [#item1:"one"]
+--
+--              ---------- the mGetXMLStringFromList() function escapes the reserved xml chars <> and & and ' and " by default
+--              ---------- if for some reason you rather want to enclose the contents in a <![CDATA[ tag, use the dontReplaceGT flag.
+--------------------------------------------- EXAMPLE for <dontReplaceGT = 1> (dontReplaceGT means don't replace "greater than" btw...):
+--
 -- myList = [#stringWithInvalidChars:"A string with invalid chars like <> and & and ' and " & QUOTE]
 -- myList[#stringWithInvalidChars] = "<![CDATA[" & myList[#stringWithInvalidChars] & "]]>"
@@ -28 +51 @@
 --   end if
 -- end repeat
+--------------------------------------------- please note, that the above example is ONLY needed, if you use dontReplaceGT = 1 !!
 --
 -- HISTORY:
@@ -129 +153 @@
   -- ACTION: Convert lingo list (also nested lists) to XML stylish string
   -- INPUT: 
--- <listref> format: property list or linear list
--- <docName> format: #string; optional. if omitted "Untitled" is used for the XML document name
+  --              <listref> format: property list or linear list
+  --              <docName> format: #string; optional. if omitted "Untitled" is used for the XML document name
   --              <strict>        => boolean; avoid spaces in tag names
   --              <dontReplaceGT> => boolean; dont replace < and >
   --              <withParams>    => boolean; write attribute in tag for the lingo ilk => bigger xml files and unfortunately it is slower to parse
------------------------------ (I thought avoiding value() would help, but in this case the additional text parsing of the attributes tag slows down)
+  ----------------------------- (I thought avoiding value() would help, but in this case the additional text parsing of the attributes tag slows down)
   -- RETURNS: string
   -- EXAMPLE: saveString = mGetXMLStringFromList(me, lingo_list, "documentName")
@@ -173 +197 @@
   -- ACTION: Description
   -- INPUT:
--- <str> format: #string; split a string using <> and </> tags into lingo list
--- <convertValues> #integer 0=>don't convert (fast, all values are strings), 1 => convert only numbers (slower); 2 => try to convert all data, even colors (slow)
+  --          <str> format: #string; split a string using <> and </> tags into lingo list
+  --          <convertValues> #integer 0=>don't convert (fast, all values are strings), 1 => convert only numbers (slower); 2 => try to convert all data, even colors (slow)
   --          <withParams> : #boolean : parse parameters too. new, not very well tested
   -- RETURNS: property list
@@ -224 +248 @@
   --         BUT it must be a valid xml string, the above is slower but allows more malformed xml
   -- INPUT: 
--- <str> format: #string; split a string using <> and </> tags into lingo list
--- <convertValues> #integer
--- -- -- 0 => don't convert (fast, all values are strings)
--- -- -- 1 => convert only integer() and float() (slower)
--- -- -- 2 => try to convert all data with value(), even parse for colors in hexstring format (slow)
+  --         <str> format: #string; split a string using <> and </> tags into lingo list
+  --         <convertValues> #integer
+  --           -- -- 0 => don't convert (fast, all values are strings)
+  --           -- -- 1 => convert only integer() and float() (slower)
+  --           -- -- 2 => try to convert all data with value(), even parse for colors in hexstring format (slow)
   -- RETURNS: property list
   -- EXAMPLE: lingo_list = mGetListFromXMLStringX(me, saveString)
@@ -306 +330 @@
   li = mConvertXMLPropList(me, [xx], convertValues, dontEscapeSpecialChars)
   
- -- put "x" && the milliseconds - ms
+  -- put "PseudoXMLPS: mGetListFromXMLStringX:" && the milliseconds - ms
   
   if not(listP(li)) then return [:]
@@ -328 +352 @@
   
   dertext = xscr(#FileIOFunktionen).mGetTextFromFile(thePath)
-  if length(dertext) > 0 then return xscr(#PseudoXMLPS).mGetListFromXMLStringX(dertext)
+  if length(dertext) > 0 then return mGetListFromXMLStringX(me, dertext)
   return [:]
 end
@@ -345 +369 @@
   
   if not(listP(theList)) then return 0
-  theResult = xscr(#PseudoXMLPS).mGetXMLStringFromList(theList)
+  theResult = mGetXMLStringFromList(me, theList)
   return xscr(#FileIOFunktionen).mSaveToTextFile(theResult, thePath)
 end
@@ -757 +781 @@
   
   if val.length = 7 then
-    if (val.char[1] = "#") and (offset(val.char[2], "abcdef0123456789") > 0) then return rgb(val)
+    if (val.char[1] = "#") then
+      isColor = 1
+      repeat with n = 2 to 7
+        if (offset(val.char[n], "abcdef0123456789") < 1) then
+          isColor = 0
+          exit repeat
+        end if
+      end repeat
+      if isColor = 1 then return rgb(val)
+    end if
   end if 
   
@@ -921 +954 @@
       if count(val) then
         if ilk(retlist) = #proplist then
-        retlist.addProp(symbol(inputlist[n].getaprop(#name)), mConvertXMLPropList(me, val, convertValues, dontEscapeSpecialChars))
-      else
+          retlist.addProp(symbol(inputlist[n].getaprop(#name)), mConvertXMLPropList(me, val, convertValues, dontEscapeSpecialChars))
+        else
           retlist.add(mConvertXMLPropList(me, val, convertValues, dontEscapeSpecialChars))
         end if
@@ -943 +976 @@
               
               -- unescape <>&'"
-               if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)
+              if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)
               
             #integer:
@@ -988 +1021 @@
             
             -- unescape <>&'"
-           if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)
+            if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)
             
             
@@ -1000 +1033 @@
         
         if ilk(retlist) = #proplist then
-        retlist.addProp(symbol(inputlist[n].getaprop(#name)), val)
+          retlist.addProp(symbol(inputlist[n].getaprop(#name)), val)
         else
           retlist.add(val)
@@ -1022 +1055 @@
   -- INPUT: <theText> ; string ; required => xml formatted string
   -- RETURNS: property list
-  -- EXAMPLE: plist = xscr(#PseudoXMLPS).mParseExcelXML(xscr(#FileIOFunktionen).mGetTextFromFile())
+  -- EXAMPLE: plist = new(script "PseudoXMLPS").mParseExcelXML(xscr(#FileIOFunktionen).mGetTextFromFile())
   -----------------------------------
   
@@ -1061 +1094 @@
                         
                       else
-                        call(#mPut, mGetXScript(), "mParseExcelXML: Row "&n&" Cell "&m&" is not a property list")
+                        put "mParseExcelXML: Row "&n&" Cell "&m&" is not a property list"
                       end if -- if ilk(thisCell) = #proplist then
                       
@@ -1067 +1100 @@
                     
                   else
-                    call(#mPut, mGetXScript(), "mParseExcelXML: Row "&n&" is not a list")
+                    put "mParseExcelXML: Row "&n&" is not a list"
                   end if -- if listP(currRow) then
                   
@@ -1073 +1106 @@
                 
               else
-                call(#mPut, mGetXScript(), "mParseExcelXML: Table not found")
+                put "mParseExcelXML: Table not found"
               end if -- if listP(xmlList) then
               
             else
-              call(#mPut, mGetXScript(), "mParseExcelXML: Worksheet not found")
+              put "mParseExcelXML: Worksheet not found"
             end if -- if ilk(xmlList) = #proplist then
             
           else
-            call(#mPut, mGetXScript(), "mParseExcelXML: Workbook not found")
+            put "mParseExcelXML: Workbook not found"
           end if -- if ilk(xmlList) = #proplist then
           
         else
-          call(#mPut, mGetXScript(), "mParseExcelXML: ROOT is not a property list")
+          put "mParseExcelXML: ROOT is not a property list"
         end if --if ilk(xmlList) = #proplist then
         
       else
-        call(#mPut, mGetXScript(), "mParseExcelXML: Xml parser makelist() returned empty list")
+        put "mParseExcelXML: Xml parser makelist() returned empty list"
       end if -- if count(xmlList) > 0 then
       
     else
-      call(#mPut, mGetXScript(), "mParseExcelXML: Xml parser makelist() failed")
+      put "mParseExcelXML: Xml parser makelist() failed"
     end if -- if listP(xmlList) then
     
   else
-    call(#mPut, mGetXScript(), "mParseExcelXML: Xml parser error: "&xmlp.getError())
+    put "mParseExcelXML: Xml parser error: "&xmlp.getError()
   end if -- if voidP(xmlp.getError()) then
   
@@ -1113 +1146 @@
   -- INPUT: <pfad> ; string ; full pathname to plist file. This is optional, if it is void or "" a file selection dialog is displayed 
   -- RETURNS: property list
-  -- EXAMPLE: plist = xscr(#PseudoXMLPS).mReadPList()
+  -- EXAMPLE: plist = new(script "PseudoXMLPS").mReadPList()
   -----------------------------------
   
@@ -1186 +1219 @@
 
 on mGetListFromPListString me, str
-  return mConvertKeyList(me, mGetListFromXMLString(me, str, 0))
+  return mConvertKeyList(me, mGetListFromXMLStringX(me, str, 0))
 end
 

trunk/lingosource/castlib2/aleXtrasMovieScript.ls

@@ -49 +49 @@
       halt
     end if
+    
+    if voidP(cms.script) then -- strangely enough this happened suddenly, dunno why...
+      -- until now it happened only in authoring with the stopped movie
+      -- therefore I just exit here without alert
+      halt
+    end if
+    
     alextras = rawnew(cms.script)
     if ilk(alextras) <> #instance then
@@ -55 +62 @@
     end if
     (script "aleXtrasMovieScript").pAleXtras = alextras
+    
   end if
   return alextras

trunk/lingosource/castlib2/commonMovieScript.ls

@@ -387 +387 @@
   --         ACTION: Create/Get timeout object
   --                 This handler works the same with the old player <10 and the new player >=10
-  --         INPUT: ||ÊtheName     || string  || name for new timeout object||
-  --                ||ÊtheDuration || integer || timeout perios in milliseconds||
+  --         INPUT: || theName     || string  || name for new timeout object||
+  --                || theDuration || integer || timeout perios in milliseconds||
   --                || theHandler  || symbol  || handler to be called on each timepout event||
   --                || theTarget   || object  || object to be sent the timeout event <theHandler>||
@@ -1705 +1705 @@
 -- dummy handler for translate function
 
-on mTranslate me, aString
+on mTranslate me, aString, variablesList
   theGlobs = mGetGlobalList(me)
   uebersetzungsListe = theGlobs.getaprop(#gUebersetzung)
@@ -1711 +1711 @@
   uebersetzung = uebersetzungsListe.getaprop(aString)
   if voidP(uebersetzung) then
+    if listP(variablesList) then return mReplacePlaceHoldersInString(me, aString, variablesList)
     return aString
   else
@@ -1725 +1726 @@
 end
 
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mReplacePlaceHoldersInString me, aString, variablesList
+  if ilk(variablesList) = #proplist then
+    cnt = count(variablesList)
+    if cnt > 0 then
+      repeat with n = 1 to cnt
+        str = string(variablesList[n])
+        prop = variablesList.getPropAt(n)
+        srchStr = "%%" & prop & "%%"
+        len = length(srchStr) - 1
+        offs = offset(srchStr, aString)
+        repeat while offs > 0
+          put str into char offs to offs + len of aString
+          offs = offset(srchStr, aString)
+        end repeat
+      end repeat        
+    end if
+  else if ilk(variablesList) = #list then -- printf like replacement
+    if count(variablesList) > 0 then
+      offs = offset("%s", aString)
+      str = string(variablesList[1])
+      repeat while offs > 0
+        put str into char offs to offs + 1 of aString
+        if count(variablesList) > 1 then variablesList.deleteAt(1)
+        offs = offset("%s", aString)
+      end repeat
+    end if
+  end if
+  return aString
+end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

trunk/lingosource/castlib2/memberInfo.xml

@@ -5 +5 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>commonMovieScript</memberName>
-                <fName>commonMovieScript</fName>
+                <fname>commonMovieScript</fname>
         </commonmoviescript>
         <FileIOFunktionen>
@@ -11 +11 @@
                 <comments>~/Documents/Scripts/lingo/FileIOFunktionen.ls</comments>
                 <memberName>FileIOFunktionen</memberName>
-                <fName>FileIOFunktionen</fName>
+                <fname>FileIOFunktionen</fname>
         </FileIOFunktionen>
         <GetSetPrefs>
@@ -17 +17 @@
                 <comments>~/Documents/Scripts/lingo/GetSetPrefs.ls</comments>
                 <memberName>GetSetPrefs</memberName>
-                <fName>GetSetPrefs</fName>
+                <fname>GetSetPrefs</fname>
         </GetSetPrefs>
         <aleXtrasMovieScript>
@@ -23 +23 @@
                 <comments>~/Documents/Scripts/lingo/aleXtrasMovieScript.ls</comments>
                 <memberName>aleXtrasMovieScript</memberName>
-                <fName>aleXtrasMovieScript</fName>
+                <fname>aleXtrasMovieScript</fname>
         </aleXtrasMovieScript>
         <PseudoXMLPS>
@@ -29 +29 @@
                 <comments>~/Documents/Scripts/lingo/PseudoXMLPS.ls</comments>
                 <memberName>PseudoXMLPS</memberName>
-                <fName>PseudoXMLPS</fName>
+                <fname>PseudoXMLPS</fname>
         </PseudoXMLPS>
         <simpleGoToAction>
@@ -35 +35 @@
                 <comments>/Users/alex/Documents/ALIEN/myLinkedScripts/simpleGoToAction.ls</comments>
                 <memberName>simpleGoToAction</memberName>
-                <fName>simpleGoToAction</fName>
+                <fname>simpleGoToAction</fname>
         </simpleGoToAction>
         <SpriteNameBeaver>
@@ -41 +41 @@
                 <comments>~/Documents/Scripts/lingo/SpriteNameBeaver.ls</comments>
                 <memberName>SpriteNameBeaver</memberName>
-                <fName>SpriteNameBeaver</fName>
+                <fname>SpriteNameBeaver</fname>
         </SpriteNameBeaver>
         <subversionVersionChecker>
@@ -47 +47 @@
                 <comments>~/Documents/Scripts/lingo/subversionVersionChecker.ls</comments>
                 <memberName>subversionVersionChecker</memberName>
-                <fName>subversionVersionChecker</fName>
+                <fname>subversionVersionChecker</fname>
         </subversionVersionChecker>
 </Untitled>