Skip to content

Commit 1506840

Browse files
authored
Merge pull request #45 from ninioArtillero/overview-fixes
2 parents e2042af + c8d163c commit 1506840

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

_docs/guides/editor-support.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ manual setup stuff to get it working).
5555
| command | keybinding |
5656
|----------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
5757
| `switch-to-extempore` (or start Extermpore if it's not running) | <kbd class="nopretty">CTRL</kbd>+<kbd>C</kbd> <kbd class="nopretty">CTRL</kbd>+<kbd>Z</kbd> |
58-
| `extempore-connect-or-disconnect` () | <kbd class="nopretty">CTRL</kbd>+<kbd>C</kbd> <kbd class="nopretty">CTRL</kbd>+<kbd>J</kbd> |
58+
| `extempore-connect-or-disconnect` | <kbd class="nopretty">CTRL</kbd>+<kbd>C</kbd> <kbd class="nopretty">CTRL</kbd>+<kbd>J</kbd> |
5959
| `extempore-send-dwim` (to evaluate current top-level form or region) | <kbd class="nopretty">CTRL</kbd>+<kbd>META</kbd>+<kbd>X</kbd> |
6060
| `extempore-send-region` | <kbd class="nopretty">CTRL</kbd>+<kbd>C</kbd> <kbd class="nopretty">CTRL</kbd>+<kbd>R</kbd> |
61-
| `extempore-send-buffer` | <kbd class="nopretty">CTRL</kbd>+<kbd>C</kbd> <kbd class="nopretty">CTRL</kbd>+<kbd>B</kbd> |
6261
| | |
6362

6463
To restart the Extempore process, just <kbd

_docs/overview/contributing.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ list](mailto:[email protected]).
1818

1919
This documentation is built using [Jekyll](https://jekyllrb.com/), using the
2020
[Jekyll Doc](https://aksakalli.github.io/jekyll-doc-theme/) theme. Since it's
21-
all just markdown files in the `docs/` subdirectory, it's easy for others to
21+
all just markdown files in the `_docs/` subdirectory, it's easy for others to
2222
contribute.
2323

2424
If you find problems, or can think of improvements, [fork away on
2525
GH](https://github.com/digego/extempore), edit the documentation source files
26-
and submit a pull request---there's a nice little "Edit on Github" link at the
26+
and submit a pull request---there's a nice little "IMPROVE THIS PAGE" link at the
2727
bottom of every page. We'd love these docs to become a real community effort.
2828
There will probably be a few broken links and other little things like that, so
2929
no pull request is too small to be appreciated :)
@@ -42,7 +42,8 @@ If you want to see your changes locally (which of course you do!) then you can
4242
run a local 'live' test server with
4343

4444
~~~~ sourceCode
45-
bundle exec jekyll serve
45+
bundle exec jekyll serve # or
46+
bundle exec jekyll serve --livereload # to have the site reload on save
4647
~~~~
4748

4849
### Hosting

_docs/overview/philosophy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ factor of two integers `a` and `b` using a brute-force approach:
9191
(= (modulo b i) 0))
9292
i
9393
(hcf (- i 1))))))
94-
(hcf (if (< a b) b a)))))
94+
(hcf (if (< a b) a b)))))
9595
9696
(hcf-scheme 10 15) ;; returns 5
9797
@@ -102,7 +102,7 @@ factor of two integers `a` and `b` using a brute-force approach:
102102
(= (modulo b i) 0))
103103
i
104104
(hcf (- i 1))))))
105-
(hcf (if (< a b) b a)))))
105+
(hcf (if (< a b) a b)))))
106106
107107
(hcf_xtlang 10 15) ;; returns 5
108108
~~~~

_docs/overview/time.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ arpeggiated triad).
6363
(bind-func dsp:DSP
6464
(lambda (in time chan dat)
6565
(synth in time chan dat)))
66+
6667
(dsp:set! dsp)
6768
6869
;; schedule three nodes to play in succession
@@ -216,7 +217,7 @@ will have moved on. You should always try to schedule your code execution
216217
;; This is best (callback happens 4100 samples earlier than new time)
217218
(define loop
218219
(lambda (time)
219-
(play-note time synth 60 80 1.0)
220+
(play-note time synth 60 80 44100)
220221
(callback (+ time 40000) 'loop (+ time 44100))))
221222
222223
(loop (now))
@@ -226,6 +227,8 @@ In the 'good' version of `loop`, the `time` passed as an argument to `loop` is
226227
exactly the same time as the scheduled callback time. The problem with this is
227228
that the next note needs to be scheduled at exactly the same time that the
228229
function is called. The note will always be late. The 'best' version schedules
229-
the callback just ahead of the time that we want the note to play. This gives us
230-
`4100` samples to execute the code to schedule the note before the note is
231-
required to sound.
230+
the callback just ahead of the time that you want the note to play. This gives
231+
Extempore `4100` samples to execute the code to schedule the note before the note
232+
is required to sound.
233+
Notice `*second*` has been replaced by its actual value in samples to make
234+
the time difference explicit.

0 commit comments

Comments
 (0)