diff --git a/src/mol-script/transpilers/_spec/rasmol.spec.ts b/src/mol-script/transpilers/_spec/rasmol.spec.ts index 77b42605e89604a75929154041863b51db74db10..c8d70cd07010a8e57a8cceafadb9f16a5ddb8d38 100644 --- a/src/mol-script/transpilers/_spec/rasmol.spec.ts +++ b/src/mol-script/transpilers/_spec/rasmol.spec.ts @@ -30,10 +30,10 @@ const general = { ' [ALA] and [VAL]', // within with whitespaces 'within ( 5 , [HEM] ) ', - ], - unsupported: [ // un-braketed residue name 'LEU and ILE', + ], + unsupported: [ // un-parenthesized residue index '100-120', // within in the head or the middle of sentence diff --git a/src/mol-script/transpilers/rasmol/macroproperties.ts b/src/mol-script/transpilers/rasmol/macroproperties.ts index 9514ec8fccc04763cffd91bbae4a29653214a4f2..f991e2ed925319cacf5aedd61f1cde48120a3322 100644 --- a/src/mol-script/transpilers/rasmol/macroproperties.ts +++ b/src/mol-script/transpilers/rasmol/macroproperties.ts @@ -8,9 +8,6 @@ import { MolScriptBuilder } from '../../../mol-script/language/builder'; const B = MolScriptBuilder; import { PropertyDict } from '../types'; -// const reFloat = /[-+]?[0-9]*\.?[0-9]+/; -// const rePosInt = /[0-9]+/; - function atomNameListMap(x: string) { return x.split(',').map(B.atomName); } function listMap(x: string) { return x.split(',').map(x => x.replace(/^["']|["']$/g, '')); } function rangeMap(x: string) { @@ -44,19 +41,6 @@ function elementListMap(x: string) { return x.split(',').map(B.struct.type.elementSymbol); } -// const sstrucDict: { [k: string]: string } = { -// H: 'helix', -// S: 'beta', -// L: 'none' -// }; -// function sstrucListMap(x: string) { -// return { -// flags: B.struct.type.secondaryStructureFlags( -// x.toUpperCase().split('+').map(ss => sstrucDict[ss] || 'none') -// ) -// }; -// } - export const macroproperties: PropertyDict = { symbol: { '@desc': 'chemical-symbol-list: list of 1- or 2-letter chemical symbols from the periodic table',