diff options
author | Marius <mariausol@gmail.com> | 2013-10-20 01:21:09 +0300 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2013-10-20 01:21:09 +0300 |
commit | b8ac6d7b7fdb16293c28034c349efd5b0b7b20b3 (patch) | |
tree | 0e9051dbe21b4e9cfc72fe594df5b0fe7bc511f3 /scripts/context/ruby | |
parent | 965214d981e6129b782c67adcaf3a81aedcb0bac (diff) | |
download | context-b8ac6d7b7fdb16293c28034c349efd5b0b7b20b3.tar.gz |
beta 2013.10.20 07:09
Diffstat (limited to 'scripts/context/ruby')
-rw-r--r-- | scripts/context/ruby/base/pdf.rb | 10 | ||||
-rw-r--r-- | scripts/context/ruby/base/switch.rb | 10 | ||||
-rw-r--r-- | scripts/context/ruby/base/tex.rb | 53 |
3 files changed, 41 insertions, 32 deletions
diff --git a/scripts/context/ruby/base/pdf.rb b/scripts/context/ruby/base/pdf.rb index 5aec06fc5..6be0d3f98 100644 --- a/scripts/context/ruby/base/pdf.rb +++ b/scripts/context/ruby/base/pdf.rb @@ -5,16 +5,24 @@ module PDFview @closecalls = Hash.new @allcalls = Hash.new - @method = 'default' # 'xpdf' + # acrobat no longer is a valid default as (1) it keeps crashing with pdfopen due to a dual acrobat/reader install (a side effect + # of the api changing every version, and (2) because there are all these anyoing popups with respect to signed, review, online + # this and that stuff ... hardly useable as fast previewer, and (3) sumatra is faster and nicer and doesn't block (okay, we have to + # get rid of this horrible yellow bg-coloring buts that is doable + + @method = 'sumatra' # 'default' # 'xpdf' @opencalls['default'] = "pdfopen --file" # "pdfopen --back --file" @opencalls['xpdf'] = "xpdfopen" + @opencalls['sumatra'] = 'start "test" sumatrapdf.exe -reuse-instance -bg-color 0xCCCCCC' @closecalls['default'] = "pdfclose --file" @closecalls['xpdf'] = nil + @closecalls['sumatra'] = nil @allcalls['default'] = "pdfclose --all" @allcalls['xpdf'] = nil + @allcalls['sumatra'] = nil def PDFview.setmethod(method) @method = method diff --git a/scripts/context/ruby/base/switch.rb b/scripts/context/ruby/base/switch.rb index e38752018..73f532082 100644 --- a/scripts/context/ruby/base/switch.rb +++ b/scripts/context/ruby/base/switch.rb @@ -487,20 +487,20 @@ class CommandLine private - def dirtyvalue(value) + def dirtyvalue(value) # \xFF suddenly doesn't work any longer if value then value.gsub(/([\"\'])(.*?)\1/) do - $2.gsub(/\s+/o, "\xFF") + $2.gsub(/\s+/o, "\0xFF") end else '' end end - def cleanvalue(value) + def cleanvalue(value) # \xFF suddenly doesn't work any longer if value then # value.sub(/^([\"\'])(.*?)\1$/) { $2.gsub(/\xFF/o, ' ') } - value.gsub(/\xFF/o, ' ') + value.gsub(/\0xFF/o, ' ') else '' end @@ -569,7 +569,7 @@ class CommandLine def locateseries(series, value) - series.each do |key| + series.each_char do |key| # was .each but there is no alias to each_char any longer locatesingle(key,cleanvalue(value)) end diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb index 77d61b4db..9a520f313 100644 --- a/scripts/context/ruby/base/tex.rb +++ b/scripts/context/ruby/base/tex.rb @@ -364,8 +364,7 @@ class TEX def mpsformats() @@mpsformats.keys.sort end def defaulttexformats() ['en','nl','mptopdf'] end - # def defaultmpsformats() ['metafun'] end # no longer formats - def defaultmpsformats() [] end + def defaultmpsformats() ['metafun'] end # no longer formats def texmakeextras(format) @@texmakestr[format] || '' end def mpsmakeextras(format) @@mpsmakestr[format] || '' end @@ -630,34 +629,36 @@ class TEX texformatpath = '' end # generate mps formats - if mpsformats && mpsengine then - report("using mp engine #{mpsengine}") - mpsformatpath = if getvariable('local') then '.' else Kpse.formatpath(mpsengine,false) end - report("using mps format path #{mpsformatpath}") - Dir.chdir(mpsformatpath) rescue false - if FileTest.writable?(mpsformatpath) then - mpsformats.each do |mpsformat| - report("generating mps format #{mpsformat}") - progname = validprogname([getvariable('progname'),mpsformat,mpsengine]) - if not runcommand([quoted(mpsengine),prognameflag(progname),iniflag,runoptions(mpsengine),mpsformat,mpsmakeextras(mpsformat)]) then - setvariable('error','no format made') - end - end - else - report("unable to make format due to lack of permissions") - mpsformatpath = '' - setvariable('error','file permission problem') - end - else - mpsformatpath = '' - end + # if mpsformats && mpsengine then + # report("using mp engine #{mpsengine}") + # mpsformatpath = if getvariable('local') then '.' else Kpse.formatpath(mpsengine,false) end + # report("using mps format path #{mpsformatpath}") + # Dir.chdir(mpsformatpath) rescue false + # if FileTest.writable?(mpsformatpath) then + # mpsformats.each do |mpsformat| + # report("generating mps format #{mpsformat}") + # progname = validprogname([getvariable('progname'),mpsformat,mpsengine]) + # if not runcommand([quoted(mpsengine),prognameflag(progname),iniflag,runoptions(mpsengine),mpsformat,mpsmakeextras(mpsformat)]) then + # setvariable('error','no format made') + # end + # end + # else + # report("unable to make format due to lack of permissions") + # mpsformatpath = '' + # setvariable('error','file permission problem') + # end + # else + # mpsformatpath = '' + # end # check for problems report("") report("tex engine path: #{texformatpath}") unless texformatpath.empty? - report("mps engine path: #{mpsformatpath}") unless mpsformatpath.empty? + # report("mps engine path: #{mpsformatpath}") unless mpsformatpath.empty? report("") - [['fmt','tex'],['mem','mps']].each do |f| - [[texformatpath,'global'],[mpsformatpath,'global'],[savedpath,'current']].each do |p| + # [['fmt','tex'],['mem','mps']].each do |f| + # [[texformatpath,'global'],[mpsformatpath,'global'],[savedpath,'current']].each do |p| + [['fmt','tex']].each do |f| + [[texformatpath,'global'],[savedpath,'current']].each do |p| begin Dir.chdir(p[0]) rescue |