diff --git a/src/mol-script/transpilers/pymol/keywords.ts b/src/mol-script/transpilers/pymol/keywords.ts index 556544447c69a2dfede314804519d06604051df7..26ef52ef99fab8b397786c535088ce0e75210611 100644 --- a/src/mol-script/transpilers/pymol/keywords.ts +++ b/src/mol-script/transpilers/pymol/keywords.ts @@ -18,38 +18,38 @@ const ResDict = { const Backbone = { nucleic: ['P', "O3'", "O5'", "C5'", "C4'", "C3'", 'OP1', 'OP2', 'O3*', 'O5*', 'C5*', 'C4*', 'C3*', - "C2'","C1'","O4'","O2'"], + "C2'", "C1'", "O4'", "O2'"], protein: ['C', 'N', 'CA', 'O'] }; function backboneExpr() { return B.struct.combinator.merge([ B.struct.modifier.intersectBy( - { 0: B.struct.generator.atomGroups({ + { 0: B.struct.generator.atomGroups({ 'residue-test': B.core.set.has([ - B.core.type.set(ResDict.protein), - B.ammp('label_comp_id') - ])}) + B.core.type.set(ResDict.protein), + B.ammp('label_comp_id') + ]) }) , - by : B.struct.generator.atomGroups({ + by: B.struct.generator.atomGroups({ 'atom-test': B.core.set.has([ B.core.type.set(Backbone.protein), - B.ammp('label_atom_id')])}) - }), + B.ammp('label_atom_id')]) }) + }), B.struct.modifier.intersectBy( - { 0: B.struct.generator.atomGroups({ + { 0: B.struct.generator.atomGroups({ 'residue-test': B.core.set.has([ - B.core.type.set(ResDict.nucleic), - B.ammp('label_comp_id') - ])}) + B.core.type.set(ResDict.nucleic), + B.ammp('label_comp_id') + ]) }) , - by : B.struct.generator.atomGroups({ + by: B.struct.generator.atomGroups({ 'atom-test': B.core.set.has([ B.core.type.set(Backbone.nucleic), - B.ammp('label_atom_id')])}) - }), - ]) - + B.ammp('label_atom_id')]) }) + }), + ]); + } @@ -96,15 +96,16 @@ export const keywords: KeywordDict = { }, sidechain: { '@desc': 'Polymer non-backbone atoms (new in PyMOL 1.6.1)', - abbr:['sc.'], - map: () => { + abbr: ['sc.'], + map: () => { return B.struct.modifier.exceptBy({ - '0': B.struct.generator.atomGroups({ + '0': B.struct.generator.atomGroups({ 'residue-test': B.core.set.has([ - B.core.type.set(ResDict.nucleic.concat(ResDict.protein)), - B.ammp('label_comp_id')])}), - by: backboneExpr() - })}, + B.core.type.set(ResDict.nucleic.concat(ResDict.protein)), + B.ammp('label_comp_id')]) }), + by: backboneExpr() + }); + }, }, present: { '@desc': 'All atoms with defined coordinates in the current state (used in creating movies)', @@ -242,7 +243,7 @@ export const keywords: KeywordDict = { }, backbone: { '@desc': 'the C, N, CA, and O atoms of a protein and the equivalent atoms in a nucleic acid.', - abbr: ['bb.'], + abbr: ['bb.'], map: () => backboneExpr() }, 'bFCLHMz55tjm16c9': { diff --git a/src/mol-script/transpilers/pymol/properties.ts b/src/mol-script/transpilers/pymol/properties.ts index 5b405187bc6276885b84d07782f8282ea73814b2..cc3062cbd313795d8e1cbbeafc91707744bbedf2 100644 --- a/src/mol-script/transpilers/pymol/properties.ts +++ b/src/mol-script/transpilers/pymol/properties.ts @@ -205,9 +205,9 @@ export const properties: PropertyDict = { level: 'atom-test' }, elem: { - '@desc': 'str atomic element symbol string ("X" if undefined)', - '@examples': ['elem N'], - regex: /[a-zA-Z0-9]{1,3}/, map: x => B.es(x), - level: 'atom-test', property: B.acp('elementSymbol') + '@desc': 'str atomic element symbol string ("X" if undefined)', + '@examples': ['elem N'], + regex: /[a-zA-Z0-9]{1,3}/, map: x => B.es(x), + level: 'atom-test', property: B.acp('elementSymbol') } };