From eae4992f0a155838308608636a6f1b356d36dd64 Mon Sep 17 00:00:00 2001 From: TMueller83 Date: Tue, 11 Jun 2019 18:40:38 +0200 Subject: [PATCH 1/2] Improved comment_out check Improve the test if '\usepackage{sagetex}' is commented out in the LaTeX source file. See #33. --- scripts.dtx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts.dtx b/scripts.dtx index 4520e17..1ba79a8 100644 --- a/scripts.dtx +++ b/scripts.dtx @@ -56,14 +56,13 @@ if sys.argv[1].endswith('.sagetex.sage'): else: src = os.path.splitext(sys.argv[1])[0] -commented_out = r'^\s*%' usepackage = r'\usepackage(\[.*\])?{sagetex}' uses_sagetex = False # if it doesn't use sagetex, obviously running sage is unnecessary with open(src + '.tex') as texf: for line in texf: - if not re.search(commented_out, line) and re.search(usepackage, line): + if re.search(usepackage, line.split('%')[0]): uses_sagetex = True break From 3211cffcb629beaeea9f00253b50809f31762566 Mon Sep 17 00:00:00 2001 From: TMueller83 Date: Wed, 4 Sep 2019 23:21:26 +0200 Subject: [PATCH 2/2] Fix to not regard `\%` as beginning of a comment --- scripts.dtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.dtx b/scripts.dtx index 1ba79a8..a751c22 100644 --- a/scripts.dtx +++ b/scripts.dtx @@ -62,7 +62,7 @@ uses_sagetex = False # if it doesn't use sagetex, obviously running sage is unnecessary with open(src + '.tex') as texf: for line in texf: - if re.search(usepackage, line.split('%')[0]): + if re.search(usepackage, line.replace(r'\%', '').split('%')[0]): uses_sagetex = True break