diff --git a/docs/marca/simbolo-naranja.svg b/docs/marca/simbolo-naranja.svg index 5cae2b1..2c7b19d 100644 --- a/docs/marca/simbolo-naranja.svg +++ b/docs/marca/simbolo-naranja.svg @@ -1 +1 @@ - + diff --git a/docs/marca/simbolo-negativo.svg b/docs/marca/simbolo-negativo.svg index 0f7d933..c8746dc 100644 --- a/docs/marca/simbolo-negativo.svg +++ b/docs/marca/simbolo-negativo.svg @@ -1 +1 @@ - + diff --git a/docs/marca/simbolo.svg b/docs/marca/simbolo.svg index 07941ee..bbf0232 100644 --- a/docs/marca/simbolo.svg +++ b/docs/marca/simbolo.svg @@ -1 +1 @@ - + diff --git a/sites/takethestreet/favicon.svg b/sites/takethestreet/favicon.svg index 07941ee..bbf0232 100644 --- a/sites/takethestreet/favicon.svg +++ b/sites/takethestreet/favicon.svg @@ -1 +1 @@ - + diff --git a/sites/takethestreet/img/simbolo-negativo.svg b/sites/takethestreet/img/simbolo-negativo.svg index 0f7d933..c8746dc 100644 --- a/sites/takethestreet/img/simbolo-negativo.svg +++ b/sites/takethestreet/img/simbolo-negativo.svg @@ -1 +1 @@ - + diff --git a/sites/takethestreet/img/simbolo.svg b/sites/takethestreet/img/simbolo.svg index 07941ee..bbf0232 100644 --- a/sites/takethestreet/img/simbolo.svg +++ b/sites/takethestreet/img/simbolo.svg @@ -1 +1 @@ - + diff --git a/sites/tomalacalle/favicon.svg b/sites/tomalacalle/favicon.svg index 07941ee..bbf0232 100644 --- a/sites/tomalacalle/favicon.svg +++ b/sites/tomalacalle/favicon.svg @@ -1 +1 @@ - + diff --git a/sites/tomalacalle/img/simbolo-negativo.svg b/sites/tomalacalle/img/simbolo-negativo.svg index 0f7d933..c8746dc 100644 --- a/sites/tomalacalle/img/simbolo-negativo.svg +++ b/sites/tomalacalle/img/simbolo-negativo.svg @@ -1 +1 @@ - + diff --git a/sites/tomalacalle/img/simbolo.svg b/sites/tomalacalle/img/simbolo.svg index 07941ee..bbf0232 100644 --- a/sites/tomalacalle/img/simbolo.svg +++ b/sites/tomalacalle/img/simbolo.svg @@ -1 +1 @@ - + diff --git a/tools/farola.py b/tools/farola.py index a47c0b1..b8e03b9 100644 --- a/tools/farola.py +++ b/tools/farola.py @@ -1,41 +1,32 @@ -import math, sys -NAR, AMA = "#f04e23", "#f2b705" +import sys +NAR, AMA, INK = "#f04e23", "#f2b705", "#111" -def bordes(signo, t0, t1, n=24): - izq, der = [], [] - for k in range(n + 1): - t = t0 + (t1 - t0) * k / n - y = 18 + 79 * t - a = 5 + 9 * t - cx = 72 + signo * a * math.cos(2 * math.pi * t) - w = 3 + 6 * t - izq.append((cx - w, y)); der.append((cx + w, y)) - return izq, der +def estrella(cx, cy, r, col, borde=None, bw=0): + k = r * .22 + d = (f"M{cx},{cy - r} Q{cx + k},{cy - k} {cx + r},{cy} Q{cx + k},{cy + k} {cx},{cy + r} " + f"Q{cx - k},{cy + k} {cx - r},{cy} Q{cx - k},{cy - k} {cx},{cy - r} Z") + b = f' stroke="{borde}" stroke-width="{bw}" stroke-linejoin="round"' if borde else "" + return f'' -def linea(pts): - return "M" + " L".join(f"{x:.1f},{y:.1f}" for x, y in pts) - -def cinta(signo, t0, t1): - izq, der = bordes(signo, t0, t1) - return linea(izq + der[::-1]) + " Z" - -def farola(ink="#111", fondo=None, nar=NAR, ama=AMA): +def farola(ink=INK, rell=NAR, fondo=None, brillo="#fff"): bg = f'' if fondo else "" - corte = fondo or "#fff" - def pieza(col, signo, t0, t1, arriba): - out = f'' - if arriba: - izq, der = bordes(signo, t0, t1) - out += "".join(f'' for e in (izq, der)) - return out - luz = (pieza(ama, 1, 0, .5, False) + pieza(nar, -1, 0, .5, True) - + pieza(nar, -1, .5, 1, False) + pieza(ama, 1, .5, 1, True)) - poste = f'' - cabeza = f'' - return f'{bg}{luz}{poste}{cabeza}\n' + eje = "M27,99 V38 Q27,15 50,15 H62" + cabeza = "M56,9 Q60,4 74,4 Q90,4 94,12 Q96,18 88,20 H62 Q54,20 54,15 Q54,11 56,9 Z" + luz = f'' + gotas = "".join(f'' + for x, w, y0, y1 in ((23.5, 2.2, 60, 72), (65, 1.8, 20, 28), (90, 1.5, 19, 25))) + return (f'{bg}{luz}' + f'' + f'' + f'{gotas}' + f'' + f'' + f'' + f'' + f'{estrella(76, 52, 13, AMA, ink, 2.5)}{estrella(62, 74, 7, brillo, ink, 2)}\n') if __name__ == "__main__": d = sys.argv[1] open(f"{d}/simbolo.svg", "w").write(farola()) - open(f"{d}/simbolo-negativo.svg", "w").write(farola("#fff", "#111")) - open(f"{d}/simbolo-naranja.svg", "w").write(farola("#111", NAR, nar="#fff")) + open(f"{d}/simbolo-negativo.svg", "w").write(farola(fondo=INK, ink="#fff")) + open(f"{d}/simbolo-naranja.svg", "w").write(farola(fondo=NAR, rell="#fff", brillo=NAR))