Merge

.gitattributes

@@ -0,0 +1,3 @@
+index.html merge=binary
+*_appendix.html merge=binary
+

.gitignore

@@ -0,0 +1 @@
+*.pyc

Makefile

@@ -3,14 +3,15 @@ BIKESHED_ARGS ?= --print=plain
 
 .PHONY: lint watch
 
-index.html: index.bs 
+index.html: index.bs messages_appendix.cddl
+	./scripts/pygmentize_dir.py
 	$(BIKESHED) $(BIKESHED_ARGS) spec $<
 
 lint: index.bs
 	$(BIKESHED) $(BIKESHED_ARGS) --dry-run --force spec --line-numbers $<
 
 watch: index.bs
-	@echo 'Browse to file://${PWD}/index.html' 
+	@echo 'Browse to file://${PWD}/index.html'
 	$(BIKESHED) $(BIKESHED_ARGS) watch $<
 
 

README.md

@@ -23,12 +23,12 @@ aspects of the Open Screen Protocol.  The following proposals have been
 submitted:
 
 - Discovery
-  - [SSDP](ssdp.md)
-  - [mDNS / DNS-SD](mdns.md)
+  - [SSDP](archive/ssdp.md)
+  - [mDNS / DNS-SD](archive/mdns.md)
 - Transport
-  - [QUIC](quic.md)
-  - [WebRTC Data Channel](datachannel.md)
-- [Control Protocol](control_protocol.md)
+  - [QUIC](archive/quic.md)
+  - [WebRTC Data Channel](archive/datachannel.md)
+- [Control Protocol](archive/control_protocol.md)
 - Authentication
   ([Issue #13](https://github.com/webscreens/openscreenprotocol/issues/13))
 

benchmarks/discovery.md

@@ -4,8 +4,8 @@ The goal of this benchmark design is to create a controlled environment in which
 we can gather data on performance, efficiency, and reliability of the two
 network discovery protocols proposed for Open Screen:
 
-* [SSDP](../ssdp.md)
-* [mDNS](../mdns.md)
+* [SSDP](../archive/ssdp.md)
+* [mDNS](../archive/mdns.md)
 
 # Observables
 
@@ -64,7 +64,7 @@ software that is available as a Debian package.
 For SSDP, we will either:
 
 1. Fork and customize [libupnp](http://pupnp.sourceforge.net/) for the
-[Open Screen SSDP discovery protocol](../ssdp.md).
+[Open Screen SSDP discovery protocol](../archive/ssdp.md).
 2. Write our own SSDP implementation from scratch, possibly based on the
 [Chromium](https://cs.chromium.org/chromium/src/chrome/browser/media/router/discovery/dial/dial_service.h)
 implementation or the [Fraunhofer FOKUS](https://github.com/fraunhoferfokus/peer-ssdp/blob/master/lib/peer-ssdp.js)

benchmarks/transport.md

@@ -4,8 +4,8 @@ The goal of this benchmark design is to create a controlled environment in which
 we can gather data on performance, efficiency, and reliability of the two
 network trasnport protocols proposed for Open Screen:
 
-* [QUIC](../quic.md)
-* [RTC DataChannel](../datachannel.md)
+* [QUIC](../archive/quic.md)
+* [RTC DataChannel](../archive/datachannel.md)
 
 # Observables
 

code-style.html

@@ -0,0 +1,63 @@
+<style>
+.highlight .hll { background-color: #ffffcc }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { color: #000000; font-weight: bold } /* Keyword */
+.highlight .o { color: #000000; font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { color: #000000; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #000000; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #000000; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { color: #000000; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d01040 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nl { color: #990000; font-weight: bold } /* Name.Label */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { color: #000000; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d01040 } /* Literal.String.Backtick */
+.highlight .sc { color: #d01040 } /* Literal.String.Char */
+.highlight .sd { color: #d01040 } /* Literal.String.Doc */
+.highlight .s2 { color: #d01040 } /* Literal.String.Double */
+.highlight .se { color: #d01040 } /* Literal.String.Escape */
+.highlight .sh { color: #d01040 } /* Literal.String.Heredoc */
+.highlight .si { color: #d01040 } /* Literal.String.Interpol */
+.highlight .sx { color: #d01040 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d01040 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
+</style>