Se actualiza a glabels2.

diff --git a/mp3_labels/MP3_12.glabels b/mp3_labels/MP3_12.glabels
index bd6da01f4da4645739c057e153900f08c35f346d..61705fde4594cb5eb7b5f1d8de6649567c14373d 100644 (file)
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 fd48d743ed4dceec6f0850f7a06cd7e7686e3e36..9df7d1cffdf4fb31b748b629ff3c9e2d7eabea3c 100644 (file)
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 f1c3edad90aed93dd15e925e89777e835c02c5ab..e5cea08bdf1d1a70a4a759618a97682e958ef052 100644 (file)
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 a520779980b572d306336d98ee341a07ef39ffb2..a07c101cee42d5ff4a06633a8ef3f2ff96a1560b 100644 (file)
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 53bd52991bed305e28ce9ba9d9d78a95a8a1d273..41c6293f4ad1dc34af82d8b89788e23222caf920 100644 (file)
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 95ea0084bce1d00c65b9faaaca784af76ec9b277..0885cd7e2efad256b9f84dbfa99aeef2234e1a54 100644 (file)
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 6c3b05183a0c3912a0084e9ff5e7f4710b44047f..02c661c80b8ec1c8f7a2c0f0c227bb0321fcc653 100644 (file)
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 4e4b7a3b5991c2c4fecbb1a8f15973298f600459..36f02d305428589da14a24b9a1e8e6366bb98d00 100644 (file)
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 e61ff72c44db5bcb245ba9b299b3ee36f7d39ae3..6cc347ef3b5a12ba187e4a86158ea4d851aaf5b4 100644 (file)
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 e2c3dfa7ed04cfedf9fa509ffb9752a596ca38d5..912322a43be132d5a53e88222db430fa9ec41736 100644 (file)
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 916a41e1092f596db03eb23ab79ab70058940c52..1059d488f639ba1864c24f68e74b4388a5de7786 100644 (file)
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 5157562e13eaebe0b5259485175ffe707836b832..6e1f615ee999da9ed5f96ea5910f3fd04cd57926 100644 (file)
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 1d720eba3b7374fab5340f744c32947f140a796a..7a96fe9af9fa4d9fd2234471f0bf23eaa1adbd7b 100644 (file)
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 84b688971347d4915ee6b3cd8d02a0333d5b38ab..fe32cbf5ad8fdd860e6607fc8dfa4dede0bcc899 100644 (file)
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 26eb6bb98356981aeb3fbc66cafd003f715e8d95..9b0c360a3be40d848d3a792572c6b7ee2653ac73 100644 (file)
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 5167c850c8ebe29e4b2d5c2d159c26dfdeaa04c6..893c5bac2d1675abd74656b62a9b165929137c5b 100644 (file)
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 ad7c0db03fe3bc2151a1985401afd0708fccc5ef..bd21be2dcd8c40adeae0c7000941bfac9b978feb 100644 (file)
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 543f006cbd848287beb6508582091243af63a060..c6019aeb2dab08df2f2796b2820b37dfdb620e4c 100644 (file)
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 c96862fc0e823420848617d51b48b5154ea804f7..6abf2bced73f99e8e8925eecf765f7a8643e5c85 100644 (file)
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 e9916691ece8c7f2179e696bb5648e919de39f51..53bbd61573cd1b5ba79593f7a36492cd1af8bbee 100644 (file)
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 5ee4f223a580ca4b95f6b3f4820a479b1fd03362..69dfcf8e6ffeb987e225b406efc048a82c8a19d4 100644 (file)
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 10dd62de35d7f0b0e3a19585b86966956e2577ca..ab6027585a2b09524fdd7a794b12785f1c425dcb 100644 (file)
--- 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 81ede2b7409b9452d2293996266a9d73a3c5aefa..e2921c90d97386b543bb28b25b31bc5d96137bc0 100644 (file)
--- 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 a9e4ebfea057d1420cb596e02c1a09ff217aafcd..b190d9f79f5697b2a7c315cbac35599e0117edce 100755 (executable)
--- 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);