Changeset 29485 in project
- Timestamp:
- 08/03/13 09:20:20 (7 years ago)
- Location:
- release/4/nemo/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
release/4/nemo/trunk/examples/Golgi/Golgi_DeSouza10.nemo
r29297 r29485 2110 2110 nseg = 1 2111 2111 2112 {% with diam = default(diam, 1), L = default(L, 1), celsius = default(celsius, 23) %}2112 {% with diam = default(diam, 5.65), L = default(L, 5.65), celsius = default(celsius, 23) %} 2113 2113 diam = {{diam}} 2114 2114 L = {{L}} -
release/4/nemo/trunk/nemo-version.scm
r29474 r29485 1 1 2 (define nemo-version 8.29)2 (define nemo-version "8.30") -
release/4/nemo/trunk/nemo.scm
r29300 r29485 1262 1262 1263 1263 (define (ncml->model-decls options doc) 1264 (let* ((parse-expr (or (lookup-def 'parse-expr options) identity)) 1264 1265 (define (load-ss in) 1266 (eval `(begin 1267 ,@sxslt-preamble 1268 (sxml:make-ss ,@(read in)) 1269 ))) 1270 1271 (define (make-ss-fname dirname fname) 1272 (or (and dirname (make-pathname dirname fname)) fname)) 1273 1274 (let* ((source-path (lookup-def 'source-path options)) 1275 (dirname (pathname-directory source-path)) 1276 (parse-expr (or (lookup-def 'parse-expr options) identity)) 1265 1277 (ncml:model ((lambda (x) 1266 1278 (if (null? x) (error 'ncml->model "ncml:model element not found in input document") (car x))) … … 1275 1287 (let ((ss (map 1276 1288 (lambda (x) 1277 (call-with-input-string (sxml:text x) 1278 (lambda (in) (eval `(begin 1279 ,@sxslt-preamble 1280 (sxml:make-ss ,@(read in)) 1281 )) 1282 ))) 1289 (let ((fn (sxml:attr x 'filename))) 1290 (or (and fn (call-with-input-file (make-ss-fname dirname fn) load-ss)) 1291 (call-with-input-string (sxml:text x) load-ss)) 1292 )) 1283 1293 ncml-ss))) 1284 1294 (fold (lambda (s doc) (stx:apply-templates doc s doc (list))) doc ss)) … … 1973 1983 ((sxml xml ixml) (ncml->model-decls 1974 1984 `((parse-expr . ,parse-expr) 1975 (debug . ,(opt 'debug) )) 1985 (debug . ,(opt 'debug) ) 1986 (source-path . ,operand) 1987 ) 1976 1988 (car doc.iexpr))) 1977 1989 ((sexp nemo) (sexp->model-decls (car doc.iexpr)))
Note: See TracChangeset
for help on using the changeset viewer.