From faf14041cf1a7a5153d985a6cfdb609be7c50ba5 Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Tue, 8 Oct 2019 08:54:17 +0100
Subject: [PATCH] Update README.md, git-sync script
---
README.md | 45 ++++++++++++++++++++++++++++++++++++++++++++-
git-sync.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a46d63e..be54d0d 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Annotator Generator is an examples-driven generator of fast text annotators. “
* You supply a corpus of pre-annotated texts for Annotator Generator to work out the rules and exceptions
-* Annotator Generator creates code (in C, C#, Java, Go, Javascript or Python 2) that hard-codes the rules for fast processing
+* Annotator Generator creates code (in C, C#, Java, Go, Javascript, Dart or Python 2) that hard-codes the rules for fast processing
* The resulting program should be able to annotate any text that contains words or phrases similar to those found in the examples
@@ -1073,3 +1073,46 @@ Options:
`-p STATUS_PREFIX, --status-prefix=STATUS_PREFIX
`
: Label to add at the start of the status line, for use if you batch-run annogen in multiple configurations and want to know which one is currently running
+
+Copyright and Trademarks
+========================
+
+(c) Silas S. Brown, licensed under Apache 2
+
+* Android is a trademark of Google LLC.
+
+* Apache is a registered trademark of The Apache Software Foundation.
+
+* AppEngine is possibly a trademark of Google LLC.
+
+* Apple is a trademark of Apple Inc.
+
+* Firefox is a registered trademark of The Mozilla Foundation.
+
+* Google Play is a trademark of Google LLC.
+
+* Google is a trademark of Google LLC.
+
+* Java is a registered trademark of Oracle Corporation in the US and possibly other countries.
+
+* Javascript is a trademark of Oracle Corporation in the US.
+
+* Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.
+
+* MP3 is a trademark that was registered in Europe to Hypermedia GmbH Webcasting but I was unable to confirm its current holder.
+
+* Mac is a trademark of Apple Inc.
+
+* Microsoft is a registered trademark of Microsoft Corp.
+
+* Python is a trademark of the Python Software Foundation.
+
+* Raspberry Pi is a trademark of the Raspberry Pi Foundation.
+
+* Unicode is a registered trademark of Unicode, Inc. in the United States and other countries.
+
+* Windows is a registered trademark of Microsoft Corp.
+
+* iPhone is a trademark of Apple in some countries.
+
+* Any other trademarks I mentioned without realising are trademarks of their respective holders.
diff --git a/git-sync.sh b/git-sync.sh
index 0ce790e..51495e2 100755
--- a/git-sync.sh
+++ b/git-sync.sh
@@ -10,6 +10,48 @@ wget -N http://ssb22.user.srcf.net/adjuster/tmux-annotator.sh
python adjuster.py --markdown-options
echo;echo Annotator Generator command line;echo ===========================;echo
COLUMNS=32767 python annogen.py --help 2>/dev/null|sed -e 's/^ \([^ ]\)/\n`\1/' -e 's, *,`\n : ,' -e 's,BEFORE,**before**,g' -e 's,AFTER,**after**,g' -e 's,ALWAYS,**always**,g' -e 's, ALL , **all** ,g' -e 's, LONG , **long** ,g' -e 's, NOT , **not** ,g' -e 's, TOTAL , **total** ,g' -e 's,DEPRECATED,**Deprecated**,g' -e 's, WITHOUT , **without** ,g' -e 's/\(<[^ ]*\)/`\1`/g'
+ echo;echo Copyright and Trademarks;echo ========================;echo
+ cat <<EOF
+(c) Silas S. Brown, licensed under Apache 2
+
+* Android is a trademark of Google LLC.
+
+* Apache is a registered trademark of The Apache Software Foundation.
+
+* AppEngine is possibly a trademark of Google LLC.
+
+* Apple is a trademark of Apple Inc.
+
+* Firefox is a registered trademark of The Mozilla Foundation.
+
+* Google Play is a trademark of Google LLC.
+
+* Google is a trademark of Google LLC.
+
+* Java is a registered trademark of Oracle Corporation in the US and possibly other countries.
+
+* Javascript is a trademark of Oracle Corporation in the US.
+
+* Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.
+
+* MP3 is a trademark that was registered in Europe to Hypermedia GmbH Webcasting but I was unable to confirm its current holder.
+
+* Mac is a trademark of Apple Inc.
+
+* Microsoft is a registered trademark of Microsoft Corp.
+
+* Python is a trademark of the Python Software Foundation.
+
+* Raspberry Pi is a trademark of the Raspberry Pi Foundation.
+
+* Unicode is a registered trademark of Unicode, Inc. in the United States and other countries.
+
+* Windows is a registered trademark of Microsoft Corp.
+
+* iPhone is a trademark of Apple in some countries.
+
+* Any other trademarks I mentioned without realising are trademarks of their respective holders.
+EOF
) > n && mv n README.md
git commit -am "Update $(echo $(git diff|grep '^--- a/'|sed -e 's,^--- a/,,')|sed -e 's/ /, /g' -e 's/git-sync.sh/git-sync script/' -e 's/adjuster.py/Web Adjuster/' -e 's/annogen.py/Annotator Generator/' -e 's/termlayout.py/TermLayout/')" && git push
--
GitLab