summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-09 23:40:27 +0000
committerKarl Berry <karl@freefriends.org>2011-01-09 23:40:27 +0000
commit5e2fa289125cb5d0a8c0a14544aee379aeef47e7 (patch)
tree2007115ea6018ba66f951bde316fe9dc930e96c4 /Master/texmf-dist/tex
parentb45231e143e38e8fee0093edba02962a7899f345 (diff)
context-simplefonts (<8jan11)
git-svn-id: svn://tug.org/texlive/trunk@20997 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua2
-rw-r--r--Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex70
2 files changed, 23 insertions, 49 deletions
diff --git a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua
index 129c14854ce..de13b00afaf 100644
--- a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua
+++ b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua
@@ -4,7 +4,7 @@ if not modules then modules = { } end modules ['t-simplefonts'] = {
author = "Wolfgang Schuster",
copyright = "Wolfgang Schuster",
email = "schuster.wolfgang@googlemail.com",
- license = "Public Domain"
+ license = "GNU General Public License"
}
local texsprint, ctxcatcodes, prtcatcodes, format, lower, gsub, find = tex.sprint, tex.ctxcatcodes, tex.prtcatcodes, string.format, string.lower, string.gsub, string.find
diff --git a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex
index f1f3479dea8..b1a596b89b5 100644
--- a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex
+++ b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex
@@ -1,13 +1,28 @@
%D \module
%D [ file=t-simplefonts,
-%D version=2010.10.13,
+%D version=2010.12.28,
%D title=\CONTEXT\ User Module,
%D subtitle=Simplefonts,
%D author=Wolfgang Schuster,
%D date=\currentdate,
%D copyright=Wolfgang Schuster,
%D email=schuster.wolfgang@googlemail.com,
-%D license=Public Domain]
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C (at your option) any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\writestatus{loading}{ConTeXt User Module / Simplefonts}
@@ -120,26 +135,9 @@
%D Module setup
\setupmodule
- [\c!contextversion=2009.08.22,
- \c!size=\!!twelvepoint,
+ [ \c!size=\!!twelvepoint,
\c!style=\c!rm]
-%D Check ConTeXt version
-
-\ifx\forcequitjob\undefined % copied from core-job, needed for older installations
-
- \def\forcequitjob#1%
- {\writestatus\m!systems{forcing quit: #1}%
- \batchmode
- \dorecurse\textlevel{\stoptext}
- \normalend}
-
-\fi
-
-\doifolderversionelse\contextversion{\currentmoduleparameter\c!contextversion}
- {\showmessage\m!simplefonts{3}{\currentmoduleparameter\c!contextversion}\forcequitjob\v!simplefonts}
- \donothing
-
%D Lua code
\ctxloadluafile{t-simplefonts}{}
@@ -188,8 +186,6 @@
%D Simplefont style
-\definefontalternative[\c!bc] % BoldCaps
-
\definefontstyle [\c!sf,\v!simplefont] [\c!sf]
\starttypescript [simplefont] [default] [size]
@@ -205,28 +201,7 @@
sl=SimplefontSlanted sa 1,
bi=SimplefontBoldItalic sa 1,
bs=SimplefontBoldSlanted sa 1,
- sc=SimplefontCaps sa 1,
- bc=SimplefontBoldCaps sa 1]
-
-\definebodyfont [default] [rm]
- [tf=Serif sa 1,
- bf=SerifBold sa 1,
- it=SerifItalic sa 1,
- sl=SerifSlanted sa 1,
- bi=SerifBoldItalic sa 1,
- bs=SerifBoldSlanted sa 1,
- sc=SerifCaps sa 1,
- bc=SerifBoldCaps sa 1]
-
-\definebodyfont [default] [ss]
- [tf=Sans sa 1,
- bf=SansBold sa 1,
- it=SansItalic sa 1,
- sl=SansSlanted sa 1,
- bi=SansBoldItalic sa 1,
- bs=SansBoldSlanted sa 1,
- sc=SansCaps sa 1,
- bc=SansBoldCaps sa 1]
+ sc=SimplefontCaps sa 1]
%D \macros
%D {simplefontparameter,namedsimplefontparameter,
@@ -600,7 +575,7 @@
\definefontcommand[\v!mainfont ][\v!simplefonts][\c!style=\v!serif ]
\definefontcommand[\v!sansfont ][\v!simplefonts][\c!style=\v!sans ]
-\definefontcommand[\v!monofont ][\v!simplefonts][\c!style=\v!mono ]
+\definefontcommand[\v!monofont ][\v!simplefonts][\c!style=\v!mono ,\s!features=\s!none]
\definefontcommand[\v!mathfont ][\v!simplefonts][\c!style=\v!math ]
\definefontcommand[\v!handwritingfont ][\v!simplefonts][\c!style=\v!handwriting]
\definefontcommand[\v!calligraphicfont][\v!simplefonts][\c!style=\v!calligraphy]
@@ -614,11 +589,11 @@
\definesubfontcommand[\v!cjk\v!mainfont][\v!mainfont][\c!range={0x00400-0x2FA1F}]
\definesubfontcommand[\v!cjk\v!sansfont][\v!sansfont][\c!range={0x00400-0x2FA1F}]
-\definesubfontcommand[\v!cjk\v!monofont][\v!monofont][\c!range={0x00400-0x2FA1F}]
+\definesubfontcommand[\v!cjk\v!monofont][\v!monofont][\c!range={0x00400-0x2FA1F},\s!features=\s!none]
\definesubfontcommand[\v!mainfont\v!fallback][\v!mainfont][\c!range=]
\definesubfontcommand[\v!sansfont\v!fallback][\v!sansfont][\c!range=]
-\definesubfontcommand[\v!monofont\v!fallback][\v!monofont][\c!range=]
+\definesubfontcommand[\v!monofont\v!fallback][\v!monofont][\c!range=,\s!features=\s!none]
%D \macros
%D {simplefont,definesimplefont}
@@ -673,7 +648,6 @@
\v!sans=>{\simplefonts@definetextfont [#1][#1][#2][#3]},
\v!mono=>{\simplefonts@definetextfont [#1][#1][#2][#3]},
\v!math=>{\simplefonts@definemathfont [#1][#1][#2][#3]},
- \v!math=>{\simplefonts@definemathfont [#1][#1][#2][#3]},
\v!handwriting=>{\simplefonts@definescriptfont[#1][#1][#2][#3]},
\v!calligraphy=>{\simplefonts@definescriptfont[#1][#1][#2][#3]},
\s!unknown=>{\simplefonts@definetextfont [#1][#1][#2][#3]}]}