deplate 0.8.1 → 0.8.2
Sign up to get free protection for your applications and to get access to all the features.
- data/AUTHORS.TXT +2 -1
- data/CHANGES.TXT +56 -211
- data/NEWS.TXT +15 -38
- data/VERSION.TXT +1 -1
- data/bin/deplate +0 -0
- data/bin/deplate.bat +0 -0
- data/etc/deplate.ini +11 -0
- data/lib/deplate/commands.rb +8 -3
- data/lib/deplate/common.rb +2 -2
- data/lib/deplate/core.rb +157 -45
- data/lib/deplate/css/article.css +19 -3
- data/lib/deplate/css/doc.css +770 -0
- data/lib/deplate/elements.rb +7 -7
- data/lib/deplate/ents/general-latin1.entities +100 -0
- data/lib/deplate/ents/general-utf-8.entities +252 -0
- data/lib/deplate/external.rb +3 -2
- data/lib/deplate/fmt/html.rb +12 -10
- data/lib/deplate/fmt/latex.rb +25 -14
- data/lib/deplate/fmt/plain.rb +4 -5
- data/lib/deplate/fmt/xhtml11m.rb +25 -0
- data/lib/deplate/formatter.rb +106 -32
- data/lib/deplate/input.rb +8 -7
- data/lib/deplate/lib/Makefile.config +11 -1
- data/lib/deplate/locale/de.latin1 +9 -0
- data/lib/deplate/macros.rb +23 -18
- data/lib/deplate/mod/code-coderay.rb +45 -0
- data/lib/deplate/mod/code-gvim.rb +3 -2
- data/lib/deplate/mod/code-gvim71.rb +3 -6
- data/lib/deplate/mod/code-highlight.rb +3 -2
- data/lib/deplate/mod/entities-decode.rb +72 -0
- data/lib/deplate/mod/entities-encode.rb +50 -0
- data/lib/deplate/mod/guesslanguage.rb +3 -3
- data/lib/deplate/mod/html-jsmath.rb +5 -5
- data/lib/deplate/mod/html-mathml.rb +40 -0
- data/lib/deplate/mod/latex-styles.rb +21 -11
- data/lib/deplate/mod/makefile.rb +21 -11
- data/lib/deplate/mod/markup-1.rb +3 -3
- data/lib/deplate/mod/particle-math.rb +15 -6
- data/lib/deplate/particles.rb +2 -2
- data/lib/deplate/regions.rb +50 -15
- data/lib/deplate/template.rb +7 -2
- data/lib/deplate/themes/presentation.html/css/highstep.css +29 -0
- data/lib/deplate/themes/presentation.html/css/presentation.css +206 -0
- data/lib/deplate/themes/presentation.html/css/website.css +281 -0
- data/lib/deplate/themes/presentation.html/prelude.txt +19 -0
- data/lib/deplate/themes/presentation.html/resources/spacer.png +0 -0
- data/lib/deplate/themes/presentation.html/templates/presentation.html +26 -0
- data/lib/deplate/themes/presentation.html/theme.ini +20 -0
- data/man/man1/deplate.1 +147 -73
- metadata +67 -40
- data/bin/deplate.exy +0 -192
data/lib/deplate/elements.rb
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
# @Website: http://deplate.sf.net/
|
|
4
4
|
# @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
|
|
5
5
|
# @Created: 26-M�r-2004.
|
|
6
|
-
# @Last Change:
|
|
7
|
-
# @Revision: 0.
|
|
6
|
+
# @Last Change: 2008-07-06.
|
|
7
|
+
# @Revision: 0.4514
|
|
8
8
|
|
|
9
9
|
require "deplate/abstract-class"
|
|
10
10
|
|
|
@@ -389,14 +389,14 @@ class Deplate::Element < Deplate::BaseElement
|
|
|
389
389
|
# log(["Cannot attach caption to", self.class.name], :error)
|
|
390
390
|
end
|
|
391
391
|
|
|
392
|
-
def set_caption(captiondef, quiet=false)
|
|
392
|
+
def set_caption(captiondef, quiet=false, extended_syntax=false)
|
|
393
393
|
if @caption
|
|
394
394
|
log('Element already has a caption', :error) unless quiet
|
|
395
395
|
else
|
|
396
396
|
self.level_as_string = @deplate.get_current_heading
|
|
397
397
|
captiondef.elt = @deplate.parse_with_source(captiondef.source,
|
|
398
|
-
captiondef.elt,
|
|
399
|
-
|
|
398
|
+
captiondef.elt,
|
|
399
|
+
extended_syntax)
|
|
400
400
|
@caption = captiondef
|
|
401
401
|
if respond_to?(:register_caption)
|
|
402
402
|
register_caption
|
|
@@ -1094,7 +1094,7 @@ class Deplate::Element::Command < Deplate::Element
|
|
|
1094
1094
|
|
|
1095
1095
|
def get_var_or_option(deplate, key)
|
|
1096
1096
|
begin
|
|
1097
|
-
if deplate.
|
|
1097
|
+
if deplate.is_allowed?(':') && key =~ /^:(.*)$/
|
|
1098
1098
|
return deplate.options.send($1)
|
|
1099
1099
|
# elsif deplate.variables.has_key?(key)
|
|
1100
1100
|
else
|
|
@@ -1375,7 +1375,7 @@ class Deplate::Element::Heading < Deplate::Element
|
|
|
1375
1375
|
end
|
|
1376
1376
|
|
|
1377
1377
|
def register_heading
|
|
1378
|
-
sc = @args['id'] || @args['shortcaption']
|
|
1378
|
+
sc = @args['@id'] || @args['shortcaption']
|
|
1379
1379
|
log(['Register heading', level_as_string, sc], :debug)
|
|
1380
1380
|
@deplate.set_top_heading(self, sc)
|
|
1381
1381
|
end
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
" " "
|
|
2
|
+
& & &
|
|
3
|
+
< < <
|
|
4
|
+
> > >
|
|
5
|
+
�  
|
|
6
|
+
� ¡ ¡
|
|
7
|
+
� ¢ ¢
|
|
8
|
+
� £ £
|
|
9
|
+
� ¤ ¤
|
|
10
|
+
� ¥ ¥
|
|
11
|
+
� ¦ ¦
|
|
12
|
+
� § §
|
|
13
|
+
� ¨ ¨
|
|
14
|
+
� © ©
|
|
15
|
+
� ª ª
|
|
16
|
+
� « «
|
|
17
|
+
� ¬ ¬
|
|
18
|
+
� ­ ­
|
|
19
|
+
� ® ®
|
|
20
|
+
� ¯ ¯
|
|
21
|
+
� ° °
|
|
22
|
+
� ± ±
|
|
23
|
+
� ² ²
|
|
24
|
+
� ³ ³
|
|
25
|
+
� ´ ´
|
|
26
|
+
� µ µ
|
|
27
|
+
� ¶ ¶
|
|
28
|
+
� · ·
|
|
29
|
+
� ¸ ¸
|
|
30
|
+
� ¹ ¹
|
|
31
|
+
� º º
|
|
32
|
+
� » »
|
|
33
|
+
� ¼ ¼
|
|
34
|
+
� ½ ½
|
|
35
|
+
� ¾ ¾
|
|
36
|
+
� ¿ ¿
|
|
37
|
+
� À À
|
|
38
|
+
� Á Á
|
|
39
|
+
� Â Â
|
|
40
|
+
� Ã Ã
|
|
41
|
+
� Ä Ä
|
|
42
|
+
� Å Å
|
|
43
|
+
� Æ Æ
|
|
44
|
+
� Ç Ç
|
|
45
|
+
� È È
|
|
46
|
+
� É É
|
|
47
|
+
� Ê Ê
|
|
48
|
+
� Ë Ë
|
|
49
|
+
� Ì Ì
|
|
50
|
+
� Í Í
|
|
51
|
+
� Î Î
|
|
52
|
+
� Ï Ï
|
|
53
|
+
� Ð Ð
|
|
54
|
+
� Ñ Ñ
|
|
55
|
+
� Ò Ò
|
|
56
|
+
� Ó Ó
|
|
57
|
+
� Ô Ô
|
|
58
|
+
� Õ Õ
|
|
59
|
+
� Ö Ö
|
|
60
|
+
� × ×
|
|
61
|
+
� Ø Ø
|
|
62
|
+
� Ù Ù
|
|
63
|
+
� Ú Ú
|
|
64
|
+
� Û Û
|
|
65
|
+
� Ü Ü
|
|
66
|
+
� Ý Ý
|
|
67
|
+
� Þ Þ
|
|
68
|
+
� ß ß
|
|
69
|
+
� à à
|
|
70
|
+
� á á
|
|
71
|
+
� â â
|
|
72
|
+
� ã ã
|
|
73
|
+
� ä ä
|
|
74
|
+
� å å
|
|
75
|
+
� æ æ
|
|
76
|
+
� ç ç
|
|
77
|
+
� è è
|
|
78
|
+
� é é
|
|
79
|
+
� ê ê
|
|
80
|
+
� ë ë
|
|
81
|
+
� ì ì
|
|
82
|
+
� í í
|
|
83
|
+
� î î
|
|
84
|
+
� ï ï
|
|
85
|
+
� ð ð
|
|
86
|
+
� ñ ñ
|
|
87
|
+
� ò ò
|
|
88
|
+
� ó ó
|
|
89
|
+
� ô ô
|
|
90
|
+
� õ õ
|
|
91
|
+
� ö ö
|
|
92
|
+
� ÷ ÷
|
|
93
|
+
� ø ø
|
|
94
|
+
� ù ù
|
|
95
|
+
� ú ú
|
|
96
|
+
� û û
|
|
97
|
+
� ü ü
|
|
98
|
+
� ý ý
|
|
99
|
+
� þ þ
|
|
100
|
+
� ÿ ÿ
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
" " "
|
|
2
|
+
& & &
|
|
3
|
+
< < <
|
|
4
|
+
> > >
|
|
5
|
+
�  
|
|
6
|
+
¡ ¡ ¡
|
|
7
|
+
¢ ¢ ¢
|
|
8
|
+
£ £ £
|
|
9
|
+
¤ ¤ ¤
|
|
10
|
+
¥ ¥ ¥
|
|
11
|
+
¦ ¦ ¦
|
|
12
|
+
§ § §
|
|
13
|
+
¨ ¨ ¨
|
|
14
|
+
© © ©
|
|
15
|
+
ª ª ª
|
|
16
|
+
« « «
|
|
17
|
+
¬ ¬ ¬
|
|
18
|
+
­ ­
|
|
19
|
+
® ® ®
|
|
20
|
+
¯ ¯ ¯
|
|
21
|
+
° ° °
|
|
22
|
+
± ± ±
|
|
23
|
+
² ² ²
|
|
24
|
+
³ ³ ³
|
|
25
|
+
´ ´ ´
|
|
26
|
+
µ µ µ
|
|
27
|
+
¶ ¶ ¶
|
|
28
|
+
· · ·
|
|
29
|
+
¸ ¸ ¸
|
|
30
|
+
¹ ¹ ¹
|
|
31
|
+
º º º
|
|
32
|
+
» » »
|
|
33
|
+
¼ ¼ ¼
|
|
34
|
+
½ ½ ½
|
|
35
|
+
¾ ¾ ¾
|
|
36
|
+
¿ ¿ ¿
|
|
37
|
+
À À À
|
|
38
|
+
Á Á Á
|
|
39
|
+
  Â
|
|
40
|
+
à à Ã
|
|
41
|
+
Ä Ä Ä
|
|
42
|
+
Å Å Å
|
|
43
|
+
Æ Æ Æ
|
|
44
|
+
Ç Ç Ç
|
|
45
|
+
È È È
|
|
46
|
+
É É É
|
|
47
|
+
Ê Ê Ê
|
|
48
|
+
Ë Ë Ë
|
|
49
|
+
Ì Ì Ì
|
|
50
|
+
Í Í Í
|
|
51
|
+
Î Î Î
|
|
52
|
+
Ï Ï Ï
|
|
53
|
+
Ð Ð Ð
|
|
54
|
+
Ñ Ñ Ñ
|
|
55
|
+
Ò Ò Ò
|
|
56
|
+
Ó Ó Ó
|
|
57
|
+
Ô Ô Ô
|
|
58
|
+
Õ Õ Õ
|
|
59
|
+
Ö Ö Ö
|
|
60
|
+
× × ×
|
|
61
|
+
Ø Ø Ø
|
|
62
|
+
Ù Ù Ù
|
|
63
|
+
Ú Ú Ú
|
|
64
|
+
Û Û Û
|
|
65
|
+
Ü Ü Ü
|
|
66
|
+
Ý Ý Ý
|
|
67
|
+
Þ Þ Þ
|
|
68
|
+
ß ß ß
|
|
69
|
+
à à à
|
|
70
|
+
á á á
|
|
71
|
+
â â â
|
|
72
|
+
ã ã ã
|
|
73
|
+
ä ä ä
|
|
74
|
+
å å å
|
|
75
|
+
æ æ æ
|
|
76
|
+
ç ç ç
|
|
77
|
+
è è è
|
|
78
|
+
é é é
|
|
79
|
+
ê ê ê
|
|
80
|
+
ë ë ë
|
|
81
|
+
ì ì ì
|
|
82
|
+
í í í
|
|
83
|
+
î î î
|
|
84
|
+
ï ï ï
|
|
85
|
+
ð ð ð
|
|
86
|
+
ñ ñ ñ
|
|
87
|
+
ò ò ò
|
|
88
|
+
ó ó ó
|
|
89
|
+
ô ô ô
|
|
90
|
+
õ õ õ
|
|
91
|
+
ö ö ö
|
|
92
|
+
÷ ÷ ÷
|
|
93
|
+
ø ø ø
|
|
94
|
+
ù ù ù
|
|
95
|
+
ú ú ú
|
|
96
|
+
û û û
|
|
97
|
+
ü ü ü
|
|
98
|
+
ý ý ý
|
|
99
|
+
þ þ þ
|
|
100
|
+
ÿ ÿ ÿ
|
|
101
|
+
Α Α Α
|
|
102
|
+
α α α
|
|
103
|
+
Β Β Β
|
|
104
|
+
β β β
|
|
105
|
+
Γ Γ Γ
|
|
106
|
+
γ γ γ
|
|
107
|
+
Δ Δ Δ
|
|
108
|
+
δ δ δ
|
|
109
|
+
Ε Ε Ε
|
|
110
|
+
ε ε ε
|
|
111
|
+
Ζ Ζ Ζ
|
|
112
|
+
ζ ζ ζ
|
|
113
|
+
Η Η Η
|
|
114
|
+
η η η
|
|
115
|
+
Θ Θ Θ
|
|
116
|
+
θ θ θ
|
|
117
|
+
Ι Ι Ι
|
|
118
|
+
ι ι ι
|
|
119
|
+
Κ Κ Κ
|
|
120
|
+
κ κ κ
|
|
121
|
+
Λ Λ Λ
|
|
122
|
+
λ λ λ
|
|
123
|
+
Μ Μ Μ
|
|
124
|
+
μ μ μ
|
|
125
|
+
Ν Ν Ν
|
|
126
|
+
ν ν ν
|
|
127
|
+
Ξ Ξ Ξ
|
|
128
|
+
ξ ξ ξ
|
|
129
|
+
Ο Ο Ο
|
|
130
|
+
ο ο ο
|
|
131
|
+
Π Π Π
|
|
132
|
+
π π π
|
|
133
|
+
Ρ Ρ Ρ
|
|
134
|
+
ρ ρ ρ
|
|
135
|
+
Σ Σ Σ
|
|
136
|
+
ς ς ς
|
|
137
|
+
σ σ σ
|
|
138
|
+
Τ Τ Τ
|
|
139
|
+
τ τ τ
|
|
140
|
+
Υ Υ Υ
|
|
141
|
+
υ υ υ
|
|
142
|
+
Φ Φ Φ
|
|
143
|
+
φ φ φ
|
|
144
|
+
Χ Χ Χ
|
|
145
|
+
χ χ χ
|
|
146
|
+
Ψ Ψ Ψ
|
|
147
|
+
ψ ψ ψ
|
|
148
|
+
Ω Ω Ω
|
|
149
|
+
ω ω ω
|
|
150
|
+
ϑ ϑ ϑ
|
|
151
|
+
ϒ ϒ ϒ
|
|
152
|
+
ϖ ϖ ϖ
|
|
153
|
+
∀ ∀ ∀
|
|
154
|
+
∂ ∂ ∂
|
|
155
|
+
∃ ∃ ∃
|
|
156
|
+
∅ ∅ ∅
|
|
157
|
+
∇ ∇ ∇
|
|
158
|
+
∈ ∈ ∈
|
|
159
|
+
∉ ∉ ∉
|
|
160
|
+
∋ ∋ ∋
|
|
161
|
+
∏ ∏ ∏
|
|
162
|
+
∑ ∑ ∑
|
|
163
|
+
− − −
|
|
164
|
+
∗ ∗ ∗
|
|
165
|
+
√ √ √
|
|
166
|
+
∝ ∝ ∝
|
|
167
|
+
∞ ∞ ∞
|
|
168
|
+
∠ ∠ ∠
|
|
169
|
+
∧ ∧ ∧
|
|
170
|
+
∨ ∨ ∨
|
|
171
|
+
∩ ∩ ∩
|
|
172
|
+
∪ ∪ ∪
|
|
173
|
+
∫ ∫ ∫
|
|
174
|
+
∴ ∴ ∴
|
|
175
|
+
∼ ∼ ∼
|
|
176
|
+
≅ ≅ ≅
|
|
177
|
+
≈ ≈ ≈
|
|
178
|
+
≠ ≠ ≠
|
|
179
|
+
≡ ≡ ≡
|
|
180
|
+
≤ ≤ ≤
|
|
181
|
+
≥ ≥ ≥
|
|
182
|
+
⊂ ⊂ ⊂
|
|
183
|
+
⊃ ⊃ ⊃
|
|
184
|
+
⊄ ⊄ ⊄
|
|
185
|
+
⊆ ⊆ ⊆
|
|
186
|
+
⊇ ⊇ ⊇
|
|
187
|
+
⊕ ⊕ ⊕
|
|
188
|
+
⊗ ⊗ ⊗
|
|
189
|
+
⊥ ⊥ ⊥
|
|
190
|
+
⋅ ⋅ ⋅
|
|
191
|
+
◊ ◊ ◊
|
|
192
|
+
⌈ ⌈ ⌈
|
|
193
|
+
⌉ ⌉ ⌉
|
|
194
|
+
⌊ ⌊ ⌊
|
|
195
|
+
⌋ ⌋ ⌋
|
|
196
|
+
〈 ⟨ 〈
|
|
197
|
+
〉 ⟩ 〉
|
|
198
|
+
← ← ←
|
|
199
|
+
↑ ↑ ↑
|
|
200
|
+
→ → →
|
|
201
|
+
↓ ↓ ↓
|
|
202
|
+
↔ ↔ ↔
|
|
203
|
+
↵ ↵ ↵
|
|
204
|
+
⇐ ⇐ ⇐
|
|
205
|
+
⇑ ⇑ ⇑
|
|
206
|
+
⇒ ⇒ ⇒
|
|
207
|
+
⇓ ⇓ ⇓
|
|
208
|
+
⇔ ⇔ ⇔
|
|
209
|
+
• • •
|
|
210
|
+
′ ′ ′
|
|
211
|
+
″ ″ ″
|
|
212
|
+
‾ ‾ ‾
|
|
213
|
+
⁄ ⁄ ⁄
|
|
214
|
+
℘ ℘ ℘
|
|
215
|
+
ℑ ℑ ℑ
|
|
216
|
+
ℜ ℜ ℜ
|
|
217
|
+
™ ™ ™
|
|
218
|
+
€ € €
|
|
219
|
+
ℵ ℵ ℵ
|
|
220
|
+
♠ ♠ ♠
|
|
221
|
+
♣ ♣ ♣
|
|
222
|
+
♥ ♥ ♥
|
|
223
|
+
♦ ♦ ♦
|
|
224
|
+
Œ Œ Œ
|
|
225
|
+
œ œ œ
|
|
226
|
+
Š Š Š
|
|
227
|
+
š š š
|
|
228
|
+
Ÿ Ÿ Ÿ
|
|
229
|
+
ƒ ƒ ƒ
|
|
230
|
+
   
|
|
231
|
+
   
|
|
232
|
+
   
|
|
233
|
+
‌ ‌
|
|
234
|
+
‍ ‍
|
|
235
|
+
‎ ‎
|
|
236
|
+
‏ ‏
|
|
237
|
+
– – –
|
|
238
|
+
— — —
|
|
239
|
+
‘ ‘ ‘
|
|
240
|
+
’ ’ ’
|
|
241
|
+
‚ ‚ ‚
|
|
242
|
+
“ “ “
|
|
243
|
+
” ” ”
|
|
244
|
+
„ „ „
|
|
245
|
+
† † †
|
|
246
|
+
‡ ‡ ‡
|
|
247
|
+
… … …
|
|
248
|
+
‰ ‰ ‰
|
|
249
|
+
‹ ‹ ‹
|
|
250
|
+
› › ›
|
|
251
|
+
ˆ ˆ ˆ
|
|
252
|
+
˜ ˜ ˜
|
data/lib/deplate/external.rb
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
# @Website: http://deplate.sf.net/
|
|
4
4
|
# @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
|
|
5
5
|
# @Created: 04-Sep-2004.
|
|
6
|
-
# @Last Change:
|
|
7
|
-
# @Revision: 0.
|
|
6
|
+
# @Last Change: 2008-07-06.
|
|
7
|
+
# @Revision: 0.217
|
|
8
8
|
|
|
9
9
|
require "ps2ppm"
|
|
10
10
|
|
|
@@ -106,6 +106,7 @@ module Deplate::External
|
|
|
106
106
|
def jave(instance, imgfile, args)
|
|
107
107
|
variables = args[:deplate].variables
|
|
108
108
|
cmd = ["#{get_app('jave')} image2ascii #{imgfile}"]
|
|
109
|
+
p cmd
|
|
109
110
|
alg = args['ascii_algorithm'] || args['algorithm'] ||
|
|
110
111
|
variables['ascii_algorithm'] || 'edge_detection'
|
|
111
112
|
cmd << "algorithm=#{alg}"
|
data/lib/deplate/fmt/html.rb
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
# @Website: http://deplate.sf.net/
|
|
4
4
|
# @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
|
|
5
5
|
# @Created: 17-M�r-2004.
|
|
6
|
-
# @Last Change:
|
|
7
|
-
# @Revision: 0.
|
|
6
|
+
# @Last Change: 2008-07-06.
|
|
7
|
+
# @Revision: 0.4317
|
|
8
8
|
|
|
9
9
|
# require 'cgi'
|
|
10
10
|
require 'uri'
|
|
@@ -58,7 +58,7 @@ class Deplate::Formatter::HTML < Deplate::Formatter
|
|
|
58
58
|
}
|
|
59
59
|
build_plain_text_rx
|
|
60
60
|
@encodings = {
|
|
61
|
-
'latin1' => '
|
|
61
|
+
'latin1' => 'ISO-8859-1',
|
|
62
62
|
}
|
|
63
63
|
@deplate.output.attributes[:stepwiseIdx] ||= 0
|
|
64
64
|
end
|
|
@@ -75,7 +75,7 @@ class Deplate::Formatter::HTML < Deplate::Formatter
|
|
|
75
75
|
@deplate.copy_file(src, dest)
|
|
76
76
|
end
|
|
77
77
|
else
|
|
78
|
-
srcc = @deplate.auxiliary_filename(
|
|
78
|
+
srcc = @deplate.auxiliary_filename(Deplate::Core.ensure_suffix(name, '.css'), true)
|
|
79
79
|
unless File.exist?(srcc)
|
|
80
80
|
log(['File not found', srcc], :error)
|
|
81
81
|
end
|
|
@@ -140,8 +140,8 @@ class Deplate::Formatter::HTML < Deplate::Formatter
|
|
|
140
140
|
output_at(:pre, :doc_beg, html_def)
|
|
141
141
|
output_at(:pre, :head_beg, '<head>')
|
|
142
142
|
|
|
143
|
-
t =
|
|
144
|
-
t =
|
|
143
|
+
# t = canonic_encoding('ISO-8859-1')
|
|
144
|
+
t = document_encoding()
|
|
145
145
|
t = %{http-equiv="content-type" content="text/html; charset=#{t}"}
|
|
146
146
|
output_at(:pre, :head, head_meta_tag(t))
|
|
147
147
|
|
|
@@ -773,7 +773,8 @@ EOJS
|
|
|
773
773
|
style.gsub!(/[,;]+/, ' ') if style
|
|
774
774
|
clss = style || get_html_class(invoker, :default => 'standard')
|
|
775
775
|
clsss = %{ class="#{clss}"}
|
|
776
|
-
opts = format_particle(:table_args, invoker)
|
|
776
|
+
# opts = format_particle(:table_args, invoker)
|
|
777
|
+
opts = table_args(invoker)
|
|
777
778
|
halfindent = ' '
|
|
778
779
|
indent = halfindent * 2
|
|
779
780
|
|
|
@@ -1214,12 +1215,13 @@ EOJS
|
|
|
1214
1215
|
csso = @variables['css']
|
|
1215
1216
|
if csso
|
|
1216
1217
|
csss = Deplate::Core.split_list(csso, ',', ' ;', nil, nil)
|
|
1218
|
+
csss.map! {|css| Deplate::Core.ensure_suffix(css, '.css')}
|
|
1217
1219
|
else
|
|
1218
1220
|
csss = []
|
|
1219
1221
|
end
|
|
1220
1222
|
cls = @variables['class']
|
|
1221
1223
|
if cls
|
|
1222
|
-
csss << cls
|
|
1224
|
+
csss << Deplate::Core.ensure_suffix(cls, '.css')
|
|
1223
1225
|
end
|
|
1224
1226
|
acc = []
|
|
1225
1227
|
if @deplate.variables['cssInclude']
|
|
@@ -1238,7 +1240,7 @@ EOJS
|
|
|
1238
1240
|
@deplate.options.css << [cssName]
|
|
1239
1241
|
end
|
|
1240
1242
|
if @deplate.variables['cssInclude']
|
|
1241
|
-
cssFile = @deplate.collected_css[
|
|
1243
|
+
cssFile = @deplate.collected_css[cssName]
|
|
1242
1244
|
if cssFile and File.readable?(cssFile)
|
|
1243
1245
|
acc << File.read(cssFile)
|
|
1244
1246
|
else
|
|
@@ -1456,7 +1458,7 @@ EOJS
|
|
|
1456
1458
|
opts << %{align="#{align}"} if align
|
|
1457
1459
|
width = args['width'] || @variables['tableWidth']
|
|
1458
1460
|
opts << %{width="#{width}"} if width
|
|
1459
|
-
opts << %{summary="#{caption.elt}"} if caption and caption.elt
|
|
1461
|
+
opts << %{summary="#{clean_tags(caption.elt)}"} if caption and caption.elt
|
|
1460
1462
|
return opts.join(' ')
|
|
1461
1463
|
end
|
|
1462
1464
|
|