latex update
This commit is contained in:
@@ -2300,9 +2300,21 @@ class Production extends Base
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
//单行处理公式内容
|
//单行处理公式内容
|
||||||
$pattern = '/^<wmath[^>]*?\s+data-latex="([^"]*)"[^>]*?>.*?<\/wmath>$/';
|
/* $pattern = '/^<wmath[^>]*?\s+data-latex="([^"]*)"[^>]*?>.*?<\/wmath>$/';*/
|
||||||
|
// if(preg_match($pattern, $content) === 1){
|
||||||
|
// $pattern1 = '/<wmath[^>]*?\s+data-latex="([^"]*)">/';
|
||||||
|
// if (preg_match($pattern1, $content, $matches)) {
|
||||||
|
// $latexContent = $matches[1];
|
||||||
|
// // 将 $$ 转换为 $,因为equation环境不需要$$
|
||||||
|
// $latexContent = str_replace('$$', '', $latexContent);
|
||||||
|
//
|
||||||
|
// return "\\begin{equation}\n\t{$latexContent}\n\\end{equation}";
|
||||||
|
// }
|
||||||
|
// return $content;
|
||||||
|
// }
|
||||||
|
$pattern = '/^<wmath[^>]*?\s+data-latex="([^"]*)"[^>]*?\s+data-wrap="block"[^>]*?>.*?<\/wmath>$/';
|
||||||
if(preg_match($pattern, $content) === 1){
|
if(preg_match($pattern, $content) === 1){
|
||||||
$pattern1 = '/<wmath[^>]*?\s+data-latex="([^"]*)">/';
|
$pattern1 = '/<wmath[^>]*?\s+data-latex="([^"]*)"[^>]*?\s+data-wrap="block"[^>]*?>/';
|
||||||
if (preg_match($pattern1, $content, $matches)) {
|
if (preg_match($pattern1, $content, $matches)) {
|
||||||
$latexContent = $matches[1];
|
$latexContent = $matches[1];
|
||||||
// 将 $$ 转换为 $,因为equation环境不需要$$
|
// 将 $$ 转换为 $,因为equation环境不需要$$
|
||||||
@@ -2360,7 +2372,7 @@ class Production extends Base
|
|||||||
$latex .= $this->escapeLatexSpecialChars($content);
|
$latex .= $this->escapeLatexSpecialChars($content);
|
||||||
$content = '';
|
$content = '';
|
||||||
}else {
|
}else {
|
||||||
$tagOpen = "<{$nextTag}>";
|
$tagOpen = "<{$nextTag}";
|
||||||
$tagClose = "</{$nextTag}>";
|
$tagClose = "</{$nextTag}>";
|
||||||
$beginTag = strpos($content, $tagOpen);
|
$beginTag = strpos($content, $tagOpen);
|
||||||
|
|
||||||
@@ -2450,7 +2462,7 @@ class Production extends Base
|
|||||||
* @return int|false 闭合标签的起始位置
|
* @return int|false 闭合标签的起始位置
|
||||||
*/
|
*/
|
||||||
private function getLastTabIndex($content, $tag) {
|
private function getLastTabIndex($content, $tag) {
|
||||||
$tagOpen = "<{$tag}>";
|
$tagOpen = "<{$tag}";
|
||||||
$tagClose = "</{$tag}>";
|
$tagClose = "</{$tag}>";
|
||||||
|
|
||||||
$beginTag = strpos($content, $tagOpen);
|
$beginTag = strpos($content, $tagOpen);
|
||||||
@@ -2466,7 +2478,7 @@ class Production extends Base
|
|||||||
|
|
||||||
// 统计当前标签内的开放标签数量
|
// 统计当前标签内的开放标签数量
|
||||||
$caNowStr = substr($content, $beginTag, $endTagCa - $beginTag + strlen($tagClose));
|
$caNowStr = substr($content, $beginTag, $endTagCa - $beginTag + strlen($tagClose));
|
||||||
$caCount = preg_match_all("/<{$tag}>/", $caNowStr, $matches);
|
$caCount = preg_match_all("/<{$tag}/", $caNowStr, $matches);
|
||||||
|
|
||||||
if ($caCount === 1) {
|
if ($caCount === 1) {
|
||||||
return $endTagCa;
|
return $endTagCa;
|
||||||
@@ -2479,7 +2491,7 @@ class Production extends Base
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$substring = substr($content, $beginTag, $numIndex - $beginTag + strlen($tagClose));
|
$substring = substr($content, $beginTag, $numIndex - $beginTag + strlen($tagClose));
|
||||||
$ccaCount = preg_match_all("/<{$tag}>/", $substring, $matches);
|
$ccaCount = preg_match_all("/<{$tag}/", $substring, $matches);
|
||||||
if ($ccaCount !== $caCount) {
|
if ($ccaCount !== $caCount) {
|
||||||
$caCount = $ccaCount;
|
$caCount = $ccaCount;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user