Commit 2c6872fd33b4d90355eac386364b9271b21d5fcd - mediawiki2latex

Update upstream source from tag 'upstream/7.51' Update to upstream version '7.51' with Debian dir 2d281ee725ab9d9ab59291592a91a440f89cfed3 georgesk 10 months ago

6 changed file(s) with 25 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all

-0

ChangeLog less more

	0	Version 7.51
	1	* src
	2	fixing latex error message for no line here to end
	3	in citations inside lists
	4	removing superflous tables
	5	removal of superfluous content introduced by
	6	new wikipedia website layout
	7	added link and img tags be allowed to also closed
	8	with > instead of />
0	9	Version 7.50
1	10	* src
2	11	removal of superfluous content introduced by

-1

mediawiki2latex.cabal less more

0	0	Name: mediawiki2latex
1		Version: 7.50
	1	Version: 7.51
2	2	License: GPL
3	3	License-File: LICENSE
4	4	Author: Dirk Hünniger <dirk.hunniger@googlemail.com>

-1

src/Compiler.hs less more

84	84	templates
85	85	tabs
86	86	formulas (vectorr st))
87		HTML No -> do --liftIO (Tools.writeFile "/home/dirk/dhudhu" (show (printPrepareTree(parseit minparsers text))))
	87	HTML No -> do -- liftIO (Tools.writeFile "/home/dirk/dhudhu" (show (printPrepareTree(parseit minparsers text))))
88	88	return
89	89	(run b mylanguage mytitle
90	90	(printPrepareTree (parseit minparsers text))

-3

src/LatexRenderer.hs less more

471	471	outputLastRowOfHeader = 0, inputLastRowOfHeader = 0,
472	472	lastRowHadEmptyMultiRowMap = True,
473	473	outputTableHasHeaderRows = False, activeColumn = Nothing}
474		put $ newstate{getF = getF st}
475		r <- return $
	474	if spec == "" then return () else put $ newstate{getF = getF st}
	475	r <- if spec == "" then treeToLaTeX2 l else return $
476	476	lsb ++
477	477	sb ++
478	478	(if (env /= "tabular") then "\n" else "\\scalebox{0.85}{") ++

2645	2645	= do st <- get
2646	2646	walk ((fontsetter (font st)) ++ "\\textsubscript{") l "}"
2647	2647	nodeToLaTeX (Environment Tag (TagAttr "cite" _) l)
2648		= walk "\\newline\n \\quad {\\scshape " l "}"
	2648	= walk "{$\\text{ }$}\\newline\n\\quad {\\scshape " l "}"
2649	2649	nodeToLaTeX (Environment Sup (Str s) _)
2650	2650	= return $ "{$^{\\textrm{\\scriptsize " ++ s ++ "}}$}"
2651	2651	nodeToLaTeX (Environment Sub (Str s) _)

+10

-5

src/MediaWikiParser.hs less more

1128	1128
1129	1129	attr :: GenParser Char () ([Char], [Char])
1130	1130	attr
1131		= do try (skipMany1 (oneOf " \n")) <\|> (lookAhead (char '=')>> return ())
	1131	= do try (skipMany1 (oneOf " \t\n")) <\|> (lookAhead (char '=')>> return ())
1132	1132	k <- try (many1 (try (alphaNum) <\|> oneOf ":-")) <\|> (((lookAhead (char '=')) >> return "class"))
1133	1133	v <- try
1134		(do skipMany (oneOf " \n")
	1134	(do skipMany (oneOf " \t\n")
1135	1135	_ <- char '='
1136		skipMany (oneOf " \n")
	1136	skipMany (oneOf " \t\n")
1137	1137	vv <- try
1138	1138	(do _ <- try (char '"')
1139	1139	vvv <- many (attrinside "\"><")

1250	1250	return (),
1251	1251	allowed = SpaceIndent : everywheretbl, self = Tag}
1252	1252
1253		{-DHUN\| Parser for the 'meta' tag of HTML DHUN-}
	1253	{-DHUN\| Parser for the 'meta' and 'link' tag of HTML DHUN-}
1254	1254
1255	1255	metatagparser :: MyParser Char
1256	1256	metatagparser
1257	1257	= baseParser{start =
1258	1258	\ _ ->
1259	1259	do _ <- string "<"
1260		t <- (oneOfTheStrings ["meta"])
	1260	t <- (oneOfTheStrings ["meta", "link", "img"])
1261	1261	atr <- many (try (attr))
1262	1262	_ <- try (many (oneOf " \n")) <\|> return []
1263	1263	_ <- try (char '/') <\|> (return '/')

1949	1949	printPrepareNode (Environment Tag (TagAttr "div" m) _)
1950	1950	\| (Map.lookup "id" m) == (Just "vector-user-links-dropdown")
1951	1951	= []
	1952	printPrepareNode (Environment Tag (TagAttr "div" m) _)
	1953	\| (Map.lookup "class" m) == (Just "vector-settings")
	1954	= []
	1955
	1956
1952	1957	printPrepareNode (Environment Tag (TagAttr "div" m) _)
1953	1958	\| (Map.lookup "id" m) == (Just "p-personal")
1954	1959	= []

-1

src/mediawiki2latex.hs less more

202	202
203	203	versionHeader :: String
204	204	versionHeader
205		= "mediawiki2latex version 7.50\n" ++ (usageInfo header options)
	205	= "mediawiki2latex version 7.51\n" ++ (usageInfo header options)
206	206
207	207	{-DHUN\| print the version string of mediawiki2latex. Takes the output of the compilerOpts function as input. Prints the version string if no options were given or the version command was given does noting otherwise DHUN-}
208	208