@open-press/cli 1.2.0 → 1.3.1

package/README.md

@@ -26,7 +26,8 @@ npx @open-press/cli init <target> [flags]
 
 | Flag                 | Description                                                                 |
 | -------------------- | --------------------------------------------------------------------------- |
-| `--title <s>`        | Document title (written to workspace config)                                |
+| `--title <s>`        | Document title                                                              |
+| `--type <pages|slides>` | Scaffold a folder-convention Press under `press/<target-name>/`          |
 | `--no-git`           | Skip `git init` + initial commit (use when scaffolding inside an existing repo) |
 | `--no-install`       | Skip `npm install` (offline, or you'll run pnpm/bun yourself)              |
 | `--skills`           | Install OpenPress agent skills after scaffolding                            |
@@ -46,8 +47,10 @@ npx -y skills@latest add quan0715/openpress-social-card-skill
 A self-contained workspace with:
 
 - `package.json` with `@open-press/core`, `@open-press/cli`, and `open-press ...` scripts
-- `press/index.tsx` — the workspace document entry
-- `press/theme/`, `press/media/`, `press/components/` — user-owned authoring files
+- `press/<target-name>/press.tsx` for folder-convention Press entries
+- `press/<target-name>/theme/`, `press/<target-name>/media/`, `press/<target-name>/components/` — artifact-owned authoring files
+- optional `press/shared/` for assets, media, components, or theme used by multiple Press folders
+- `press/<target-name>/ui/` and `press/<target-name>/layouts/` for slide starters created with `--type slides`
 - `press/design.md` — working design notes for agents and maintainers
 
 It does **not** create `engine/`, `src/openpress/`, `index.html`, or `vite.config.ts` in your project. Those are package-owned runtime internals.

package/dist/cli.js

@@ -9,7 +9,7 @@ import process2 from "process";
 // src/init.ts
 import { spawn } from "child_process";
 import { existsSync } from "fs";
-import { mkdir, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
+import { mkdir, readFile, writeFile } from "fs/promises";
 import path from "path";
 import process from "process";
 import { fileURLToPath } from "url";
@@ -29,24 +29,6 @@ async function pathIsEmpty(target, options = {}) {
   }
 }
 
-// src/metadata.ts
-import { readFile, writeFile } from "fs/promises";
-async function patchPressTitle(entryPath, title) {
-  const source = await readFile(entryPath, "utf8");
-  const escaped = escapeStringForJs(title);
-  const existing = /(<Press\b[^>]*\btitle\s*=\s*)("[^"]*"|'[^']*'|\{`[^`]*`\})/;
-  let next;
-  if (existing.test(source)) {
-    next = source.replace(existing, `$1"${escaped}"`);
-  } else {
-    next = source.replace(/<Press\b/, `<Press title="${escaped}"`);
-  }
-  await writeFile(entryPath, next);
-}
-function escapeStringForJs(value) {
-  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-}
-
 // src/init.ts
 var FRAMEWORK_SKILLS_SOURCE = "quan0715/open-press";
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -58,14 +40,12 @@ async function init(options) {
   const title = options.title ?? "OpenPress Document";
   const version = await readCliVersion();
   log(`Creating open-press workspace at ${target}`);
+  if (!options.type) {
+    throw new Error("open-press init requires --type pages or --type slides.");
+  }
   await writeWorkspacePackageJson(target, workspaceName, version);
   await writeWorkspaceGitignore(target);
-  await writeStarterPress(target, title);
-  if (options.title) {
-    const pressEntry = path.join(target, "press", "index.tsx");
-    log("Writing title into <Press> in press/index.tsx");
-    await patchPressTitle(pressEntry, options.title);
-  }
+  await writeTypedStarterPress(target, { pressName: workspaceName, title, type: options.type });
   if (options.skills) {
     log(`Installing framework skills via \`open-press skills add\`\u2026`);
     try {
@@ -110,7 +90,7 @@ async function ensureTarget(target) {
   await mkdir(target, { recursive: true });
 }
 async function readCliVersion() {
-  const pkg = JSON.parse(await readFile2(CLI_PACKAGE_JSON, "utf8"));
+  const pkg = JSON.parse(await readFile(CLI_PACKAGE_JSON, "utf8"));
   return typeof pkg.version === "string" && pkg.version ? pkg.version : "latest";
 }
 async function writeWorkspacePackageJson(target, workspaceName, version) {
@@ -154,7 +134,7 @@ async function writeWorkspacePackageJson(target, workspaceName, version) {
       }
     }
   };
-  await writeFile2(path.join(target, "package.json"), `${JSON.stringify(pkg, null, 2)}
+  await writeFile(path.join(target, "package.json"), `${JSON.stringify(pkg, null, 2)}
 `, "utf8");
 }
 async function writeWorkspaceGitignore(target) {
@@ -173,21 +153,45 @@ async function writeWorkspaceGitignore(target) {
     "output/",
     ""
   ].join("\n");
-  await writeFile2(path.join(target, ".gitignore"), content, "utf8");
+  await writeFile(path.join(target, ".gitignore"), content, "utf8");
 }
-async function writeStarterPress(target, title) {
+async function writeTypedStarterPress(target, options) {
+  const folder = folderNameFromPressName(options.pressName);
+  const title = options.title;
   const pressRoot = path.join(target, "press");
-  await mkdir(path.join(pressRoot, "components"), { recursive: true });
-  await mkdir(path.join(pressRoot, "media"), { recursive: true });
+  const sharedRoot = path.join(pressRoot, "shared");
+  const typedRoot = path.join(pressRoot, folder);
+  await writeWorkspaceThemeSkeleton(sharedRoot);
+  await mkdir(path.join(sharedRoot, "media"), { recursive: true });
+  await mkdir(path.join(typedRoot, "components"), { recursive: true });
+  await mkdir(path.join(typedRoot, "theme"), { recursive: true });
+  await mkdir(path.join(typedRoot, "media"), { recursive: true });
+  await writeFile(path.join(pressRoot, "design.md"), `# ${title}
+
+Starter OpenPress ${options.type} workspace.
+`, "utf8");
+  await writeFile(path.join(sharedRoot, "media", "README.md"), "# Shared Media\n\nPlace workspace-wide media here.\n", "utf8");
+  await writeFile(path.join(typedRoot, "media", "README.md"), "# Media\n\nPlace Press-specific media here.\n", "utf8");
+  if (options.type === "pages") {
+    await writePagesPress(typedRoot, { folder, title });
+  } else {
+    await writeSlidesPress(typedRoot, { folder, title });
+  }
+}
+async function writeWorkspaceThemeSkeleton(pressRoot) {
   await mkdir(path.join(pressRoot, "theme", "base"), { recursive: true });
   await mkdir(path.join(pressRoot, "theme", "page-surfaces"), { recursive: true });
   await mkdir(path.join(pressRoot, "theme", "shell"), { recursive: true });
-  await writeFile2(path.join(pressRoot, "design.md"), `# ${title}
-
-Starter OpenPress workspace.
-`, "utf8");
-  await writeFile2(path.join(pressRoot, "media", "README.md"), "# Media\n\nPlace project media here.\n", "utf8");
-  await writeFile2(
+  await writeFile(
+    path.join(pressRoot, "theme", "tokens.css"),
+    `:root {
+  --openpress-font-body: system-ui, sans-serif;
+  --openpress-font-serif: Georgia, serif;
+}
+`,
+    "utf8"
+  );
+  await writeFile(
     path.join(pressRoot, "theme", "base", "page-contract.css"),
     `* {
   box-sizing: border-box;
@@ -212,7 +216,7 @@ body {
 `,
     "utf8"
   );
-  await writeFile2(
+  await writeFile(
     path.join(pressRoot, "theme", "base", "typography.css"),
     `h1,
 h2,
@@ -221,25 +225,13 @@ p {
   margin: 0;
 }
 
-h1 {
-  font-family: var(--openpress-font-serif, Georgia, serif);
-  font-size: clamp(42px, 8cqw, 72px);
-  line-height: 1;
-  font-weight: 500;
-}
-
-p {
-  font-size: clamp(16px, 2cqw, 22px);
-  line-height: 1.5;
-}
-
 code {
   font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
 }
 `,
     "utf8"
   );
-  await writeFile2(
+  await writeFile(
     path.join(pressRoot, "theme", "base", "print.css"),
     `@media print {
   html,
@@ -250,41 +242,363 @@ code {
 `,
     "utf8"
   );
-  await writeFile2(path.join(pressRoot, "theme", "page-surfaces", "cover.css"), "/* Starter cover surface. */\n", "utf8");
-  await writeFile2(path.join(pressRoot, "theme", "page-surfaces", "back-cover.css"), "/* Starter back-cover surface. */\n", "utf8");
-  await writeFile2(path.join(pressRoot, "theme", "page-surfaces", "toc.css"), "/* Starter TOC surface. */\n", "utf8");
-  await writeFile2(path.join(pressRoot, "theme", "shell", "reader-controls.css"), "/* Starter reader controls surface. */\n", "utf8");
-  await writeFile2(
-    path.join(pressRoot, "theme", "tokens.css"),
-    `:root {
-  --openpress-font-body: system-ui, sans-serif;
-  --openpress-font-serif: Georgia, serif;
+  await writeFile(path.join(pressRoot, "theme", "page-surfaces", "cover.css"), "/* Starter cover surface. */\n", "utf8");
+  await writeFile(path.join(pressRoot, "theme", "page-surfaces", "back-cover.css"), "/* Starter back-cover surface. */\n", "utf8");
+  await writeFile(path.join(pressRoot, "theme", "page-surfaces", "toc.css"), "/* Starter TOC surface. */\n", "utf8");
+  await writeFile(path.join(pressRoot, "theme", "shell", "reader-controls.css"), "/* Starter reader controls surface. */\n", "utf8");
+}
+async function writePagesPress(typedRoot, { folder, title }) {
+  await mkdir(path.join(typedRoot, "chapters", "01-intro", "content"), { recursive: true });
+  await writeFile(
+    path.join(typedRoot, "press.tsx"),
+    `import { Press } from "@open-press/core";
+import { mdxSource } from "@open-press/core/mdx";
+import { Sections, Toc } from "@open-press/core/manuscript";
+
+export default function ${componentNameFromFolder(folder)}Press() {
+  return (
+    <Press
+      slug="${escapeJsxAttribute(folder)}"
+      title="${escapeJsxAttribute(title)}"
+      type="pages"
+      page="a4"
+      componentsDir="./components"
+      mediaDir="./media"
+      sources={[mdxSource({ id: "${escapeJsxAttribute(folder)}", preset: "section-folders", root: "${escapeJsxAttribute(folder)}/chapters" })]}
+    >
+      <Toc source="${escapeJsxAttribute(folder)}" maxLevel={2} />
+      <Sections source="${escapeJsxAttribute(folder)}" />
+    </Press>
+  );
+}
+`,
+    "utf8"
+  );
+  await writeFile(
+    path.join(typedRoot, "chapters", "01-intro", "content", "01-intro.mdx"),
+    `# ${escapeText(title)}
+
+Start writing this OpenPress document here.
+`,
+    "utf8"
+  );
+}
+async function writeSlidesPress(typedRoot, { folder, title }) {
+  await mkdir(path.join(typedRoot, "ui"), { recursive: true });
+  await mkdir(path.join(typedRoot, "layouts"), { recursive: true });
+  await writeFile(
+    path.join(typedRoot, "press.tsx"),
+    `import { Press, Text } from "@open-press/core";
+import { TitleSlide } from "./layouts/title-slide";
+import { TitledContentSlide } from "./layouts/titled-content-slide";
+import { Timeline } from "./ui/timeline";
+import "./theme/slides.css";
+
+export default function ${componentNameFromFolder(folder)}Press() {
+  return (
+    <Press
+      slug="${escapeJsxAttribute(folder)}"
+      title="${escapeJsxAttribute(title)}"
+      type="slides"
+      page="slide-16-9"
+      componentsDir="./components"
+      mediaDir="./media"
+    >
+      <TitleSlide id="cover">
+        <TitleSlide.Title objectId="title">${escapeText(title)}</TitleSlide.Title>
+        <TitleSlide.Description objectId="description">
+          A concise deck authored as editable OpenPress source.
+        </TitleSlide.Description>
+      </TitleSlide>
+
+      <TitledContentSlide id="problem-context">
+        <TitledContentSlide.Eyebrow objectId="eyebrow">Context</TitledContentSlide.Eyebrow>
+        <TitledContentSlide.Title objectId="title">Problem Context</TitledContentSlide.Title>
+        <TitledContentSlide.Content>
+          <Text as="p" objectId="summary">Write visible slide content directly in JSX.</Text>
+        </TitledContentSlide.Content>
+      </TitledContentSlide>
+
+      <TitledContentSlide id="workflow">
+        <TitledContentSlide.Eyebrow objectId="eyebrow">Process</TitledContentSlide.Eyebrow>
+        <TitledContentSlide.Title objectId="title">Workflow</TitledContentSlide.Title>
+        <TitledContentSlide.Content>
+          <Timeline>
+            <Timeline.Item id="draft" marker="01" title="Draft">Create the first structure.</Timeline.Item>
+            <Timeline.Item id="review" marker="02" title="Review">Tighten content and layout.</Timeline.Item>
+            <Timeline.Item id="export" marker="03" title="Export">Render PDF or images.</Timeline.Item>
+          </Timeline>
+        </TitledContentSlide.Content>
+      </TitledContentSlide>
+    </Press>
+  );
+}
+`,
+    "utf8"
+  );
+  await writeFile(
+    path.join(typedRoot, "components", "DeckSlide.tsx"),
+    `import { PageFolio, Slide } from "@open-press/core";
+import type { ReactNode } from "react";
+
+export function DeckSlide({
+  id,
+  variant = "default",
+  children,
+}: {
+  id: string;
+  variant?: "default" | "cover";
+  children: ReactNode;
+}) {
+  return (
+    <Slide id={id} className={\`op-slide op-slide--\${variant}\`}>
+      <div className="op-slide__surface">
+        <main className="op-slide__content">{children}</main>
+        <footer className="op-slide__footer">
+          <PageFolio variant="slash" currentFormat="2-digit" totalFormat="2-digit" />
+        </footer>
+      </div>
+    </Slide>
+  );
+}
+`,
+    "utf8"
+  );
+  await writeFile(
+    path.join(typedRoot, "layouts", "title-slide.tsx"),
+    `import { Text, type TextProps } from "@open-press/core";
+import type { ReactNode } from "react";
+import { DeckSlide } from "../components/DeckSlide";
+
+function TitleSlideRoot({ id, children }: { id: string; children: ReactNode }) {
+  return (
+    <DeckSlide id={id} variant="cover">
+      <section className="op-title-slide">{children}</section>
+    </DeckSlide>
+  );
+}
+
+function TitleSlideTitle(props: Omit<TextProps, "as" | "label">) {
+  return <Text as="h1" label="Title" className="op-slide-title" {...props} />;
+}
+
+function TitleSlideDescription(props: Omit<TextProps, "as" | "label">) {
+  return <Text as="p" label="Description" className="op-slide-description" {...props} />;
+}
+
+export const TitleSlide = Object.assign(TitleSlideRoot, {
+  Title: TitleSlideTitle,
+  Description: TitleSlideDescription,
+});
+`,
+    "utf8"
+  );
+  await writeFile(
+    path.join(typedRoot, "layouts", "titled-content-slide.tsx"),
+    `import { Text, type TextProps } from "@open-press/core";
+import type { ReactNode } from "react";
+import { DeckSlide } from "../components/DeckSlide";
+
+function TitledContentSlideRoot({ id, children }: { id: string; children: ReactNode }) {
+  return (
+    <DeckSlide id={id}>
+      <section className="op-titled-content-slide">{children}</section>
+    </DeckSlide>
+  );
+}
+
+function TitledContentSlideEyebrow(props: Omit<TextProps, "as" | "label">) {
+  return <Text as="p" label="Eyebrow" className="op-slide-eyebrow" {...props} />;
+}
+
+function TitledContentSlideTitle(props: Omit<TextProps, "as" | "label">) {
+  return <Text as="h2" label="Title" className="op-slide-heading" {...props} />;
+}
+
+function TitledContentSlideDescription(props: Omit<TextProps, "as" | "label">) {
+  return <Text as="p" label="Description" className="op-slide-description" {...props} />;
+}
+
+function TitledContentSlideContent({ children }: { children: ReactNode }) {
+  return <div className="op-slide-body">{children}</div>;
 }
+
+export const TitledContentSlide = Object.assign(TitledContentSlideRoot, {
+  Eyebrow: TitledContentSlideEyebrow,
+  Title: TitledContentSlideTitle,
+  Description: TitledContentSlideDescription,
+  Desc: TitledContentSlideDescription,
+  Content: TitledContentSlideContent,
+});
 `,
     "utf8"
   );
-  await writeFile2(
-    path.join(pressRoot, "index.tsx"),
-    `import { Frame, Press, Workspace } from "@open-press/core";
+  await writeFile(
+    path.join(typedRoot, "ui", "timeline.tsx"),
+    `import { Text } from "@open-press/core";
+import type { ReactNode } from "react";
+
+function TimelineRoot({ children }: { children: ReactNode }) {
+  return <ol className="op-timeline">{children}</ol>;
+}
 
-export default function OpenPressDocument() {
+function TimelineItem({
+  id,
+  marker,
+  title,
+  children,
+}: {
+  id: string;
+  marker: string;
+  title: string;
+  children: ReactNode;
+}) {
   return (
-    <Workspace name="${escapeJsxAttribute(title)}">
-      <Press title="${escapeJsxAttribute(title)}">
-        <Frame frameKey="cover" role="manuscript.cover">
-          <main style={{ padding: "72px", fontFamily: "var(--openpress-font-serif, Georgia, serif)" }}>
-            <p style={{ letterSpacing: "0.12em", textTransform: "uppercase" }}>OpenPress</p>
-            <h1>${escapeText(title)}</h1>
-            <p>Edit <code>press/index.tsx</code>, then run <code>npm run dev</code>.</p>
-          </main>
-        </Frame>
-      </Press>
-    </Workspace>
+    <li className="op-timeline__item">
+      <Text as="span" objectId={\`\${id}-marker\`} label="Timeline marker" className="op-timeline__marker">{marker}</Text>
+      <div>
+        <Text as="h3" objectId={\`\${id}-title\`} label="Timeline title" className="op-timeline__title">{title}</Text>
+        <Text as="p" objectId={\`\${id}-body\`} label="Timeline body" className="op-timeline__body">{children}</Text>
+      </div>
+    </li>
   );
 }
+
+export const Timeline = Object.assign(TimelineRoot, {
+  Item: TimelineItem,
+});
+`,
+    "utf8"
+  );
+  await writeFile(
+    path.join(typedRoot, "ui", "text.tsx"),
+    `export { Text } from "@open-press/core";
+export type { TextProps } from "@open-press/core";
 `,
     "utf8"
   );
+  await writeFile(path.join(typedRoot, "ui", "card.tsx"), `import type { ReactNode } from "react";
+
+export function Card({ children }: { children: ReactNode }) {
+  return <article className="op-card">{children}</article>;
+}
+`, "utf8");
+  await writeFile(path.join(typedRoot, "theme", "tokens.css"), `:root {
+  --op-slide-bg: #f8fafc;
+  --op-slide-fg: #17202a;
+  --op-slide-muted: #607084;
+  --op-slide-accent: #2563eb;
+}
+`, "utf8");
+  await writeFile(
+    path.join(typedRoot, "theme", "slides.css"),
+    `@import "./tokens.css";
+
+.op-slide {
+  background: var(--op-slide-bg);
+  color: var(--op-slide-fg);
+  font-family: Inter, ui-sans-serif, system-ui, sans-serif;
+}
+
+.op-slide__surface {
+  width: 100%;
+  height: 100%;
+  padding: 92px 112px;
+  display: grid;
+  grid-template-rows: 1fr auto;
+}
+
+.op-slide__content {
+  min-width: 0;
+}
+
+.op-slide__footer {
+  color: var(--op-slide-muted);
+  display: flex;
+  justify-content: flex-end;
+  font-size: 22px;
+}
+
+.op-title-slide,
+.op-titled-content-slide {
+  display: grid;
+  gap: 28px;
+}
+
+.op-title-slide {
+  align-content: center;
+  max-width: 1180px;
+}
+
+.op-slide-title {
+  font-size: 112px;
+  line-height: 1;
+}
+
+.op-slide-heading {
+  font-size: 72px;
+  line-height: 1.08;
+}
+
+.op-slide-eyebrow {
+  color: var(--op-slide-accent);
+  font-size: 24px;
+  font-weight: 700;
+  text-transform: uppercase;
+}
+
+.op-slide-description,
+.op-slide-body {
+  color: var(--op-slide-muted);
+  font-size: 34px;
+  line-height: 1.35;
+}
+
+.op-timeline {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 24px;
+  padding: 0;
+  margin: 24px 0 0;
+  list-style: none;
+}
+
+.op-timeline__item {
+  background: #ffffff;
+  border: 1px solid #dbe3ef;
+  display: grid;
+  gap: 18px;
+  padding: 28px;
+}
+
+.op-timeline__marker {
+  color: var(--op-slide-accent);
+  font-size: 24px;
+  font-weight: 800;
+}
+
+.op-timeline__title {
+  font-size: 34px;
+}
+
+.op-timeline__body {
+  color: var(--op-slide-muted);
+  font-size: 26px;
+  line-height: 1.35;
+}
+`,
+    "utf8"
+  );
+}
+function folderNameFromPressName(value) {
+  const base = path.basename(value);
+  const folder = base.trim().toLowerCase().replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
+  return folder || "press";
+}
+function componentNameFromFolder(folder) {
+  const words = folder.split(/[-_]+/).filter(Boolean);
+  const name = words.map((word) => word.slice(0, 1).toUpperCase() + word.slice(1)).join("");
+  return name || "OpenPress";
 }
 function escapeJsxAttribute(value) {
   return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
@@ -332,7 +646,7 @@ function printNextSteps(target, options) {
     "",
     "Then open the local URL printed by Vite (typically http://127.0.0.1:5173/workspace).",
     "",
-    "Use an OpenPress-ready skill to add or adapt the press source tree.",
+    "Use openpress-create-pages for a page-based artifact or openpress-create-slide for a deck.",
     ""
   );
   process.stdout.write(lines.join("\n"));
@@ -348,7 +662,8 @@ Usage:
   open-press skills <add|update> [--source <owner/repo>]
 
 Init flags:
-  --title <s>              Document title (written into <Press title="..."> in press/index.tsx)
+  --title <s>              Document title (written into <Press title="...">)
+  --type <pages|slides>    Required. Scaffold a Press under press/<target-name>/
   --no-git                 Skip git init
   --no-install             Skip npm install
   --skills                 Install OpenPress agent skills after scaffolding
@@ -371,8 +686,8 @@ Runtime commands:
   skills                   Install or update OpenPress agent skills
 
 Examples:
-  npx @open-press/cli init my-doc
-  npx @open-press/cli init my-brief --title "Q2 Brief"
+  npx @open-press/cli init my-doc --type pages
+  npx @open-press/cli init my-brief --type slides --title "Q2 Brief"
   npx open-press dev .
   npx open-press image .
 `;
@@ -411,6 +726,7 @@ function parseInitArgs(args) {
   const options = {
     target: "",
     title: void 0,
+    type: void 0,
     git: true,
     install: true,
     skills: false
@@ -421,6 +737,17 @@ function parseInitArgs(args) {
       case "--title":
         options.title = args[++i];
         break;
+      case "--type": {
+        const type = args[++i];
+        if (type !== "pages" && type !== "slides") {
+          process2.stderr.write(`Invalid --type: ${type}. Expected "pages" or "slides".
+
+`);
+          return null;
+        }
+        options.type = type;
+        break;
+      }
       case "--no-git":
         options.git = false;
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-press/cli",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "type": "module",
   "description": "Command line interface for OpenPress workspaces.",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@open-press/core": "1.2.0"
+    "@open-press/core": "1.3.1"
   },
   "devDependencies": {
     "@types/node": "^25.8.0",