X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Ftools%2FlistFontWithLang.pl;h=2ae732c4fe3ae55e3907844d46ee733e0ffa21ec;hb=be4f5c8084019bfdd7d067a8c18c960b823df3f7;hp=e365dc49f0b1113e7f78ca382f25bddae747238c;hpb=e2309c6ea54ba5540ff25cc7bbcff32149304176;p=lyx.git diff --git a/development/tools/listFontWithLang.pl b/development/tools/listFontWithLang.pl index e365dc49f0..2ae732c4fe 100644 --- a/development/tools/listFontWithLang.pl +++ b/development/tools/listFontWithLang.pl @@ -35,6 +35,7 @@ use warnings; use Encode; use GetOptions; use constant { + # for ftype SERIF => 1, SANS => 2, SCRIPT => 4, @@ -43,8 +44,32 @@ use constant { FANCY => 32, INITIALS => 64, SYMBOL => 128, + SMALLCAP => 256, + + # for UseProperty (UP) + UPPROPERTY => 1, # select + UPNPROPERTY => 2, # deselect + UPPPROPERTIES => 4, # print + UPWPROPERTIES => 8, # write to a file + + # for UseCharsets (UC) + UCCONTAINS => 1, # select + UCNCONTAINS => 2, # deselect + UCPCONTAINS => 4, # print + + # for UseScripts (US) + USSCRIPT => 1, # select + USNSCRIPT => 2, # deselect + USMSCRIPT => 4, # math + USPSCRIPT => 8, # print + USWSCRIPT => 16, # write to a file }; +# These will be set according to options +my $iproperty = 0; # info for Use Properties +my $icontains = 0; # info for Use Charsets +my $iscript = 0; # info for Use Scripts + sub convertlang($); sub extractlist($$$); # my ($l, $islang, $txt, $rres) = @_; sub getIndexes($$); @@ -55,7 +80,9 @@ sub correctstyle($); sub decimalUnicode($); sub contains($$); sub sprintIntervalls($); -sub buildFontName($$$$); +sub buildFontName($$); +sub splitatlU($); # split text at change from lower case to upper case +sub splitStyle($); # Following fields for a parameter can be defined: # fieldname: Name of entry in %options @@ -124,18 +151,52 @@ my @optionsDef = ( ["pw", {fieldname => "PrintWarnings", comment => "Print warnings about discarded/overwritten fonts, conflicting styles"},], + ["wf", + {fieldname => "Write", + type => "=s", alias => ["writefile"], + comment => "Write to a file for later use"},], ); my %options = %{&handleOptions(\@optionsDef)}; $options{Lang} = "" if (! defined($options{Lang})); ############################################################# +my %mapShortcuts = ( + "Cond" => "Condensed", + "Expd" => "Expanded", + "Lt" => "Light", + "Med" => "Medium", + "med" => "Medium", + "bol" => "Bold", +); my @langs = split(',', $options{Lang}); for my $lg (@langs) { $lg = &convertlang($lg); } +$iproperty |= UPPROPERTY if (defined($options{Property})); +$iproperty |= UPNPROPERTY if (defined($options{NProperty})); +$iproperty |= UPPPROPERTIES if (exists($options{PrintProperties})); + +$icontains |= UCCONTAINS if (defined($options{Contains})); +$icontains |= UCNCONTAINS if (defined($options{NContains})); +$icontains |= UCPCONTAINS if (exists($options{PrintCharset})); + +$iscript |= USSCRIPT if (defined($options{Scripts})); +$iscript |= USNSCRIPT if (defined($options{NScripts})); +$iscript |= USMSCRIPT if (exists($options{Math})); +$iscript |= USPSCRIPT if (exists($options{PrintScripts})); + +if (defined($options{Write})) { + if (! open(INFOS, '>', $options{Write})) { + die("Could not open file $options{Write} for write"); + } + $iproperty |= UPWPROPERTIES; + # not yet ... + # $iscript |= USWSCRIPT; +} + for my $charFld ("Contains", "NContains") { if (defined($options{$charFld})) { my %glyphs = (); # To ignore duplicates @@ -178,6 +239,27 @@ for my $charFld ("Contains", "NContains") { } } +for my $fn ("FontName", "NFontName") { + if (defined($options{$fn})) { + # split each entry and make a compiled regex + # Allow space between all characters + for my $e (@{$options{$fn}}) { + if ($e =~ /(\^|\\|\||\[|\]|\(|\)|\*|\+|\?)/) { + # already regex, don't manipulate + $e = qr/$e/i; + } + else { + my $u = decode('utf-8', $e); + my $fill = decode('utf-8', "\\s?"); + my @u = split(//, $u); + my $ud = join($fill, @u); + my $e1 = encode('utf-8', $ud); + $e = qr/$e1/i; + } + } + } +} + my $cmd = "fc-list"; if (defined($langs[0])) { $cmd .= " :lang=" . join(',', @langs); @@ -189,16 +271,16 @@ my $format = "foundry=\"%{foundry}\"" . " family=\"%{family}\" flang=\"%{familylang}\" " . " style=\"%{style}\" stylelang=\"%{stylelang}\""; -if (exists($options{PrintScripts}) || defined($options{Scripts}) || defined($options{NScripts}) || exists($options{Math})) { +if ($iscript) { $format .= " script=\"%{capability}\""; } if (exists($options{PrintLangs}) || defined($langs[0])) { $format .= " lang=\"%{lang}\""; } -if (exists($options{PrintProperties}) || defined($options{Property}) || defined($options{NProperty})) { +if ($iproperty) { $format .= " weight=%{weight} slant=%{slant} width=%{width} spacing=%{spacing}"; } -if (defined($options{Contains}) || defined($options{NContains}) || exists($options{PrintCharset})) { +if ($icontains) { $format .= " charset=\"%{charset}\""; } $format .= " file=\"%{file}\" abcd\\n"; @@ -218,6 +300,7 @@ my %ftypes = ( FANCY() => "Fancy", INITIALS() => "Initials", SYMBOL() => "Symbol", + SMALLCAP() => "SmallCap", "default" => 1, ); @@ -298,27 +381,27 @@ my %serifFonts = ( # list of regexes for known sans serif fonts my %sansFonts = ( "value" => SANS, # Sans serif - "a" => qr/^a(030|bydos|haroni|e?rial|ndika|ngostura|nonymous|rab|roania|rimo|sap|e almothnna|egean|egyptus|l (arabiya|battar|hor|manzomah|yarmook)|lmonte|natolian|ndale|nglepoise|njali|xaxa)/i, - "b" => qr/^b(abel ?stone ?modern|aekmuk|alker|altar|andal|angwool|arbatrick|aveuse|dxsfm|ebas|erenika|eteckna|euron|iometric|iting|lue|m ?hanna)/i, - "c" => qr/^c(abin|aliban|antarell|arbon|arlito|handas|hivo|mu bright|omfortaa|omi[cx]|oolvetica|ortoba|ousine|uprum|wtex(hei|yen)|yklop|ypro)/i, + "a" => qr/^a(030|bydos|haroni|e?rial|ndika|ngostura|nonymous|rab|roania|rimo|rundina|sap|e almothnna|egean|egyptus|l (arabiya|battar|hor|manzomah|yarmook)|lmonte|natolian|ndale|nglepoise|njali|xaxa)/i, + "b" => qr/^b(abel ?stone ?modern|aekmuk|alker|altar|andal|angwool|arbatrick|aveuse|old|dxsfm|ebas|erenika|eteckna|euron|iometric|iting|lue|m ?hanna)/i, + "c" => qr/^c(abin|aliban|antarell|arbon|arlito|handas|harles|hilanka|hinese ?rocks|hivo|mu bright|omfortaa|omi[cx]|omputer ?(bold|(modern ?(bright ?((semi)?bold|math|oblique|roman|italic))))|oolvetica|ortoba|ountries|ousine|uprum|wtex(hei|yen)|yklop|ypro)/i, "d" => qr/^(d2coding|dimnah|dosis|dyuthi)/i, "e" => qr/^(electron|engebrechtre)/i, "f" => qr/^(fandolhei|fetamont|fira|font awesome 5|forgotten)/i, - "g" => qr/^(gardiner|garuda|gfs ?neo|gillius|granada|graph|guanine|gunplay)/i, + "g" => qr/^g(ardiner|aruda|fs ?neo|illius|ood ?times|ranada|raph|uanine|unplay)/i, "h" => qr/^(hack|hani|haramain|harano|harmattan|hor\b)/i, "i" => qr/^(ibm ?(plex ?mono|3270)|ikarius|inconsolata|induni.?h|iwona)/i, - "j" => qr/^(jara|jura)/i, - "k" => qr/^(kalimati|kanji|karla|karma|kayrawan|kenyan|keraleeyam|khalid|khmer [or]|kiloji|klaudia|ko[mn]atu|kurier|kustom)/i, - "l" => qr/^l(aksaman|arabie|ato|eague|exend|exigulim|ibel|iberation|ibre franklin|ibris|inux biolinum|obster|ogix|ohit|oma)/i, - "m" => qr/^m(\+ |anchu|anjari|arcellus|ashq|eera|etal|igmix|igu|ikachan|intspirit|iriam ?clm|ona|onlam|ono(fonto|id|isome|noki)|ontserrat|otoyal|ukti|usica)/i, - "n" => qr/^(nachlieli|nada|nafees|nagham|nanum(barunpen|square)|nice)/i, - "o" => qr/^(ocr|okolaks|opendyslexic|ostorah|ouhud|over|oxygen)/i, + "j" => qr/^j(ara|ura|s ?math.?bbold)/i, + "k" => qr/^(kalimati|kanji|karla|karma|kayrawan|kenyan|keraleeyam|khalid|khmer [or]|kiloji|klaudia|ko[mn]atu|kp ?mono|kurier|kustom)/i, + "l" => qr/^l(aksaman|arabie|ato|eague|exend|exigulim|ibel|iberation ?mono|ibre franklin|ibris|inux biolinum|obster|ogix|ohit ?(devana|telugu)|oma)/i, + "m" => qr/^m(\+ |anchu|anjari|arcellus|ashq|eera|etal|igmix|igu|ikachan|intspirit|iriam ?clm|isaki|itra ?mono|ona|onlam|ono(fonto|id|isome|noki)|ontserrat|otoyal|ukti|usica)/i, + "n" => qr/^(nachlieli|nada|nafees|nagham|nanum(barunpen|square)|nice|noto ?mono)/i, + "o" => qr/^(ocr|okolaks|open ?dyslexic|ostorah|ouhud|over|oxygen)/i, "p" => qr/^(padauk|pagul|paktype|pakenham|palladio|petra|phetsarath|play\b|poiret|port\b|primer\b|prociono|pt\b|purisa)/i, "q" => qr/^(qt(ancient|helvet|avanti|doghaus|eratype|eurotype|floraline|frank|fritz|future|greece|howard|letter|optimum)|quercus)/i, "r" => qr/^(rachana|radio\b|raleway|ricty|roboto|rosario)/i, "s" => qr/^(salem|samanata|sawasdee|shado|sharja|simple|sophia|soul|source|switzera)/i, "t" => qr/^(tarablus|teen|texgyre(adventor|heros)|tiresias|trebuchet|tscu|tuffy)/i, - "u" => qr/^u(buntu|kij (bom|chechek|cjk|diwani|ekran|elipbe|inchike|jelliy|kufi|mejnuntal|qara|qolyazma|teng|title|tor|tuz ?(neqish|tom))|mpush|n ?(dinaru|jamo|graphic|taza|vada|yetgul)|uni(kurd|space|versalis)|roob|rw ?classico)/i, + "u" => qr/^u(buntu|kij (bom|chechek|cjk|diwani|ekran|elipbe|inchike|jelliy|kufi|mejnuntal|qara|qolyazma|teng|title|tor|tuz ?(neqish|tom))|mpush|n ?(dinaru|jamo|graphic|taza|vada|yetgul)|ni(kurd|space|versalis)|roob|rw ?classico)/i, "v" => qr/^(veranda|vn ?urwclassico)/i, "w" => qr/^(waree)/i, "y" => qr/^(yanone)/i, @@ -334,10 +417,10 @@ my %scriptFonts = ( "f" => qr/^femkeklaver/i, "j" => qr/^jsmath.?(rsfs)/i, "k" => qr/^(kaushan|karumbi|kristi)/i, - "m" => qr/^(mathjax_script|miama)/i, + "m" => qr/^(math ?jax.?script|miama)/i, "n" => qr/^(nanum (brush|pen) script)/i, "p" => qr/^pecita/i, - "q" => qr/^qt(arabian|boulevard|brush ?stroke|chancery|coronation|florencia|handwriting|linostroke|merry|pandora|slogan)/i, + "q" => qr/^qt( ?black ?forest|arabian|boulevard|brush ?stroke|chancery|coronation|florencia|handwriting|linostroke|merry|pandora|slogan)/i, "r" => qr/^((romande.*|ruf)script|rsfs)/i, "t" => qr/^typo ?script/i, "u" => qr/^u(n ?pilgi|rw ?chancery|kij ?(jelliy|moy|qolyazma ?(tez|yantu)))/i, @@ -350,28 +433,30 @@ my %fraktFonts = ( "j" => qr/^(jsmath.?euf)/i, "m" => qr/^(missaali)/i, "o" => qr/^(oldania)/i, - "q" => qr/^qt(blackforest|cloisteredmonk|dublinirish|fraktur|heidelbergtype|(lino|london)scroll)/i, + "q" => qr/^qt(blackforest|cloisteredmonk|dublinirish|fraktur|heidelbergtype|(lino|london) ?scroll)/i, "u" => qr/^ukij ?(kufi ?tar|mejnun ?reg)/i, ); my %fancyFonts = ( "value" => FANCY, # Fancy - "a" => qr/^a(bandoned|bberancy|driator|irmole|lmonte (snow|woodgrain)|nalecta|ni|nklepants|nn ?stone|oyagi|rt ?nouveau ?caps|stron|xaxa)/i, + "a" => qr/^a(bandoned|bberancy|driator|irmole|lmendra ?display|lmonte (snow|woodgrain)|nalecta|ni|nklepants|nn ?stone|oyagi|rt ?nouveau ?caps|stron|xaxa)/i, "b" => qr/^b(aileys|alcony|altar|andal|arbatrick|aveuse|eat ?my|etsy|iometric|iting|lankenburg|oondox ?callig|org|oron|raeside|ramalea|udmo|urnstown|utterbelly)/i, - "c" => qr/^c(retino|msy)/i, + "c" => qr/^c(retino|msy|abin ?sketch|arbon|arolingan|harles|hicken|hilanka|hr\d)/i, "d" => qr/^dseg/i, "e" => qr/^electorate/i, "f" => qr/^frederika/i, "g" => qr/^(gfs.?theo)/i, "j" => qr/^jsmath.cmsy/i, - "k" => qr/^keter|kicking|kredit|kouzan|kerkis calligraphic/i, + "k" => qr/^keter|kicking|kredit|kouzan/i, "l" => qr/^lcmsy/i, + "q" => qr/^qtcaslan ?open/i, "u" => qr/^u(kij ?(saet|tiken)|nion ?city)/i, "v" => qr/^vectroid/i, ); my %initialFonts = ( "value" => INITIALS, # Initials + "c" => qr/^carrick/i, "e" => qr/^(eb.?garamond.?init)/i, "t" => qr/^typographer/i, "y" => qr/^(yinit)/i, @@ -381,25 +466,36 @@ my %symbolFonts = ( "value" => SYMBOL, # Symbol "a" => qr/^a(cademicons|lblant|lianna|mar|nka|rb?\d|rchaic|rrow|rs|rt[mt]|ssy(rb\d+)?\b|miri ?quran|mit\b)/i, "b" => qr/^b(aby ?jeepers|bding|euron|guq|lex|lsy|oondox ?upr|ullets|urma)/i, - "c" => qr/^(caladings|ccicons|chess|cmsy|cmex)/i, + "c" => qr/^c(aladings|cicons|hess|msy|mex|apacitor|ounterscraps)/i, "d" => qr/^(dingbats|drmsym|d05)/i, "e" => qr/^e(lusiveicons|mmentaler|moji|sint|uterpe)/i, "f" => qr/^(fandol.?brail|fdsymbol|fourierorns|font(awesome|ello|.?mfizz))/i, "g" => qr/^(gan.?clm|gfs.?(baskerville|gazis|olga|porson|solomos|(bodoni|didot).?classic|complutum))/i, - "h" => qr/^(hots)/i, + "h" => qr/^h(ots|ershey)/i, "j" => qr/^jsmath.?(msam|cmsy|masm|msbm|wasy|cmex|stmary)/i, - "l" => qr/^l(cmsy|msam)/i, + "l" => qr/^l(cmsy|msam|ohit ?(Assamese|Bengali|Gujarati|Gurmukhi|Kannada|Malayalam|Marathi|Nepali|Odia|Tamil))/i, "m" => qr/^(marvosym|material|msam|msbm)/i, "n" => qr/^(noto.*(emoji|brahmi))/i, "o" => qr/^(octicons)/i, "p" => qr/^patch/i, "q" => qr/^(qtding ?bits)/i, - "s" => qr/^s(kak|tmary|s?msam)/i, - "t" => qr/^(typicons|twemoji)/i, + "s" => qr/^s(emafor|kak|tmary|s?msam|tix ?math)/i, + "t" => qr/^(te ?xxslh?[du]|typicons|twemoji)/i, "u" => qr/^ukij ?(imaret|orxun|tughra)/i, "w" => qr/^w(ebdings|asy|elfare ?brat)/i, ); +my %smallcapFonts = ( + "value" => SMALLCAP | SERIF, + "c" => qr/^c(s[ct]sc\d|inzel|omputer ?modern ?sans ?italic ?regular ?\d)/i, + "d" => qr/^drm(it)?sc\d/i, + "f" => qr/^fetamont.?script/i, + "n" => qr/^newtxb?ttsc/i, + "s" => qr/^(screengem|sf.?kp.?sc)/i, + "t" => qr/^t1?xb?ttsc/i, + "v" => qr/^vn ?cccsc\d/i, +); + if (open(FI, "$cmd |")) { NXTLINE: while (my $l = ) { chomp($l); @@ -434,28 +530,29 @@ if (open(FI, "$cmd |")) { for my $lang (@langs) { next NXTLINE if (! defined($usedlangs{$lang})); } - my $style = &getVal($l, "style", "stylelang", 1); + my ($fullname, $fuidx) = &getVal($l, "fn", "fnl", -1); + my ($style, $fsidx) = &getVal($l, "style", "stylelang", $fuidx); $style =~ s/^\\040//; - my $fullname = &getVal($l, "fn", "fnl"); + my ($family, $faidx) = &getVal($l, "family", "flang", $fsidx); + my $postscriptname = ""; if ($l =~ /postscriptname=\"([^\"]+)\"/) { $postscriptname = $1; } - my $family = &getVal($l, "family", "flang", 0); - my $fontname = &buildFontName($family, $style, $fullname, $postscriptname); - + my $fontname; + ($fontname, $style) = &buildFontName($family, $style); if (defined($options{NFontName})) { for my $fn (@{$options{NFontName}}) { - next NXTLINE if ($fontname =~ /$fn/i); + next NXTLINE if ($fontname =~ $fn); } } if (defined($options{FontName})) { for my $fn (@{$options{FontName}}) { - next NXTLINE if ($fontname !~ /$fn/i); + next NXTLINE if ($fontname !~ $fn); } } my @charlist = (); - if (defined($options{Contains}) || defined($options{NContains}) || exists($options{PrintCharset})) { + if ($icontains) { if ($l =~ / charset=\"([^\"]+)\"/) { my @list = split(/\s+/, $1); for my $e (@list) { @@ -464,12 +561,12 @@ if (open(FI, "$cmd |")) { push(@charlist, [hex($l), hex($h)]); } } - if (defined($options{Contains})) { + if ($icontains & UCCONTAINS) { for my $g (@{$options{Contains}}) { next NXTLINE if (! contains($g, \@charlist)); } } - if (defined($options{NContains})) { + if ($icontains & UCNCONTAINS) { for my $g (@{$options{NContains}}) { # Ignore if ANY char exist in @charlist for (my $i = $g->[0]; $i <= $g->[1]; $i++) { @@ -479,31 +576,34 @@ if (open(FI, "$cmd |")) { } } my $props = ""; + my $wprops = ""; my @errors = (); - if (exists($options{PrintProperties}) || defined($options{Property}) || defined($options{NProperty})) { + if ($iproperty) { my $properties = getproperties($l, $fontname, $style, \@errors); - if (defined($options{Property})) { + if ($iproperty & UPPROPERTY) { for my $pn (@{$options{Property}}) { next NXTLINE if ($properties !~ /$pn/i); } } - if (defined($options{NProperty})) { + if ($iproperty & UPNPROPERTY) { for my $pn (@{$options{NProperty}}) { next NXTLINE if ($properties =~ /$pn/i); } } - if (exists($options{PrintProperties})) { + if ($iproperty & UPPPROPERTIES) { $props .= " ($properties)"; } + if ($iproperty & UPWPROPERTIES) { + $wprops .= " ($properties)"; + } } - if (exists($options{PrintLangs})) { $props .= '(' . join(',', sort keys %usedlangs) . ')'; } if (exists($options{PrintCharset})) { $props .= '(' . &sprintIntervalls(\@charlist) . ')'; } - if (exists($options{PrintScripts}) || defined($options{Scripts}) || defined($options{NScripts}) || exists($options{Math})) { + if ($iscript) { my @scripts = (); my $scripts = ""; if ($l =~ / script=\"([^\"]+)\"/) { @@ -514,23 +614,23 @@ if (open(FI, "$cmd |")) { } $scripts = join(',', @scripts); } - if (exists($options{Math})) { + if ($iscript & USMSCRIPT) { next NXTLINE if (! &ismathfont($fontname,\@scripts)); } - if (exists($options{PrintScripts})) { + if ($iscript & USPSCRIPT) { $props .= "($scripts)"; } if (!defined($scripts[0])) { # No script defined in font, so check only $options{Scripts} - next NXTLINE if (defined($options{Scripts})); + next NXTLINE if ($iscript & USSCRIPT); } else { - if (defined($options{Scripts})) { + if ($iscript & USSCRIPT) { for my $s (@{$options{Scripts}}) { next NXTLINE if ($scripts !~ /$s/i); } } - if (defined($options{NScripts})) { + if ($iscript & USNSCRIPT) { for my $s (@{$options{NScripts}}) { next NXTLINE if ($scripts =~ /$s/i); } @@ -550,10 +650,10 @@ if (open(FI, "$cmd |")) { push(@{$collectedfonts{$fontname}->{$foundry}->{errors}}, @errors); } if ($fontpriority{$oldfonttype} > $fontpriority{$fonttype}) { - push(@{$collectedfonts{$fontname}->{$foundry}->{errors}}, "Warning: overwriting old info for file: " . $collectedfonts{$fontname}->{$foundry}->{file}); + push(@{$collectedfonts{$fontname}->{$foundry}->{errors}}, "Warning: overwriting old info of file: " . $collectedfonts{$fontname}->{$foundry}->{file}); } else { - push(@{$collectedfonts{$fontname}->{$foundry}->{errors}}, "Warning: discarding new info for file: $file"); + push(@{$collectedfonts{$fontname}->{$foundry}->{errors}}, "Warning: discarding new info from file: $file"); next; } } @@ -561,6 +661,7 @@ if (open(FI, "$cmd |")) { $collectedfonts{$fontname}->{$foundry}->{errors} = \@errors; } $collectedfonts{$fontname}->{$foundry}->{props} = $props; + $collectedfonts{$fontname}->{$foundry}->{wprops} = $wprops; $collectedfonts{$fontname}->{$foundry}->{file} = $file; $collectedfonts{$fontname}->{$foundry}->{fonttype} = $fonttype; } @@ -584,7 +685,10 @@ for my $fontname (sort keys %collectedfonts) { $fn .= " \[$foundry\]"; } print $fn; + print INFOS $fn if (defined($options{Write})); print $collectedfonts{$fontname}->{$foundry}->{props}; + print INFOS $collectedfonts{$fontname}->{$foundry}->{wprops} if (defined($options{Write})); + print INFOS ": " . $collectedfonts{$fontname}->{$foundry}->{file} . "\n" if (defined($options{Write})); if (exists($options{PrintFiles})) { print ": " . $collectedfonts{$fontname}->{$foundry}->{file} . "\n"; } @@ -593,6 +697,7 @@ for my $fontname (sort keys %collectedfonts) { } } } +close(INFOS) if (defined($options{Write})); exit(0); ################################################################################# @@ -641,33 +746,41 @@ sub getIndexes($$) sub getVal($$$$) { - my ($l, $txtval, $txtlang, $combine) = @_; + my ($l, $txtval, $txtlang, $startentry) = @_; my @values = (); my @langs = (); &extractlist($l, 0, $txtval, \@values); - return("") if (! defined($values[0])); + return("", -1) if (! defined($values[0])); &extractlist($l, 1, $txtlang, \@langs); my $i = &getIndexes("en", \@langs); + my $usedentry = -1; + my $actualentry = -1; my $res = ""; for my $k (@{$i}) { if (defined($values[$k])) { - if ($combine) { - if ($res ne "") { - $res .= " $values[$k]"; - } - else { + $actualentry++; + if ($startentry < 0) { + if (length($values[$k]) > length($res)) { $res = $values[$k]; + $usedentry = $actualentry; } } + elsif ($actualentry == $startentry) { + $res = $values[$k]; + $usedentry = $actualentry; + last; + } else { + # select the longest entry if possible if (length($values[$k]) > length($res)) { $res = $values[$k]; + $usedentry = $actualentry; } } } } - return($values[0]) if ($res eq ""); - return($res); + return($values[0], -1) if ($res eq ""); + return($res, $usedentry); } sub getsinglevalue($$$) @@ -728,27 +841,39 @@ sub getftype($$) if ($fontname =~ /bisrat gothic/i) { $resftype |= SERIF; } - else { + elsif ($fontname !~ /hershey/i) { $resftype |= SANS; } } - elsif ($fontname =~ /^(jsmath.?)?bbold|msbm|^(ds(rom|serif|ss))|DoubleStruck/i) { + elsif ($fontname =~ /^(js ?math.?)?bbold|msbm|^(ds(rom|serif|ss))|DoubleStruck/i) { $resftype |= DOUBLESTROKE; # Double stroke (math font) } if ($fontname =~ /serif|times|mincho|batang/i) { - if ($fontname =~ /good times/i) { - $resftype |= SERIF; # Serif - } + $resftype |= SERIF; # Serif } if ($fontname =~ /initial(s|en)/i) { $resftype |= INITIALS; + if ($fontname =~ /^linux ?libertine/i) { + $resftype |= SERIF; + } } if ($fontname =~ /participants/i) { $resftype |= SANS|FANCY; } - if ($fontname =~ /symbol/i) { - if ($fontname !~ /^symbola/i) { + if ($fontname =~ /symbol|cherokee/i) { + if ($fontname !~ /^(symbola|asap)/i) { $resftype |= SYMBOL; + if ($fontname =~ /^(ams ?math|computer modern bright msb)/i) { + $resftype |= DOUBLESTROKE | SERIF; + } + } + } + if ($fontname =~ /callig/i) { + $resftype |= FANCY; + } + if ($fontname =~ /\bS(mall)?C(aps)\b/i) { + if ($fontname !~ /^noto/i) { + $resftype |= SMALLCAP|SERIF; } } # Now check for fonts without a hint in font name @@ -763,7 +888,7 @@ sub getftype($$) } } } - for my $rFonts (\%fancyFonts, \%initialFonts, \%symbolFonts) { + for my $rFonts (\%fancyFonts, \%initialFonts, \%symbolFonts, \%smallcapFonts) { if (defined($rFonts->{$key})) { if ($fontname =~ $rFonts->{$key}) { $resftype |= $rFonts->{"value"}; @@ -911,7 +1036,7 @@ sub getproperties($$$$) my $val1 = $rget->($newfam, $newstyle); my $val; if (defined($val2) && defined($val1) && ($val2 ne $val1)) { - if (($txt =~/^(weight|slant)$/) && ($newstyle =~ /$val1/)){ + if (($txt =~/^(weight|slant)$/) && ($newstyle =~ /$val1/i)){ # style overrides weight and slant push(@{$rerrors}, "Fontname($fontname),Style($style): Values for $txt ($val1 != $val2) differ, pick $val1 from style"); $val = $val1; @@ -949,7 +1074,6 @@ sub getproperties($$$$) sub correctstyle($) { my ($style) = @_; - $style =~ s/^\\040//; $style =~ s/^\s*\d+\s*//; $style =~ s/\s*\d+$//; $style =~ s/italic/ Italic/i; @@ -962,16 +1086,16 @@ sub correctstyle($) $style =~ s/\bmedita(lic)?\b/Medium Italic/i; $style =~ s/\bmedobl(ique)?\b/Medium Oblique/i; $style =~ s/\bmed\b/Medium /i; - $style =~ s/\bdemi\b/SemiBold/i; $style =~ s/\bex(pd|t)\b/Expanded/i; $style =~ s/semi ?cond(ensed)?/SemiCondensed/i; $style =~ s/[sd]emi ?(bold|bd|bol)/SemiBold/i; $style =~ s/semi ?(expanded|extended|expd)/SemiExpanded/i; $style =~ s/[sd]emi ?light/SemiLight/i; + $style =~ s/\b[sd]emi\b/SemiBold/i; $style =~ s/ultra ?(expanded|extended|expd)/UltraExpanded/i; $style =~ s/light/Light /i; $style =~ s/\blt\b/Light /i; - $style =~ s/(ultra|extra)(light|lt)/ExtraLight /i; + $style =~ s/(ultra|extra) ?(light|lt)/ExtraLight /i; $style =~ s/\bheavy\b/Extrabold/i; $style =~ s/\bhairline\b/Extralight/i; $style =~ s/\bcond\b/Condensed/i; @@ -982,6 +1106,7 @@ sub correctstyle($) $style =~ s/Regul[ea]r/Regular/i; $style =~ s/Megablack/ExtraBlack/i; $style =~ s/ +/ /g; + $style =~ s/ +$//; return($style); } @@ -1068,9 +1193,9 @@ sub sprintIntervalls($) return join(',', @out); } -sub buildFontName($$$$) +sub buildFontName($$) { - my ($family, $style, $fullname, $postscriptname) = @_; + my ($family, $style) = @_; my $result = ""; $style =~ s/\\040//; @@ -1082,11 +1207,13 @@ sub buildFontName($$$$) $family =~ s/\bextcond\b/ExtraCondensed/i; $family =~ s/\bextbd\b/ExtraBold/i; $family =~ s/\bextlt\b/ExtraLight/i; - $style =~ s/\bextra\-light\b/ExtraLight/i; - $style =~ s/\bbol\b/Bold/i; $family =~ s/\bmed\b/Medium/i; - $family =~ s/^([A-Z]+[a-z]+)([A-Z][a-z]+)\b/$1 $2/; - my @style = split(' ', $style); + if ($family =~ /^([A-Z]*[a-z]+)([A-Z]\w+)\b(.*)$/) { + $family = $1 . splitatlU($2) . $3; + } + $family =~ s/^Ant Polt\b/Antykwa Poltawskiego/; + $family =~ s/\b(Semi|Extra) (Bold|Condensed|Expanded|Light)\b/$1$2/; + my @style = &splitStyle($style); for my $st (@style) { $st = ucfirst($st); if ($family !~ s/$st/$st/i) { @@ -1097,15 +1224,47 @@ sub buildFontName($$$$) $family =~ s/(\w)$st/$1 $st/i; } } - $postscriptname =~ s/[- ]?Regular$//; - if ($fullname =~ /^(font)?\d+/) { - $fullname = ""; - } - if (length($fullname) <= length($family)) { - $result = $family; + $result = $family; + return($result, join(' ', @style)); +} + +# split text at change from lower case to upper case +sub splitatlU($) +{ + my ($txt) = @_; + if ($txt =~ /^([A-Z]+[a-z]*)(.*)$/) { + if (defined($mapShortcuts{$1})) { + return(" " . $mapShortcuts{$1} . splitatlU($2)); + } + else { + return(" $1" . splitatlU($2)); + } } - else { - $result = $fullname; + return($txt); +} + +sub splitStyle($) +{ + my @in = split(/[- ]/, $_[0]); + my @result = (); + my $prefix = ""; + for my $en (@in) { + while ($en =~ s/^([A-Z][a-z]+)//) { + my $found = $1; + if ($found =~ /^(Semi|Extra)$/) { + $prefix = $found; + next; + } + elsif (defined($mapShortcuts{$found})) { + $found = $mapShortcuts{$found}; + } + push(@result, "$prefix$found"); + $prefix = ""; + } + if ($en ne "") { + push(@result, "$prefix$en"); + $prefix = ""; + } } - return($result); + return(@result); }