From 663adaa8612242dfce8c32ae5c7afc6be45c6eb6 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 22 Jul 2011 22:18:04 -0700 Subject: Renamed templates from .template to default.. --- default.context | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 default.context (limited to 'default.context') diff --git a/default.context b/default.context new file mode 100644 index 000000000..4269d06a1 --- /dev/null +++ b/default.context @@ -0,0 +1,84 @@ +\enableregime[utf] % use UTF-8 + +\setupcolors[state=start] +\setupinteraction[state=start, color=middleblue] % needed for hyperlinks + +\setuppapersize[letter][letter] % use letter paper +\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in, + height=middle, header=0.75in, footer=0.75in] % page layout +\setuppagenumbering[location={footer,center}] % number pages +\setupbodyfont[11pt] % 11pt font +\setupwhitespace[medium] % inter-paragraph spacing + +\setuphead[section][style=\tfc] +\setuphead[subsection][style=\tfb] +\setuphead[subsubsection][style=\bf] + +% define descr (for definition lists) +\definedescription[descr][ + headstyle=bold,style=normal,align=left,location=hanging, + width=broad,margin=1cm] + +% prevent orphaned list intros +\setupitemize[autointro] + +% define defaults for bulleted lists +\setupitemize[1][symbol=1][indentnext=no] +\setupitemize[2][symbol=2][indentnext=no] +\setupitemize[3][symbol=3][indentnext=no] +\setupitemize[4][symbol=4][indentnext=no] + +\setupthinrules[width=15em] % width of horizontal rules + +% for block quotations +\unprotect + +\startvariables all +blockquote: blockquote +\stopvariables + +\definedelimitedtext +[\v!blockquote][\v!quotation] + +\setupdelimitedtext +[\v!blockquote] +[\c!left=, +\c!right=, +before={\blank[medium]}, +after={\blank[medium]}, +] + +\protect +$for(header-includes)$ +$header-includes$ +$endfor$ + +\starttext +$if(title)$ +\startalignment[center] + \blank[2*big] + {\tfd $title$} +$if(author)$ + \blank[3*medium] + {\tfa $for(author)$$author$$sep$\crlf $endfor$} +$endif$ +$if(date)$ + \blank[2*medium] + {\tfa $date$} +$endif$ + \blank[3*medium] +\stopalignment +$endif$ +$for(include-before)$ +$include-before$ +$endfor$ +$if(toc)$ +\placecontent +$endif$ + +$body$ + +$for(include-after)$ +$include-after$ +$endfor$ +\stoptext -- cgit v1.2.3 From 939e3e151bdc9de5ee0247f0bc29d16fc4d4bb66 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 20 Aug 2011 15:30:18 -0700 Subject: ConTexT: Use 'description' instead of 'descr'. --- default.context | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index 4269d06a1..a07e7b285 100644 --- a/default.context +++ b/default.context @@ -14,10 +14,9 @@ \setuphead[subsection][style=\tfb] \setuphead[subsubsection][style=\bf] -% define descr (for definition lists) -\definedescription[descr][ - headstyle=bold,style=normal,align=left,location=hanging, - width=broad,margin=1cm] +% define description (for definition lists) +\definedescription[description][ + headstyle=bold,style=normal,location=hanging,width=broad,margin=1cm] % prevent orphaned list intros \setupitemize[autointro] -- cgit v1.2.3 From 3a429589355f35793fc8632d34379464a7cc0dc6 Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Tue, 23 Aug 2011 10:25:30 -0400 Subject: Refactoring code style --- default.context | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index a07e7b285..449aa61dd 100644 --- a/default.context +++ b/default.context @@ -1,22 +1,28 @@ -\enableregime[utf] % use UTF-8 +\startmode[*mkii] + \enableregime[utf-8] + \setupcolors[state=start] +\stopmode -\setupcolors[state=start] -\setupinteraction[state=start, color=middleblue] % needed for hyperlinks +% Enable hyperlinks +\setupinteraction[state=start, color=middleblue] -\setuppapersize[letter][letter] % use letter paper -\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in, - height=middle, header=0.75in, footer=0.75in] % page layout -\setuppagenumbering[location={footer,center}] % number pages -\setupbodyfont[11pt] % 11pt font -\setupwhitespace[medium] % inter-paragraph spacing +\setuppapersize [letter][letter] +\setuplayout [width=middle, backspace=1.5in, cutspace=1.5in, + height=middle, header=0.75in, footer=0.75in] -\setuphead[section][style=\tfc] -\setuphead[subsection][style=\tfb] +\setuppagenumbering[location={footer,center}] + +\setupbodyfont[11pt] + +\setupwhitespace[medium] + +\setuphead[section] [style=\tfc] +\setuphead[subsection] [style=\tfb] \setuphead[subsubsection][style=\bf] -% define description (for definition lists) -\definedescription[description][ - headstyle=bold,style=normal,location=hanging,width=broad,margin=1cm] +\definedescription + [description] + [headstyle=bold,style=normal,location=hanging,width=broad,margin=1cm] % prevent orphaned list intros \setupitemize[autointro] @@ -27,7 +33,7 @@ \setupitemize[3][symbol=3][indentnext=no] \setupitemize[4][symbol=4][indentnext=no] -\setupthinrules[width=15em] % width of horizontal rules +\setupthinrules[width=15em] % width of horizontal rules % for block quotations \unprotect @@ -37,15 +43,15 @@ blockquote: blockquote \stopvariables \definedelimitedtext -[\v!blockquote][\v!quotation] + [\v!blockquote][\v!quotation] \setupdelimitedtext -[\v!blockquote] -[\c!left=, -\c!right=, -before={\blank[medium]}, -after={\blank[medium]}, -] + [\v!blockquote] + [\c!left=, + \c!right=, + \c!before={\blank[medium]}, + \c!after={\blank[medium]}, + ] \protect $for(header-includes)$ -- cgit v1.2.3 From fd86fd4bf810128de810d5d2d79f4610ca1e55d6 Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Tue, 23 Aug 2011 10:26:01 -0400 Subject: Changing layout header and footer do not affect the visual layout. I am assuming that the original author meant topspace and bottomspace --- default.context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 449aa61dd..91e94d3c1 100644 --- a/default.context +++ b/default.context @@ -8,7 +8,7 @@ \setuppapersize [letter][letter] \setuplayout [width=middle, backspace=1.5in, cutspace=1.5in, - height=middle, header=0.75in, footer=0.75in] + height=middle, topspace=0.75in, bottomspace=0.75in] \setuppagenumbering[location={footer,center}] -- cgit v1.2.3 From 75c5b26f2e00de59f00bdd29deb623e8b2573b1a Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Tue, 23 Aug 2011 10:27:37 -0400 Subject: Spacing --- default.context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 91e94d3c1..0b14e22a6 100644 --- a/default.context +++ b/default.context @@ -22,7 +22,7 @@ \definedescription [description] - [headstyle=bold,style=normal,location=hanging,width=broad,margin=1cm] + [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm] % prevent orphaned list intros \setupitemize[autointro] -- cgit v1.2.3 From a3ceaffed42065ab33038149dc3185a7f308cf57 Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Tue, 23 Aug 2011 10:28:41 -0400 Subject: Cleaning setup --- default.context | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index 0b14e22a6..2ad7399ce 100644 --- a/default.context +++ b/default.context @@ -24,14 +24,8 @@ [description] [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm] -% prevent orphaned list intros -\setupitemize[autointro] - -% define defaults for bulleted lists -\setupitemize[1][symbol=1][indentnext=no] -\setupitemize[2][symbol=2][indentnext=no] -\setupitemize[3][symbol=3][indentnext=no] -\setupitemize[4][symbol=4][indentnext=no] +\setupitemize[autointro] % prevent orphan list intro +\setupitemize[indentnext=no] \setupthinrules[width=15em] % width of horizontal rules -- cgit v1.2.3 From 439e7f0d419234dbb92046a3f1672d3f6498c9e4 Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Tue, 23 Aug 2011 10:30:57 -0400 Subject: Blockquote are now in the core --- default.context | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index 2ad7399ce..a9ce8e09d 100644 --- a/default.context +++ b/default.context @@ -29,25 +29,13 @@ \setupthinrules[width=15em] % width of horizontal rules -% for block quotations -\unprotect - -\startvariables all -blockquote: blockquote -\stopvariables - -\definedelimitedtext - [\v!blockquote][\v!quotation] - \setupdelimitedtext - [\v!blockquote] - [\c!left=, - \c!right=, - \c!before={\blank[medium]}, - \c!after={\blank[medium]}, + [blockquote] + [before={\blank[medium]}, + after={\blank[medium]}, + indentnext=no, ] -\protect $for(header-includes)$ $header-includes$ $endfor$ -- cgit v1.2.3 From 5dcdf3738f0469143bb61ec9b89e9b34a21e2194 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 30 Dec 2011 11:41:26 -0800 Subject: ConTeXt: Made setuphead sensitive to `number-sections` variable. --- default.context | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index a9ce8e09d..f2710a8e9 100644 --- a/default.context +++ b/default.context @@ -16,9 +16,9 @@ \setupwhitespace[medium] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] -\setuphead[subsubsection][style=\bf] +\setuphead[section] [style=\tfc$if(number-sections)$$else$,number=no$endif$] +\setuphead[subsection] [style=\tfb$if(number-sections)$$else$,number=no$endif$] +\setuphead[subsubsection][style=\bf$if(number-sections)$$else$,number=no$endif$] \definedescription [description] -- cgit v1.2.3 From 3c7f5f8f1ee5b6bd16f5a4b9e637a4fda03fcdfc Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Tue, 28 Feb 2012 19:37:05 -0500 Subject: Better support for unnumbered sections In ConTeXt, the canonical method to get unumbered sections is to use \title {Unnumbered chapter} \subject {Unnumbered section} \subsubject {Unnumbered subsection} etc. However, pandoc generates \section {...} tags irrespective of whether `number-sections` is active or not. Personally I think that the default pandoc output is better than generating `\title`, `\subject`, etc. in the output. The current patch sets `number=no` for first four level of section heads when `number-sections` is not set. --- default.context | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index f2710a8e9..f6887640c 100644 --- a/default.context +++ b/default.context @@ -16,9 +16,14 @@ \setupwhitespace[medium] -\setuphead[section] [style=\tfc$if(number-sections)$$else$,number=no$endif$] -\setuphead[subsection] [style=\tfb$if(number-sections)$$else$,number=no$endif$] -\setuphead[subsubsection][style=\bf$if(number-sections)$$else$,number=no$endif$] +\setuphead[chapter] [style=\tfd] +\setuphead[section] [style=\tfc] +\setuphead[subsection] [style=\tfb] +\setuphead[subsubsection][style=\bf] + +$if(number-sections)$$else$ +\setuphead[chapter, section, subsection, subsubsection][number=no] +$endif$ \definedescription [description] -- cgit v1.2.3 From 5aaa69eda58dc84a16dc818c02c3e261fdb11975 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 3 Mar 2012 08:37:17 -0800 Subject: Slight change in context template to avoid double spacing. --- default.context | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index f6887640c..abc405655 100644 --- a/default.context +++ b/default.context @@ -21,7 +21,8 @@ \setuphead[subsection] [style=\tfb] \setuphead[subsubsection][style=\bf] -$if(number-sections)$$else$ +$if(number-sections)$ +$else$ \setuphead[chapter, section, subsection, subsubsection][number=no] $endif$ -- cgit v1.2.3 From 917c3e61887b3df9650d699f50a8825925857769 Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Mon, 5 Mar 2012 19:33:13 -0500 Subject: Set mainlanguage for ConTeXt --- default.context | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'default.context') diff --git a/default.context b/default.context index abc405655..21a062482 100644 --- a/default.context +++ b/default.context @@ -3,6 +3,10 @@ \setupcolors[state=start] \stopmode +$if(lang)$ +\mainlanguage[$lang$] +$endif$ + % Enable hyperlinks \setupinteraction[state=start, color=middleblue] -- cgit v1.2.3 From 1bcfd44b43a36f4c05e87f034c4e623214737018 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 7 Mar 2012 10:06:59 -0800 Subject: Use mainlang variable to set main language in context template. --- default.context | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index 21a062482..8def3a671 100644 --- a/default.context +++ b/default.context @@ -3,8 +3,8 @@ \setupcolors[state=start] \stopmode -$if(lang)$ -\mainlanguage[$lang$] +$if(mainlang)$ +\mainlanguage[$mainlang$] $endif$ % Enable hyperlinks -- cgit v1.2.3 From 7c4816983e652dddbd15adcfffa13823adec944e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 7 Mar 2012 10:08:13 -0800 Subject: Fixed spacing issue in context template. --- default.context | 1 - 1 file changed, 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 8def3a671..54cc8ea09 100644 --- a/default.context +++ b/default.context @@ -2,7 +2,6 @@ \enableregime[utf-8] \setupcolors[state=start] \stopmode - $if(mainlang)$ \mainlanguage[$mainlang$] $endif$ -- cgit v1.2.3 From b0e32b5db64f0049300c9e30803db871f1dbc66f Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Wed, 5 Sep 2012 18:36:00 -0400 Subject: papersize variable for ConTeXt template Controls the `papersize` in ConTeXt template. Any valid argument of `\setuppapersize[...]` descirbed on the [ConTeXt wiki][wiki] works. [wiki]: http://wiki.contextgarden.net/PaperSetup --- default.context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 54cc8ea09..6c77f75a4 100644 --- a/default.context +++ b/default.context @@ -9,7 +9,7 @@ $endif$ % Enable hyperlinks \setupinteraction[state=start, color=middleblue] -\setuppapersize [letter][letter] +\setuppapersize [$if(papersize)$$papersize$$else$letter$endif$][$if(papersize)$$papersize$$else$letter$endif$] \setuplayout [width=middle, backspace=1.5in, cutspace=1.5in, height=middle, topspace=0.75in, bottomspace=0.75in] -- cgit v1.2.3 From f0347e7af09f8aad32287b2b2d808cfb57e4e50e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 5 Jan 2013 18:15:14 -0800 Subject: Added \placelist to context writer. This selects TOC depth. --- default.context | 1 + 1 file changed, 1 insertion(+) (limited to 'default.context') diff --git a/default.context b/default.context index 6c77f75a4..6372cd0b4 100644 --- a/default.context +++ b/default.context @@ -69,6 +69,7 @@ $for(include-before)$ $include-before$ $endfor$ $if(toc)$ +\placelist[$placelist$] \placecontent $endif$ -- cgit v1.2.3 From ad3af80a4ffcea4b5a355c49c6c5fb99f0e66f2d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 19 Feb 2013 21:56:21 -0800 Subject: ConTeXt writer: Removed `\placecontent`. This produced a duplicate toc, in conjunction with `\placelist`. --- default.context | 1 - 1 file changed, 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 6372cd0b4..fe1509c65 100644 --- a/default.context +++ b/default.context @@ -70,7 +70,6 @@ $include-before$ $endfor$ $if(toc)$ \placelist[$placelist$] -\placecontent $endif$ $body$ -- cgit v1.2.3 From e5d22ce91a614d8a8d4a7bec870f6fbcd4756396 Mon Sep 17 00:00:00 2001 From: Aditya Mahajan Date: Wed, 20 Feb 2013 02:44:42 -0500 Subject: Canonical way to set TOC depth Use `\placecontent` instead of `\placelist` as `\placecontent` is easier to configure. --- default.context | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index fe1509c65..3fdb0a2a0 100644 --- a/default.context +++ b/default.context @@ -45,6 +45,10 @@ $endif$ indentnext=no, ] +$if(toc)$ +\setupcombinedlist[content][list={$placelist$}] +$endif$ + $for(header-includes)$ $header-includes$ $endfor$ @@ -69,7 +73,7 @@ $for(include-before)$ $include-before$ $endfor$ $if(toc)$ -\placelist[$placelist$] +\placecontent $endif$ $body$ -- cgit v1.2.3 From fbc015a54d8b98eb904fae997ce732f0cc507472 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 20 Feb 2013 09:57:05 -0800 Subject: Minor spacing tweak in context template. --- default.context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 3fdb0a2a0..18c8429f3 100644 --- a/default.context +++ b/default.context @@ -47,8 +47,8 @@ $endif$ $if(toc)$ \setupcombinedlist[content][list={$placelist$}] -$endif$ +$endif$ $for(header-includes)$ $header-includes$ $endfor$ -- cgit v1.2.3 From 8cadd4f2044c0c25842eeb5a2370a6e3384f4bd4 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 22 Nov 2013 19:50:26 -0800 Subject: ConTeXt template: setup captions with no numbering. See pandoc #1067. --- default.context | 2 ++ 1 file changed, 2 insertions(+) (limited to 'default.context') diff --git a/default.context b/default.context index 18c8429f3..03d260921 100644 --- a/default.context +++ b/default.context @@ -36,6 +36,8 @@ $endif$ \setupitemize[autointro] % prevent orphan list intro \setupitemize[indentnext=no] +\setupcaption[figure][number=no] % don't number figures + \setupthinrules[width=15em] % width of horizontal rules \setupdelimitedtext -- cgit v1.2.3 From 713a8f63d5589ab9313869e47b03cf7f49e00e98 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 30 Nov 2013 16:15:53 -0800 Subject: ConTeXt template: Setup up defaults for floats. This allows the user to adjust the figure and table placement and numbering globally. --- default.context | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 03d260921..6a4be1ed5 100644 --- a/default.context +++ b/default.context @@ -36,7 +36,8 @@ $endif$ \setupitemize[autointro] % prevent orphan list intro \setupitemize[indentnext=no] -\setupcaption[figure][number=no] % don't number figures +\setupfloat[figure][default={here,nonumber}] +\setupfloat[table][default={here,nonumber}] \setupthinrules[width=15em] % width of horizontal rules -- cgit v1.2.3 From 7ce5302d2016f3b204ba1d92894a168a6dfa0dc2 Mon Sep 17 00:00:00 2001 From: mb21 Date: Sun, 28 Jun 2015 23:35:43 +0200 Subject: ConTeXt template description lists --- default.context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 6a4be1ed5..d09ecb40f 100644 --- a/default.context +++ b/default.context @@ -31,7 +31,7 @@ $endif$ \definedescription [description] - [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm] + [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm, alternative=hanging] \setupitemize[autointro] % prevent orphan list intro \setupitemize[indentnext=no] -- cgit v1.2.3 From aabd14676b7c006a93f55886fbe105a76ddbc8fd Mon Sep 17 00:00:00 2001 From: mb21 Date: Thu, 20 Aug 2015 17:27:28 +0200 Subject: LaTeX, ConTeXt: more specific language variables --- default.context | 4 ++-- default.latex | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index d09ecb40f..c9b4936fb 100644 --- a/default.context +++ b/default.context @@ -2,8 +2,8 @@ \enableregime[utf-8] \setupcolors[state=start] \stopmode -$if(mainlang)$ -\mainlanguage[$mainlang$] +$if(context-lang)$ +\mainlanguage[$context-lang$] $endif$ % Enable hyperlinks diff --git a/default.latex b/default.latex index 26684135d..bfb2e3094 100644 --- a/default.latex +++ b/default.latex @@ -1,4 +1,4 @@ -\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} +\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} $if(fontfamily)$ \usepackage{$fontfamily$} $else$ @@ -74,10 +74,10 @@ $endif$ $if(lang)$ \ifxetex \usepackage{polyglossia} - \setmainlanguage{$mainlang$} - \setotherlanguages{$for(otherlang)$$otherlang$$sep$,$endfor$} + \setmainlanguage[variant=$polyglossia-variant$]{$polyglossia-lang$} + \setotherlanguages{$for(polyglossia-otherlangs)$$polyglossia-otherlangs$$sep$,$endfor$} \else - \usepackage[shorthands=off,$lang$]{babel} + \usepackage[shorthands=off,$babel-lang$]{babel} \fi $endif$ $if(natbib)$ -- cgit v1.2.3 From 0b80b7006f110509d82879707f633b945b3b8ae1 Mon Sep 17 00:00:00 2001 From: mb21 Date: Sat, 26 Sep 2015 21:28:09 +0200 Subject: Support bidirectional text output with XeLaTeX, ConTeXt and HTML --- default.context | 4 ++++ default.html | 2 +- default.latex | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index c9b4936fb..1bfc6bc14 100644 --- a/default.context +++ b/default.context @@ -5,6 +5,10 @@ $if(context-lang)$ \mainlanguage[$context-lang$] $endif$ +$if(context-dir)$ +\setupalign[$context-dir$] +\setupdirections[bidi=on,method=two] +$endif$ % Enable hyperlinks \setupinteraction[state=start, color=middleblue] diff --git a/default.html b/default.html index 1bbeda47a..aad3ffaea 100644 --- a/default.html +++ b/default.html @@ -1,5 +1,5 @@ - + diff --git a/default.latex b/default.latex index bfb2e3094..c67dbfecb 100644 --- a/default.latex +++ b/default.latex @@ -139,6 +139,23 @@ $endif$ $if(verbatim-in-note)$ \VerbatimFootnotes % allows verbatim text in footnotes $endif$ +$if(dir)$ +\ifxetex + % load bidi as late as possible as it modifies e.g. graphicx + $if(latex-dir-rtl)$ + \usepackage[RTLdocument]{bidi} + $else$ + \usepackage{bidi} + $endif$ +\fi +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \TeXXeTstate=1 + \newcommand{\RL}[1]{\beginR #1\endR} + \newcommand{\LR}[1]{\beginL #1\endL} + \newenvironment{RTL}{\beginR}{\endR} + \newenvironment{LTR}{\beginL}{\endL} +\fi +$endif$ $if(title)$ \title{$title$$if(subtitle)$\\\vspace{0.5em}{\large $subtitle$}$endif$} -- cgit v1.2.3 From befc9e2e848f5d0850a798e0a4944a791e4a9ecc Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Mon, 19 Oct 2015 17:55:56 -0400 Subject: Expand ConTeXt variables; drop MkII support. --- default.context | 99 +++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 27 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index 1bfc6bc14..93602e65b 100644 --- a/default.context +++ b/default.context @@ -1,7 +1,3 @@ -\startmode[*mkii] - \enableregime[utf-8] - \setupcolors[state=start] -\stopmode $if(context-lang)$ \mainlanguage[$context-lang$] $endif$ @@ -9,25 +5,68 @@ $if(context-dir)$ \setupalign[$context-dir$] \setupdirections[bidi=on,method=two] $endif$ - % Enable hyperlinks -\setupinteraction[state=start, color=middleblue] - -\setuppapersize [$if(papersize)$$papersize$$else$letter$endif$][$if(papersize)$$papersize$$else$letter$endif$] -\setuplayout [width=middle, backspace=1.5in, cutspace=1.5in, - height=middle, topspace=0.75in, bottomspace=0.75in] - -\setuppagenumbering[location={footer,center}] - -\setupbodyfont[11pt] - +\setupinteraction + [state=start$if(style)$, + style=$style$$endif$$if(linkcolor)$, + color=$linkcolor$, + contrastcolor=$linkcolor$$endif$$if(title)$, + title=$title$$endif$$if(subtitle)$, + subtitle=$subtitle$$endif$$if(author)$, + author=$author$$endif$$if(keywords)$, + keyword=$keywords$$endif$] +% make chapter, section bookmarks visible when opening document +\placebookmarks[chapter,section,subsection,subsubsection][chapter,section] +\setupinteractionscreen[option=bookmark] + +$if(papersize)$ +\setuppapersize[$for(papersize)$$papersize$$sep$, + $endfor$] +$endif$ +$if(layout)$ +\setuplayout[$for(layout)$$layout$$sep$, + $endfor$] +$endif$ +$if(pagenumbering)$ +\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$, + $endfor$] +$endif$ +\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes] % use microtypography +\setupalign[hz,hanging] +\setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted +$if(mainfont)$ +\definefontfamily[mainfont][serif][$mainfont$] +$endif$ +$if(sansfont)$ +\definefontfamily[sansfont][sans][$sansfont$] +$endif$ +$if(monofont)$ +\definefontfamily[monofont][mono][$monofont$][features=none] +$endif$ +$if(mathfont)$ +\definefontfamily[mathfont][math][$mathfont$] +$endif$ +\setupbodyfont[mainfont$if(fontsize)$,$fontsize$$endif$] +$if(whitespace)$ +\setupwhitespace[$whitespace$] +$else$ \setupwhitespace[medium] +$endif$ +$if(interlinespace)$ +\setupinterlinespace[$interlinespace$] +$endif$ \setuphead[chapter] [style=\tfd] \setuphead[section] [style=\tfc] \setuphead[subsection] [style=\tfb] \setuphead[subsubsection][style=\bf] +$if(headertext)$ +\setupheadertexts[$headertext$] +$endif$ +$if(footertext)$ +\setupfootertexts[$footertext$] +$endif$ $if(number-sections)$ $else$ \setuphead[chapter, section, subsection, subsubsection][number=no] @@ -45,17 +84,6 @@ $endif$ \setupthinrules[width=15em] % width of horizontal rules -\setupdelimitedtext - [blockquote] - [before={\blank[medium]}, - after={\blank[medium]}, - indentnext=no, - ] - -$if(toc)$ -\setupcombinedlist[content][list={$placelist$}] - -$endif$ $for(header-includes)$ $header-includes$ $endfor$ @@ -65,6 +93,10 @@ $if(title)$ \startalignment[center] \blank[2*big] {\tfd $title$} +$if(subtitle)$ + \blank[3*medium] + {\tfa $subtitle$} +$endif$ $if(author)$ \blank[3*medium] {\tfa $for(author)$$author$$sep$\crlf $endfor$} @@ -76,11 +108,24 @@ $endif$ \blank[3*medium] \stopalignment $endif$ +$if(abstract)$ +\midaligned{\bf Abstract} +\startnarrower[2*middle] +$abstract$ +\stopnarrower +\blank[big] +$endif$ $for(include-before)$ $include-before$ $endfor$ $if(toc)$ -\placecontent +\completecontent +$endif$ +$if(lot)$ +\completelistoftables +$endif$ +$if(lof)$ +\completelistoffigures $endif$ $body$ -- cgit v1.2.3 From d54b34cca6d401b19883a719a468da131d1668bd Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Tue, 20 Oct 2015 15:31:11 -0400 Subject: ConTeXt link colour to black; define all sections. Sets default link colour to black with normal style (default is bolded red/green links), per the discussion in #138. Provides heading styles for all section types applied by Pandoc. --- default.context | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index 93602e65b..ca82d293c 100644 --- a/default.context +++ b/default.context @@ -7,17 +7,18 @@ $if(context-dir)$ $endif$ % Enable hyperlinks \setupinteraction - [state=start$if(style)$, - style=$style$$endif$$if(linkcolor)$, - color=$linkcolor$, - contrastcolor=$linkcolor$$endif$$if(title)$, + [state=start, + style=$if(style)$$style$$else$normal$endif$, + color=$if(linkcolor)$$linkcolor$$else$black$endif$, + contrastcolor=$if(linkcolor)$$linkcolor$$else$black$endif$$if(title)$, title=$title$$endif$$if(subtitle)$, subtitle=$subtitle$$endif$$if(author)$, author=$author$$endif$$if(keywords)$, keyword=$keywords$$endif$] % make chapter, section bookmarks visible when opening document -\placebookmarks[chapter,section,subsection,subsubsection][chapter,section] +\placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] \setupinteractionscreen[option=bookmark] +\setuptagging[state=start] $if(papersize)$ \setuppapersize[$for(papersize)$$papersize$$sep$, @@ -56,10 +57,12 @@ $if(interlinespace)$ \setupinterlinespace[$interlinespace$] $endif$ -\setuphead[chapter] [style=\tfd] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] -\setuphead[subsubsection][style=\bf] +\setuphead[chapter] [style=\tfd,header=empty] +\setuphead[section] [style=\tfc] +\setuphead[subsection] [style=\tfb] +\setuphead[subsubsection] [style=\bf] +\setuphead[subsubsubsection] [style=\sc] +\setuphead[subsubsubsubsection][style=\it] $if(headertext)$ \setupheadertexts[$headertext$] @@ -69,7 +72,7 @@ $if(footertext)$ $endif$ $if(number-sections)$ $else$ -\setuphead[chapter, section, subsection, subsubsection][number=no] +\setuphead[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][number=no] $endif$ \definedescription -- cgit v1.2.3 From 8264f9f8f837b13fb50c3631d0e2e1936aec1684 Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Tue, 20 Oct 2015 16:07:18 -0400 Subject: Write title block in ConTeXt using \title. This prevents a page number from appearing on the first page. --- default.context | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index ca82d293c..d4e8d29f0 100644 --- a/default.context +++ b/default.context @@ -13,7 +13,7 @@ $endif$ contrastcolor=$if(linkcolor)$$linkcolor$$else$black$endif$$if(title)$, title=$title$$endif$$if(subtitle)$, subtitle=$subtitle$$endif$$if(author)$, - author=$author$$endif$$if(keywords)$, + author=$for(author)$$author$$sep$; $endfor$$endif$$if(keywords)$, keyword=$keywords$$endif$] % make chapter, section bookmarks visible when opening document \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] @@ -87,32 +87,34 @@ $endif$ \setupthinrules[width=15em] % width of horizontal rules -$for(header-includes)$ -$header-includes$ -$endfor$ - -\starttext -$if(title)$ -\startalignment[center] - \blank[2*big] - {\tfd $title$} +\setuphead[title][ + style={\tfd\raggedcenter}, + before={\startalignment[middle]}, + after={ $if(subtitle)$ - \blank[3*medium] - {\tfa $subtitle$} + \smallskip + {\tfa $subtitle$} $endif$ $if(author)$ - \blank[3*medium] - {\tfa $for(author)$$author$$sep$\crlf $endfor$} + \smallskip + {\tfa $for(author)$$author$$sep$\crlf $endfor$} $endif$ $if(date)$ - \blank[2*medium] - {\tfa $date$} + \smallskip + {\tfa $date$} $endif$ - \blank[3*medium] -\stopalignment + \bigskip\stopalignment}] + +$for(header-includes)$ +$header-includes$ +$endfor$ + +\starttext +$if(title)$ +\title{$title$} $endif$ $if(abstract)$ -\midaligned{\bf Abstract} +\midaligned{\it Abstract} \startnarrower[2*middle] $abstract$ \stopnarrower -- cgit v1.2.3 From e7f2258c8999561012479841687858870c8e3216 Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Thu, 22 Oct 2015 13:35:13 -0400 Subject: Always use $for$ to allow multiple options in LaTeX/ConTeXt/Beamer. Also makes minor improvements to spacing. Adds indenting option to ConTeXt and multiple header/footer texts. --- default.beamer | 16 +++++++++------- default.context | 44 +++++++++++++++++++++++++------------------- default.latex | 34 ++++++++++++++++++++++------------ 3 files changed, 56 insertions(+), 38 deletions(-) (limited to 'default.context') diff --git a/default.beamer b/default.beamer index dcbc16196..7826f6177 100644 --- a/default.beamer +++ b/default.beamer @@ -21,7 +21,7 @@ $endif$ \setbeamertemplate{caption label separator}{: } \setbeamercolor{caption name}{fg=normal text.fg} $if(fontfamily)$ -\usepackage[$fontfamilyoptions$]{$fontfamily$} +\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} $else$ \usepackage{lmodern} $endif$ @@ -43,20 +43,20 @@ $endif$ \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \newcommand{\euro}{€} $if(mainfont)$ - \setmainfont[$mainfontoptions$]{$mainfont$} + \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$} $endif$ $if(sansfont)$ - \setsansfont[$sansfontoptions$]{$sansfont$} + \setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$} $endif$ $if(monofont)$ - \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$monofontoptions$$endif$]{$monofont$} + \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$} $endif$ $if(mathfont)$ - \setmathfont(Digits,Latin,Greek)[$mathfontoptions$]{$mathfont$} + \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} $endif$ $if(CJKmainfont)$ \usepackage{xeCJK} - \setCJKmainfont[$CJKoptions$]{$CJKmainfont$} + \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} $endif$ \fi % use upquote if available, for straight quotes in verbatim environments @@ -68,8 +68,10 @@ $endif$ }{} $if(lang)$ \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex - \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel} +$if(babel-newcommands)$ $babel-newcommands$ +$endif$ \else \usepackage{polyglossia} \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} diff --git a/default.context b/default.context index d4e8d29f0..519311256 100644 --- a/default.context +++ b/default.context @@ -8,31 +8,38 @@ $endif$ % Enable hyperlinks \setupinteraction [state=start, +$if(title)$ + title={$title$}, +$endif$ +$if(subtitle)$ + subtitle={$subtitle$}, +$endif$ +$if(author)$ + author={$for(author)$$author$$sep$; $endfor$}, +$endif$ +$if(keywords)$ + keyword={$for(keywords)$$keywords$$sep$; $endfor$}, +$endif$ style=$if(style)$$style$$else$normal$endif$, color=$if(linkcolor)$$linkcolor$$else$black$endif$, - contrastcolor=$if(linkcolor)$$linkcolor$$else$black$endif$$if(title)$, - title=$title$$endif$$if(subtitle)$, - subtitle=$subtitle$$endif$$if(author)$, - author=$for(author)$$author$$sep$; $endfor$$endif$$if(keywords)$, - keyword=$keywords$$endif$] + contrastcolor=$if(linkcolor)$$linkcolor$$else$black$endif$] % make chapter, section bookmarks visible when opening document \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] \setupinteractionscreen[option=bookmark] \setuptagging[state=start] $if(papersize)$ -\setuppapersize[$for(papersize)$$papersize$$sep$, - $endfor$] +\setuppapersize[$for(papersize)$$papersize$$sep$,$endfor$] $endif$ $if(layout)$ -\setuplayout[$for(layout)$$layout$$sep$, - $endfor$] +\setuplayout[$for(layout)$$layout$$sep$,$endfor$] $endif$ $if(pagenumbering)$ -\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$, - $endfor$] +\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$] $endif$ -\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes] % use microtypography +% use microtypography +\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes,pnum=yes] +\definefontfeature[smallcaps][smallcaps][protrusion=quality,expansion=quality,onum=yes,pnum=yes] \setupalign[hz,hanging] \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted $if(mainfont)$ @@ -48,13 +55,12 @@ $if(mathfont)$ \definefontfamily[mathfont][math][$mathfont$] $endif$ \setupbodyfont[mainfont$if(fontsize)$,$fontsize$$endif$] -$if(whitespace)$ -\setupwhitespace[$whitespace$] -$else$ -\setupwhitespace[medium] +\setupwhitespace[$if(whitespace)$$whitespace$$else$medium$endif$] +$if(indenting)$ +\setupindenting[$for(indenting)$$indenting$$sep$,$endfor$] $endif$ $if(interlinespace)$ -\setupinterlinespace[$interlinespace$] +\setupinterlinespace[$for(interlinespace)$$interlinespace$$sep$,$endfor$] $endif$ \setuphead[chapter] [style=\tfd,header=empty] @@ -65,10 +71,10 @@ $endif$ \setuphead[subsubsubsubsection][style=\it] $if(headertext)$ -\setupheadertexts[$headertext$] +\setupheadertexts$for(headertext)$[$headertext$]$endfor$ $endif$ $if(footertext)$ -\setupfootertexts[$footertext$] +\setupfootertexts$for(footertext)$[$footertext$]$endfor$ $endif$ $if(number-sections)$ $else$ diff --git a/default.latex b/default.latex index 935c2422d..305ae9dee 100644 --- a/default.latex +++ b/default.latex @@ -1,6 +1,6 @@ \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} $if(fontfamily)$ -\usepackage[$fontfamilyoptions$]{$fontfamily$} +\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} $else$ \usepackage{lmodern} $endif$ @@ -26,20 +26,20 @@ $endif$ \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \newcommand{\euro}{€} $if(mainfont)$ - \setmainfont[$mainfontoptions$]{$mainfont$} + \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$} $endif$ $if(sansfont)$ - \setsansfont[$sansfontoptions$]{$sansfont$} + \setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$} $endif$ $if(monofont)$ - \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$monofontoptions$$endif$]{$monofont$} + \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$} $endif$ $if(mathfont)$ - \setmathfont(Digits,Latin,Greek)[$mathfontoptions$]{$mathfont$} + \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} $endif$ $if(CJKmainfont)$ \usepackage{xeCJK} - \setCJKmainfont[$CJKoptions$]{$CJKmainfont$} + \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} $endif$ \fi % use upquote if available, for straight quotes in verbatim environments @@ -55,11 +55,19 @@ $endif$ \usepackage{hyperref} \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref \hypersetup{breaklinks=true, - unicode=true,$if(title-meta)$ - pdftitle={$title-meta$},$endif$$if(author-meta)$ - pdfauthor={$author-meta$},$endif$$if(subtitle)$ - pdfsubject={$subtitle$},$endif$$if(keywords)$ - pdfkeywords={$keywords$},$endif$ + unicode=true, +$if(title-meta)$ + pdftitle={$title-meta$}, +$endif$ +$if(author-meta)$ + pdfauthor={$author-meta$}, +$endif$ +$if(subtitle)$ + pdfsubject={$subtitle$}, +$endif$ +$if(keywords)$ + pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$}, +$endif$ colorlinks=true, citecolor=$if(citecolor)$$citecolor$$else$black$endif$, urlcolor=$if(urlcolor)$$urlcolor$$else$black$endif$, @@ -69,8 +77,10 @@ $endif$ \urlstyle{same} % don't use monospace font for urls $if(lang)$ \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex - \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel} +$if(babel-newcommands)$ $babel-newcommands$ +$endif$ \else \usepackage{polyglossia} \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} -- cgit v1.2.3 From 3ed48ae68f628b787e4ba98a34e6c51834378bc9 Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Mon, 9 Nov 2015 11:10:47 -0500 Subject: Make LaTeX/ConTeXt link colour optional. Prevents a conflict when base text is not black. This makes the `hidelinks` option redundant. --- default.context | 4 ++-- default.latex | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index 519311256..cba3f28b7 100644 --- a/default.context +++ b/default.context @@ -21,8 +21,8 @@ $if(keywords)$ keyword={$for(keywords)$$keywords$$sep$; $endfor$}, $endif$ style=$if(style)$$style$$else$normal$endif$, - color=$if(linkcolor)$$linkcolor$$else$black$endif$, - contrastcolor=$if(linkcolor)$$linkcolor$$else$black$endif$] + color=$linkcolor$, + contrastcolor=$linkcolor$] % make chapter, section bookmarks visible when opening document \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] \setupinteractionscreen[option=bookmark] diff --git a/default.latex b/default.latex index 305ae9dee..33277c053 100644 --- a/default.latex +++ b/default.latex @@ -54,8 +54,7 @@ $if(geometry)$ $endif$ \usepackage{hyperref} \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref -\hypersetup{breaklinks=true, - unicode=true, +\hypersetup{unicode=true, $if(title-meta)$ pdftitle={$title-meta$}, $endif$ @@ -68,12 +67,15 @@ $endif$ $if(keywords)$ pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$}, $endif$ +$if(colorlinks)$ colorlinks=true, - citecolor=$if(citecolor)$$citecolor$$else$black$endif$, - urlcolor=$if(urlcolor)$$urlcolor$$else$black$endif$, - linkcolor=$if(linkcolor)$$linkcolor$$else$black$endif$, - pdfborder={0 0 0}$if(hidelinks)$, - hidelinks$endif$} + linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$, + citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$, + urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$, +$else$ + pdfborder={0 0 0}, +$endif$ + breaklinks=true} \urlstyle{same} % don't use monospace font for urls $if(lang)$ \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex @@ -206,7 +208,9 @@ $include-before$ $endfor$ $if(toc)$ { +$if(colorlinks)$ \hypersetup{linkcolor=$if(toccolor)$$toccolor$$else$black$endif$} +$endif$ \setcounter{tocdepth}{$toc-depth$} \tableofcontents } -- cgit v1.2.3 From 2823096cb47eb8639b43677081bb593b22f1e3ab Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Mon, 9 Nov 2015 11:35:47 -0500 Subject: Rename ConTeXt `style` to `linkstyle`. Not necessary to write `normal` to prevent links from rendering as bold. --- default.context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index cba3f28b7..45323839b 100644 --- a/default.context +++ b/default.context @@ -20,7 +20,7 @@ $endif$ $if(keywords)$ keyword={$for(keywords)$$keywords$$sep$; $endfor$}, $endif$ - style=$if(style)$$style$$else$normal$endif$, + style=$linkstyle$, color=$linkcolor$, contrastcolor=$linkcolor$] % make chapter, section bookmarks visible when opening document -- cgit v1.2.3 From e0bd757310c6dfc73dcba747c78115c1016fa90e Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Mon, 9 Nov 2015 11:37:43 -0500 Subject: Provide separate `linkcontrastcolor` in ConTeXt. --- default.context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.context') diff --git a/default.context b/default.context index 45323839b..c5ad2113f 100644 --- a/default.context +++ b/default.context @@ -22,7 +22,7 @@ $if(keywords)$ $endif$ style=$linkstyle$, color=$linkcolor$, - contrastcolor=$linkcolor$] + contrastcolor=$linkcontrastcolor$] % make chapter, section bookmarks visible when opening document \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] \setupinteractionscreen[option=bookmark] -- cgit v1.2.3 From 959c20399bdf5f44e56497352a63917c4db2a5ce Mon Sep 17 00:00:00 2001 From: Andrew Dunning Date: Tue, 17 Nov 2015 20:22:23 -0500 Subject: Revert use of \setuphead for ConTeXt title block. Thanks to Rik Kabel on pandoc-discuss. --- default.context | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index c5ad2113f..1feff01b0 100644 --- a/default.context +++ b/default.context @@ -93,31 +93,28 @@ $endif$ \setupthinrules[width=15em] % width of horizontal rules -\setuphead[title][ - style={\tfd\raggedcenter}, - before={\startalignment[middle]}, - after={ -$if(subtitle)$ - \smallskip - {\tfa $subtitle$} -$endif$ -$if(author)$ - \smallskip - {\tfa $for(author)$$author$$sep$\crlf $endfor$} -$endif$ -$if(date)$ - \smallskip - {\tfa $date$} -$endif$ - \bigskip\stopalignment}] - $for(header-includes)$ $header-includes$ $endfor$ \starttext $if(title)$ -\title{$title$} +\startalignment[middle] + {\tfd $title$} +$if(subtitle)$ + \smallskip + {\tfa $subtitle$} +$endif$ +$if(author)$ + \smallskip + {\tfa $for(author)$$author$$sep$\crlf $endfor$} +$endif$ +$if(date)$ + \smallskip + {\tfa $date$} +$endif$ + \bigskip +\stopalignment $endif$ $if(abstract)$ \midaligned{\it Abstract} -- cgit v1.2.3 From 56bb94b61f8fc207396f662cf1909c52fe0cc95f Mon Sep 17 00:00:00 2001 From: Pablo Rodríguez Date: Thu, 19 Nov 2015 22:15:49 +0100 Subject: font loading with simplefonts simplefonts is required, since ConTeXt stable from TeX Live 2015 seems to have problem with some typefaces when not used. --- default.context | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'default.context') diff --git a/default.context b/default.context index c5ad2113f..4bd4b7113 100644 --- a/default.context +++ b/default.context @@ -38,23 +38,25 @@ $if(pagenumbering)$ \setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$] $endif$ % use microtypography -\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes,pnum=yes] -\definefontfeature[smallcaps][smallcaps][protrusion=quality,expansion=quality,onum=yes,pnum=yes] +\definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes] +\definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes] \setupalign[hz,hanging] +\setupitaliccorrection[global, always] \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted +\usemodule[simplefonts$if(fontsize)$,$fontsize$$endif$] +\setmainfontfallback[DejaVu Serif][range={greekandcoptic, greekextended}, force=yes, rscale=auto] $if(mainfont)$ -\definefontfamily[mainfont][serif][$mainfont$] +\setmainfont[$mainfont$] $endif$ $if(sansfont)$ -\definefontfamily[sansfont][sans][$sansfont$] +\setsansfont[$sansfont$][rscale=auto] $endif$ $if(monofont)$ -\definefontfamily[monofont][mono][$monofont$][features=none] +\setmonofont[$monofont$][features=none, rscale=auto] $endif$ $if(mathfont)$ -\definefontfamily[mathfont][math][$mathfont$] +\setmathfont[$mathfont$][rscale=auto] $endif$ -\setupbodyfont[mainfont$if(fontsize)$,$fontsize$$endif$] \setupwhitespace[$if(whitespace)$$whitespace$$else$medium$endif$] $if(indenting)$ \setupindenting[$for(indenting)$$indenting$$sep$,$endfor$] -- cgit v1.2.3