From 3ac1a4bbf84101cca4e80acb31eb7fc5754248d3 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sun, 13 Aug 2017 17:00:01 +0200 Subject: 2017-08-13 16:44:00 --- .../general/manuals/mkiv-publications.pdf | Bin 501803 -> 527802 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 845539 -> 815667 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 842986 -> 816438 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 848140 -> 818400 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 841914 -> 811811 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 843669 -> 815205 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 840042 -> 809991 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 840776 -> 812522 bytes .../manuals/publications/publications-datasets.tex | 4 +- .../manuals/publications/publications-style.tex | 59 ++++++++++++--------- .../sources/general/manuals/sql/sql-mkiv.tex | 1 - 11 files changed, 37 insertions(+), 27 deletions(-) (limited to 'doc') diff --git a/doc/context/documents/general/manuals/mkiv-publications.pdf b/doc/context/documents/general/manuals/mkiv-publications.pdf index a123306b2..ebee8fe0a 100644 Binary files a/doc/context/documents/general/manuals/mkiv-publications.pdf and b/doc/context/documents/general/manuals/mkiv-publications.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index dbd912c54..b1eb86f5e 100644 Binary files a/doc/context/documents/general/qrcs/setup-cs.pdf and b/doc/context/documents/general/qrcs/setup-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf index 451f735b9..9b9623b3d 100644 Binary files a/doc/context/documents/general/qrcs/setup-de.pdf and b/doc/context/documents/general/qrcs/setup-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf index 65537fd65..29515f75c 100644 Binary files a/doc/context/documents/general/qrcs/setup-en.pdf and b/doc/context/documents/general/qrcs/setup-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf index db6b246b3..4bdbed445 100644 Binary files a/doc/context/documents/general/qrcs/setup-fr.pdf and b/doc/context/documents/general/qrcs/setup-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf index 5db100c45..b93b4ce3c 100644 Binary files a/doc/context/documents/general/qrcs/setup-it.pdf and b/doc/context/documents/general/qrcs/setup-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index e24127ed2..0c875d5fe 100644 Binary files a/doc/context/documents/general/qrcs/setup-nl.pdf and b/doc/context/documents/general/qrcs/setup-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf index 3679fd3ad..32d1a26a8 100644 Binary files a/doc/context/documents/general/qrcs/setup-ro.pdf and b/doc/context/documents/general/qrcs/setup-ro.pdf differ 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] -- cgit v1.2.3