From d685bee5422c44d145ae6ee7a38f8a5ff31b0b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= Date: Sun, 4 Oct 2020 17:14:41 +0200 Subject: [PATCH] Fix fluorescence support for fromXLSToLaTeX format --- tools/lib/formats/default/fromXLSToLaTeXHandler.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/lib/formats/default/fromXLSToLaTeXHandler.py b/tools/lib/formats/default/fromXLSToLaTeXHandler.py index 9e3d581e..2d6032e2 100644 --- a/tools/lib/formats/default/fromXLSToLaTeXHandler.py +++ b/tools/lib/formats/default/fromXLSToLaTeXHandler.py @@ -21,8 +21,12 @@ def GetTypeFromAcronym(acronym): return None else: raise ValueError("acronym not recognised") -def GetFullState(TexState,datatype=DataType.ABS,VR=None,typeAcronym=None,Soup=True): - statemath=str(extractMath(TexState)) +def GetFullState(TexState,defaultDatatype=DataType.ABS,VR=None,typeAcronym=None,Soup=True): + datatype=defaultDatatype + lst=list(TexState) + if len(lst)>1 and lst[1].value=="F": + datatype=DataType.FLUO + statemath=str(list(lst[0].contents)[0]) resultstr=statemath fulltype=[] if datatype==DataType.FLUO: