diff options
Diffstat (limited to 'lib/sisu/v4/sysenv.rb')
-rw-r--r-- | lib/sisu/v4/sysenv.rb | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index d43bba91..22a520f6 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -266,7 +266,7 @@ module SiSU_Env end class GetInit < InfoSystemGen @@noyaml=false - @@rc,@@sisurc_path,@@tx=nil,nil,nil + @@rc,@@sisu_doc_makefile,@@sisurc_path,@@tx=nil,nil,nil,nil @@ad={ promo: nil, promo_list: nil, flag_promo: false } @@sdmd=nil attr_accessor :yaml @@ -282,20 +282,39 @@ module SiSU_Env def tex @@tx ||=SiSU_Viz::TeX.new end + def rc_path_options + @rc_path=[ + "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}", + "#{$sisu_document_markup_directory}/.sisu", + "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}", + "#{$sisu_document_markup_directory}/_sisu", + "#{@@home}/.sisu/#{SiSU_version_dir}", + "#{@@home}/.sisu", + "#{@@sisu_etc}/#{SiSU_version_dir}", + "#{@@sisu_etc}", + ] + end + def sisu_document_make + def makefile + #if @markup_dir_changed_ + rc_path_options.each do |v| + f='sisu_document_make' + if FileTest.exist?("#{v}/#{f}") + @@sisu_make_path=v + sisu_doc_makefile=IO.read("#{@@sisu_make_path}/#{f}", mode: 'r:utf-8') + @@sisu_doc_makefile=sisu_doc_makefile.split(/\s*\n\s*\n/m) + break + end + end + #end + @@sisu_doc_makefile + end + self + end def sisu_yaml def rc if @markup_dir_changed_ - @rc_path=[ - "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}", - "#{$sisu_document_markup_directory}/.sisu", - "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}", - "#{$sisu_document_markup_directory}/_sisu", - "#{@@home}/.sisu/#{SiSU_version_dir}", - "#{@@home}/.sisu", - "#{@@sisu_etc}/#{SiSU_version_dir}", - "#{@@sisu_etc}", - ] - @rc_path.each do |v| + rc_path_options.each do |v| if @@noyaml \ or FileTest.exist?("#{v}/noyaml") STDERR.puts "WARNING - YAML loading switched off, to enable delete the file:\n\t#{v}/noyaml\n\n" unless @@noyaml |