b8a68c5107d53a7f2ca512f68b64caf3914f0c29 — octaspire a month ago v0.463.0
Bounce: add more controls, Dern: remove Pygments related things
8 files changed, 18 insertions(+), 63 deletions(-)

M dev/doc/book/dern-manual.htm
D dev/doc/how_to_add_Dern_into_pygments
D dev/etc/pygments_init.rb
M dev/include/octaspire/dern/octaspire_dern_config.h
M release/README
M release/documentation/dern-manual.html
M release/games/octaspire-bounce.dern
M release/octaspire-dern-amalgamated.c
M dev/doc/book/dern-manual.htm => dev/doc/book/dern-manual.htm +1 -2
@@ 1103,8 1103,7 @@     <p>
      <b>etc</b>-directory of the source distribution contains syntax files
-     for <b>vim</b>, <b>emacs</b>, <b>pygments</b> and
-     <b>GNU source-highlight</b>.
+     for <b>vim</b>, <b>emacs</b> and <b>GNU source-highlight</b>.
    </p>
  
    <h2>Using the development repository</h2>

D dev/doc/how_to_add_Dern_into_pygments => dev/doc/how_to_add_Dern_into_pygments +0 -49
@@ 1,49 0,0 @@-To use asciidoctor to build the documentation with a version of pygments with a lexer for
- Dern (the dern repo is in ~/octaspire/dern in this example, but modify paths if needed):
- 
- 1. Make a directory and clone pygments using mercurial:
- -------------------------------------------------------
- 
-     mkdir ~/hg
-     cd ~/hg
-     hg clone http://bitbucket.org/birkenfeld/pygments-main pygments-main
- 
- 
- 2. Modify pygments by adding Dern into it:
- ------------------------------------------
- 
- diff -r 7941677dc77d pygments/lexers/_mapping.py
- --- a/pygments/lexers/_mapping.py       Mon Mar 13 19:16:03 2017 +0000
- +++ b/pygments/lexers/_mapping.py       Wed Sep 27 21:10:25 2017 +0300
- @@ -122,6 +122,7 @@
-     'DartLexer': ('pygments.lexers.javascript', 'Dart', ('dart',), ('*.dart',), ('text/x-dart',)),
-     'DebianControlLexer': ('pygments.lexers.installers', 'Debian Control file', ('control', 'debcontrol'), ('control',), ()),
-     'DelphiLexer': ('pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
- +   'DernLexer': ('pygments.lexers.dern', 'Dern', ('dern',), ('*', '.', 'd', 'e', 'r', 'n'), ()),
-     'DgLexer': ('pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
-     'DiffLexer': ('pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
-     'DjangoLexer': ('pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
- 
- 
- 3. Create link to the syntax file:
- ----------------------------------
- 
-     cd ~/hg/pygments-main/pygments/lexers
-     ln -s ~/octaspire/dern/etc/pygments/dern.py dern.py
- 
- 
- 4. In directory ~/hg/pygments-main/ give command:
- -------------------------------------------------
- 
-     make mapfiles
- 
- 
- 5. Install asciidoctor, asciidoctor-pdf and pygments.rb gems:
- -------------------------------------------------------------
- 
-     gem install --user-install asciidoctor
-     gem install --user-install pygments.rb
-     gem install asciidoctor-pdf --pre --user-install
- 
- and add the local gem bin-folder into the PATH. (or install with sudo)
- 

D dev/etc/pygments_init.rb => dev/etc/pygments_init.rb +0 -6
@@ 1,6 0,0 @@-# This file is based on documentation from:
- # https://github.com/asciidoctor/asciidoctor.org/blob/master/docs/_includes/src-pygments.adoc
- require 'pygments'
- Pygments.start "#{ENV['HOME']}/hg/pygments-main"
- Pygments::Lexer.create name: 'dern', aliases: ['dern'], filenames: ['*.dern'],
-     mimetypes: ['text/dern', 'application/x-dern']

M dev/include/octaspire/dern/octaspire_dern_config.h => dev/include/octaspire/dern/octaspire_dern_config.h +1 -1
@@ 18,7 18,7 @@ #define OCTASPIRE_DERN_CONFIG_H
  
  #define OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "0"
- #define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "462"
+ #define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "463"
  #define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "0"
  
  #define OCTASPIRE_DERN_CONFIG_VERSION_STR "Octaspire Dern version " \

M release/README => release/README +1 -1
@@ 24,7 24,7 @@   Directory 'tool-support' contains files that help working with the Dern
  language using different tools; there are, for example, syntax files
- to allow Dern code to be syntax highlighted in Vim, Emacs, Pygments and
+ to allow Dern code to be syntax highlighted in Vim, Emacs and
  GNU source-highlight.
  
  Directory 'documentation' contains a manual and directory 'examples'

M release/documentation/dern-manual.html => release/documentation/dern-manual.html +1 -2
@@ 1940,8 1940,7 @@     <p>
      <b>etc</b>-directory of the source distribution contains syntax files
-     for <b>vim</b>, <b>emacs</b>, <b>pygments</b> and
-     <b>GNU source-highlight</b>.
+     for <b>vim</b>, <b>emacs</b> and <b>GNU source-highlight</b>.
    </p>
  
    <h2><a id="29"></a>29. Using the development repository</h2>

M release/games/octaspire-bounce.dern => release/games/octaspire-bounce.dern +13 -1
@@ 327,7 327,16 @@ (= bounce-pass-star-delta {D+0})
    (= bounce-pass-star-alpha {D+0})
    (bounce-level-load bounce-level-index))
-   [load next level or the first all passed] '() howto-no)
+   [load next level or the first if all passed] '() howto-no)
+ 
+ (define bounce-level-prev as (fn ()
+   (-- bounce-level-index)
+   (if (< bounce-level-index {D+0}) (= bounce-level-index (- bounce-level-count {D+1})))
+   (= bounce-level-passed false)
+   (= bounce-pass-star-delta {D+0})
+   (= bounce-pass-star-alpha {D+0})
+   (bounce-level-load bounce-level-index))
+   [load previous level or the last] '() howto-no)
  
  (define bounce-ball-on-platform as false [is ball in contact with a platform])
  


@@ 418,7 427,10 @@ (define bounce-handle-keydown as (fn (event)
    (define key as (ln@ event {D+1}) [key])
    (if (ln@ event {D+4}) (return)) ; don't handle repeat events.
+   (if (== key [q]) (= bounce-running false))
    (if (== key [r]) (do (bounce-game-over) (return)))
+   (if (== (ln@ event {D+1}) [LEFT])  (if (== (ln@ event {D+2}) [KMOD_LCTRL]) (bounce-level-prev)))
+   (if (== (ln@ event {D+1}) [RIGHT]) (if (== (ln@ event {D+2}) [KMOD_LCTRL]) (bounce-level-next)))
    (if (not bounce-ball-on-platform) (return))
    (if (== current-jump-key [])
        (do

M release/octaspire-dern-amalgamated.c => release/octaspire-dern-amalgamated.c +1 -1
@@ 26214,7 26214,7 @@ #define OCTASPIRE_DERN_CONFIG_H
  
  #define OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "0"
- #define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "462"
+ #define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "463"
  #define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "0"
  
  #define OCTASPIRE_DERN_CONFIG_VERSION_STR "Octaspire Dern version " \