daily-focus 2.0.0-dev.14 → 2.0.0-dev.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daily-focus",
-  "version": "2.0.0-dev.14",
+  "version": "2.0.0-dev.16",
   "description": "An interactive dashboard of what you should focus on today at work",
   "keywords": [
     "dashboard",
@@ -28,6 +28,7 @@
     "public/index.html",
     "public/style.css",
     "public/app.js",
+    "public/fonts/",
     "prompts/",
     "schema/",
     "tools/dfcal/build.sh",
@@ -66,5 +67,8 @@
     "happy-dom": "20.14.5",
     "preact": "10.29.8",
     "typescript": "7.0.2"
+  },
+  "allowScripts": {
+    "esbuild": true
   }
 }

package/prompts/morning-brief-personal.md

@@ -340,7 +340,7 @@ Then the general editorial bar:
 {
   "version": 1,
   "generatedAt": "<ISO 8601 timestamp, with offset>",
-  "generatedBy": "<name yourself — your model or agent id>",
+  "generatedBy": "<your model or agent id, such as codex, and nothing else>",
   "date": "<today, YYYY-MM-DD>",
   "headline": "<one or two sentences, or omit>",
   "items": [ … ]
@@ -418,7 +418,9 @@ Check all of these, and fix anything that fails:
 6. Every `url` starts with `http://` or `https://`, and came from a tool rather than
    being built by you.
 7. Every `start`/`end` has a timezone offset, unless deliberately all-day.
-8. `generatedAt` is now, and `generatedBy` names whoever ran.
+8. `generatedAt` is now, and `generatedBy` names whoever ran — your model or agent
+   id and nothing else: not a working directory, a path or an account. The dashboard
+   prints it after "updated … by" in its header.
 9. **When `focus.md` sets an objective, at least one item offers a concrete path to
    it** — a real one you found, or the synthesised one. With no objective, no item has
    `advancesObjective`.

package/prompts/morning-brief-work.md

@@ -512,7 +512,7 @@ Then the general editorial bar:
 {
   "version": 1,
   "generatedAt": "<ISO 8601 timestamp, with offset>",
-  "generatedBy": "<name yourself — your model or agent id>",
+  "generatedBy": "<your model or agent id, such as codex, and nothing else>",
   "date": "<today, YYYY-MM-DD>",
   "headline": "<one or two sentences, or omit>",
   "dayStart": "09:00",
@@ -601,7 +601,9 @@ Check all of these, and fix anything that fails:
 6. Every `url` starts with `http://` or `https://`.
 7. Every `start`/`end` has a timezone offset, unless deliberately all-day.
 8. `generatedAt` is now, and `generatedBy` names whoever ran — your model or agent
-   id, so the dashboard can show who produced the brief.
+   id and nothing else: not a working directory, a path or an account. The dashboard
+   prints it after "updated … by" in its header, so `codex` reads well there and
+   `codex (/root)` does not.
 9. **When `focus.md` sets an objective, at least one item offers a concrete path to
    it** — a real one you found, or the synthesised "no path today" item. A brief with
    no route to the objective and no acknowledgement of that fact is a failed run.

package/public/app.js

@@ -2480,10 +2480,11 @@ function agentRunBanner(run, state2, handlers2) {
   };
   if (run.status === "running") {
     const helping = (run.steps ?? []).filter((step) => step.subagent && step.state === "running").length;
+    const doing = briefLanded(run, state2.brief?.generatedAt) ? "The brief is in. The morning agent is checking it and writing its report" : "The morning agent is writing a new brief";
     return bannerNode(
       "info",
       "i",
-      `The morning agent is writing a new brief, started ${relativeTime(run.startedAt, now)}` + (helping ? `, with ${helping} ${helping === 1 ? "subagent" : "subagents"} at work.` : "."),
+      `${doing}, started ${relativeTime(run.startedAt, now)}` + (helping ? `, with ${helping} ${helping === 1 ? "subagent" : "subagents"} at work.` : "."),
       [el("button", { type: "button", class: "button banner__action", onClick: () => handlers2.stopAgent() }, "Stop")],
       strip
     );
@@ -2504,6 +2505,11 @@ function agentRunBanner(run, state2, handlers2) {
     strip
   );
 }
+function briefLanded(run, generatedAt) {
+  const started = parseDate(run.startedAt)?.getTime();
+  const landed = generatedAt ? parseDate(generatedAt)?.getTime() : void 0;
+  return started !== void 0 && landed !== void 0 && landed >= started;
+}
 function isHeldOverDayOff(state2) {
   if (state2.brief.generatedAt === null || state2.schedule.runsToday) return false;
   const today = dayKey(new Date(state2.now));
@@ -2640,7 +2646,11 @@ function ItemRow({ item, state: state2, ui: ui2, handlers: handlers2 }) {
     },
     el(
       "span",
-      { class: "item__mark" },
+      // A ranked row's number stands in the margin where the source dot would be:
+      // the stylesheet draws it off `data-rank` and hides the dot, since the
+      // source is named in the meta line anyway and the rank is what this row
+      // is for.
+      { class: "item__mark", "data-rank": item.priority !== void 0 && item.status === "open" ? String(item.priority) : void 0 },
       el("span", {
         class: "item__dot",
         style: `background:${sourceColor(item.source)}`,
@@ -2666,9 +2676,6 @@ function renderMeta(item, state2, now) {
     pills.push(el("span", { class: cls }, text));
     said.add(text.trim().toLowerCase());
   };
-  if (item.priority !== void 0 && item.status === "open") {
-    pill("pill pill--priority", `#${item.priority}`);
-  }
   for (const [cls, text] of rowPillTexts(item, state2)) pill(cls, text);
   if (item.advancesObjective) {
     pill("pill pill--objective", "objective");
@@ -3730,7 +3737,7 @@ function briefRefresh(state2, handlers2) {
   const agent = state2.agentRun;
   if (!agent?.enabled) return null;
   const running = agent.last?.status === "running";
-  const label = running ? `The morning agent is writing a new brief, started ${formatTime(agent.last?.startedAt)}` : `Run the morning agent now, for a fresh brief${nextRunPhraseFor(agent)}`;
+  const label = running ? agent.last && briefLanded(agent.last, state2.brief.generatedAt) ? `The brief is in; the morning agent is checking it and writing its report, started ${formatTime(agent.last.startedAt)}` : `The morning agent is writing a new brief, started ${formatTime(agent.last?.startedAt)}` : `Run the morning agent now, for a fresh brief${nextRunPhraseFor(agent)}`;
   return el(
     "button",
     {
@@ -3897,8 +3904,8 @@ function RunPanel({ run, state: state2, ui: ui2, handlers: handlers2 }) {
     el(
       "div",
       { class: "flyout__body", ref: body, onScroll },
-      runStatus(run, now, handlers2),
-      runReport(run, ui2, handlers2),
+      run.status === "running" ? null : runStatus(run, now, handlers2),
+      runReport(run, { landed: briefLanded(run, state2.brief?.generatedAt), now }, ui2, handlers2),
       run.status === "running" ? null : runConversation(run, busy, answering, enabled, ui2, handlers2, askInput),
       runList(run, runs, now, agent, handlers2)
     )
@@ -3935,8 +3942,8 @@ function describeWhen(value, now) {
   const named = day === "today" || day === "tomorrow" || day === "yesterday";
   return `${named ? day : date && date.getFullYear() === now.getFullYear() ? formatShortDay(value) : formatDay(value)} at ${formatTime(value)}`;
 }
-function runReport(run, ui2, handlers2) {
-  if (run.steps?.length) return runWork(run, ui2, handlers2);
+function runReport(run, live, ui2, handlers2) {
+  if (run.steps?.length) return runWork(run, live, ui2, handlers2);
   const messages = run.messages ?? (run.report ? [run.report] : []);
   const running = run.status === "running";
   const earlier = !running && messages.length && messages.at(-1) === run.report ? messages.slice(0, -1) : messages;
@@ -3975,12 +3982,9 @@ function runReport(run, ui2, handlers2) {
     })
   ) : null;
   if (running) {
-    return el(
-      "section",
-      { class: "flyout__section" },
-      el("h3", { class: "flyout__label" }, "What it is doing"),
-      list ?? el("p", { class: "flyout__empty" }, "Nothing yet.")
-    );
+    const latest = earlier.at(-1);
+    const summary = `${latest ? firstLine(latest) : "Starting"} \xB7 ${earlier.length} ${earlier.length === 1 ? "message" : "messages"}`;
+    return liveSection(run, live, summary, [list, el("ol", { class: "assistant__steps agent-run__steps" }, waitingLine(earlier.length > 0))], ui2, handlers2);
   }
   return el(
     "section",
@@ -3995,16 +3999,9 @@ function runReport(run, ui2, handlers2) {
     ) : null
   );
 }
-function runWork(run, ui2, handlers2) {
+function runWork(run, live, ui2, handlers2) {
   const running = run.status === "running";
-  if (running) {
-    return el(
-      "section",
-      { class: "flyout__section" },
-      el("h3", { class: "flyout__label" }, "What it is doing"),
-      runSteps(run, run.steps, null, ui2, handlers2)
-    );
-  }
+  if (running) return liveSection(run, live, workSummary(run), runSteps(run, run.steps, null, true, ui2, handlers2), ui2, handlers2);
   const last = run.steps.findLast((step) => step.by === null && step.kind === "message");
   const steps2 = last && sameWords(last.text, run.report) ? run.steps.filter((step) => step !== last) : run.steps;
   const handoffs = steps2.filter((step) => step.subagent).length;
@@ -4021,29 +4018,122 @@ function runWork(run, ui2, handlers2) {
         null,
         `How it got there, in ${steps2.length} ${steps2.length === 1 ? "step" : "steps"}` + (handoffs ? `, with ${handoffs} ${handoffs === 1 ? "subagent" : "subagents"}` : "")
       ),
-      runSteps(run, steps2, null, ui2, handlers2)
+      runSteps(run, steps2, null, false, ui2, handlers2)
     ) : null
   );
 }
+function liveSection(run, live, summary, content, ui2, handlers2) {
+  const phase = live.landed ? "The brief is in; checking it and writing its report" : "Writing a new brief";
+  return el(
+    "section",
+    { class: "flyout__section" },
+    el("h3", { class: "flyout__label" }, `${phase}, started ${relativeTime(run.startedAt, live.now)}`),
+    el(
+      "div",
+      { class: "agent-run__live" },
+      workFold(run, summary, content, ui2, handlers2),
+      el("button", { type: "button", class: "button", onClick: () => handlers2.stopAgent() }, "Stop")
+    )
+  );
+}
+function workFold(run, summary, content, ui2, handlers2) {
+  const key = `${run.id}:work`;
+  return el(
+    "details",
+    {
+      class: "agent-run__list agent-run__list--working",
+      open: ui2.messageOpen.value.get(key) ?? false,
+      onToggle: (event) => {
+        const isOpen = event.currentTarget.open;
+        handlers2.toggleMessage(key, isOpen ? true : null);
+      }
+    },
+    el("summary", null, summary),
+    content
+  );
+}
+function workSummary(run) {
+  const own = run.steps.filter((step) => step.by === null);
+  const inFlight = own.findLast((step) => step.kind === "tool" && step.state === "running");
+  const latest = own.at(-1);
+  const working = run.steps.filter((step) => step.subagent && step.state === "running");
+  const count = `${run.steps.length} ${run.steps.length === 1 ? "step" : "steps"}`;
+  if (inFlight?.subagent) {
+    return `Waiting on ${working.map((step) => step.detail ?? "a subagent").join(", ") || "a subagent"} \xB7 ${count}`;
+  }
+  const doing = inFlight ? inFlight.text : latest ? latest.kind === "message" ? firstLine(latest.text) : latest.text : "Starting";
+  const helping = working.length;
+  return `${doing} \xB7 ${count}${helping ? `, ${helping} ${helping === 1 ? "subagent" : "subagents"} at work` : ""}`;
+}
+function waitingLine(begun) {
+  return el(
+    "li",
+    { class: "assistant__step assistant__step--waiting", "data-state": "running" },
+    el("span", { class: "assistant__step-text" }, begun ? "Thinking\u2026" : "Starting\u2026")
+  );
+}
 var NESTING = 4;
-function runSteps(run, steps2, by, ui2, handlers2, depth = 0) {
-  const own = steps2.filter((step) => step.by === by);
+var CALLS_FOLD = 2;
+function runSteps(run, steps2, by, active, ui2, handlers2, depth = 0) {
+  const own = steps2.map((step, index) => ({ step, index })).filter(({ step }) => step.by === by);
+  const inFlight = own.some(({ step }) => step.state === "running");
+  const items = [];
+  let calls = [];
+  const flush = () => {
+    if (calls.length >= CALLS_FOLD) items.push(callsFold(run, by, calls, ui2, handlers2));
+    else for (const placed of calls) items.push(callLine(placed));
+    calls = [];
+  };
+  for (const placed of own) {
+    const { step, index } = placed;
+    const folds = step.subagent && depth < NESTING;
+    if (step.kind === "tool" && !folds && step.state !== "running") {
+      calls.push(placed);
+      continue;
+    }
+    flush();
+    if (step.kind === "message") items.push(el("li", { key: index, class: "agent-run__said" }, renderMarkdownBlocks(step.text)));
+    else if (folds) items.push(runHandoff(run, steps2, step, ui2, handlers2, depth, index));
+    else items.push(callLine(placed));
+  }
+  flush();
   return el(
     "ol",
     { class: "assistant__steps agent-run__steps" },
-    own.length ? null : el("li", { class: "assistant__step assistant__step--message" }, "Nothing yet."),
-    own.map((step, index) => {
-      if (step.kind === "message") {
-        return el("li", { key: index, class: "agent-run__said" }, renderMarkdownBlocks(step.text));
-      }
-      if (step.subagent && depth < NESTING) return runHandoff(run, steps2, step, ui2, handlers2, depth, index);
-      return el(
-        "li",
-        { key: index, class: "assistant__step", "data-state": step.state },
-        el("span", { class: "assistant__step-text" }, step.text),
-        step.detail ? el("code", { class: "assistant__step-detail", title: step.detail }, step.detail) : null
-      );
-    })
+    own.length || active ? null : el("li", { class: "assistant__step assistant__step--message" }, "Nothing yet."),
+    items,
+    active && !inFlight ? waitingLine(own.length > 0) : null
+  );
+}
+function callLine({ step, index }) {
+  return el(
+    "li",
+    { key: index, class: "assistant__step", "data-state": step.state },
+    el("span", { class: "assistant__step-text" }, step.text),
+    step.detail ? el("code", { class: "assistant__step-detail", title: step.detail }, step.detail) : null
+  );
+}
+function callsFold(run, by, calls, ui2, handlers2) {
+  const key = `${run.id}:${by ?? "run"}:calls@${calls[0].index}`;
+  const failed = calls.filter(({ step }) => step.state === "failed").length;
+  const names = [...new Set(calls.map(({ step }) => step.text))];
+  const named = names.length <= 2 ? names.join(", ") : `${names.slice(0, 2).join(", ")} and ${names.length - 2} more`;
+  const summary = `${calls.length} calls${failed ? `, ${failed} failed` : ""} \xB7 ${named}`;
+  return el(
+    "li",
+    { key, class: "assistant__step agent-run__calls", "data-state": failed ? "failed" : "done" },
+    el(
+      "details",
+      {
+        open: ui2.messageOpen.value.get(key) ?? false,
+        onToggle: (event) => {
+          const isOpen = event.currentTarget.open;
+          handlers2.toggleMessage(key, isOpen ? true : null);
+        }
+      },
+      el("summary", null, summary),
+      el("ol", { class: "assistant__steps agent-run__steps" }, calls.map((placed) => callLine(placed)))
+    )
   );
 }
 function runHandoff(run, steps2, step, ui2, handlers2, depth, index) {
@@ -4053,8 +4143,7 @@ function runHandoff(run, steps2, step, ui2, handlers2, depth, index) {
   const calls = own.filter((candidate) => candidate.kind === "tool").length;
   const doing = step.state === "running" ? latest ? latest.kind === "message" ? firstLine(latest.text) : latest.text : "starting" : `${calls} ${calls === 1 ? "step" : "steps"}`;
   const key = `${run.id}:${id}`;
-  const fallback = step.state === "running";
-  const open = ui2.messageOpen.value.has(key) ? ui2.messageOpen.value.get(key) : fallback;
+  const open = ui2.messageOpen.value.get(key) ?? false;
   return el(
     "li",
     { key: index, class: "assistant__step agent-run__handoff", "data-state": step.state },
@@ -4065,7 +4154,7 @@ function runHandoff(run, steps2, step, ui2, handlers2, depth, index) {
         // As the message folds do: a toggle back to the default is forgotten.
         onToggle: (event) => {
           const isOpen = event.currentTarget.open;
-          handlers2.toggleMessage(key, isOpen === fallback ? null : isOpen);
+          handlers2.toggleMessage(key, isOpen ? true : null);
         }
       },
       el(
@@ -4074,7 +4163,7 @@ function runHandoff(run, steps2, step, ui2, handlers2, depth, index) {
         el("span", { class: "assistant__step-text" }, `Subagent: ${step.detail ?? "unnamed"}`),
         el("span", { class: "assistant__step-detail" }, doing)
       ),
-      runSteps(run, steps2, id, ui2, handlers2, depth + 1)
+      runSteps(run, steps2, id, step.state === "running", ui2, handlers2, depth + 1)
     )
   );
 }
@@ -4082,14 +4171,6 @@ function sameWords(a4, b4) {
   return a4.replace(/\s+/g, " ").trim() === b4.replace(/\s+/g, " ").trim();
 }
 function runStatus(run, now, handlers2) {
-  if (run.status === "running") {
-    return el(
-      "p",
-      { class: "agent-run__status" },
-      `Writing a new brief, started ${relativeTime(run.startedAt, now)}. `,
-      el("button", { type: "button", class: "button", onClick: () => handlers2.stopAgent() }, "Stop")
-    );
-  }
   const took = runDuration(run);
   if (run.status === "done") {
     return el("p", { class: "agent-run__status" }, `Finished at ${formatTime(run.endedAt)}${took ? `, in ${took}` : ""}.`);
@@ -4961,6 +5042,11 @@ function SettingsView({ state: state2, ui: ui2, handlers: handlers2 }) {
   }, []);
   const page = ui2.settings.value;
   const draft = ui2.settingsDraft.value;
+  const sections = [
+    { id: "objective", title: "Your objective" },
+    { id: "sources", title: "Where the agent looks" },
+    ...page?.groups ?? []
+  ];
   return el(
     "div",
     { class: "settings" },
@@ -4970,6 +5056,7 @@ function SettingsView({ state: state2, ui: ui2, handlers: handlers2 }) {
       el("h2", { class: "settings__title" }, "Settings"),
       el("button", { type: "button", class: "button", onClick: () => handlers2.closeSettings() }, `Back to ${VIEW_NAME[ui2.settingsReturn.value]}`)
     ),
+    k(SectionIndex, { sections }),
     page?.error ? el("p", { class: "settings__problem", role: "alert" }, page.error) : null,
     objectiveCard(state2, ui2, handlers2),
     sourcesCard(state2, ui2, handlers2),
@@ -4994,6 +5081,29 @@ function SettingsView({ state: state2, ui: ui2, handlers: handlers2 }) {
     saveBar(ui2, handlers2)
   );
 }
+function SectionIndex({ sections }) {
+  const [current, setCurrent] = d2(sections[0]?.id ?? null);
+  h2(() => {
+    const look = () => {
+      let seen = sections[0]?.id ?? null;
+      for (const section2 of sections) {
+        const card = document.getElementById(`settings-${section2.id}`);
+        if (card && card.getBoundingClientRect().top <= 120) seen = section2.id;
+      }
+      setCurrent(seen);
+    };
+    look();
+    window.addEventListener("scroll", look, { passive: true });
+    return () => window.removeEventListener("scroll", look);
+  }, [sections.map((section2) => section2.id).join(" ")]);
+  return el(
+    "nav",
+    { class: "settings__nav", "aria-label": "Settings sections" },
+    sections.map(
+      (section2) => el("a", { key: section2.id, href: `#settings-${section2.id}`, "aria-current": section2.id === current ? "true" : void 0 }, section2.title)
+    )
+  );
+}
 function objectiveCard(state2, ui2, handlers2) {
   const focus = state2.focus;
   return el(
@@ -5122,6 +5232,7 @@ function shownValue(setting, draft) {
   if (draft.has(setting.key)) return draft.get(setting.key) ?? "";
   return setting.source === "default" ? "" : setting.value ?? "";
 }
+var SEGMENTS = 4;
 function flagValue(raw) {
   if (raw === "") return "";
   return ["off", "false", "0", "no"].includes(raw.trim().toLowerCase()) ? "off" : "on";
@@ -5138,7 +5249,30 @@ function settingField(setting, draft, handlers2) {
   if (setting.kind === "choice" || setting.kind === "flag") {
     const choices = setting.kind === "flag" ? [{ value: "on", label: "On" }, { value: "off", label: "Off" }] : setting.choices ?? [];
     const current = setting.kind === "flag" ? flagValue(value) : value;
-    input = el(
+    const fallback = choices.find((choice) => choice.label.toLowerCase() === setting.fallback.toLowerCase());
+    input = choices.length <= SEGMENTS && fallback ? el(
+      "div",
+      { class: "segmented", id, role: "radiogroup", "aria-label": setting.label, "aria-disabled": String(locked) },
+      choices.map((choice) => {
+        const isDefault = choice.value === fallback.value;
+        const checked = current === "" ? isDefault : current === choice.value;
+        return el(
+          "button",
+          {
+            type: "button",
+            key: choice.value,
+            role: "radio",
+            class: "segmented__option",
+            "aria-checked": String(checked),
+            disabled: locked,
+            title: isDefault ? "The default" : void 0,
+            onClick: () => handlers2.editSetting(setting.key, isDefault ? null : choice.value)
+          },
+          choice.label,
+          checked && current === "" ? el("small", null, "default") : null
+        );
+      })
+    ) : el(
       "select",
       { class: "field__input", id, disabled: locked, value: current, onChange },
       el("option", { value: "" }, `Default: ${setting.fallback}`),
@@ -5291,7 +5425,10 @@ function FirstBriefCard({ state: state2, handlers: handlers2 }) {
 // client/today.ts
 function TodayView({ state: state2, ui: ui2, handlers: handlers2 }) {
   if (state2.setup?.needed) return [k(FirstBriefCard, { state: state2, handlers: handlers2 })];
-  return [renderObjective(state2, handlers2), renderStats(state2), renderHeadline(state2), renderSections(state2, ui2, handlers2)];
+  return [
+    el("div", { class: "today__masthead" }, renderObjective(state2, handlers2), renderStats(state2), renderHeadline(state2)),
+    renderSections(state2, ui2, handlers2)
+  ];
 }
 function renderObjective(state2, handlers2 = null) {
   const focus = state2.focus;
@@ -5413,8 +5550,9 @@ function App({ ui: ui2, handlers: handlers2 }) {
   if (current?.onboarding) return [k(OnboardingView, { state: current, ui: ui2, handlers: handlers2 }), k(Toast, { ui: ui2, handlers: handlers2 })];
   return [
     el("a", { class: "skip-link", href: "#main" }, "Skip to content"),
-    k(Header, { state: current, ui: ui2, handlers: handlers2 }),
-    k(Tabs, { state: current, ui: ui2, handlers: handlers2 }),
+    // The band: the masthead's navy runs behind both, and on Today on behind
+    // the objective below (see `.band` in the stylesheet).
+    el("div", { class: "band" }, k(Header, { state: current, ui: ui2, handlers: handlers2 }), k(Tabs, { state: current, ui: ui2, handlers: handlers2 })),
     el("div", { id: "banners", class: "banners" }, current ? renderBanners(current, ui2, handlers2) : null),
     el(
       "main",

package/public/fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.