show the range of 条s in TOC!

chuan6 · Nov 7, 2016 · a60c773 · a60c773
1 parent 8da4f57
commit a60c773
Show file tree

Hide file tree

Showing 30 changed files with 33 additions and 30 deletions.
diff --git a/generator/src/generator/toc.clj b/generator/src/generator/toc.clj
@@ -15,7 +15,10 @@
                [:div {:class "li-head"}
                 elmt-a
                 (when-let [r (:entries-range t)]
-                  [:span (str "条" (int (:from r)))])]]))
+                  (let [a (int (:from r))
+                        b (int (:to r))]
+                    [:span (str "条" a
+                                (when (not= a b) (str "-" b)))]))]]))
           (to-html [ot]
             (let [t (pt/node-val ot)
                   r (when (pt/internal-node? ot)

diff --git a/体育法.html b/体育法.html
diff --git a/党内监督条例.html b/党内监督条例.html
diff --git a/公司法.html b/公司法.html
diff --git a/农村土地承包法.html b/农村土地承包法.html
diff --git a/出口退（免）税企业分类管理办法.html b/出口退（免）税企业分类管理办法.html
diff --git a/刑法.html b/刑法.html
diff --git a/劳动合同法.html b/劳动合同法.html
diff --git a/劳动法.html b/劳动法.html
diff --git a/合伙企业法.html b/合伙企业法.html
diff --git a/合同法.html b/合同法.html
diff --git a/国有土地上房屋征收与补偿条例.html b/国有土地上房屋征收与补偿条例.html
diff --git a/婚姻法.html b/婚姻法.html
diff --git a/婚姻登记条例.html b/婚姻登记条例.html
diff --git a/宪法.html b/宪法.html
diff --git a/工伤保险条例.html b/工伤保险条例.html
diff --git a/收养法.html b/收养法.html
diff --git a/教育法.html b/教育法.html
diff --git a/民法通则.html b/民法通则.html
diff --git a/消费者权益保护法.html b/消费者权益保护法.html
diff --git a/物业管理条例.html b/物业管理条例.html
diff --git a/物权法.html b/物权法.html
diff --git a/种子法.html b/种子法.html
diff --git a/立法法.html b/立法法.html
diff --git a/继承法.html b/继承法.html
diff --git a/网络借贷信息中介机构业务活动管理暂行办法.html b/网络借贷信息中介机构业务活动管理暂行办法.html
diff --git a/网络预约出租汽车经营服务管理暂行办法.html b/网络预约出租汽车经营服务管理暂行办法.html
diff --git a/道路交通安全法.html b/道路交通安全法.html
diff --git a/食品安全法.html b/食品安全法.html
diff --git a/高等教育法.html b/高等教育法.html