From 97c003887ee2b36079c07c7dab9414a266056b47 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 16 May 2006 18:35:00 +0200 Subject: stable 2006.05.16 18:35 --- context/data/context.properties | 20 ++++++++----- .../hoekwater/lm/lmtypewriter10-regular.ttf | Bin 0 -> 128311 bytes scripts/context/ruby/base/merge.rb | 20 +++++++------ scripts/context/ruby/texmfstart.rb | 22 +++++++------- scripts/context/ruby/www/exa.rb | 2 +- scripts/context/ruby/www/lib.rb | 5 ++-- scripts/context/ruby/wwwwatch.rb | 2 +- tex/context/base/cont-new.tex | 2 +- tex/context/base/context.tex | 2 +- tex/context/base/core-con.tex | 33 ++++++++++++++------- tex/context/base/lang-ger.tex | 15 ++++++++++ tex/context/base/mult-sys.tex | 3 ++ tex/context/interface/keys-cz.xml | 2 +- tex/context/interface/keys-de.xml | 2 +- tex/context/interface/keys-en.xml | 2 +- tex/context/interface/keys-fr.xml | 2 +- tex/context/interface/keys-it.xml | 2 +- tex/context/interface/keys-nl.xml | 2 +- tex/context/interface/keys-ro.xml | 2 +- 19 files changed, 90 insertions(+), 50 deletions(-) create mode 100644 fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf diff --git a/context/data/context.properties b/context/data/context.properties index f99bde78a..4c15b6666 100644 --- a/context/data/context.properties +++ b/context/data/context.properties @@ -67,9 +67,9 @@ if PLAT_WIN if PLAT_GTK name.context.console=rxvt - name.context.gsview=gs - name.context.acrobat=xpdfopen - name.texexec.flag.pdfopen= + name.context.gsview=gv + name.context.acrobat=acroread + name.texexec.flag.pdfopen=--autopdf name.metafun.console=$(name.context.console) name.example.console=$(name.context.console) @@ -355,13 +355,19 @@ Alt+F12|IDM_STOPEXECUTE|\ # Editor: fonts (16.5/11.5) +# install: fonts/truetype/hoekwater/lm/LMTypewriter10-Regular.ttf + +if PLAT_WIN + font.monospace=font:LMTypewriter10,size:16 + font.errorfont=font:LMTypewriter10,size:12 + if PLAT_WIN - font.monospace=font:LMTypewriter10,size:16.5 - font.errorfont=font:LMTypewriter10,size:11.5 + font.monospace=font:lmtypewriter10 regular,size:16 + font.errorfont=font:lmtypewriter10 regular,size:12 if PLAT_GTK - font.monospace=font:!LMTypewriter10 Regular,size:16.5 - font.errorfont=font:!LMTypewriter10 Regular,size:11.5 + font.monospace=font:!lmtypewriter10 regular,size:16 + font.errorfont=font:!lmtypewriter10 regular,size:12 font.base=$(font.monospace) #~ font.small=$(font.monospace) diff --git a/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf b/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf new file mode 100644 index 000000000..86d04bb3c Binary files /dev/null and b/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf differ diff --git a/scripts/context/ruby/base/merge.rb b/scripts/context/ruby/base/merge.rb index 36ab85269..c6ea6c09e 100644 --- a/scripts/context/ruby/base/merge.rb +++ b/scripts/context/ruby/base/merge.rb @@ -53,9 +53,9 @@ module SelfMerge end end - def SelfMerge::merge(filename=@@filename) + def SelfMerge::merge begin - if rbfile = IO.read(filename) then + if SelfMerge::ok? && rbfile = IO.read(@@filename) then begin inserts = "#{@@kpsemergestart}\n\n" @@modules.each do |file| @@ -80,7 +80,7 @@ module SelfMerge return false else begin - File.open(filename,'w') do |f| + File.open(@@filename,'w') do |f| f << rbfile end rescue @@ -95,9 +95,9 @@ module SelfMerge end end - def SelfMerge::cleanup(filename=@@filename) + def SelfMerge::cleanup begin - if rbfile = IO.read(filename) then + if rbfile = IO.read(@@filename) then begin rbfile.sub!(/#{@@kpsemergestart}(.*)#{@@kpsemergestop}\s*/mois) do "#{@@kpsemergestart}\n\n#{@@kpsemergestop}\n\n" @@ -114,7 +114,7 @@ module SelfMerge return false else begin - File.open(filename,'w') do |f| + File.open(@@filename,'w') do |f| f << rbfile end rescue @@ -129,9 +129,11 @@ module SelfMerge end end - def SelfMerge::replace(filename=@@filename) - SelfMerge::cleanup(filename) - SelfMerge::merge(filename) + def SelfMerge::replace + if SelfMerge::ok? then + SelfMerge::cleanup + SelfMerge::merge + end end end diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb index 8bda35c7b..6cb5d5ccb 100644 --- a/scripts/context/ruby/texmfstart.rb +++ b/scripts/context/ruby/texmfstart.rb @@ -1331,9 +1331,9 @@ module SelfMerge end end - def SelfMerge::merge(filename=@@filename) + def SelfMerge::merge begin - if rbfile = IO.read(filename) then + if SelfMerge::ok? && rbfile = IO.read(@@filename) then begin inserts = "#{@@kpsemergestart}\n\n" @@modules.each do |file| @@ -1358,7 +1358,7 @@ module SelfMerge return false else begin - File.open(filename,'w') do |f| + File.open(@@filename,'w') do |f| f << rbfile end rescue @@ -1373,9 +1373,9 @@ module SelfMerge end end - def SelfMerge::cleanup(filename=@@filename) + def SelfMerge::cleanup begin - if rbfile = IO.read(filename) then + if rbfile = IO.read(@@filename) then begin rbfile.sub!(/#{@@kpsemergestart}(.*)#{@@kpsemergestop}\s*/mois) do "#{@@kpsemergestart}\n\n#{@@kpsemergestop}\n\n" @@ -1392,7 +1392,7 @@ module SelfMerge return false else begin - File.open(filename,'w') do |f| + File.open(@@filename,'w') do |f| f << rbfile end rescue @@ -1407,9 +1407,11 @@ module SelfMerge end end - def SelfMerge::replace(filename=@@filename) - SelfMerge::cleanup(filename) - SelfMerge::merge(filename) + def SelfMerge::replace + if SelfMerge::ok? then + SelfMerge::cleanup + SelfMerge::merge + end end end @@ -2379,7 +2381,7 @@ def execute(arguments) # private: $selfmerge = $directives['selfmerge'] || false - $selfcleanup = $directives['selfcleanup'] || false + $selfcleanup = $directives['selfclean'] || $directives['selfcleanup'] || false ENV['_CTX_VERBOSE_'] = 'yes' if $verbose diff --git a/scripts/context/ruby/www/exa.rb b/scripts/context/ruby/www/exa.rb index 6cf7d8a9b..c6d59d864 100644 --- a/scripts/context/ruby/www/exa.rb +++ b/scripts/context/ruby/www/exa.rb @@ -49,7 +49,7 @@ class WWW end def handle_exainterface() - check_template_file('text','text-template.htm') + check_template_file('text','exalogin-template.htm') if id = valid_session() then filename = @interface.get('process:uri').to_s # kind of dup if ! filename.empty? && filename.sub!(/^.*\//,'') then diff --git a/scripts/context/ruby/www/lib.rb b/scripts/context/ruby/www/lib.rb index b330c2a97..2a4f3e14f 100644 --- a/scripts/context/ruby/www/lib.rb +++ b/scripts/context/ruby/www/lib.rb @@ -158,8 +158,8 @@ class WWW analyze_request() update_interface() - @interface.set('template:message' , 'text-template.htm') - @interface.set('template:status' , 'text-template.htm') + @interface.set('template:message' , 'exalogin-template.htm') + @interface.set('template:status' , 'exalogin-template.htm') @interface.set('template:login' , 'exalogin.htm') @interface.set('process:timeout' , @@session_max_age) @interface.set('process:threshold' , @@send_threshold) @@ -278,6 +278,7 @@ class WWW end end end + @interface.set('path:root', File.dirname(@interface.get('path:docroot'))) end # name in calling script takes precedence diff --git a/scripts/context/ruby/wwwwatch.rb b/scripts/context/ruby/wwwwatch.rb index 1f61ef479..e5f0c0654 100644 --- a/scripts/context/ruby/wwwwatch.rb +++ b/scripts/context/ruby/wwwwatch.rb @@ -74,7 +74,7 @@ class Watch < Monitor @files = Array.new @stats = Hash.new @skips = Hash.new - @root_path = File.expand_path(File.join(File.dirname($0),'..')) if @root_path.empty? + @root_path = File.expand_path(File.join(File.dirname($0),'.')) if @root_path.empty? @work_path = File.expand_path(File.join(@root_path,'work','watch')) if @work_path.empty? @cache_path = File.expand_path(File.join(@root_path,'work','cache')) if @work_path.empty? begin File.makedirs(@work_path) ; rescue ; end diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 990bc8365..aaf2f7f52 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2006.05.14 23:57} +\newcontextversion{2006.05.16 18:35} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 2dd3b95af..7d41beb55 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@ %D 2004.8.30 the low level interface is english. Watch out and adapt %D your styles an modules. -\def\contextversion{2006.05.14 23:57} +\def\contextversion{2006.05.16 18:35} %D For those who want to use this: diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex index 34592ab20..ca2bb7a86 100644 --- a/tex/context/base/core-con.tex +++ b/tex/context/base/core-con.tex @@ -310,24 +310,32 @@ %D %D Anyhow, the conversion looks like: -\def\doconvertmonth#1% - {\labeltext - {\ifcase#1% - \or \v!january \or \v!february \or \v!march \or \v!april - \or \v!may \or \v!june \or \v!july \or \v!august - \or \v!september \or \v!october \or \v!november \or \v!december - \fi}} +\def\domonthtag#1% + {\ifcase#1% + \or \v!january \or \v!february \or \v!march \or \v!april + \or \v!may \or \v!june \or \v!july \or \v!august + \or \v!september \or \v!october \or \v!november \or \v!december + \else + \v!unknown + \fi} + +\def\doconvertmonthlong #1{\labeltext{\domonthtag{#1}}} +\def\doconvertmonthshort#1{\labeltext{\domonthtag{#1}:\s!mnem}} + +\let\doconvertmonth\doconvertmonthlong %D We redefine the \TEX\ primitive \type{\month} as: %D %D \showsetup{month} %D \showsetup{MONTH} -\def\month - {\doconvertmonth} +\def\monthlong {\doconvertmonthlong} +\def\monthshort{\doconvertmonthshort} +\def\month {\doconvertmonth} -\def\MONTH#1% - {{\let\labeltext\LABELTEXT\month{#1}}} +\def\MONTH #1{{\let\labeltext\LABELTEXT\month {#1}}} +\def\MONTHLONG #1{{\let\labeltext\LABELTEXT\monthlong {#1}}} +\def\MONTHSHORT#1{{\let\labeltext\LABELTEXT\monthshort{#1}}} %D We never explicitly needed this, but Tobias Burnus pointed %D out that it would be handy to convert to the day of the @@ -914,6 +922,9 @@ \defineconversion [arabicnumerals] [\numbers] \defineconversion [persiannumerals] [\numbers] +\defineconversion [month] [\doconvertmonthlong] +\defineconversion [month:mnem] [\doconvertmonthshort] + \beginXETEX \number \defineconversionvector{arabicnumerals} {"0660} diff --git a/tex/context/base/lang-ger.tex b/tex/context/base/lang-ger.tex index 049905649..8a379203f 100644 --- a/tex/context/base/lang-ger.tex +++ b/tex/context/base/lang-ger.tex @@ -598,4 +598,19 @@ %D \ShowAllLanguageValues [\s!af] [afrikaans] {Afrikaaner} {boer} % afrikaanse gasvryheid %D \ShowAllLanguageValues [\s!no] [norwegian] {Norwegian} {wood} +%D Extra month names: + +\setuplabeltext [\s!en] [\v!january :\s!mnem=jan] +\setuplabeltext [\s!en] [\v!february :\s!mnem=feb] +\setuplabeltext [\s!en] [\v!march :\s!mnem=mar] +\setuplabeltext [\s!en] [\v!april :\s!mnem=apr] +\setuplabeltext [\s!en] [\v!may :\s!mnem=may] +\setuplabeltext [\s!en] [\v!june :\s!mnem=jun] +\setuplabeltext [\s!en] [\v!july :\s!mnem=jul] +\setuplabeltext [\s!en] [\v!august :\s!mnem=aug] +\setuplabeltext [\s!en] [\v!september:\s!mnem=sep] +\setuplabeltext [\s!en] [\v!october :\s!mnem=oct] +\setuplabeltext [\s!en] [\v!november :\s!mnem=nov] +\setuplabeltext [\s!en] [\v!december :\s!mnem=dec] + \protect \endinput diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex index 653cde3f8..8636ec402 100644 --- a/tex/context/base/mult-sys.tex +++ b/tex/context/base/mult-sys.tex @@ -82,6 +82,8 @@ \definesystemconstant {Normal} \definesystemconstant {Caps} +\definesystemconstant {mnem} % kind of generic short tag + %D As the name of their define command states, the next set of %D constants is used in the message macro's. @@ -106,6 +108,7 @@ \definemessageconstant {verbatims} \definemessageconstant {versions} + %D The word \type{height} takes 6~token memory cells. The %D control sequence \type{\height} on the other hand uses only %D one. Knowing this, we can improve the performance of \TEX, diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index dcf341757..7ce6d9f6e 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 4870b4288..7fe0242cc 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index d0311f050..9641b780f 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index 6a43c3a9c..56b45a319 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index cbe1efb68..eff156850 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index d22c400f4..b9fbc1980 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index ed6420c3c..964963ccd 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3