diff options
| -rw-r--r-- | src/Text/Pandoc/Readers/LaTeX.hs | 4 | ||||
| -rw-r--r-- | windows/pandoc.wxs | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 408a05cdf..411369a05 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -200,8 +200,6 @@ inline = (mempty <$ comment) <|> (str "\160" <$ char '~') <|> mathDisplay (string "$$" *> mathChars <* string "$$") <|> mathInline (char '$' *> mathChars <* char '$') - <|> try (superscript <$> (char '^' *> tok)) - <|> (subscript <$> (char '_' *> tok)) <|> (guardEnabled Ext_literate_haskell *> char '|' *> doLHSverb) <|> (str . (:[]) <$> tildeEscape) <|> (str . (:[]) <$> oneOf "[]") @@ -826,7 +824,7 @@ inlineText :: LP Inlines inlineText = str <$> many1 inlineChar inlineChar :: LP Char -inlineChar = noneOf "\\$%^_&~#{}^'`\"‘’“”-[] \t\n" +inlineChar = noneOf "\\$%&~#{}^'`\"‘’“”-[] \t\n" environment :: LP Blocks environment = do diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs index 0403be2a5..fea3ec554 100644 --- a/windows/pandoc.wxs +++ b/windows/pandoc.wxs @@ -110,10 +110,21 @@ may need to restart Cmd/Powershell windows before using it." /> + <CustomAction Id="CustomWixSetPerUserFolder" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder][ApplicationFolderName]" Execute="immediate" /> + + <InstallExecuteSequence> + <Custom Action="CustomWixSetPerUserFolder" After="WixSetPerUserFolder"> + ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))) + </Custom> + </InstallExecuteSequence> + <InstallUISequence> <Custom Action="SetExitDialogOptText" Before="ExecuteAction"> NOT Installed </Custom> + <Custom Action="CustomWixSetPerUserFolder" After="WixSetPerUserFolder"> + ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))) + </Custom> </InstallUISequence> <CustomActionRef Id="WixBroadcastSettingChange" /> |