Repositories / mmondor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae7d1e6)
AnalogTerm2: Reorganize font files and install them.
authorMatthew Mondor <mmondor@pulsar-zone.net>
Sat, 27 May 2023 16:06:50 +0000 (16:06 +0000)
committerMatthew Mondor <mmondor@pulsar-zone.net>
Sat, 27 May 2023 16:06:50 +0000 (16:06 +0000)
28 files changed:
mmsoftware/analogterm2/GNUmakefile patch | blob | blame | history
mmsoftware/analogterm2/README.txt patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x10/wargames-ansi.txt [moved from mmsoftware/analogterm2/tests/wargames2-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x10/wargames.txt [moved from mmsoftware/analogterm2/tests/wargames2-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/3161-ansi.txt [moved from mmsoftware/analogterm2/tests/3161-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/3161.txt [moved from mmsoftware/analogterm2/tests/3161-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/3270-ansi.txt [moved from mmsoftware/analogterm2/tests/3270-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/3270.txt [moved from mmsoftware/analogterm2/tests/3270-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/a2-ansi.txt [moved from mmsoftware/analogterm2/tests/a2-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/a2.txt [moved from mmsoftware/analogterm2/tests/a2-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/adm3a-ansi.txt [moved from mmsoftware/analogterm2/tests/adm3a-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/adm3a.txt [moved from mmsoftware/analogterm2/tests/adm3a-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/archaic-ansi.txt [moved from mmsoftware/analogterm2/tests/archaic-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/archaic.txt [moved from mmsoftware/analogterm2/tests/archaic-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/demonseed-ansi.txt [moved from mmsoftware/analogterm2/tests/demonseed-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/demonseed.txt [moved from mmsoftware/analogterm2/tests/demonseed-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/nosquare-ansi.txt [moved from mmsoftware/analogterm2/tests/nosquare-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/nosquare.txt [moved from mmsoftware/analogterm2/tests/nosquare-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/ocr-ansi.txt [moved from mmsoftware/analogterm2/tests/ocr-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/ocr.txt [moved from mmsoftware/analogterm2/tests/ocr-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/serif-ansi.txt [moved from mmsoftware/analogterm2/tests/serif-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/serif.txt [moved from mmsoftware/analogterm2/tests/serif-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/square-ansi.txt [moved from mmsoftware/analogterm2/tests/square-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/square.txt [moved from mmsoftware/analogterm2/tests/square-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/topaz-ansi.txt [moved from mmsoftware/analogterm2/tests/topaz-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/topaz.txt [moved from mmsoftware/analogterm2/tests/topaz-font.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/wargames-ansi.txt [moved from mmsoftware/analogterm2/tests/wargames-font-ansi.txt with 100% similarity] patch | blob | blame | history
mmsoftware/analogterm2/fonts/7x9/wargames.txt [moved from mmsoftware/analogterm2/tests/wargames-font.txt with 100% similarity] patch | blob | blame | history

diff --git a/mmsoftware/analogterm2/GNUmakefile b/mmsoftware/analogterm2/GNUmakefile
index 2316836..b47fbb0 100644 (file)
--- a/mmsoftware/analogterm2/GNUmakefile
+++ b/mmsoftware/analogterm2/GNUmakefile
@@ -33,7 +33,8 @@ CFLAGS += -DNDEBUG
 CHARS := src/font/*9.xbm
 OBJS := $(addprefix src/,config.o main.o font.o utf8.o state.o xshm.o screen.o draw.o tty.o)
 BIN := analogterm2
-FONTS := $(addprefix tests/,a2-font-ansi.txt ocr-font-ansi.txt topaz-font-ansi.txt nosquare-font-ansi.txt square-font-ansi.txt serif-font-ansi.txt archaic-font-ansi.txt 3161-font-ansi.txt 3270-font-ansi.txt wargames-font-ansi.txt demonseed-font-ansi.txt)
+FONTDIRS := fonts/*x*
+FONTS := fonts/*/*ansi.txt
 
 # OS dependent settings follow
 OS_TARGET := UNIX
@@ -84,8 +85,12 @@ $(BIN): $(OBJS)
 install:
        $(INSTALL) -c -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin
        $(INSTALL) -d -o 0 -g 0 -m 755 $(PREFIX)/share/analogterm2
+       $(INSTALL) -d -o 0 -g 0 -m 755 $(PREFIX)/share/analogterm2/fonts
+       for f in $(FONTDIRS); do \
+               $(INSTALL) -d -o 0 -g 0 -m 755 $(PREFIX)/share/analogterm2/$$f ; \
+       done
        for f in $(FONTS); do \
-               $(INSTALL) -c -o 0 -g 0 -m 644 $$f $(PREFIX)/share/analogterm2 ; \
+               $(INSTALL) -c -o 0 -g 0 -m 644 $$f $(PREFIX)/share/analogterm2/$$f ; \
        done
        $(INSTALL) -c -o 0 -g 0 -m 755 tests/at2-aliases.sh $(PREFIX)/share/analogterm2 ; \
 
diff --git a/mmsoftware/analogterm2/README.txt b/mmsoftware/analogterm2/README.txt
index acb45a6..80b6ff2 100644 (file)
--- a/mmsoftware/analogterm2/README.txt
+++ b/mmsoftware/analogterm2/README.txt
@@ -34,8 +34,7 @@ Private Mode" ESC sequences or via the command line arguments.  If
 you are using tmux or screen, these ESC sequences should be issued
 when detached as they are not understood or proxied/forwarded by
 default.  A collection of custom alternative fonts and aliases are
-included in the test/ directory, some are also installed by the
-GNUmakefile.
+installed in the share/analogterm2/ directory.
 
 AnalogTerm 2 uses a 7x9 font matrix by default and includes an
 internal font of that size natively.  It can be started with the
@@ -200,7 +199,7 @@ hand, etc.
 Here is an example to setup a fancy custom statistics display window
 utility.  This also makes use of some of the above aliases.
 
-$ ( atmono; atblue3; atintscan2; atupper; atline; atmixed2; atcurnodisable; cat /usr/local/share/analogterm2/demonseed-font-ansi.txt; atslowscroll; atslowtext5 ) >/tmp/ds-stat-setup.txt
+$ ( atmono; atblue3; atintscan2; atupper; atline; atmixed2; atcurnodisable; cat /usr/local/share/analogterm2/fonts/7x9/demonseed-ansi.txt; atslowscroll; atslowtext5 ) >/tmp/ds-stat-setup.txt
 
 Assuming that ds-stat-setup.txt was also added to
 /usr/local/share/analogterm2/, example custom menu/launcher item
MMSoftware