diff --git a/src/mol-io/writer/cif/encoder/text.ts b/src/mol-io/writer/cif/encoder/text.ts index 9a8c7ddbef016d17445407a0e231cb18853c7108..91c0d897f7388483dd7da49a98a458702e17b578 100644 --- a/src/mol-io/writer/cif/encoder/text.ts +++ b/src/mol-io/writer/cif/encoder/text.ts @@ -235,7 +235,7 @@ function writeChecked(builder: StringBuilder, val: string) { } const fst = val.charCodeAt(0); - if (!escape && (fst === 35 /* # */ || fst === 59 /* ; */ || hasWhitespace)) { + if (!escape && (fst === 35 /* # */|| fst === 36 /* $ */ || fst === 59 /* ; */ || fst === 91 /* [ */ || fst === 93 /* ] */ || hasWhitespace)) { escapeCharStart = '\''; escapeCharEnd = '\' '; escape = true; diff --git a/src/mol-state/selection.ts b/src/mol-state/selection.ts index b442e562354a24c4bd31ebc418d527d8d4ee4ba4..60c512855f7ab9070b5f25d93b43b70594464545 100644 --- a/src/mol-state/selection.ts +++ b/src/mol-state/selection.ts @@ -40,13 +40,13 @@ namespace StateSelection { } export interface Builder { - flatMap(f: (n: Node) => Node[]): Builder; - mapEntity(f: (n: Node) => Node): Builder; + flatMap(f: (n: StateObject.Node) => StateObject.Node[]): Builder; + mapEntity(f: (n: StateObject.Node) => StateObject.Node): Builder; unique(): Builder; parent(): Builder; first(): Builder; - filter(p: (n: Node) => boolean): Builder; + filter(p: (n: StateObject.Node) => boolean): Builder; subtree(): Builder; children(): Builder; ofType(t: StateObject.Type): Builder;