From d464e8b70e65efb7139f2a5a60d734a7afe134a8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 23 Feb 2013 21:58:36 +0530
Subject: [PATCH] Nezavisne Novine by Darko Miletic. Fixes #1132143 (New recipe
 for Nezavisne novine)

---
 recipes/icons/nezavisne_novine.png | Bin 0 -> 454 bytes
 recipes/nezavisne_novine.recipe    |  59 +++++++++++++++++++++++++++++
 src/calibre/utils/icu.py           |  21 ++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 recipes/icons/nezavisne_novine.png
 create mode 100644 recipes/nezavisne_novine.recipe

diff --git a/recipes/icons/nezavisne_novine.png b/recipes/icons/nezavisne_novine.png
new file mode 100644
index 0000000000000000000000000000000000000000..29da3de24f10c21ad2c38354d010e11a00c25ec8
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0004vNkl<Zc$~FT
zODIH97(VBY8MoP3NLb9uYF49Iu@F&`&Dc;jWHU8eWq~PWqe)g|_ERi~vhZ4=lt(6c
zB#&faknxzgxHISJKlk1#k1Qx(U#IW?>g)XXy9Y}t(QknN5}-_QAz&zUyD-KeC>NY7
z$K!Tsmh&kPnp}&mp1`mYX=w`hKnzZ856>h(oR4=@lofppXzGBiqyV;!EafQw=zL$v
z3Lt?51HQav`{SEdz;S*EaE>^$IX1U@d6(9ZbR6`x5_=^G5MZ$v3r2!Nvy>3qLEk#G
zZ(xWLV7#{#&i%9N==6q%Wc{xxe*YjDgJML+kc8%28l8_V?7(0wM*3pQ6Z2c3gGO@V
zb`ONRsg5NMWa?46T%||r_6-!#91tTM4K?eSgKm7jN(%<`hPzE)xzdavcR_w7Vk#o(
z)jjcnc5l}38_5)-w5D3G3M3DYL5uoYP1mgeB^og`6;KE^RCbo22V&mPTuHbmb9#|{
weo{Kr<$Qw;HCV9zn{@iI-$h<4{QGNt2a(tVEjMS$O#lD@07*qoM6N<$f;vyeeE<Le

literal 0
HcmV?d00001

diff --git a/recipes/nezavisne_novine.recipe b/recipes/nezavisne_novine.recipe
new file mode 100644
index 0000000000..357c478ce1
--- /dev/null
+++ b/recipes/nezavisne_novine.recipe
@@ -0,0 +1,59 @@
+__license__   = 'GPL v3'
+__copyright__ = '2013, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.nezavisne.com
+'''
+from calibre import strftime
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class NezavisneNovine(BasicNewsRecipe):
+    title                 = 'Nezavisne novine'
+    __author__            = 'Darko Miletic'
+    description           = 'Nezavisne novine - Najnovije vijesti iz BiH, Srbije, Hrvatske, Crne Gore i svijeta'
+    publisher             = 'NIGP "DNN"'
+    category              = 'news, politics, Bosnia, Balcans'
+    oldest_article        = 2
+    max_articles_per_feed = 200
+    no_stylesheets        = True
+    encoding              = 'utf8'
+    use_embedded_content  = False
+    language              = 'sr'
+    remove_empty_feeds    = True
+    publication_type      = 'newspaper'
+    cover_url             = strftime('http://pdf.nezavisne.com/slika/novina/nezavisne_novine.jpg?v=%Y%m%d')
+    masthead_url          = 'http://www.nezavisne.com/slika/osnova/nezavisne-novine-logo.gif'
+    extra_css             = """
+                               body{font-family: Arial,Helvetica,sans-serif }
+                               img{margin-bottom: 0.4em; display:block}
+                            """
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+    keep_only_tags = [dict(name='div', attrs={'class':'vijest'})]
+    remove_tags_after = dict(name='div', attrs={'id':'wrap'})
+    remove_tags = [
+                     dict(name=['meta','link','iframe','object'])
+                    ,dict(name='div', attrs={'id':'wrap'})
+                  ]
+    remove_attributes=['lang','xmlns:fb','xmlns:og']
+
+
+    feeds = [
+              (u'Novosti'            , u'http://feeds.feedburner.com/Novosti-NezavisneNovine'          )
+             ,(u'Posao'              , u'http://feeds.feedburner.com/Posao-NezavisneNovine'            )
+             ,(u'Sport'              , u'http://feeds.feedburner.com/Sport-NezavisneNovine'            )
+             ,(u'Komentar'           , u'http://feeds.feedburner.com/Komentari-NezavisneNovine'        )
+             ,(u'Umjetnost i zabava' , u'http://feeds.feedburner.com/UmjetnostIZabava-NezavisneNovine' )
+             ,(u'Život i stil'       , u'http://feeds.feedburner.com/ZivotIStil-NezavisneNovine'       )
+             ,(u'Auto'               , u'http://feeds.feedburner.com/Auto-NezavisneNovine'             )
+             ,(u'Nauka i tehnologija', u'http://feeds.feedburner.com/NaukaITehnologija-NezavisneNovine')
+            ]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup
diff --git a/src/calibre/utils/icu.py b/src/calibre/utils/icu.py
index aaf8c415e1..e1e6c1a1c6 100644
--- a/src/calibre/utils/icu.py
+++ b/src/calibre/utils/icu.py
@@ -341,6 +341,7 @@ pêché'''
 
     german = create(german)
     c = _icu.Collator('de')
+    c.numeric = True
     gs = list(sorted(german, key=c.sort_key))
     if gs != create(german_good):
         print 'German sorting failed'
@@ -348,6 +349,7 @@ pêché'''
     print
     french = create(french)
     c = _icu.Collator('fr')
+    c.numeric = True
     fs = list(sorted(french, key=c.sort_key))
     if fs != create(french_good):
         print 'French sorting failed (note that French fails with icu < 4.6)'
@@ -396,6 +398,25 @@ pêché'''
         print 'startswith() failed'
         return
 
+    print '\nTesting collation_order()'
+    for group in [
+        ('Šaa', 'Smith', 'Solženicyn', 'Štepánek'),
+        ('calibre', 'Charon', 'Collins'),
+        ('01', '1'),
+        ('1', '11', '13'),
+    ]:
+        last = None
+        for x in group:
+            val = icu_collation_order(sort_collator(), x)
+            if val[1] != 1:
+                prints('collation_order() returned incorrect length for', x)
+            if last is None:
+                last = val
+            else:
+                if val != last:
+                    prints('collation_order() returned incorrect value for', x)
+            last = val
+
 # }}}
 
 if __name__ == '__main__':