2017-08-13 16:44:00

3 files changed, 37 insertions, 27 deletions

diff --git a/doc/context/sources/general/manuals/publications/publications-datasets.tex b/doc/context/sources/general/manuals/publications/publications-datasets.tex
index c9b5698cb..eb0f4f91b 100644
--- a/doc/context/sources/general/manuals/publications/publications-datasets.tex
+++ b/doc/context/sources/general/manuals/publications/publications-datasets.tex
@@ -103,9 +103,9 @@ be explained elsewhere in the text.
    title={mkiv-publications.bib\\
           This test file was constructed to illustrate various features of the
           \BIBTEX\ format and contains some fields that might at first glance
-          appear somewhat curious.}].
+          appear somewhat curious.}]
   \typeBTXfile
-    [range={@Comment{Start example},@Comment{Stop example}}]
+    [range={@Comment{Start example},@Comment{Stop example}},before=,after=]
     {mkiv-publications.bib}
 \stopplacetable
 
diff --git a/doc/context/sources/general/manuals/publications/publications-style.tex b/doc/context/sources/general/manuals/publications/publications-style.tex
index 5283b9c61..f8457dddc 100644
--- a/doc/context/sources/general/manuals/publications/publications-style.tex
+++ b/doc/context/sources/general/manuals/publications/publications-style.tex
@@ -1,5 +1,9 @@
 \startenvironment publications-style
 
+\startmode[atpragma]
+    \usemodule[scite] % gives the default lexing
+\stopmode
+
 \dontcomplain
 
 \setupbodyfont
@@ -75,37 +79,42 @@
 
 % All this syntax highlighting doesn't look good but Alan likes it, so:
 
-\definetype[BTXcode][option=TEX]
-\definetype[XMLcode][option=XML]
-\definetype[TEXcode][option=TEX]
-\definetype[LUAcode][option=LUA]
-\definetype[MPcode] [option=MP]
+\ifdefined\scitebuffer
 
-\definetyping[BTX]  [option=LUA] % we don't have a highlight yet
+    \definetype  [BTXcode] [option=bibtex]
+    \definetype  [XMLcode] [option=xml]
+    \definetype  [TEXcode] [option=tex]
+    \definetype  [LUAcode] [option=lua]
+    \definetype  [MPcode]  [option=mps]
 
-\setuptyping
-  [keeptogether=yes]
+    \definetyping[BTX]     [option=bibtex]
 
-% I guess that Hans finds the syntax highlighting to be distracting ... Indeed,
-% too much color.
+\else
 
-\startmode[atpragma]
+    \definetype  [BTXcode] [option=,color=fore:two]
+    \definetype  [XMLcode] [option=,color=fore:two]
+    \definetype  [TEXcode] [option=,color=fore:two]
+    \definetype  [LUAcode] [option=,color=fore:two]
+    \definetype  [MPcode]  [option=,color=fore:two]
 
-    \setuptype         [option=,color=fore:two]
-    \setuptype[BTXcode][option=,color=fore:two]
-    \setuptype[XMLcode][option=,color=fore:two]
-    \setuptype[TEXcode][option=,color=fore:two]
-    \setuptype[LUAcode][option=,color=fore:two]
-    \setuptype[MPcode] [option=,color=fore:two]
+    \setuptyping [BTX]     [option=,color=fore:one]
+    \setuptyping [XML]     [option=,color=fore:one]
+    \setuptyping [TEX]     [option=,color=fore:one]
+    \setuptyping [LUA]     [option=,color=fore:one]
+    \setuptyping [MP]      [option=,color=fore:one]
 
-    \setuptyping     [option=,color=fore:one]
-    \setuptyping[BTX][option=,color=fore:one]
-    \setuptyping[XML][option=,color=fore:one]
-    \setuptyping[TEX][option=,color=fore:one]
-    \setuptyping[LUA][option=,color=fore:one]
-    \setuptyping[MP] [option=,color=fore:one]
+\fi
 
-\stopmode
+\setuptype
+  [option=,
+   color=fore:two]
+
+\setuptyping
+  [option=,
+   color=fore:one]
+
+\setuptyping
+  [keeptogether=yes]
 
 % \setupinteraction
 %   [state=start,
@@ -260,6 +269,8 @@
   [mysetuptext]
   [framedbg]
   [framecolor=fore:three,
+   topoffset=1ex,
+   bottomoffset=1ex,
    backgroundcolor=back:three]
 
 \startsetups xml:setups:start
diff --git a/doc/context/sources/general/manuals/sql/sql-mkiv.tex b/doc/context/sources/general/manuals/sql/sql-mkiv.tex
index dabb0a34f..d7f8849c7 100644
--- a/doc/context/sources/general/manuals/sql/sql-mkiv.tex
+++ b/doc/context/sources/general/manuals/sql/sql-mkiv.tex
@@ -576,7 +576,6 @@ In this example we typeset the (small) table):
 
 \ctxluabuffer
 
-
 \stopsection
 
 \startsection[title=Colofon]