commit 82abcd6fd693549b225e53c6c161ea3909f2cf00 from: Russ Cox date: Mon Nov 12 16:09:39 2018 UTC plumb: allow @ in file names Helps Go module download cache, Upspin, maybe others. commit - 48da9bd71ddae0c51f8aff4c0d6806a8e32c4e23 commit + 82abcd6fd693549b225e53c6c161ea3909f2cf00 blob - f728132fdcbacafd377915bfa63da384105911a4 blob + 438fc48fcab15db9c9d45b7552bba737fd89fe1b --- plumb/basic +++ plumb/basic @@ -37,8 +37,8 @@ plumb start wdoc2txt $file # image files go to page type is text -data matches '[a-zA-Z¡-￿0-9_\-./]+' -data matches '([a-zA-Z¡-￿0-9_\-./]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|bit|png|PNG)' +data matches '[a-zA-Z¡-￿0-9_\-./@]+' +data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|bit|png|PNG)' arg isfile $0 plumb to image plumb start 9 page $file @@ -46,22 +46,22 @@ plumb start 9 page $file # postscript/pdf/dvi go to page but not over the a plumb port # the port is here for reference but is unused type is text -data matches '[a-zA-Z¡-￿0-9_\-./]+' -data matches '([a-zA-Z¡-￿0-9_\-./]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI)' +data matches '[a-zA-Z¡-￿0-9_\-./@]+' +data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI)' arg isfile $0 plumb to postscript plumb start 9 page $file # open office - s[xt][cdigmw], doc, xls, ppt -data matches '[a-zA-Z¡-￿0-9_\-./]+' -data matches '([a-zA-Z¡-￿0-9_\-./]+)\.([Ss][XxTt][CcDdIiGgMmWw]|[Dd][Oo][Cc]|[Xx][Ll][Ss]|[Pp][Pp][Tt])' +data matches '[a-zA-Z¡-￿0-9_\-./@]+' +data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.([Ss][XxTt][CcDdIiGgMmWw]|[Dd][Oo][Cc]|[Xx][Ll][Ss]|[Pp][Pp][Tt])' arg isfile $0 plumb to openoffice plumb start openoffice $file # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor type is text -data matches '([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr,$twocolonaddr +data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr,$twocolonaddr arg isfile $1 data set $file attr add addr=$2-#1+#$3,$4-#1+#$5 @@ -70,7 +70,7 @@ plumb client $editor # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor type is text -data matches '([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr +data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr arg isfile $1 data set $file attr add addr=$2-#1+#$3 @@ -79,7 +79,7 @@ plumb client $editor # existing files, possibly tagged by line number, go to editor type is text -data matches '([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-])('$addr')?' +data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])('$addr')?' arg isfile $1 data set $file attr add addr=$3