From ff0a20d421d280f752ad7f40cf5e92b782d7220f Mon Sep 17 00:00:00 2001 From: polos Date: Sun, 5 Mar 2017 17:03:10 +0100 Subject: [PATCH] small revision of "qml-file.lisp" (add newline after FORMAT) --- examples/M-modules/quick/palindrome-1/generate-qml.lisp | 6 +++--- examples/M-modules/quick/palindrome-1/qml-file.lisp | 4 +++- examples/M-modules/quick/palindrome-2/generate-qml.lisp | 2 +- examples/M-modules/quick/palindrome-2/qml-file.lisp | 4 +++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/M-modules/quick/palindrome-1/generate-qml.lisp b/examples/M-modules/quick/palindrome-1/generate-qml.lisp index 510428b..4428057 100644 --- a/examples/M-modules/quick/palindrome-1/generate-qml.lisp +++ b/examples/M-modules/quick/palindrome-1/generate-qml.lisp @@ -42,7 +42,7 @@ "color: 'black'" (let ((n 0)) (dolist (char *chars*) - (qml "Image { id: img~A; source: 'img/~A.png' }~%" + (qml "Image { id: img~A; source: 'img/~A.png' }" (incf n) (image-of-char char)))) (qml "SequentialAnimation" @@ -59,11 +59,11 @@ (let ((target 0)) (mapc (lambda (from-xy to-xy) (incf target) - (qml "PalindromeAnimation { target: img~A; property: 'x'; from: ~A; to: ~A } " + (qml "PalindromeAnimation { target: img~A; property: 'x'; from: ~A; to: ~A }" target (* 31 (first from-xy)) (* 31 (first to-xy))) - (qml "PalindromeAnimation { target: img~A; property: 'y'; from: ~A; to: ~A }~%" + (qml "PalindromeAnimation { target: img~A; property: 'y'; from: ~A; to: ~A }" target (* 31 (second from-xy)) (* 31 (second to-xy)))) diff --git a/examples/M-modules/quick/palindrome-1/qml-file.lisp b/examples/M-modules/quick/palindrome-1/qml-file.lisp index 5f77617..22e30dd 100644 --- a/examples/M-modules/quick/palindrome-1/qml-file.lisp +++ b/examples/M-modules/quick/palindrome-1/qml-file.lisp @@ -19,7 +19,9 @@ (defmacro qml (first &body body) (if (find #\~ first) - `(format s ,first ,@body) + `(progn + (format s ,first ,@body) + (terpri s)) (let ((open-close (and (upper-case-p (char first 0)) (not (find #\{ first))))) (if body diff --git a/examples/M-modules/quick/palindrome-2/generate-qml.lisp b/examples/M-modules/quick/palindrome-2/generate-qml.lisp index 438789f..1d1aba6 100644 --- a/examples/M-modules/quick/palindrome-2/generate-qml.lisp +++ b/examples/M-modules/quick/palindrome-2/generate-qml.lisp @@ -14,7 +14,7 @@ (let ((num 0)) (mapc (lambda (char xy) (incf num) - (qml "PalindromeImage { objectName: 'img~A'; source: 'img/~A.png'; x: ~D; y: ~D }~%" + (qml "PalindromeImage { objectName: 'img~A'; source: 'img/~A.png'; x: ~D; y: ~D }" num (image-of-char char) (* 31 (first xy)) diff --git a/examples/M-modules/quick/palindrome-2/qml-file.lisp b/examples/M-modules/quick/palindrome-2/qml-file.lisp index 5f77617..22e30dd 100644 --- a/examples/M-modules/quick/palindrome-2/qml-file.lisp +++ b/examples/M-modules/quick/palindrome-2/qml-file.lisp @@ -19,7 +19,9 @@ (defmacro qml (first &body body) (if (find #\~ first) - `(format s ,first ,@body) + `(progn + (format s ,first ,@body) + (terpri s)) (let ((open-close (and (upper-case-p (char first 0)) (not (find #\{ first))))) (if body