From: Leandro Lucarella <llucax@gmail.com>
Date: Thu, 23 Sep 2004 06:32:45 +0000 (+0000)
Subject: Se actualiza a glabels2.
X-Git-Tag: svn_import~81
X-Git-Url: https://git.llucax.com/personal/documentos.git/commitdiff_plain/93c62db43ce4f6c0e4ac2ac424f0c36cda4a6d47?ds=sidebyside

Se actualiza a glabels2.
---

diff --git a/mp3_labels/MP3_12.glabels b/mp3_labels/MP3_12.glabels
index bd6da01..61705fd 100644
Binary files a/mp3_labels/MP3_12.glabels and b/mp3_labels/MP3_12.glabels differ
diff --git a/mp3_labels/MP3_13.glabels b/mp3_labels/MP3_13.glabels
index fd48d74..9df7d1c 100644
Binary files a/mp3_labels/MP3_13.glabels and b/mp3_labels/MP3_13.glabels differ
diff --git a/mp3_labels/MP3_14.glabels b/mp3_labels/MP3_14.glabels
index f1c3eda..e5cea08 100644
Binary files a/mp3_labels/MP3_14.glabels and b/mp3_labels/MP3_14.glabels differ
diff --git a/mp3_labels/MP3_15.glabels b/mp3_labels/MP3_15.glabels
index a520779..a07c101 100644
Binary files a/mp3_labels/MP3_15.glabels and b/mp3_labels/MP3_15.glabels differ
diff --git a/mp3_labels/MP3_16.glabels b/mp3_labels/MP3_16.glabels
index 53bd529..41c6293 100644
Binary files a/mp3_labels/MP3_16.glabels and b/mp3_labels/MP3_16.glabels differ
diff --git a/mp3_labels/MP3_17.glabels b/mp3_labels/MP3_17.glabels
index 95ea008..0885cd7 100644
Binary files a/mp3_labels/MP3_17.glabels and b/mp3_labels/MP3_17.glabels differ
diff --git a/mp3_labels/MP3_18.glabels b/mp3_labels/MP3_18.glabels
index 6c3b051..02c661c 100644
Binary files a/mp3_labels/MP3_18.glabels and b/mp3_labels/MP3_18.glabels differ
diff --git a/mp3_labels/MP3_19.glabels b/mp3_labels/MP3_19.glabels
index 4e4b7a3..36f02d3 100644
Binary files a/mp3_labels/MP3_19.glabels and b/mp3_labels/MP3_19.glabels differ
diff --git a/mp3_labels/MP3_20.glabels b/mp3_labels/MP3_20.glabels
index e61ff72..6cc347e 100644
Binary files a/mp3_labels/MP3_20.glabels and b/mp3_labels/MP3_20.glabels differ
diff --git a/mp3_labels/MP3_21.glabels b/mp3_labels/MP3_21.glabels
index e2c3dfa..912322a 100644
Binary files a/mp3_labels/MP3_21.glabels and b/mp3_labels/MP3_21.glabels differ
diff --git a/mp3_labels/MP3_22.glabels b/mp3_labels/MP3_22.glabels
index 916a41e..1059d48 100644
Binary files a/mp3_labels/MP3_22.glabels and b/mp3_labels/MP3_22.glabels differ
diff --git a/mp3_labels/MP3_23.glabels b/mp3_labels/MP3_23.glabels
index 5157562..6e1f615 100644
Binary files a/mp3_labels/MP3_23.glabels and b/mp3_labels/MP3_23.glabels differ
diff --git a/mp3_labels/MP3_24.glabels b/mp3_labels/MP3_24.glabels
index 1d720eb..7a96fe9 100644
Binary files a/mp3_labels/MP3_24.glabels and b/mp3_labels/MP3_24.glabels differ
diff --git a/mp3_labels/MP3_3.glabels b/mp3_labels/MP3_3.glabels
index 84b6889..fe32cbf 100644
Binary files a/mp3_labels/MP3_3.glabels and b/mp3_labels/MP3_3.glabels differ
diff --git a/mp3_labels/MP3_4.glabels b/mp3_labels/MP3_4.glabels
index 26eb6bb..9b0c360 100644
Binary files a/mp3_labels/MP3_4.glabels and b/mp3_labels/MP3_4.glabels differ
diff --git a/mp3_labels/MP3_5.glabels b/mp3_labels/MP3_5.glabels
index 5167c85..893c5ba 100644
Binary files a/mp3_labels/MP3_5.glabels and b/mp3_labels/MP3_5.glabels differ
diff --git a/mp3_labels/MP3_6.glabels b/mp3_labels/MP3_6.glabels
index ad7c0db..bd21be2 100644
Binary files a/mp3_labels/MP3_6.glabels and b/mp3_labels/MP3_6.glabels differ
diff --git a/mp3_labels/MP3_7.glabels b/mp3_labels/MP3_7.glabels
index 543f006..c6019ae 100644
Binary files a/mp3_labels/MP3_7.glabels and b/mp3_labels/MP3_7.glabels differ
diff --git a/mp3_labels/MP3_78.glabels b/mp3_labels/MP3_78.glabels
index c96862f..6abf2bc 100644
Binary files a/mp3_labels/MP3_78.glabels and b/mp3_labels/MP3_78.glabels differ
diff --git a/mp3_labels/MP3_8.glabels b/mp3_labels/MP3_8.glabels
index e991669..53bbd61 100644
Binary files a/mp3_labels/MP3_8.glabels and b/mp3_labels/MP3_8.glabels differ
diff --git a/mp3_labels/MP3_9.glabels b/mp3_labels/MP3_9.glabels
index 5ee4f22..69dfcf8 100644
Binary files a/mp3_labels/MP3_9.glabels and b/mp3_labels/MP3_9.glabels differ
diff --git a/mp3_labels/Template.MP3.glabels b/mp3_labels/Template.MP3.glabels
index 10dd62d..ab60275 100644
--- a/mp3_labels/Template.MP3.glabels
+++ b/mp3_labels/Template.MP3.glabels
@@ -1,18 +1,22 @@
 <?xml version="1.0"?>
-<glabels:Label xmlns:glabels="http://snaught.com/glabels/0.4/" rotate="False" width="337,32" height="337,32">
-  <glabels:Media_Type>Aa. Luca CD label: Imprime al reves, primero la de abajo</glabels:Media_Type>
-  <glabels:Line x="56" y="48" dx="225" dy="-0" line_width="2" line_color="0x4c66d9ff"/>
-  <glabels:Text x="170" y="10" font_family="Verdana" font_size="16" font_weight="Bold" font_italic="False" justify="Center" color="0x33408bff">
-    <glabels:Line>MP3</glabels:Line>
-    <glabels:Line>Volumen {N}</glabels:Line>
-  </glabels:Text>
-  <!-- BEGIN ARTISTAS -->
-  <glabels:Line x="{X}" y="{LINEA_Y}" dx="{LINEA_ANCHO}" dy="0" line_width="1" line_color="0x4d66d9ff"/>
-  <glabels:Text x="{X}" y="{TEXTO_Y}" font_family="Verdana" font_size="{PUNTOS}" font_weight="Regular" font_italic="False" justify="Left" color="0x010102ff">
-    <glabels:Line>{ARTISTA}</glabels:Line>
-    <!-- BEGIN ALBUMS -->
-    <glabels:Line> - {ALBUM}</glabels:Line>
-    <!-- END ALBUMS -->
-  </glabels:Text>
-  <!-- END ARTISTAS -->
-</glabels:Label>
+<Glabels-document xmlns="http://snaught.com/glabels/2.0/">
+  <Template name="Luca CD label" size="Other" width="0pt" height="0pt" description="Imprime al reves, primero la de abajo">
+    <Label-cd id="0" radius="168.66pt" hole="21.26pt" waste="0pt">
+      <Markup-margin size="2pt"/>
+      <Layout nx="1" ny="2" x0="43pt" y0="127.56pt" dx="0pt" dy="350pt"/>
+    </Label-cd>
+  </Template>
+  <Objects id="0" rotate="False">
+    <Object-line x="56pt" y="48pt" dx="225pt" dy="-0pt" line_width="2pt" line_color="0x4c66d9ff" a0="1" a1="0" a2="0" a3="1" a4="0" a5="0"/>
+    <Object-text x="114.559pt" y="10pt" w="0pt" h="0pt" justify="Center" auto_shrink="False" a0="1" a1="0" a2="0" a3="1" a4="0" a5="0">
+      <Span font_family="Verdana" font_size="16" font_weight="Bold" font_italic="False" color="0x33408bff" line_spacing="1">MP3<NL/>Volumen {N}</Span>
+    </Object-text><!-- BEGIN ARTISTAS -->
+    <Object-line x="{X}pt" y="{LINEA_Y}pt" dx="{LINEA_ANCHO}pt" dy="0pt" line_width="0.5pt" line_color="0x4d66d9ff" a0="1" a1="0" a2="0" a3="1" a4="0" a5="0"/>
+    <Object-text x="{X}pt" y="{TEXTO_Y}pt" w="0pt" h="0pt" justify="Left" auto_shrink="False" a0="1" a1="0" a2="0" a3="1" a4="0" a5="0">
+      <Span font_family="Verdana" font_size="{PUNTOS}" font_weight="Regular" font_italic="False" color="0x010102ff" line_spacing="1">{ARTISTA}<NL/><!-- BEGIN ALBUMS --> - {ALBUM}<NL/><!-- END ALBUMS --></Span>
+    </Object-text><!-- END ARTISTAS -->
+  </Objects>
+  <Data/>
+</Glabels-document>
+
+<!-- vim: set et sts=2 sw=2 -->
diff --git a/mp3_labels/cd.template b/mp3_labels/cd.template
index 81ede2b..e2921c9 100644
--- a/mp3_labels/cd.template
+++ b/mp3_labels/cd.template
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
-<GLabels-templates>
-    <Sheet name="Aa. Luca CD label" size="A4" description="Imprime al reves, primero la de abajo">
-        <Label style="cd" radius="168.66" hole="21.26" margin="2">
+<Glabels-templates>
+    <Template name="Luca CD label" size="Other" description="Imprime al reves, primero la de abajo">
+        <Label-cd id="0" radius="168.66" hole="21.26">
+            <Markup-margin size="2" />
             <Layout nx="1" ny="2" x0="43" y0="127.56" dx="0" dy="350"/>
-        </Label>
-    </Sheet>
-</GLabels-templates>
+        </Label-cd>
+    </Template>
+</Glabels-templates>
diff --git a/mp3_labels/procesar.php b/mp3_labels/procesar.php
index a9e4ebf..b190d9f 100755
--- a/mp3_labels/procesar.php
+++ b/mp3_labels/procesar.php
@@ -8,7 +8,7 @@ define('X_BASE', 60);
 define('X_COL2', 205);
 define('Y_BASE', 65);
 define('Y_MAX', 310);
-define('PUNTOS', 10);
+define('PUNTOS', 6);
 
 if ($argc < 2) {
     $name = basename($argv[0]);
@@ -71,8 +71,8 @@ if ($datos) {
         $tpl->setVariable(array(
             'X'           => $x,
             'TEXTO_Y'     => $y,
-            'LINEA_Y'     => $y + PUNTOS - 1,
-            'LINEA_ANCHO' => strlen($artista) * 6,
+            'LINEA_Y'     => $y + PUNTOS + 2.5,
+            'LINEA_ANCHO' => strlen($artista) * 3.45 + 60 / strlen($artista),
             'ARTISTA'     => translate($artista),
         ));
         sort($albums);