Commit 4e767ac

committed

Fix escaping code

1 parent df9467e commit 4e767acCopy full SHA for 4e767ac

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -331,9 +331,13 @@ buffer."`
`331`	`331`	`(message "An error raised in the SageMath process.")))`
`332`	`332`
`333`	`333`
	`334`	`+(defun ob-sagemath--escape-code (raw-code)`
	`335`	`+ (setq raw-code (replace-regexp-in-string (rx "\\") "\\\\" raw-code nil t)`
	`336`	`+ raw-code (replace-regexp-in-string (rx "\"") "\\\"" raw-code nil t))`
	`337`	`+ (replace-regexp-in-string (rx "\n") "\\n" raw-code nil t))`
	`338`	`+`
`334`	`339`	`(defun ob-sagemath--code (raw-code params buf)`
`335`		`- (let* ((code (replace-regexp-in-string (rx "\"") "\\\"" raw-code nil t))`
`336`		`- (code (replace-regexp-in-string (rx "\n") "\\n" code nil t)))`
	`340`	`+ (let ((code (ob-sagemath--escape-code raw-code)))`
`337`	`341`	`(format "%s(\"%s\", filename=%s, latex=%s, latex_formatter=%s)"`
`338`	`342`	`(ob-sagemath--python-name "run_cell_babel")`
`339`	`343`	`code`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,3 +85,10 @@`
`85`	`85`	`(should (string= (ob-sagemath--latex-arg '((:tolatex . "yes"))) "True"))`
`86`	`86`	`(should (string= (ob-sagemath--latex-arg '((:tolatex . "no"))) "False"))`
`87`	`87`	`(should (string= (ob-sagemath--latex-arg '((:tolatex . "foo.bar"))) "True")))`
	`88`	`+`
	`89`	`+(ert-deftest ob-sagemath--escape-code-test ()`
	`90`	`+ (should (string= (ob-sagemath--escape-code "print 'foobar\\nbar\\nbaz'`
	`91`	`+print \"foo\\nbar\"`
	`92`	`+print r\"\\bar\"`
	`93`	`+print r'\\foo\\n\\bar'")`
	`94`	`+ "print 'foobar\\\\nbar\\\\nbaz'\\nprint \\\"foo\\\\nbar\\\"\\nprint r\\\"\\\\bar\\\"\\nprint r'\\\\foo\\\\n\\\\bar'")))`

Comments

(0)