Commits

Cat's Eye Technologies committed ebfbb69

Add Disambiguation nodes. Demo -> Gewgaw. (It will get worse before it gets better.)

  • Participants
  • Parent commits a427dc8

Comments (0)

Files changed (8)

File data/disambiguation-nodes.yaml

+# encoding: UTF-8
+Demo:
+  type: Disambiguation node
+  entries:
+  - Gewgaw

File data/original-demos.yaml

-# encoding: UTF-8
-# also contains the distributions for these demos
-
-C64 Demo Depot: 
-  type: Distribution
-  bitbucket: catseye/c64-demo-depot
-  github: catseye/C64-Demo-Depot
-  issue-tracker: github
-  releases: []
-
-
-Ribos: 
-  type: Demo
-  defining-distribution: C64 Demo Depot
-  summary: Well-commented C64 raster interrupt example
-  authors:
-  - Chris Pressey
-  auspices:
-  - Cat's Eye Technologies
-  description: |
-    A simple Commodore 64 graphics demo that uses the raster interrupt facility
-    of the VIC-II chip: the colour of the border of the screen is inverted, but only in
-    the middle part of the screen.  Includes well-commented source in 6502 assembly language.
-  development-stage: mature
-
-Ribos distribution: 
-  type: Distribution
-  discontinued: true
-  releases: 
-  - version: "1.0"
-    revision: "2007.0410"
-    url: http://catseye.tc/distfiles/ribos-2007.0410.zip
-  - version: "1.1"
-    revision: "2010.0430"
-    url: http://catseye.tc/distfiles/ribos-1.1-2010.0430.zip
-
-
-The PETulant Cursor: 
-  type: Demo
-  defining-distribution: C64 Demo Depot
-  summary: A tiny C64 "display hack"
-  authors:
-  - Chris Pressey
-  auspices:
-  - Cat's Eye Technologies
-  description: |
-    A tiny (44 byte) "display hack" for the Commodore 64.
-  development-stage: mature
-
-
-The PETulant Cursor distribution: 
-  type: Distribution
-  discontinued: true
-  releases: 
-  - version: "1.0"
-    revision: "2008.0401"
-    url: http://catseye.tc/distfiles/petulant-2008.0401.zip

File data/original-gewgaws.yaml

+# encoding: UTF-8
+# also contains the distributions for these gewgaws
+
+C64 Demo Depot: 
+  type: Distribution
+  bitbucket: catseye/c64-demo-depot
+  github: catseye/C64-Demo-Depot
+  issue-tracker: github
+  releases: []
+
+
+Ribos: 
+  type: Gewgaw
+  # sigh, it's not really a gewgaw either, or at least not a very good one.
+  defining-distribution: C64 Demo Depot
+  summary: Well-commented C64 raster interrupt example
+  authors:
+  - Chris Pressey
+  auspices:
+  - Cat's Eye Technologies
+  description: |
+    A simple Commodore 64 graphics demo that uses the raster interrupt facility
+    of the VIC-II chip: the colour of the border of the screen is inverted, but only in
+    the middle part of the screen.  Includes well-commented source in 6502 assembly language.
+  development-stage: mature
+
+Ribos distribution: 
+  type: Distribution
+  discontinued: true
+  releases: 
+  - version: "1.0"
+    revision: "2007.0410"
+    url: http://catseye.tc/distfiles/ribos-2007.0410.zip
+  - version: "1.1"
+    revision: "2010.0430"
+    url: http://catseye.tc/distfiles/ribos-1.1-2010.0430.zip
+
+
+The PETulant Cursor: 
+  type: Gewgaw
+  defining-distribution: C64 Demo Depot
+  summary: A tiny C64 "display hack"
+  authors:
+  - Chris Pressey
+  auspices:
+  - Cat's Eye Technologies
+  description: |
+    A tiny (44 byte) "display hack" for the Commodore 64.
+  development-stage: mature
+
+
+The PETulant Cursor distribution: 
+  type: Distribution
+  discontinued: true
+  releases: 
+  - version: "1.0"
+    revision: "2008.0401"
+    url: http://catseye.tc/distfiles/petulant-2008.0401.zip

File data/types.yaml

 Metadata:
   type: type
   suppress-page-generation: true
+Disambiguation node:
+  type: type
 
 # presentedy things:
 Article:
   description: |
     This is a list of genres with entries in [[Chrysoberyl]].
     
-    This category is a little weird,
-    because there are genres for programming languages, games, music, and books,
-    all mixed together here.
+    This category is a little weird, because there are genres for
+    [[Programming Language|programming languages]], [[Game|games]],
+    [[Musical Composition|music]], and [[Book|books]], all mixed together here.
 Individual:
   type: type
 Organization:
     [[What is this I don't even]].
   images:
     - url: '/images/illustrations/Accordion_(PSF).jpg'
+
 Music Format:
   type: type
   images:
     - url: '/images/illustrations/Accordion_(PSF).jpg'
+
+Gewgaw:
+  type: type
+  description: |
+    In [[Chrysoberyl]] parlance, a gewgaw is the digital version of a
+    bagatelle (music) or a doodle (visual art).  It almost always involves
+    visuals (usually animated), sometimes audio, and occasionally interaction.
+    It need not be implemented in [[HTML5]], but many of
+    [[Cat's Eye Technologies]]' gewgaws are.
+    
+    A special kind of gewgaw, for which there is a whole historical "scene",
+    is the "demo".  We avoid that terminology here, partly because it has
+    other useful meanings, and partly because demos have a certain thrust
+    which gewgaws need not have (pushing the limits of a computer, being
+    very visually/aurally impressive, sending "greetings" to other demosceners,
+    etc.)
+
+# these are implementables too, but that property is less exploited for them
 Electronics Project:
   type: type
   images:
   - url: http://www.falstad.com/circuit/
     title: Circuit Simulator
     description: Circuit Simulator in a Java Applet
-Demo:
-  type: type
 Database:
   type: type

File src/chrysoberyl/checker.py

     # but it must pass these checks too.  And gets ref-dist linked
     # to it here too.
     if type_ in ['Game', 'Programming Language', 'Library', 'Tool',
-                 'Platform', 'Conlang', 'Electronics Project', 'Demo',
+                 'Platform', 'Conlang', 'Electronics Project', 'Gewgaw',
                  'Automaton', 'Programming Language Family']:
         assert 'build-requirements' not in node
         assert 'run-requirements' not in node

File templates/Demo.html

-{% extends "implementable.html" %}
-
-{% block implementable_content %}
-{% endblock implementable_content %}

File templates/Disambiguation node.html

+{% extends "base.html" %}
+
+{% block defined_by %}{% endblock %}
+
+{% block content %}
+
+<p><strong>{{ key }}</strong> may refer to:</p>
+
+<ul>
+  {% for thing in entries %}
+    <li>{{ link(thing) }}</li>
+  {% endfor %}
+</ul>
+
+{% endblock content %}

File templates/Gewgaw.html

+{% extends "implementable.html" %}
+
+{% block implementable_content %}
+{% endblock implementable_content %}