Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel:
  Release 1.3.2.
  skelrc.sod: Add skeleton for Sod.

Conflicts:
	debian/changelog -- two 1.3.2 releases!

diff --git a/Makefile.am b/Makefile.am
index c63f0d6..6a8990a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ EXTRA_DIST            += $(skel_DATA)
 
 ## C and related languages
 skel_DATA              += skelrc.c skelrc.h
+skel_DATA              += skelrc.sod
 skel_DATA              += skelrc.cc
 skel_DATA              += skelrc.m
 skel_DATA              += skelrc.cs

diff --git a/debian/changelog b/debian/changelog
index f94f0ab..d6fb804 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-skel (1.3.2) experimental; urgency=medium
+skel (1.3.2x) experimental; urgency=medium
 
   * Add template for Rust.
 
  -- Mark Wooding <mdw@distorted.org.uk>  Thu, 14 Feb 2019 13:15:56 +0000
 
+skel (1.3.2y) experimental; urgency=medium
+
+  * Add template for Sod.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Fri, 09 Aug 2019 01:01:50 +0100
+
 skel (1.3.1) experimental; urgency=medium
 
   * Add template for Scala.

diff --git a/skelrc.sod b/skelrc.sod
new file mode 100644 (file)
index 0000000..e7e6f0c
--- /dev/null
+++ b/skelrc.sod
@@ -0,0 +1,23 @@
+;;; -*-emacs-lisp-*-
+
+(skelrc-force-mode 'c-mode)
+
+(setq skel-alist
+      (append
+       '((new-comment . "/*")
+        (cont-comment . " *")
+        (end-comment . " */")
+        (block-start . "/*")
+        (block-banner-knob . "* ")
+        (block-banner-end . "*/")
+        (block-end . "\n */")
+        (preamble . "[[includes]][[preliminaries]][[classes]]")
+        (includes . "[[includes-banner]]\n\n[[headers]]")
+        (includes-banner . (skelrc-banner "Header files"))
+        (headers . "code h: includes {\n}\n\ncode c: includes {\n}\n\n")
+        (preliminaries . "[[prelim-banner]]\n\n[[prelim-body]]")
+        (prelim-banner . (skelrc-banner "Preliminaries"))
+        (prelim-body . "code h: early_user {\n}\n\ncode c: early_user {\n}\n\n")
+        (classes . "[[classes-banner]]\n\n")
+        (classes-banner . (skelrc-banner "Class definitions")))
+       skel-alist))