merge: KaTeX support (#261)

Closes #174
This commit is contained in:
Marie 2023-12-25 21:28:25 +01:00
commit a67d31c963
4 changed files with 55 additions and 3 deletions

View file

@ -51,6 +51,7 @@
"insert-text-at-cursor": "0.3.0", "insert-text-at-cursor": "0.3.0",
"is-file-animated": "1.0.2", "is-file-animated": "1.0.2",
"json5": "2.2.3", "json5": "2.2.3",
"katex": "^0.16.9",
"matter-js": "0.19.0", "matter-js": "0.19.0",
"misskey-js": "workspace:*", "misskey-js": "workspace:*",
"photoswipe": "5.4.3", "photoswipe": "5.4.3",

View file

@ -0,0 +1,33 @@
<!--
SPDX-FileCopyrightText: dakkar, MoshiBar, and other Sharkey contributors
SPDX-License-Identifier: AGPL-3.0-only
-->
<template>
<div v-if="block" :class="$style.block" v-html="renderedFormula"></div>
<span v-else v-html="renderedFormula"></span>
</template>
<script lang="ts" setup>
import { computed } from 'vue';
import katex from 'katex';
import 'katex/dist/katex.min.css';
const props = defineProps<{
formula: string;
block: boolean;
}>();
const renderedFormula = computed(() =>
katex.renderToString(props.formula, {
throwOnError: false,
trust: false,
displayMode: props.block,
} as any));
</script>
<style lang="scss" module>
.block {
text-align: center;
}
</style>

View file

@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { VNode, h } from 'vue'; import { VNode, h, defineAsyncComponent } from 'vue';
import * as mfm from '@sharkey/sfm-js'; import * as mfm from '@sharkey/sfm-js';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import MkUrl from '@/components/global/MkUrl.vue'; import MkUrl from '@/components/global/MkUrl.vue';
@ -61,6 +61,8 @@ export default function(props: MfmProps) {
const useAnim = defaultStore.state.advancedMfm && defaultStore.state.animatedMfm ? true : props.isAnim ? true : false; const useAnim = defaultStore.state.advancedMfm && defaultStore.state.animatedMfm ? true : props.isAnim ? true : false;
const MkFormula = defineAsyncComponent(() => import('@/components/MkFormula.vue'));
/** /**
* Gen Vue Elements from MFM AST * Gen Vue Elements from MFM AST
* @param ast MFM AST * @param ast MFM AST
@ -410,11 +412,17 @@ export default function(props: MfmProps) {
} }
case 'mathInline': { case 'mathInline': {
return [h('code', token.props.formula)]; return [h(MkFormula, {
formula: token.props.formula,
block: false,
})];
} }
case 'mathBlock': { case 'mathBlock': {
return [h('code', token.props.formula)]; return [h(MkFormula, {
formula: token.props.formula,
block: true,
})];
} }
case 'search': { case 'search': {

View file

@ -756,6 +756,9 @@ importers:
json5: json5:
specifier: 2.2.3 specifier: 2.2.3
version: 2.2.3 version: 2.2.3
katex:
specifier: ^0.16.9
version: 0.16.9
matter-js: matter-js:
specifier: 0.19.0 specifier: 0.19.0
version: 0.19.0 version: 0.19.0
@ -14554,6 +14557,13 @@ packages:
safe-buffer: 5.2.1 safe-buffer: 5.2.1
dev: false dev: false
/katex@0.16.9:
resolution: {integrity: sha512-fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ==}
hasBin: true
dependencies:
commander: 9.5.0
dev: false
/keyv@4.5.4: /keyv@4.5.4:
resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
dependencies: dependencies: