Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 325 insertions, 15 deletions

diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 009d47398..47c9788c9 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -4,15 +4,17 @@
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.9.4.5
-pkgrel=5
+pkgver=1.10.0.4
+pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('ghc' 'sh' 'cabal-install')
-options=(strip !makeflags !distcc)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
+options=(strip !makeflags !distcc !emptydirs)
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+        SRCBUILD
+        citeproc-hs-pre-0.3.7.patch)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
 
@@ -21,7 +23,17 @@ build() {
     mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
     cd ${srcdir}/${pkgname}-${pkgver}
 
+# Patches from the next citeproc-hs release
+# These are needed because 0.3.6 with embed_data_files is broken
+# darcs diff --from-tag=0.3.6
+   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
+   popd
+
    while read _hkpkg; do
+# Skip already built
+       [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
+
        pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
@@ -59,16 +71,23 @@ package() {
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
+# For some reason the library is installed anyway
+# Remove all files and !emptydirs takes care of the rest
   msg2 "Removing lib files..."
-  rm -rfv ${pkgdir}/build
+  find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex
 
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
+
+  msg2 "Installing licenses"
+  install -d ${pkgdir}/usr/share
+  cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
 }
-md5sums=('af01e55daded42fa54e8a2bb142c0a78'
-         '96d0ba0d9060574e56e3f23c996d0e8e'
-         '54b521d5c3ed5e2b53c4ca3206f6c941')
+md5sums=('94c36d52ee6d7e33b16d75048f6617d3'
+         '2958854a387ea0845720e9456f814845'
+         'd159a34656b7a1e13df5e6149b2f898b'
+         'd389fc323eeaced767cea53edcfc0127')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index 1eb01acc1..c1cfbfa5c 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,12 +2,11 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.9.4.5
-# 0.3.6 fails with embed_data_files
-_citeproc=0.3.5
+pkgver=1.10.0.4
 # 0.4 doesn't work with ghc 7.6 
+# Use blaze_html_0_5 flag in the future
 _blaze_html=0.5.1.3
-pkgrel=5
+pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -25,12 +24,12 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver}
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
+    cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
 }
 
 package() {
diff --git a/pcr/pandoc/citeproc-hs-pre-0.3.7.patch b/pcr/pandoc/citeproc-hs-pre-0.3.7.patch
new file mode 100644
index 000000000..754a9ac2e
--- /dev/null
+++ b/pcr/pandoc/citeproc-hs-pre-0.3.7.patch
@@ -0,0 +1,292 @@
+Fri Nov  9 09:31:27 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix issue #28
+  add support for generating links to the DOI database.
+Thu Nov  8 21:05:02 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix issue #35
+Thu Nov  8 18:24:16 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * a simple script for creating tests
+Thu Nov  8 18:21:56 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix a bug in convertQuoted which was producing stack overflows with long strings
+Thu Nov  8 17:27:38 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix editJsonInput in order to read the native JSON bibliographic data format
+Thu Nov  8 14:03:26 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix issue #37
+Fri Oct 26 18:45:09 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * bump version number
+Fri Oct 26 13:53:20 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  tagged 0.3.6
+diff -rN -u old-citeproc-hs/README new-citeproc-hs/README
+--- old-citeproc-hs/README	2013-01-22 22:19:52.097159333 -0300
++++ new-citeproc-hs/README	2013-01-22 22:19:52.107159567 -0300
+@@ -169,6 +169,21 @@
+ 
+     Summer, 2001 (the season)
+ 
++### The DOI variable
++
++If the DOI variable is prefixed by a `doi:` like:
++
++        doi = {doi:10.1038/171737a0}
++
++the processor will generate a link and produce this pandoc native
++representation:
++
++       Link [Str "10.1038/171737a0"] ("http://dx.doi.org/10.1038/171737a0", "10.1038/171737a0")
++
++that produces a link like:
++
++       <a href="http://dx.doi.org/10.1038/171737a0">10.1038/171737a0</a>
++
+ ### Running the test-suite
+ 
+ To run the test suite, you first need to grab it with [mercurial] by
+diff -rN -u old-citeproc-hs/citeproc-hs.cabal new-citeproc-hs/citeproc-hs.cabal
+--- old-citeproc-hs/citeproc-hs.cabal	2013-01-22 22:19:52.103826157 -0300
++++ new-citeproc-hs/citeproc-hs.cabal	2013-01-22 22:19:52.107159567 -0300
+@@ -1,5 +1,5 @@
+ name:               citeproc-hs
+-version:            0.3.6
++version:            0.3.7
+ homepage:           http://gorgias.mine.nu/repos/citeproc-hs/
+ synopsis:           A Citation Style Language implementation in Haskell
+ 
+diff -rN -u old-citeproc-hs/src/Text/CSL/Eval/Output.hs new-citeproc-hs/src/Text/CSL/Eval/Output.hs
+--- old-citeproc-hs/src/Text/CSL/Eval/Output.hs	2013-01-22 22:19:52.097159333 -0300
++++ new-citeproc-hs/src/Text/CSL/Eval/Output.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -29,7 +29,11 @@
+ appendOutput fm xs = if xs /= [] then [Output xs fm] else []
+ 
+ outputList :: Formatting -> Delimiter -> [Output] -> [Output]
+-outputList fm d = appendOutput fm . addDelim d
++outputList fm d = appendOutput fm . addDelim d . map cleanOutput'
++    where
++      cleanOutput' o
++          | Output xs f <- o = Output (cleanOutput xs) f
++          | otherwise        = rmEmptyOutput o
+ 
+ cleanOutput :: [Output] -> [Output]
+ cleanOutput = flatten
+@@ -37,12 +41,16 @@
+       flatten [] = []
+       flatten (o:os)
+           | ONull       <- o     = flatten os
+-          | Output [] _ <- o     = flatten os
+-          | OStr []   _ <- o     = flatten os
+-          | OUrl []   _ <- o     = flatten os
+           | Output xs f <- o
+           , f == emptyFormatting = flatten xs ++ flatten os
+-          | otherwise            = o : flatten os
++          | otherwise            = rmEmptyOutput o : flatten os
++
++rmEmptyOutput :: Output -> Output
++rmEmptyOutput o
++    | Output [] _ <- o = ONull
++    | OStr []   _ <- o = ONull
++    | OUrl t    _ <- o = if null (fst t) then ONull else o
++    | otherwise        = o
+ 
+ addDelim :: String -> [Output] -> [Output]
+ addDelim d = foldr (\x xs -> if length xs < 1 then x : xs else check x xs) []
+diff -rN -u old-citeproc-hs/src/Text/CSL/Eval.hs new-citeproc-hs/src/Text/CSL/Eval.hs
+--- old-citeproc-hs/src/Text/CSL/Eval.hs	2013-01-22 22:19:52.093825923 -0300
++++ new-citeproc-hs/src/Text/CSL/Eval.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -25,6 +25,7 @@
+ import Control.Applicative ( (<$>) )
+ import Control.Monad.State
+ import Data.Char
++import Data.List
+ import qualified Data.Map as M
+ import Data.Maybe
+ 
+@@ -153,7 +154,12 @@
+                              "title"       -> formatTitle f fm
+                              "locator"     -> getLocVar >>= formatRange fm . snd
+                              "url"         -> getStringVar "url" >>= \k ->
+-                                              if null k then return [] else return [OUrl k fm]
++                                              if null k then return [] else return [OUrl (k,k) fm]
++                             "doi"         -> getStringVar "doi" >>= \d ->
++                                              if "doi:" `isPrefixOf` d
++                                                 then let d' = drop 4 d in
++                                                      return [OUrl ("http://dx.doi.org/" ++ d', d') fm]
++                                                 else return [OStr d  fm]
+                              _             -> gets (env >>> options &&& abbrevs) >>= \(opts,as) ->
+                                               getVar [] (getFormattedValue opts as f fm s) s >>= \r ->
+                                               consumeVariable s >> return r
+diff -rN -u old-citeproc-hs/src/Text/CSL/Input/Json.hs new-citeproc-hs/src/Text/CSL/Input/Json.hs
+--- old-citeproc-hs/src/Text/CSL/Input/Json.hs	2013-01-22 22:19:52.100492747 -0300
++++ new-citeproc-hs/src/Text/CSL/Input/Json.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -106,6 +106,7 @@
+     , JSObject js <- j = (camel s      , JSArray (editDate $ fromJSObject js))
+     | "family"    <- s = ("familyName" , j)
+     | "suffix"    <- s = ("nameSuffix" , j)
++    | "URL"       <- s = ("url"        , j)
+     | "edition"   <- s = ("edition"    , toString j)
+     | "volume"    <- s = ("volume"     , toString j)
+     | "issue"     <- s = ("issue"      , toString j)
+@@ -122,7 +123,7 @@
+       camel x
+           | '-':y:ys <- x = toUpper y : camel ys
+           | '_':y:ys <- x = toUpper y : camel ys
+-          |     y:ys <- x = toLower y : camel ys
++          |     y:ys <- x =         y : camel ys
+           | otherwise     = []
+ 
+       format (x:xs) = toUpper x : xs
+diff -rN -u old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs
+--- old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs	2013-01-22 22:19:52.100492747 -0300
++++ new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -60,7 +60,7 @@
+     | FS str fm    <- fo = toPandoc fm $ toStr str
+     | FN str fm    <- fo = toPandoc fm $ toStr $ rmZeros str
+     | FO     fm xs <- fo = toPandoc fm $ rest xs
+-    | FUrl u fm    <- fo = toPandoc fm [Link (toStr u) (u,u)]
++    | FUrl u fm    <- fo = toPandoc fm [Link (toStr $ snd u) u]
+     | otherwise = []
+     where
+       addSuffix f i
+@@ -176,8 +176,10 @@
+     | Quoted t inls <- i
+     , b         = case headInline is of
+                     [x] -> if isPunctuation x
+-                           then Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is)
+-                           else Quoted t (reverseQuoted t inls             ) : clean' s b  is
++                           then if lastInline inls `elem` [".",",",";",":","!","?"]
++                                then Quoted t (reverseQuoted t inls             ) : clean' s b (tailInline is)
++                                else Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is)
++                           else Quoted t (reverseQuoted t inls) : clean' s b  is
+                     _   -> Quoted t (reverseQuoted  t inls) : clean' s b is
+     | Quoted t inls <- i = Quoted t (reverseQuoted  t inls) : clean' s b is
+     | otherwise = if lastInline [i] == headInline is && isPunct
+@@ -232,7 +234,7 @@
+ startWithPunct = and . map (`elem` ".,;:!?") . headInline
+ 
+ convertQuoted :: Style -> [Inline] -> [Inline]
+-convertQuoted s = proc convertQuoted'
++convertQuoted s = convertQuoted'
+     where
+       locale = let l = styleLocale s in case l of [x] -> x; _   -> Locale [] [] [] [] []
+       getQuote  x y = entityToChar . fst . fromMaybe (x,[]) . lookup (y,Long) . localeTermMap $ locale
+diff -rN -u old-citeproc-hs/src/Text/CSL/Parser.hs new-citeproc-hs/src/Text/CSL/Parser.hs
+--- old-citeproc-hs/src/Text/CSL/Parser.hs	2013-01-22 22:19:52.103826157 -0300
++++ new-citeproc-hs/src/Text/CSL/Parser.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -23,7 +23,6 @@
+ #ifdef EMBED_DATA_FILES
+ import Data.FileEmbed
+ import qualified Data.ByteString as S
+-import Data.ByteString.UTF8 ( toString )
+ #else
+ import Paths_citeproc_hs ( getDataFileName )
+ import System.Directory  ( doesFileExist   )
+@@ -69,7 +68,7 @@
+   return s { styleLocale = mergeLocales (styleDefaultLocale s) l (styleLocale s)}
+ 
+ #ifdef EMBED_DATA_FILES
+-localeFiles :: [(FilePath, L.ByteString)]
++localeFiles :: [(FilePath, S.ByteString)]
+ localeFiles = $(embedDir "locales/")
+ #endif
+ 
+@@ -86,7 +85,7 @@
+             | otherwise     -> case lookup ("locales-" ++ take 5 x ++ ".xml") localeFiles of
+                                  Just x' -> return x'
+                                  _       -> error "could not load the locale file"
+-  return $ readXmlString xpLocale f
++  return $ readXmlString xpLocale $ L.fromChunks [f]
+ #else
+   f <- case s of
+          x | length x == 2 -> getDataFileName ("locales/locales-" ++
+diff -rN -u old-citeproc-hs/src/Text/CSL/Style.hs new-citeproc-hs/src/Text/CSL/Style.hs
+--- old-citeproc-hs/src/Text/CSL/Style.hs	2013-01-22 22:19:52.093825923 -0300
++++ new-citeproc-hs/src/Text/CSL/Style.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -20,7 +20,7 @@
+                      , everywhere', everything, mkT, mkQ)
+ import qualified Data.Map as M
+ import Text.JSON
+-import Text.Pandoc.Definition ( Inline )
++import Text.Pandoc.Definition ( Inline, Target )
+ 
+ -- | The representation of a parsed CSL style.
+ data Style
+@@ -309,8 +309,8 @@
+     = FO          Formatting [FormattedOutput]          -- ^ List of 'FormatOutput' items
+     | FN   String Formatting                            -- ^ Formatted number
+     | FS   String Formatting                            -- ^ Formatted string
+-    | FUrl String Formatting                            -- ^ Formatted uniform resource locator (URL)
+     | FDel String                                       -- ^ Delimeter string
++    | FUrl Target Formatting                            -- ^ Formatted URL
+     | FPan [Inline]                                     -- ^ Pandoc inline elements
+     | FNull                                             -- ^ Null formatting item
+       deriving ( Eq, Show )
+@@ -331,7 +331,7 @@
+     | OContrib String    String   [Output] [Output] [[Output]] -- ^ The citation key, the role (author, editor, etc.), the contributor(s),
+                                                         -- the output needed for year suf. disambiguation, and everything used for
+                                                         -- name disambiguation.
+-    | OUrl    String              Formatting            -- ^ A uniform resource locator (URL)
++    | OUrl    Target              Formatting            -- ^ An URL
+     | OLoc    [Output]            Formatting            -- ^ The citation's locator
+     | Output  [Output]            Formatting            -- ^ Some nested 'Output'
+       deriving ( Eq, Ord, Show, Typeable, Data )
+diff -rN -u old-citeproc-hs/src/Text/CSL/Test.hs new-citeproc-hs/src/Text/CSL/Test.hs
+--- old-citeproc-hs/src/Text/CSL/Test.hs	2013-01-22 22:19:52.103826157 -0300
++++ new-citeproc-hs/src/Text/CSL/Test.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -45,7 +45,8 @@
+ import Text.CSL.Style
+ import Text.Pandoc.Definition
+ #ifdef EMBED_DATA_FILES
+-import Data.ByteString.UTF8 ( toString )
++import qualified Data.ByteString.Lazy as L
++import qualified Data.ByteString.UTF8 as U
+ import Text.CSL.Parser ( localeFiles )
+ #else
+ import System.IO.Unsafe
+@@ -217,7 +218,7 @@
+                    | otherwise     -> take 5 x
+ #ifdef EMBED_DATA_FILES
+   ls <- case lookup ("locales-" ++ locale ++ ".xml") localeFiles of
+-          Just x' -> return $ readXmlString xpLocale (toString x')
++          Just x' -> return $ readXmlString xpLocale $ L.fromChunks [x']
+           _       -> return $ Locale [] [] [] [] []
+ #else
+   ls' <- getCachedLocale locale
+diff -rN -u old-citeproc-hs/test/createTest.hs new-citeproc-hs/test/createTest.hs
+--- old-citeproc-hs/test/createTest.hs	1969-12-31 21:00:00.000000000 -0300
++++ new-citeproc-hs/test/createTest.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -0,0 +1,37 @@
++import System.Environment
++import Text.CSL
++import Text.CSL.Test
++import Text.JSON.Generic
++
++main :: IO ()
++main = do
++  args <- getArgs
++  case args of
++    [c,r] -> readStruff c r [] >>= putStrLn
++    _ -> error "usage:    kljlkjljlkjlkjl"
++
++readStruff :: String -> String -> String -> IO String
++readStruff c r s = do
++  c' <- readFile c
++  r' <- readBiblioFile r
++  return $ mode "citation" ++ result [] ++ citationItems r' ++ csl c' ++ input r'
++
++mode :: String -> String
++mode s = ">>===== MODE =====>>\n" ++ s ++ "\n<<===== MODE =====<<\n\n"
++
++result :: String -> String
++result s = ">>===== RESULT =====>>\n" ++ s ++ "\n<<===== RESULT =====<<\n\n"
++
++citationItems :: [Reference] -> String
++citationItems l = ">>===== CITATION-ITEMS =====>>\n[\n    [\n" ++ toId ++
++                  "\n    ]\n]\n<<===== CITATION-ITEMS =====<<\n\n"
++    where
++      toId = foldr addComma [] toStringList
++      addComma x xs = if length xs < 1 then x ++ xs else x ++ ",\n" ++ xs
++      toStringList = flip map l $ \x -> "        {\n            \"id\": \"" ++ refId x ++ "\"\n        }"
++
++csl :: String -> String
++csl s = ">>===== CSL =====>>\n" ++ s ++ "<<===== CSL =====<<\n\n"
++
++input :: [Reference] -> String
++input s = ">>===== INPUT =====>>\n" ++ encodeJSON s ++ "\n<<===== INPUT =====<<\n\n"
+\ No newline at end of file