From: <ha...@us...> - 2009-01-20 16:19:06
|
Revision: 10564 http://jmol.svn.sourceforge.net/jmol/?rev=10564&view=rev Author: hansonr Date: 2009-01-20 16:19:01 +0000 (Tue, 20 Jan 2009) Log Message: ----------- version=11.6.14 # bug fix: structure helix ({xx:yy}) compiler bug # bug fix: user menu write povray/vrml/maya missing quotation marks in command Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/viewer/Compiler.java branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Compiler.java =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Compiler.java 2009-01-20 16:15:48 UTC (rev 10563) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Compiler.java 2009-01-20 16:19:01 UTC (rev 10564) @@ -461,7 +461,8 @@ if (lookingAtString()) { if (cchToken < 0) return error(ERROR_endOfCommandUnexpected); - String str = ((tokCommand == Token.load || tokCommand == Token.background || tokCommand == Token.script) + String str = ((tokCommand == Token.load + || tokCommand == Token.background || tokCommand == Token.script) && !iHaveQuotedString ? script.substring(ichToken + 1, ichToken + cchToken - 1) : getUnescapedStringLiteral()); addTokenToPrefix(new Token(Token.string, str)); @@ -546,7 +547,8 @@ } if (lookingAtObjectID(nTokens == 1)) { addTokenToPrefix(Token.getTokenFromName("$")); - addTokenToPrefix(new Token(Token.identifier, script.substring(ichToken, ichToken + cchToken))); + addTokenToPrefix(new Token(Token.identifier, script.substring( + ichToken, ichToken + cchToken))); continue; } if (lookingAtDecimal()) { @@ -594,13 +596,15 @@ addTokenToPrefix(new Token(Token.integer, val, intString)); continue; } - if (lastToken.tok == Token.select + if (tokCommand == Token.structure && nTokens == 2 + || lastToken.tok == Token.select || lastToken.tok == Token.within - || lastToken.tok != Token.identifier - && !tokenAttr(lastToken, Token.mathfunc)) { + || !(lastToken.tok == Token.identifier || tokenAttr(lastToken, + Token.mathfunc))) { // here if: // select ({...}) // within({...}) + // structure helix ({...}) // NOT myfunc({...}) // NOT mathFunc({...}) // if you want to use a bitset there, you must use @@ -737,7 +741,8 @@ if (tokAttr(tokCommand, Token.command)) break; isSetBrace = (tok == Token.leftbrace); - if (!isSetBrace && !tokAttr(tok, Token.identifier) && !tokAttr(tok, Token.setparam)) + if (!isSetBrace && !tokAttr(tok, Token.identifier) + && !tokAttr(tok, Token.setparam)) return commandExpected(); tokCommand = Token.set; isNewSet = !isSetBrace; @@ -902,9 +907,9 @@ continue; } } - if (bracketCount == 0 && tok != Token.identifier - && !tokAttr(tok, Token.expression) - && tok != Token.min && tok != Token.max) + if (bracketCount == 0 && tok != Token.identifier + && !tokAttr(tok, Token.expression) && tok != Token.min + && tok != Token.max) return error(ERROR_invalidExpressionToken, ident); break; case Token.center: Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-01-20 16:15:48 UTC (rev 10563) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-01-20 16:19:01 UTC (rev 10564) @@ -1,8 +1,9 @@ # Developers: to add a description of changes you have made, # add it on a line starting with # below the "version=..." line -version=11.6.14_dev +version=11.6.14 +# bug fix: structure helix ({xx:yy}) compiler bug # bug fix: user menu write povray/vrml/maya missing quotation marks in command # ----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |