From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 2 May 2017 20:52:17 +0000 (+0200)
Subject: move all generated includes into data/
X-Git-Tag: v1.10~21
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/2b719dc0950d9e160458490cb1c69b7cd37d240d

move all generated includes into data/
---

diff --git a/.gitignore b/.gitignore
index 666b07a..89c1555 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,5 @@
 # downloaded data and generated includes
 /data
 
-# data includes automatically generated by tools/
-/countries.inc.pl
-	# tools/mkcountries-geonames
-/digraphs.inc.pl
-	# tools/mkdigraphlist
-/unicode-char.inc.pl
-	# tools/mkcharinfo
-/unicode-age.inc.pl
-	# tools/mkcharver
-/ttfsupport/
-	# tools/convert-allfonts
-/unicode-cover.inc.pl
-	# tools/mkfontinfo
-
 # site owner tag for google webmaster tools
 /google????????????????.html
diff --git a/Makefile b/Makefile
index 7727514..0c50b05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: digraphs.inc.pl unicode-cover.inc.pl countries.inc.pl data/browser data/termcol-xcolor.inc.pl
+all: data/digraphs.inc.pl data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl
 more: all data/digraphs-xorg.inc.pl
 
 download: data/DerivedAge.txt data/rfc1345.txt data/xorg-compose data/countryInfo.txt data/browser/caniuse data/browser/usage-wm.tsv data/xcolors
@@ -7,7 +7,7 @@ download: data/DerivedAge.txt data/rfc1345.txt data/xorg-compose data/countryInf
 data/DerivedAge.txt:
 	tools/wget-ifmodified http://www.unicode.org/Public/UNIDATA/$(@F) $@
 
-unicode-age.inc.pl: tools/mkcharver data/DerivedAge.txt
+data/unicode-age.inc.pl: tools/mkcharver data/DerivedAge.txt
 	$< $(word 2,$^) >$@
 
 data/rfc1345.txt:
@@ -28,13 +28,13 @@ data/digraphs-xorg.inc.pl: tools/mkdigraphs-xorg data/xorg-compose
 data/digraphs-vim.inc.pl: tools/mkdigraphs-vim
 	$< >$@
 
-digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl unicode-char.inc.pl
+data/digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl
 	$< >$@
 
-unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl unicode-age.inc.pl unicode-table.inc.pl
+data/unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl data/unicode-age.inc.pl unicode-table.inc.pl
 	$< >$@
 
-ttfsupport/%.inc.pl: tools/mkttfinfo data/font/%.ttf
+data/font/%.inc.pl: tools/mkttfinfo data/font/%.ttf
 	$< $(word 2,$^) $@ || true
 
 data/xcolors/themes: data/xcolors
@@ -63,28 +63,28 @@ data/font/roboto.ttf:
 data/font/noto%.ttf:
 	find /usr/share/fonts/truetype/noto/ -iname "Noto$(*F)-Regular.ttf" | head -1 | xargs -i ln -sf {} $@
 
-ttfsupport: tools/mkttfinfo
+data/font: tools/mkttfinfo
 	mkdir -p $@
-	$(MAKE) ttfsupport/all
+	$(MAKE) data/font/all
 	touch $@
 
-ttfsupport/all: ttfsupport/all-win2k ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/all-other
-ttfsupport/all-win2k: ttfsupport/verdana.win2k.inc.pl ttfsupport/times.win2k.inc.pl ttfsupport/arial.win2k.inc.pl ttfsupport/cour.win2k.inc.pl ttfsupport/comic.win2k.inc.pl ttfsupport/georgia.win2k.inc.pl ttfsupport/arialuni.inc.pl
-ttfsupport/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
-ttfsupport/all-google: ttfsupport/droidsans.inc.pl ttfsupport/droidserif.inc.pl ttfsupport/droidmono.inc.pl ttfsupport/roboto.inc.pl ttfsupport/notosans.inc.pl ttfsupport/notoserif.inc.pl
-ttfsupport/all-other: ttfsupport/unifont.inc.pl ttfsupport/code2000.inc.pl ttfsupport/freesans.inc.pl ttfsupport/freeserif.inc.pl
+data/font/all: data/font/all-win2k data/font/all-dejavu data/font/all-google data/font/all-other
+data/font/all-win2k: data/font/verdana.win2k.inc.pl data/font/times.win2k.inc.pl data/font/arial.win2k.inc.pl data/font/cour.win2k.inc.pl data/font/comic.win2k.inc.pl data/font/georgia.win2k.inc.pl data/font/arialuni.inc.pl
+data/font/all-dejavu: data/font/dvsans.inc.pl data/font/dvserif.inc.pl data/font/dvmono.inc.pl
+data/font/all-google: data/font/droidsans.inc.pl data/font/droidserif.inc.pl data/font/droidmono.inc.pl data/font/roboto.inc.pl data/font/notosans.inc.pl data/font/notoserif.inc.pl
+data/font/all-other: data/font/unifont.inc.pl data/font/code2000.inc.pl data/font/freesans.inc.pl data/font/freeserif.inc.pl
 
-#ttfsupport/unifont.inc.pl: tools/mkttfinfo
+#data/font/unifont.inc.pl: tools/mkttfinfo
 #	$< unifont.ttf $@
 #	$< --headless unifont_upper.ttf >>$@
 
-unicode-cover.inc.pl: tools/mkfontinfo ttfsupport $(patsubst data/font/%.ttf,ttfsupport/%.inc.pl,$(wildcard data/font/*.ttf))
+data/unicode-cover.inc.pl: tools/mkfontinfo data/font $(patsubst data/font/%.ttf,data/font/%.inc.pl,$(wildcard data/font/*.ttf))
 	$< >$@
 
 data/countryInfo.txt:
 	tools/wget-ifmodified http://download.geonames.org/export/dump/$(@F) $@
 
-countries.inc.pl: tools/mkcountries-geonames data/countryInfo.txt
+data/countries.inc.pl: tools/mkcountries-geonames data/countryInfo.txt
 	$< $(word 2,$^) >$@
 
 data/browser: data/browser/support.inc.pl data/browser/usage-wm.inc.pl
@@ -104,11 +104,11 @@ data/browser/usage-wm.inc.pl: tools/mkusage-wikimedia data/browser/usage-wm.tsv
 	$< $(word 2,$^) >$@
 
 clean:
-	-rm digraphs.inc.pl
-	-rm unicode-char.inc.pl
-	-rm unicode-age.inc.pl
-	-rm -rf ttfsupport/
-	-rm unicode-cover.inc.pl
+	-rm data/digraphs.inc.pl
+	-rm data/unicode-char.inc.pl
+	-rm data/unicode-age.inc.pl
+	-rm -rf data/font/
+	-rm data/unicode-cover.inc.pl
 	-rm data/browser/support.inc.pl
 	-rm data/browser/usage-wm.inc.pl
 
diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index c0a4cb0..c93a48a 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -10,7 +10,7 @@ use PLP::Functions 'EscapeHTML';
 
 our $VERSION = '1.08';
 
-our $uc = do 'unicode-char.inc.pl';
+our $uc = do 'data/unicode-char.inc.pl';
 
 sub new {
 	my ($class) = @_;
@@ -86,7 +86,7 @@ sub cell {
 		if ($self->{style} eq 'univer') {
 			if ($input =~ /\p{age=unassigned}/) {
 				# check include for assignments after unicode 6.0 (perl v5.14)
-				state $agemap = do 'unicode-age.inc.pl';
+				state $agemap = do 'data/unicode-age.inc.pl';
 				my $version = $agemap->{$codepoint};
 				push @class, $version ? 'l2' : 'l1';
 			}
diff --git a/chars.plp b/chars.plp
index d4cf06b..5d9a3e2 100644
--- a/chars.plp
+++ b/chars.plp
@@ -7,7 +7,7 @@ Html({
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
 	stylesheet => [qw'light dark mono circus red'],
-	data => [qw( unicode-cover.inc.pl ttfsupport unicode-char.inc.pl )],
+	data => [qw( data/unicode-cover.inc.pl data/font data/unicode-char.inc.pl )],
 	raw => <<'EOT',
 <style>
 	tbody tr:hover th {
@@ -22,7 +22,7 @@ EOT
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
-my $groupinfo = do 'unicode-cover.inc.pl' or die $@ || $!;
+my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!;
 
 my @ossel = @{ $groupinfo->{osdefault} };
 my @fontlist = map { $_->{file} }
@@ -30,7 +30,7 @@ my @fontlist = map { $_->{file} }
 
 my %font;
 for my $fontid (@fontlist) {
-		my ($fontmeta, @fontrange) = do "ttfsupport/$fontid.inc.pl";
+		my ($fontmeta, @fontrange) = do "data/font/$fontid.inc.pl";
 		$fontmeta or next;
 		$font{$fontid} = {
 			(map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}),
diff --git a/countries.plp b/countries.plp
index 60a392d..7297547 100644
--- a/countries.plp
+++ b/countries.plp
@@ -7,14 +7,14 @@ Html({
 		"Table of ISO-3166-1 country codes with the names of reserved territories.",
 	keywords => [qw'country code cc tld cctld continent territory land table'],
 	stylesheet => [qw'light dark circus mono red'],
-	data => ['countries.inc.pl'],
+	data => ['data/countries.inc.pl'],
 });
 
 :>
 <h1>ISO-3166-1α2 Country codes</h1>
 
 <:
-my $cc = do 'countries.inc.pl';
+my $cc = do 'data/countries.inc.pl';
 
 {
 	printf '<table class="mcmap">';
diff --git a/digraphs.plp b/digraphs.plp
index 44f93e6..24eb8f5 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -14,7 +14,7 @@ Html({
 		character char glyph table unicode vim xorg x11 x
 	'],
 	stylesheet => [qw'light'],
-	data => [qw( digraphs.inc.pl )],
+	data => [qw( data/digraphs.inc.pl )],
 });
 
 :>
@@ -38,7 +38,7 @@ say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
 :>
 
 <:
-my $di = do 'digraphs.inc.pl'
+my $di = do 'data/digraphs.inc.pl'
 	or die "Error loading digraphs data: ", $@ // $!;
 
 if (exists $get{v}) {
diff --git a/font.plp b/font.plp
index d4d7deb..3a39c2e 100644
--- a/font.plp
+++ b/font.plp
@@ -10,17 +10,17 @@ Html({
 		script block symbol sign mark reference table
 	)],
 	stylesheet => [qw( light dark mono circus red )],
-	data => [qw( unicode-cover.inc.pl )],
+	data => [qw( data/unicode-cover.inc.pl )],
 });
 
 if ($font) {
-	my ($fontmeta, @cover) = do "ttfsupport/$font.inc.pl";
+	my ($fontmeta, @cover) = do "data/font/$font.inc.pl";
 	$fontmeta or die "Unknown font $font\n";
 
 	my $map = eval {
 		$get{map} or return;
 
-		my $groupinfo = do 'unicode-cover.inc.pl' or die $@ || $!;
+		my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!;
 
 		my ($cat, $name) = split m{/}, $get{map}, 2 or die "invalid map\n";
 		if (!$name) {
@@ -180,7 +180,7 @@ Character support of Unicode
 
 <:
 
-my $cover = do 'unicode-cover.inc.pl' or die $@ || $!;
+my $cover = do 'data/unicode-cover.inc.pl' or die $@ || $!;
 
 my @ossel = @{ $cover->{osdefault} };
 my @fontlist = map { @{ $cover->{os}->{$_} } } @ossel;
diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index df5b595..64738ae 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -64,7 +64,7 @@ for (sort keys %diinc) {
 
 eval {
 	# read introducing unicode versions for known characters
-	my $agemap = do 'unicode-age.inc.pl' or die $@ || $!;
+	my $agemap = do 'data/unicode-age.inc.pl' or die $@ || $!;
 	for my $chr (keys %info) {
 		my $version = $agemap->{ord $chr} or next;
 		$info{$chr}->{class}->{'u-v'.$version}++
diff --git a/tools/mkdigraphlist b/tools/mkdigraphlist
index a0c5ab2..38978b6 100755
--- a/tools/mkdigraphlist
+++ b/tools/mkdigraphlist
@@ -20,7 +20,7 @@ my $vimold = do 'data/digraphs-vim-74.inc.pl'
 my $di = { %{$vim // {}}, %{$rfc}, %{$extra // {}} };
 
 # optionally get unicode character information
-my $uninfo = do 'unicode-char.inc.pl'
+my $uninfo = do 'data/unicode-char.inc.pl'
 	or warn "could not include unicode details: ", $@ // $!;
 
 # output perl code of hash
diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index de0bbf1..b27b779 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -13,7 +13,7 @@ my @fontlist;
 
 my %cover;
 my $incsuffix = '.inc.pl';
-for my $fontfile (glob 'ttfsupport/*'.$incsuffix) {
+for my $fontfile (glob 'data/font/*'.$incsuffix) {
 	my ($fontid) = basename($fontfile, $incsuffix);
 	my ($fontmeta, @fontrange) = do $fontfile or next;
 	$fontmeta->{file} = $fontid;
@@ -65,7 +65,7 @@ eval {
 } or warn "Could not include count for html entities: $@";
 
 eval {
-	my $agemap = do 'unicode-age.inc.pl'
+	my $agemap = do 'data/unicode-age.inc.pl'
 		or warn "Could not include unicode version data: $!";
 
 	use Unicode::UCD 'charinfo';
diff --git a/tools/mktermcol-xcolor b/tools/mktermcol-xcolor
index 74bed79..7f39c80 100755
--- a/tools/mktermcol-xcolor
+++ b/tools/mktermcol-xcolor
@@ -3,6 +3,7 @@ use 5.014;
 
 use Shiar_Sheet::Colour 1.05;
 
+say "# automatically generated by $0";
 say 'use strict;';
 say '+{';
 my @names;
diff --git a/unicode.plp b/unicode.plp
index 68d20f0..ed89f2d 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -11,7 +11,7 @@ Html({
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
 	stylesheet => [qw'light dark mono circus red'],
-	data => [qw'unicode-table.inc.pl unicode-char.inc.pl'],
+	data => [qw( unicode-table.inc.pl data/unicode-char.inc.pl )],
 });
 
 :>