summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2003-04-16 08:44:29 +0000
committerwlemb <wlemb>2003-04-16 08:44:29 +0000
commit6b515387b0067a49aff2709cada2b5bacb487519 (patch)
tree4e76614e3575dd024d445e7edd97fe649c923d3b
parent6d74082d44b9c94bfe519ff30329f95d023aab1e (diff)
downloadgroff-6b515387b0067a49aff2709cada2b5bacb487519.tar.gz
* tmac/hyphenex.sh: Make script more portable by using a here
document.
-rw-r--r--ChangeLog5
-rw-r--r--tmac/hyphenex.sh115
2 files changed, 64 insertions, 56 deletions
diff --git a/ChangeLog b/ChangeLog
index 1da009ec..317f77aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-16 Werner LEMBERG <wl@gnu.org>
+
+ * tmac/hyphenex.sh: Make script more portable by using a here
+ document.
+
2003-04-15 Werner LEMBERG <wl@gnu.org>
Renamed all `*.cc' files to `*.cpp'.
diff --git a/tmac/hyphenex.sh b/tmac/hyphenex.sh
index e97bb99e..89d94fc7 100644
--- a/tmac/hyphenex.sh
+++ b/tmac/hyphenex.sh
@@ -8,7 +8,7 @@
#
# Written by Werner Lemberg <wl@gnu.org>.
#
-# Version 1.2 (2003/04/15)
+# Version 1.3 (2003/04/15)
#
# Public domain.
#
@@ -17,69 +17,72 @@
#
# sh hyphenex.sh < tugboat-article > hyphenation-exceptions
-sed -n '
-1 i\
-% Hyphenation exceptions for US English, based on the hyphenation exception\
-% log article in TUGBoat.\
-%\
-% This is an automatically generated file. Do not edit!\
-%\
-% Please contact Barbara Beeton <bnb@ams.org> for corrections and omissions.\
-\
-\\hyphenation{
-$ i\
-}\
-\
+cat >/tmp/sed.$$ <<SED_EOF
+1 i\\
+% Hyphenation exceptions for US English, based on the hyphenation exception\\
+% log article in TUGBoat.\\
+%\\
+% This is an automatically generated file. Do not edit!\\
+%\\
+% Please contact Barbara Beeton <bnb@ams.org> for corrections and omissions.\\
+\\
+\\\\hyphenation{
+\$ i\\
+}\\
+\\
% EOF
-/^\\tabalign/ {
+/^\\\\tabalign/ {
s/{}//g
s/[ ][ ]*/ /g
- s/ *\\[^ ][^ ]*$//
- s/\\tabalign *[^ ][^ ]*.*& *\(.*\)$/ \1/p
+ s/ *\\\\[^ ][^ ]*\$//
+ s/\\\\tabalign *[^ ][^ ]*.*& *\\(.*\\)\$/ \\1/p
b
}
-/^\\[123456]/! d
-s/\\4/\\1/
-s/\\5/\\2/
-s/\\6/\\3/
+/^\\\\[123456]/ !d
+s/\\\\4/\\\\1/
+s/\\\\5/\\\\2/
+s/\\\\6/\\\\3/
s/[ ][ ]*/ /g
s/^/ /
-s/\\1 [^ ][^ ]* {\(.*\)}$/\1/
-s/\\2 [^ ][^ ]* {\(.*\) \(.*\),\(.*\),\(.*\)}$/\1\n \1\2\n \1\3\n \1\4/
-s/\\2 [^ ][^ ]* {\(.*\) \(.*\),\(.*\)}$/\1\n \1\2\n \1\3/
-s/\\2 [^ ][^ ]* {\(.*\) \(.*\)}$/\1\n \1\2/
-s/\\3 [^ ][^ ]* {\(.*\) \(.*\) \(.*\)}$/\1\2\n \1\3/
-s/\\1 [^ ][^ ]* {\(.*\)} .*$/\1/
-s/\\2 [^ ][^ ]* {\(.*\) \(.*\),\(.*\),\(.*\)} .*$/\1\n \1\2\n \1\3\n \1\4/
-s/\\2 [^ ][^ ]* {\(.*\) \(.*\),\(.*\)} .*$/\1\n \1\2\n \1\3/
-s/\\2 [^ ][^ ]* {\(.*\) \(.*\)} .*$/\1\n \1\2/
-s/\\3 [^ ][^ ]* {\(.*\) \(.*\) \(.*\)} .*$/\1\2\n \1\3/
-s/\\1 {.*} {\(.*\)}$/\1/
-s/\\2 {.*} {\(.*\) \(.*\),\(.*\),\(.*\)}$/\1\n \1\2\n \1\3\n \1\4/
-s/\\2 {.*} {\(.*\) \(.*\),\(.*\)}$/\1\n \1\2\n \1\3/
-s/\\2 {.*} {\(.*\) \(.*\)}$/\1\n \1\2/
-s/\\3 {.*} {\(.*\) \(.*\) \(.*\)}$/\1\2\n \1\3/
-s/\\1 {.*} {\(.*\)} .*$/\1/
-s/\\2 {.*} {\(.*\) \(.*\),\(.*\),\(.*\)} .*$/\1\n \1\2\n \1\3\n \1\4/
-s/\\2 {.*} {\(.*\) \(.*\),\(.*\)} .*$/\1\n \1\2\n \1\3/
-s/\\2 {.*} {\(.*\) \(.*\)} .*$/\1\n \1\2/
-s/\\3 {.*} {\(.*\) \(.*\) \(.*\)} .*$/\1\2\n \1\3/
-s/\\1 [^ ][^ ]* \([^ ][^ ]*\)$/\1/
-s/\\2 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\),\([^ ][^ ]*\),\([^ ][^ ]*\)$/\1\n \1\2\n \1\3\n \1\4/
-s/\\2 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\),\([^ ][^ ]*\)$/\1\n \1\2\n \1\3/
-s/\\2 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\)$/\1\n \1\2/
-s/\\3 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\) \([^ ][^ ]*\)$/\1\2\n \1\3/
-s/\\1 [^ ][^ ]* \([^ ][^ ]*\) .*$/\1/
-s/\\2 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\),\([^ ][^ ]*\),\([^ ][^ ]*\) .*$/\1\n \1\2\n \1\3\n \1\4/
-s/\\2 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\),\([^ ][^ ]*\) .*$/\1\n \1\2\n \1\3/
-s/\\2 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\) .*$/\1\n \1\2/
-s/\\3 [^ ][^ ]* \([^ ][^ ]*\) \([^ ][^ ]*\) \([^ ][^ ]*\) .*$/\1\2\n \1\3/
-s/\*//
-s/\\llap *{\(.*\)}/\1/
-s/\\[^ ]* //
-s/\\[^ ][^ ]*$//
+s/\\\\1 [^ ][^ ]* {\\(.*\\)}\$/\\1/
+s/\\\\2 [^ ][^ ]* {\\(.*\\) \\(.*\\),\\(.*\\),\\(.*\\)}\$/\\1\\n \\1\\2\\n \\1\\3\\n \\1\\4/
+s/\\\\2 [^ ][^ ]* {\\(.*\\) \\(.*\\),\\(.*\\)}\$/\\1\\n \\1\\2\\n \\1\\3/
+s/\\\\2 [^ ][^ ]* {\\(.*\\) \\(.*\\)}\$/\\1\\n \\1\\2/
+s/\\\\3 [^ ][^ ]* {\\(.*\\) \\(.*\\) \\(.*\\)}\$/\\1\\2\\n \\1\\3/
+s/\\\\1 [^ ][^ ]* {\\(.*\\)} .*\$/\\1/
+s/\\\\2 [^ ][^ ]* {\\(.*\\) \\(.*\\),\\(.*\\),\\(.*\\)} .*\$/\\1\\n \\1\\2\\n \\1\\3\\n \\1\\4/
+s/\\\\2 [^ ][^ ]* {\\(.*\\) \\(.*\\),\\(.*\\)} .*\$/\\1\\n \\1\\2\\n \\1\\3/
+s/\\\\2 [^ ][^ ]* {\\(.*\\) \\(.*\\)} .*\$/\\1\\n \\1\\2/
+s/\\\\3 [^ ][^ ]* {\\(.*\\) \\(.*\\) \\(.*\\)} .*\$/\\1\\2\\n \\1\\3/
+s/\\\\1 {.*} {\\(.*\\)}\$/\\1/
+s/\\\\2 {.*} {\\(.*\\) \\(.*\\),\\(.*\\),\\(.*\\)}\$/\\1\\n \\1\\2\\n \\1\\3\\n \\1\\4/
+s/\\\\2 {.*} {\\(.*\\) \\(.*\\),\\(.*\\)}\$/\\1\\n \\1\\2\\n \\1\\3/
+s/\\\\2 {.*} {\\(.*\\) \\(.*\\)}\$/\\1\\n \\1\\2/
+s/\\\\3 {.*} {\\(.*\\) \\(.*\\) \\(.*\\)}\$/\\1\\2\\n \\1\\3/
+s/\\\\1 {.*} {\\(.*\\)} .*\$/\\1/
+s/\\\\2 {.*} {\\(.*\\) \\(.*\\),\\(.*\\),\\(.*\\)} .*\$/\\1\\n \\1\\2\\n \\1\\3\\n \\1\\4/
+s/\\\\2 {.*} {\\(.*\\) \\(.*\\),\\(.*\\)} .*\$/\\1\\n \\1\\2\\n \\1\\3/
+s/\\\\2 {.*} {\\(.*\\) \\(.*\\)} .*\$/\\1\\n \\1\\2/
+s/\\\\3 {.*} {\\(.*\\) \\(.*\\) \\(.*\\)} .*\$/\\1\\2\\n \\1\\3/
+s/\\\\1 [^ ][^ ]* \\([^ ][^ ]*\\)\$/\\1/
+s/\\\\2 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\),\\([^ ][^ ]*\\),\\([^ ][^ ]*\\)\$/\\1\\n \\1\\2\\n \\1\\3\\n \\1\\4/
+s/\\\\2 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\),\\([^ ][^ ]*\\)\$/\\1\\n \\1\\2\\n \\1\\3/
+s/\\\\2 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\)\$/\\1\\n \\1\\2/
+s/\\\\3 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\) \\([^ ][^ ]*\\)\$/\\1\\2\\n \\1\\3/
+s/\\\\1 [^ ][^ ]* \\([^ ][^ ]*\\) .*\$/\\1/
+s/\\\\2 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\),\\([^ ][^ ]*\\),\\([^ ][^ ]*\\) .*\$/\\1\\n \\1\\2\\n \\1\\3\\n \\1\\4/
+s/\\\\2 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\),\\([^ ][^ ]*\\) .*\$/\\1\\n \\1\\2\\n \\1\\3/
+s/\\\\2 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\) .*\$/\\1\\n \\1\\2/
+s/\\\\3 [^ ][^ ]* \\([^ ][^ ]*\\) \\([^ ][^ ]*\\) \\([^ ][^ ]*\\) .*\$/\\1\\2\\n \\1\\3/
+s/\\*//
+s/\\\\llap *{\\(.*\\)}/\\1/
+s/\\\\[^ ]* //
+s/\\\\[^ ][^ ]*\$//
s/{.*}//
p
-'
+SED_EOF
+
+sed -n -f /tmp/sed.$$
+rm /tmp/sed.$$
# EOF