aml 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/aml/compile.rb +1 -0
  3. data/lib/aml/core/mixin.aml +37 -18
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 56b842efcba90148f5942d42734c201b2ad9a50f
4
- data.tar.gz: 3fe39d419cc1b58aa15023ef03a63c66eeb9fce2
3
+ metadata.gz: d4b570522d90f38a6a78c9f4d36370e1480a9c6b
4
+ data.tar.gz: 09b2e484133f8582394a8a3b70d5c8c3d6404ec3
5
5
  SHA512:
6
- metadata.gz: 212d3cdc3ef4380fe682a7ae76ed1171858169bf226c87c34c898b554e432ab5cf6d289b90473bfd902c40dd97e4929fd3f98cc281a4b0fb0cd56d5984c7d8a3
7
- data.tar.gz: f21a2425a47952923c091cdfd4b3438f930efe6ac77f302c422ad96049daa8a326b095602e3f5903a3cf8c4c0d611113a193e44ad04eb6b3a5bc7a9d8a71eaa4
6
+ metadata.gz: 8eb4411d411dc530e534b21f3de8c5533d3db16e3844b60bfe58e53a82d420ade1a25a8c9d135418afec5313c535a408e2479e1dd959e926c920de364343193b
7
+ data.tar.gz: 950f51998431245bb29040cdcaba48745b9cc1725c8cfc906900c0246e8c3925c941865227936a0b730a2bb02e501be7ad3adcc5c54038fcad84016aa2a4cea5
data/lib/aml/compile.rb CHANGED
@@ -46,6 +46,7 @@ class Compile
46
46
  end
47
47
  prepare_partial_structure(lines,definition) if(lines.select{|k|k[:type]==:partial}).count > 0
48
48
  prepare_line_variable(lines,definition)
49
+ prepare_mixin_structure(lines,definition)
49
50
  lines
50
51
  end
51
52
 
data/lib/aml/core/mixin.aml CHANGED
@@ -4,49 +4,68 @@
4
4
 
5
5
  %!-- DOCTYPES ---%
6
6
 
7
- %%html5{
7
+ %%html5-{
8
8
  <!DOCTYPE html>
9
+ }
10
+ %%html5{
11
+ %(.html5-)
9
12
  %html
10
13
  }
11
- %%html401s{
14
+ %%html401s-{
12
15
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
16
+ }
17
+ %%html401s{
18
+ %(.html401s-)
13
19
  %html
14
20
  }
15
- %%html401t{
21
+ %%html401t-{
16
22
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
23
+ }
24
+ %%html401t{
25
+ %(.html401t-)
17
26
  %html
18
27
  }
19
- %%html401f{
28
+ %%html401f-{
20
29
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
30
+ }
31
+ %%html401f{
32
+ %(.html401f-)
21
33
  %html
22
34
  }
23
- %%xhtml1s{
35
+ %%xhtml1s-{
24
36
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
37
+ }
38
+ %%xhtml1s{
39
+ %(.xhtml1s-)
25
40
  %html
26
41
  }
27
- %%xhtml1t{
42
+ %%xhtml1t-{
28
43
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
29
44
  }
30
- %%xhtml1f{
45
+ %%xhtml1t{
46
+ %(.xhtml1t-)
47
+ %html
48
+ }
49
+ %%xhtml1f-{
31
50
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
51
+ }
52
+ %%xhtml1f{
53
+ %(.xhtml1f-)
32
54
  %html
33
55
  }
34
- %%xhtml11{
56
+ %%xhtml11-{
35
57
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
58
+ }
59
+ %%xhtml11{
60
+ %(.xhtml11-)
36
61
  %html
37
62
  }
38
63
 
39
-
40
64
  %!-- HELPERS ---%
41
65
 
42
- %%stylesheet(:href=>''){
43
- %/link{:href=>'@(:href).css',:rel=>'stylesheet'}
66
+ %%css(:href=>'', :media=>'screen'){
67
+ %/link{:href=>'@(:href)',:media=>'@(:media)', :rel=>'stylesheet'}
44
68
  }
45
-
46
- %%javascript(:href=>''){
47
- %/script{:href=>'@(:href).js',:type=>'text/javascript'}
48
- }
49
-
50
- %%favicon(:href=>''){
51
- %/link{:rel=>'icon',:type=>'image/png',:href=>'@(:href)'}
69
+ %%js(:src=>''){
70
+ %script{:type=>'text/javascript', :src=>'@(:src)'}
52
71
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aml
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Esquivias
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-10 00:00:00.000000000 Z
11
+ date: 2013-12-11 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Abstract Markup Language is a robust and feature rich markup language
14
14
  designed to avoid repetition and promote clear, well-indented markup.