aboutsummaryrefslogtreecommitdiff
path: root/plumb/basic
diff options
context:
space:
mode:
authorPetter Rodhelind <petter.rodhelind@gmail.com>2019-01-07 21:48:38 +0100
committerPetter Rodhelind <petter.rodhelind@gmail.com>2019-01-07 21:48:38 +0100
commit98222694f92aeecfcbb216fd1cb835b9550aa6d6 (patch)
tree94f06e87ee4eb2145b46be89db141d82507c630d /plumb/basic
parentd95f1bcc4938b3b0b7f832b67575e07a87095721 (diff)
parent2607cc565ee3d5facb8949e9acfed35c8ae300c9 (diff)
downloadplan9port-98222694f92aeecfcbb216fd1cb835b9550aa6d6.tar.gz
plan9port-98222694f92aeecfcbb216fd1cb835b9550aa6d6.tar.bz2
plan9port-98222694f92aeecfcbb216fd1cb835b9550aa6d6.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plumb/basic')
-rw-r--r--plumb/basic22
1 files changed, 11 insertions, 11 deletions
diff --git a/plumb/basic b/plumb/basic
index f728132f..b59b7948 100644
--- a/plumb/basic
+++ b/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,40 +46,40 @@ 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
+attr add addr=$2-#0+#$3-#1,$4-#0+#$5-#1
plumb to edit
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
+attr add addr=$2-#0+#$3-#1
plumb to edit
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