diff --git a/application/common/LatexContent.php b/application/common/LatexContent.php index 880f61d..0ec1315 100644 --- a/application/common/LatexContent.php +++ b/application/common/LatexContent.php @@ -700,12 +700,6 @@ page={{stage_page}},%号 $latexLines[] = " \\centering"; $latexLines[] = " \\includegraphics[width=0.9\\textwidth]{" . $sImageUrl . "}"; } - - //添加图片的label - $ami_id = empty($aImageInfo['ami_id']) ? 0 : $aImageInfo['ami_id']; - if(!empty($ami_id)){ - $latexLines[] = " \\label{fig:" . $ami_id . "}"; - } if(!empty($aImageInfo['title']) && !empty($aImageInfo['note'])){ $escapedTitle = '{\fontspec{Calibri}\footnotesize\bfseries\color{figerTitleColor} '.$this->dealContent(preg_replace('/^Figure\s+\d+\s*/i', '', $aImageInfo['title']),[]).'}\\\\'; @@ -713,10 +707,15 @@ page={{stage_page}},%号 $latexLines[] = " \\caption{" . $escapedTitle . "}"; } - if (!empty($ami_info['title'])) { - $escapedTitle = $this->dealContent(preg_replace('/^Figure\s+\d+\s*/i', '', $ami_info['title']),[]); + if (!empty($aImageInfo['title']) && empty($aImageInfo['note'])) { + $escapedTitle = $this->dealContent(preg_replace('/^Figure\s+\d+\s*/i', '', $aImageInfo['title']),[]); $latexLines[] = " \\caption{" . $escapedTitle . "}"; } + //添加图片的label + $ami_id = empty($aImageInfo['ami_id']) ? 0 : $aImageInfo['ami_id']; + if(!empty($ami_id)){ + $latexLines[] = " \\label{fig:" . $ami_id . "}"; + } $latexLines[] = "\\end{figure" . ($isWideImage ? "*" : "") . "}"; return ['status' => 1,'msg' => 'success','data' => implode("\n", $latexLines)];