diff -Nru mediawiki2latex-7.44/ChangeLog mediawiki2latex-7.45/ChangeLog --- mediawiki2latex-7.44/ChangeLog 2021-08-26 19:23:50.000000000 +0000 +++ mediawiki2latex-7.45/ChangeLog 2021-12-25 11:05:26.000000000 +0000 @@ -1,3 +1,6 @@ +Version 7.45 + * src + remove navigation toolsbars Version 7.44 * src user agent header added to https requests diff -Nru mediawiki2latex-7.44/debian/changelog mediawiki2latex-7.45/debian/changelog --- mediawiki2latex-7.44/debian/changelog 2021-08-27 14:34:06.000000000 +0000 +++ mediawiki2latex-7.45/debian/changelog 2021-12-31 18:20:57.000000000 +0000 @@ -1,3 +1,9 @@ +mediawiki2latex (7.45-1) unstable; urgency=medium + + * new upstream version + + -- Georges Khaznadar Fri, 31 Dec 2021 19:20:57 +0100 + mediawiki2latex (7.44-1) unstable; urgency=medium * new upstream version diff -Nru mediawiki2latex-7.44/mediawiki2latex.cabal mediawiki2latex-7.45/mediawiki2latex.cabal --- mediawiki2latex-7.44/mediawiki2latex.cabal 2021-08-26 19:23:50.000000000 +0000 +++ mediawiki2latex-7.45/mediawiki2latex.cabal 2021-12-25 11:05:26.000000000 +0000 @@ -1,5 +1,5 @@ Name: mediawiki2latex -Version: 7.44 +Version: 7.45 License: GPL License-File: LICENSE Author: Dirk Hünniger diff -Nru mediawiki2latex-7.44/src/GetImages.hs mediawiki2latex-7.45/src/GetImages.hs --- mediawiki2latex-7.44/src/GetImages.hs 2021-08-26 19:23:50.000000000 +0000 +++ mediawiki2latex-7.45/src/GetImages.hs 2021-12-25 11:05:26.000000000 +0000 @@ -68,7 +68,7 @@ String -> WikiUrl -> (Integer, String) -> IO (Maybe ([String], Integer, URL)) getImagePage dir u (i, ss) - = do l <- (mapM (geturl . unify . exportURL . modpath2 ss) + = do l <- (mapM (geturl . kds.unify . exportURL . modpath2 ss) (parses u)) :: IO [String] let xx = (map (getImageUrl2) (zip l (parses u))) :: [Maybe String] @@ -86,6 +86,10 @@ where go :: (URL, Maybe String) -> [(URL, String)] go (uu, Just x) = [(uu, x)] go _ = [] + kds ('h':'t':'t':'p':'s':':':'/':'/':xs)=('h':'t':'t':'p':'s':':':'/':'/':(kds xs)) + kds ('/':'/':xs)='/':(kds xs) + kds (x:xs) = x:( kds xs) + kds [] = [] {-DHUN| downloads a single image form the wiki. It takes the temporary image download directory as first parameter. It takes a tuple as second input parameter. The first element of the tuple is the image number so just an integer that can be used to identify the image uniquely) . The second element of the tupele is image include string of the image from the wiki source, that is the text in between the square brackets as second input parameter. It takes the WikiUrl of the wiki websitze currently being processed as thrird parameter. See function getImages in this module for documentation on the returned data type DHUN-} diff -Nru mediawiki2latex-7.44/src/mediawiki2latex.hs mediawiki2latex-7.45/src/mediawiki2latex.hs --- mediawiki2latex-7.44/src/mediawiki2latex.hs 2021-08-26 19:23:50.000000000 +0000 +++ mediawiki2latex-7.45/src/mediawiki2latex.hs 2021-12-25 11:05:26.000000000 +0000 @@ -203,7 +203,7 @@ versionHeader :: String versionHeader - = "mediawiki2latex version 7.44\n" ++ (usageInfo header options) + = "mediawiki2latex version 7.45\n" ++ (usageInfo header options) {-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-} diff -Nru mediawiki2latex-7.44/src/MediaWikiParser.hs mediawiki2latex-7.45/src/MediaWikiParser.hs --- mediawiki2latex-7.44/src/MediaWikiParser.hs 2021-08-26 19:23:50.000000000 +0000 +++ mediawiki2latex-7.45/src/MediaWikiParser.hs 2021-12-25 11:05:26.000000000 +0000 @@ -1980,6 +1980,16 @@ | (Map.lookup "class" m) == (Just "editsection") = [] printPrepareNode (Environment Tag (TagAttr "span" m) _) | (Map.lookup "class" m) == (Just "mw-editsection") = [] + printPrepareNode (Environment Tag (TagAttr "div" m) _) + | (Map.lookup "id" m) == (Just "mw-navigation") = [] + printPrepareNode (Environment Tag (TagAttr "div" m) _) + | (Map.lookup "id" m) == (Just "mw-panel") = [] + printPrepareNode (Environment Tag (TagAttr "ul" m) _) + | (Map.lookup "id" m) == (Just "footer-places") = [] + printPrepareNode (Environment Tag (TagAttr "ul" m) _) + | (Map.lookup "id" m) == (Just "footer-icons") = [] + printPrepareNode (Environment Tag (TagAttr "div" m) _) + | (Map.lookup "id" m) == (Just "mw-panel") = [] printPrepareNode (Environment Tag (TagAttr "a" m) l) = case (Map.lookup "class" m) of (Just "image") -> imgfun m (printPrepareTree l) Nothing diff -Nru mediawiki2latex-7.44/src/UrlAnalyse.hs mediawiki2latex-7.45/src/UrlAnalyse.hs --- mediawiki2latex-7.44/src/UrlAnalyse.hs 2021-08-26 19:23:50.000000000 +0000 +++ mediawiki2latex-7.45/src/UrlAnalyse.hs 2021-12-25 11:05:26.000000000 +0000 @@ -259,14 +259,16 @@ getBookpage :: String -> WikiUrl -> IO (Maybe String) getBookpage ss u - = do l <- mapM ((geturl2) . unify) ((map ((++("/"++ss)).exportURL)) (parses u)) + = do l <- mapM ((geturl2) . unify) ((map attach) (map exportURL (parses u))) lll <- return (seq l l) return $ (listToMaybe $ concat (map maybeToList (map go lll))) >>= (return) where go x =if (x==(UTF8Str.fromString [])) then Nothing else Just (UTF8Str.toString x) - + attach x = case reverse x of + '/':xs -> ((reverse xs)++("/"++ss)) + xs-> ((reverse xs)++("/"++ss)) {-DHUN| Loads the wikitext of an article form a mediawiki server when mediawiki2latex is running with the --mediawiki option. This function downloads the orignial wikitext source without expanding the templates. This is going to happen later by call to getExpandedPage. The first parmeter is lemma to load. The second paramerter is the WikiUrl to the server hosting the wiki. The return value is a pair. The first element of it is the wikitext source of the article. The second element of it is the URL under which the article was downloaded DHUN-}