Skip to content

Commit 5a892e6

Browse files
committed
lint package and release
1 parent 5d16d2e commit 5a892e6

12 files changed

+34
-16
lines changed

CHANGELOG.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
# Changelog
2-
## [master]
3-
### Major Change
4-
- Csound API Removed in favour of UDP
2+
3+
## [0.2.0]
4+
### Major Changes
5+
- Csound API Removed in favour of UDP (requires Csound 6.10+)
6+
- No more dependency on Emacs `modules`
7+
- `csound-repl-plot-ftgen` removed
8+
59
### Other Changes
610
- Repl: +/. in p2 score snippets supported
711
- Repl: + in p3 score snippet supported
812
- Score: `csound-score--align-cols` improved to decrease col width as well
913
- Indentation: `csound-indentation-aggressive-score` customizeable variable added
10-
14+
- Font-lock: Bug causing slower font-locking fixed
15+
- Keybinding `C-c C-c` added for region evaluation
16+
- Repl: Newline in the prompt supported via <Ctrl-Return>
17+
- Repl: Completions added to the promt
18+
- Csound-mode repl welcome string prints the audio configuration from the csound-mode buffer
1119

1220
## [0.1.2]
1321
- Font-lock: Single line comments within score repaired
@@ -23,4 +31,4 @@
2331
## [0.1.1]
2432

2533
### Bug fixes
26-
- Csound'd eldoc function was missing from the major-mode function
34+
- Csound eldoc function was missing from the major-mode function

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ If you're using `csound-mode` directly from the git repo, and you happen to use
5656

5757
<kbd>C-c C-z</kbd> `csound-repl-start`
5858

59-
<kbd>C-M-x</kbd> `csound-evaluate-region`
59+
<kbd>C-M-x</kbd>/<kbd>C-M-x</kbd> `csound-evaluate-region`
6060

6161
<kbd>C-x C-e</kbd> `csound-evaluate-line`
6262

csound-eldoc.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.0
66
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
7+
;; URL: https://github.com/hlolli/csound-mode
78

89
;; This program is free software; you can redistribute it and/or modify
910
;; it under the terms of the GNU General Public License as published by

csound-font-lock.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.0
66
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
7+
;; URL: https://github.com/hlolli/csound-mode
78

89
;; This program is free software; you can redistribute it and/or modify
910
;; it under the terms of the GNU General Public License as published by
@@ -218,7 +219,7 @@
218219
"<CsInstruments>" "</CsInstruments>"
219220
"<CsLicense>" "</CsLicense>"))
220221
;; account for preprocessors
221-
"\\|</?CsScore[=\\\"0-9a-zA-z]?>")
222+
"\\|<CsScore[.\\\"]*>\\|</?CsScore>?")
222223
. csound-font-lock-xml-tags)
223224
csound-font-lock-list)
224225
;; Some opcodes got missing but dont need docstrings
@@ -363,7 +364,7 @@
363364
(let ((score-beg (if (string-match-p ".sco$" (buffer-name (current-buffer)))
364365
0
365366
(save-excursion (search-forward "<CsScore" nil t 1))))
366-
(score-end (or (save-excursion (search-forward "</CsScore" nil t 1)) (line-number-at-pos (buffer-size)))))
367+
(score-end (or (save-excursion (search-forward "</CsoundSynthesizer>" nil t 1)) (line-number-at-pos (buffer-size)))))
367368
(when (and score-beg score-end)
368369
(csound-font-lock--fontify-score score-beg score-end))))))
369370

csound-indentation.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.0
77
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
8+
;; URL: https://github.com/hlolli/csound-mode
89

910
;; This program is free software; you can redistribute it and/or modify
1011
;; it under the terms of the GNU General Public License as published by

csound-mode.el

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.0
66
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
7+
;; URL: https://github.com/hlolli/csound-mode
78

89
;; This program is free software; you can redistribute it and/or modify
910
;; it under the terms of the GNU General Public License as published by
@@ -110,6 +111,7 @@
110111
;; REPL Keybindings
111112
(define-key map (kbd "C-c C-z") 'csound-repl-start)
112113
(define-key map (kbd "C-M-x") 'csound-repl-evaluate-region)
114+
(define-key map (kbd "C-c C-c") 'csound-repl-evaluate-region)
113115
(define-key map (kbd "C-x C-e") 'csound-repl-evaluate-line)
114116
(define-key map (kbd "C-c C-l") 'csound-repl-interaction-evaluate-last-expression)
115117
;; Utilities
@@ -120,7 +122,7 @@
120122

121123
;;;###autoload
122124
(define-derived-mode csound-mode
123-
prog-mode "Csound Mode"
125+
fundamental-mode "Csound Mode"
124126
"A major mode for interacting and coding Csound"
125127
:syntax-table csound-mode-syntax-table
126128
(setq-local eldoc-documentation-function 'csound-eldoc-function)
@@ -133,7 +135,7 @@
133135
(setq-local font-lock-comment-end-skip "\n")
134136
(add-hook 'completion-at-point-functions #'csound-util-opcode-completion-at-point nil t)
135137
;; (add-hook 'skeleton-end-hook #'csound-font-lock-flush-buffer nil t)
136-
(font-lock-add-keywords nil csound-font-lock-list)
138+
(font-lock-add-keywords nil csound-font-lock-list t)
137139
(setq-local font-lock-fontify-region-function 'csound-font-lock-fontify-region)
138140
(setq-local font-lock-fontify-buffer-function 'csound-font-lock-flush-buffer)
139141
;; (setq-local jit-lock-mode t)

csound-opcodes.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
55
;; Version: 0.2.0
66
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
7+
;; URL: https://github.com/hlolli/csound-mode
78

89
;; This program is free software; you can redistribute it and/or modify
910
;; it under the terms of the GNU General Public License as published by
@@ -1804,5 +1805,5 @@ kres xadsr iatt, idec, islev, irel [, idel]" :doc "Calculates the classical ADSR
18041805
(puthash "printks" '(:template "printks "string", itime [, kval1] [, kval2] [...]" :doc "Prints at k-rate using a printf() style syntax.") csdoc-opcode-database)
18051806
(puthash "printks2" '(:template "printks2 "string", kval" :doc "Prints a new value every time a control variable changes using a printf() style syntax.") csdoc-opcode-database)
18061807

1807-
(provide 'csound-opcodes)
1808-
;;; csound-opcodes.el ends here
1808+
(provide 'csound-opcodes)
1809+
;;; csound-opcodes.el ends here

csound-repl-interaction.el

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.0
77
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
8+
;; URL: https://github.com/hlolli/csound-mode
89

910
;; This program is free software; you can redistribute it and/or modify
1011
;; it under the terms of the GNU General Public License as published by
@@ -78,7 +79,7 @@
7879

7980
(setq csound-repl-interaction--last-callback nil)
8081

81-
(defun csound-input-message (csound-udp input)
82+
(defun csound-repl-interaction-input-message (csound-udp input)
8283
(let ((callback (lambda () (process-send-string csound-udp (concat "$" input)))))
8384
(funcall callback)
8485
(setq csound-repl-interaction--last-callback callback)))
@@ -87,10 +88,10 @@
8788
op)
8889

8990
(defmulti-method read-csound-repl 'i (_ csound-udp input)
90-
(csound-input-message csound-udp (csound-score-trim-time input)))
91+
(csound-repl-interaction-input-message csound-udp (csound-score-trim-time input)))
9192

9293
(defmulti-method read-csound-repl 'f (_ csound-udp input)
93-
(csound-input-message csound-udp input))
94+
(csound-repl-interaction-input-message csound-udp input))
9495

9596
(defmulti-method-fallback read-csound-repl (_ csound-udp input)
9697
(process-send-string csound-udp input))

csound-repl.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.0
77
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
8-
8+
;; URL: https://github.com/hlolli/csound-mode
99

1010
;; This program is free software; you can redistribute it and/or modify
1111
;; it under the terms of the GNU General Public License as published by

csound-score.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
;; Author: Hlöðver Sigurðsson <hlolli@gmail.com>
66
;; Version: 0.2.0
77
;; Package-Requires: ((emacs "25") (shut-up "0.3.2") (multi "2.0.1"))
8+
;; URL: https://github.com/hlolli/csound-mode
89

910
;; This program is free software; you can redistribute it and/or modify
1011
;; it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)