From 738c59b641e19aca6c2a5c6eb32c4b62bca0f0ff Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jul 2010 10:50:08 -0400 Subject: git, param, refine filename regex for composite files --- lib/sisu/v2/git.rb | 4 ++-- lib/sisu/v2/param.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sisu/v2/git.rb b/lib/sisu/v2/git.rb index b910c723..b5dc403e 100644 --- a/lib/sisu/v2/git.rb +++ b/lib/sisu/v2/git.rb @@ -68,9 +68,9 @@ module SiSU_Git l=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @git_path={} if @env.i18n.multilingual - m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst)$/ #watch added match for sss + m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss fnn,fnb,fnt=@opt.fns[m,1],@opt.fns[m,2],@opt.fns[m,3] - else m=/(.+?)\.((?:-|ssm\.)?sst)$/ + else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/ fnb=@fnn=@opt.fns[m,1] fnt=@opt.fns[m,2] end diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index 89eaced3..674a0a08 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -841,7 +841,7 @@ module SiSU_Param # programs set here for things that affect output appearance only @programs[:pdf]=SiSU_Env::System_call.new.program_found?('pdflatex') if @env.i18n.multilingual - m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst)$/ #watch added match for sss + m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss @fnn,@fnb,@fnt=@fns[m,1],@fns[m,2],@fns[m,3] @flv=@env.document_language_versions_found[:f] @fnz=(@fns =~/\.(?:ssm\.sst|ssm)$/) ? (@fnn + '.ssm.zip') : (@fnn + '.sst.zip') -- cgit v1.2.3