Index: expopt/ref/layers.1.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.1.ps.gz =================================================================== --- expopt/ref/layers.1.ps.gz (nonexistent) +++ expopt/ref/layers.1.ps.gz (revision 36285) Property changes on: expopt/ref/layers.1.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.am.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.am.ps.gz =================================================================== --- expopt/ref/layers.am.ps.gz (nonexistent) +++ expopt/ref/layers.am.ps.gz (revision 36285) Property changes on: expopt/ref/layers.am.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.amirr.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.amirr.ps.gz =================================================================== --- expopt/ref/layers.amirr.ps.gz (nonexistent) +++ expopt/ref/layers.amirr.ps.gz (revision 36285) Property changes on: expopt/ref/layers.amirr.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.base.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.base.ps.gz =================================================================== --- expopt/ref/layers.base.ps.gz (nonexistent) +++ expopt/ref/layers.base.ps.gz (revision 36285) Property changes on: expopt/ref/layers.base.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.clr.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.clr.ps.gz =================================================================== --- expopt/ref/layers.clr.ps.gz (nonexistent) +++ expopt/ref/layers.clr.ps.gz (revision 36285) Property changes on: expopt/ref/layers.clr.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.dcp.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.dcp.ps.gz =================================================================== --- expopt/ref/layers.dcp.ps.gz (nonexistent) +++ expopt/ref/layers.dcp.ps.gz (revision 36285) Property changes on: expopt/ref/layers.dcp.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.dh.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.dh.ps.gz =================================================================== --- expopt/ref/layers.dh.ps.gz (nonexistent) +++ expopt/ref/layers.dh.ps.gz (revision 36285) Property changes on: expopt/ref/layers.dh.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.fill.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.fill.ps.gz =================================================================== --- expopt/ref/layers.fill.ps.gz (nonexistent) +++ expopt/ref/layers.fill.ps.gz (revision 36285) Property changes on: expopt/ref/layers.fill.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.inv.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.inv.ps.gz =================================================================== --- expopt/ref/layers.inv.ps.gz (nonexistent) +++ expopt/ref/layers.inv.ps.gz (revision 36285) Property changes on: expopt/ref/layers.inv.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.leg.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.leg.ps.gz =================================================================== --- expopt/ref/layers.leg.ps.gz (nonexistent) +++ expopt/ref/layers.leg.ps.gz (revision 36285) Property changes on: expopt/ref/layers.leg.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.mirr.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.mirr.ps.gz =================================================================== --- expopt/ref/layers.mirr.ps.gz (nonexistent) +++ expopt/ref/layers.mirr.ps.gz (revision 36285) Property changes on: expopt/ref/layers.mirr.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.outl.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.outl.ps.gz =================================================================== --- expopt/ref/layers.outl.ps.gz (nonexistent) +++ expopt/ref/layers.outl.ps.gz (revision 36285) Property changes on: expopt/ref/layers.outl.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/ref/layers.scale.ps.gz =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: expopt/ref/layers.scale.ps.gz =================================================================== --- expopt/ref/layers.scale.ps.gz (nonexistent) +++ expopt/ref/layers.scale.ps.gz (revision 36285) Property changes on: expopt/ref/layers.scale.ps.gz ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: expopt/test.sh =================================================================== --- expopt/test.sh (revision 36284) +++ expopt/test.sh (revision 36285) @@ -3,7 +3,11 @@ pcb=pcb-rnd CONVERT=convert COMPARE=compare +TRUNK=../.. +srcdir=$TRUNK/src +global_args="-c rc/library_search_paths=lib -c plugins/draw_fab/omit_date=1 -c design/fab_author=TEST -c rc/quiet=1 -c rc/default_font_file=$srcdir/default_font" + test_svg=' base ph --photo-mode @@ -39,17 +43,53 @@ mono --monochrome ' +test_ps=' + base + dh --drill-helper --drill-helper-size 0.1mm + am --no-align-marks + outl --no-outline + mirr --mirror + amirr --mirror --no-auto-mirror + fill --fill-page + clr --ps-color + inv --ps-invert + scale --scale 4 + dcp --no-drill-copper + leg --no-show-legend --no-show-toc + 1 --single-page --no-show-toc +' +# portable sed -i implementation with temp files +sedi() +{ + local sc n + sc=$1 + shift 1 + for n in "$@" + do + sed "$sc" < "$n" > "$n.sedi" && mv "$n.sedi" "$n" + done +} + + # $1: test file # $2: output ext # $3: test args, one per line +# $4: optional sedi script to make the output portable gen_any() { - echo "$3" | while read name args + local outfn + + echo "$3" | while read name args do if test ! -z "$name" then - $pcb $lead out/$1.$name.$2 $1.lht $args + outfn="out/$1.$name.$2" + $pcb $global_args $lead "$outfn" "$1.lht" $args + if test ! -z "$4" + then + sedi "$4" "$outfn" + fi fi done } @@ -84,13 +124,8 @@ test "$res" -lt 8 fi ;; - ps) + svg|eps|ps) zcat "$ref.gz" > "$ref" - zcat "$out.gz" > "$out" - diff -u "$ref" "$out" && rm "$ref" "$out" - ;; - svg|eps) - zcat "$ref.gz" > "$ref" diff -u "$ref" "$out" && rm "$ref" ;; *) @@ -150,7 +185,6 @@ cmp_any layers png "$test_png" } - gen_eps() { lead="-x eps --eps-file" @@ -162,6 +196,22 @@ cmp_any layers eps "$test_eps" } +gen_ps() +{ + lead="-x ps --psfile" + gen_any layers ps "$test_ps" ' + s@%%CreationDate:.*@%%CreationDate: date@ + s@%%Creator:.*@%%Creator: pcb-rnd@ + s@%%Version:.*@%%Version: ver@ + s@^[(]Created on.*@(Created on date@ + ' +} + +cmp_ps() +{ + cmp_any layers ps "$test_ps" +} + mkdir -p out diff case "$1" in @@ -178,6 +228,10 @@ gen_eps cmp_eps ;; + ps) + gen_ps + cmp_ps + ;; "") echo "generating svg..." gen_svg @@ -187,6 +241,14 @@ need_convert gen_png cmp_png + + echo "generating eps..." + gen_eps + cmp_eps + + echo "generating ps..." + gen_ps + cmp_ps ;; *) echo "Invalid format to test" >&2