quotes

packages/doc-builder/src/css/custom.css

@@ -61,4 +61,9 @@
 .sponsor-button:hover {
 	background-color: var(--ifm-color-primary-lighter);
 	color: white;
+}
+
+/* So that the code in markdown.md wraps. Otherwise the table takes too much space horizontally */
+pre code {
+	white-space: pre-wrap;
 }

packages/tools/website/processDocs.test.ts

@@ -16,7 +16,7 @@ const makeTestCases = () => {
 	for (const file of files) {
 		if (file.endsWith('.mdx')) continue;
 
-		// if (!file.endsWith('escaped_code.md')) continue;
+		// if (!file.endsWith('blockquotes.md')) continue;
 
 		const sourcePath = `${sampleDir}/${file}`;
 		const outputPath = `${sampleDir}/${basename(file, '.md')}.mdx`;

packages/tools/website/processDocs.ts

@@ -40,6 +40,7 @@ interface Context {
 	processedFiles?: string[];
 	isNews?: boolean;
 	donateLinks?: string;
+	inQuote?: boolean;
 }
 
 const configs: Record<string, Config> = {
@@ -122,7 +123,9 @@ const escapeForMdx = (s: string): string => {
 		.replace(/`/g, '\\`');
 };
 
-const ParagraphBreak = '///PARAGRAPH_BREAK///';
+const paragraphBreak = '///PARAGRAPH_BREAK///';
+const blockQuoteStart = '///BLOCK_QUOTE_START///';
+const blockQuoteEnd = '///BLOCK_QUOTE_END///';
 
 const processToken = (token: any, output: string[], context: Context): void => {
 	if (!context.listStack) context.listStack = [];
@@ -140,13 +143,13 @@ const processToken = (token: any, output: string[], context: Context): void => {
 	const content: string[] = [];
 
 	if (type === 'heading_open') {
-		content.push(ParagraphBreak);
+		content.push(paragraphBreak);
 		content.push(`${token.markup} `);
 	} else if (type === 'heading_close') {
-		content.push(ParagraphBreak);
+		content.push(paragraphBreak);
 	} else if (type === 'paragraph_open' || type === 'paragraph_close') {
 		if (!currentList) {
-			content.push(ParagraphBreak);
+			content.push(paragraphBreak);
 		}
 	} else if (type === 'fence') {
 		context.inFence = true;
@@ -163,11 +166,13 @@ const processToken = (token: any, output: string[], context: Context): void => {
 	} else if (type === 'code_block') {
 		contentProcessed = true;
 		content.push(`\`\`\`\n${token.content}\`\`\``);
-		content.push(ParagraphBreak);
+		content.push(paragraphBreak);
 	} else if (type === 'strong_open' || type === 'strong_close') {
 		content.push('**');
 	} else if (type === 'em_open' || type === 'em_close') {
 		content.push('*');
+	} else if (type === 'blockquote_open' || type === 'blockquote_close') {
+		content.push(type === 'blockquote_open' ? blockQuoteStart : blockQuoteEnd);
 	} else if (type === 'table_open') {
 		context.currentTable = {
 			header: [],
@@ -202,9 +207,9 @@ const processToken = (token: any, output: string[], context: Context): void => {
 		context.currentTableContent = [];
 	} else if (type === 'table_close') {
 		const tableMd = markdownUtils.createMarkdownTable(context.currentTable.header, context.currentTable.rows);
-		content.push(ParagraphBreak);
+		content.push(paragraphBreak);
 		content.push(tableMd);
-		content.push(ParagraphBreak);
+		content.push(paragraphBreak);
 		context.currentTable = null;
 	} else if (type === 'bullet_list_open') {
 		context.listStarting = !context.listStack.length;
@@ -214,7 +219,7 @@ const processToken = (token: any, output: string[], context: Context): void => {
 		context.listStack.push({ type: 'number' });
 	} else if (type === 'bullet_list_close' || type === 'ordered_list_close') {
 		context.listStack.pop();
-		if (!context.listStack.length) content.push(ParagraphBreak);
+		if (!context.listStack.length) content.push(paragraphBreak);
 	} else if (type === 'list_item_open') {
 		if (!context.listStarting) content.push('\n');
 		context.listStarting = false;
@@ -242,7 +247,7 @@ const processToken = (token: any, output: string[], context: Context): void => {
 
 	if (type === 'fence') {
 		content.push('```');
-		content.push(ParagraphBreak);
+		content.push(paragraphBreak);
 		context.inFence = false;
 	}
 
@@ -264,25 +269,49 @@ const processToken = (token: any, output: string[], context: Context): void => {
 const resolveParagraphBreaks = (output: string[]): string[] => {
 	if (!output.length) return output;
 
-	while (output.length && output[0] === ParagraphBreak) {
+	while (output.length && output[0] === paragraphBreak) {
 		output.splice(0, 1);
 	}
 
-	while (output.length && output[output.length - 1] === ParagraphBreak) {
+	while (output.length && output[output.length - 1] === paragraphBreak) {
 		output.pop();
 	}
 
 	let previous = '';
 	const newOutput: string[] = [];
 	for (const s of output) {
-		if (s === ParagraphBreak && previous === ParagraphBreak) continue;
-		newOutput.push(s === ParagraphBreak ? '\n\n' : s);
+		if (s === paragraphBreak && previous === paragraphBreak) continue;
+		newOutput.push(s === paragraphBreak ? '\n\n' : s);
 		previous = s;
 	}
 
 	return newOutput;
 };
 
+const resolveBlockQuotes = (output: string): string => {
+	if (!output) return output;
+
+	const lines = output.split('\n');
+	let inQuotes = false;
+	const quotedLines: string[] = [];
+	const newOutput: string[] = [];
+	for (const line of lines) {
+		if (line === blockQuoteStart) {
+			inQuotes = true;
+		} else if (line === blockQuoteEnd) {
+			inQuotes = false;
+			const s = quotedLines.join('\n').trim().split('\n').map(l => `> ${l}`).join('\n');
+			newOutput.push(s);
+		} else if (inQuotes) {
+			quotedLines.push(line);
+		} else {
+			newOutput.push(line);
+		}
+	}
+
+	return newOutput.join('\n');
+};
+
 const processUrls = (md: string) => {
 	md = md
 		.replace(/https:\/\/github.com\/laurent22\/joplin\/blob\/dev\/readme\/(.*)\/index\.md/g, '/help/$1')
@@ -298,24 +327,24 @@ export const processMarkdownDoc = (sourceContent: string, context: Context): str
 		html: true,
 	});
 
-	let lines: string[] = [];
+	let items: string[] = [];
 
 	markdownIt.core.ruler.push('converter', (state: StateCore) => {
 		const tokens = state.tokens;
 		// console.info(JSON.stringify(tokens, null, '\t'));
 		for (let i = 0; i < tokens.length; i++) {
 			const token = tokens[i];
-			processToken(token, lines, context);
+			processToken(token, items, context);
 		}
 	});
 
 	const mdAndFrontMatter = stripOffFrontMatter(sourceContent);
 
 	markdownIt.render(mdAndFrontMatter.doc);
 
-	lines = resolveParagraphBreaks(lines);
+	items = resolveParagraphBreaks(items);
 
-	const output = processUrls(lines.join('').trim());
+	const output = resolveBlockQuotes(processUrls(items.join('').trim()));
 
 	return compileWithFrontMatter({
 		...mdAndFrontMatter,

packages/tools/website/processDocsTestSamples/blockquotes.md

@@ -0,0 +1,5 @@
+This is a quote:
+
+> "I never said that!"
+>
+> ― Albert Einstein

packages/tools/website/processDocsTestSamples/blockquotes.mdx

@@ -0,0 +1,5 @@
+This is a quote:
+
+> "I never said that!"
+> 
+> ― Albert Einstein

renovate.json5

@@ -28,6 +28,7 @@
 		"packages/app-mobile/android/app/build.gradle",
 		"packages/generate-plugin-doc/**",
 		"packages/plugins/**",
+		"packages/app-builder/**",
 	],
 	"ignoreDeps": [
 		"@babel/core",