summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2011-10-23 17:21:44 +0100
committerdakkar <dakkar@thenautilus.net>2011-10-23 17:21:44 +0100
commit2c3081a3912ff98422d15cb8252542f63037297b (patch)
treee17df5a430b16abd667cd3ce53fae17e90feed24
parent"prep" compilato (diff)
parentno-break-space anche dopo L (diff)
downloadinventario-2c3081a3912ff98422d15cb8252542f63037297b.tar.gz
inventario-2c3081a3912ff98422d15cb8252542f63037297b.tar.bz2
inventario-2c3081a3912ff98422d15cb8252542f63037297b.zip
Merge branch 'master' into risultati
-rw-r--r--incantesimi/excel_to_incantesimi.pl1
-rw-r--r--incantesimi/incantesimi.cmd.tex2
2 files changed, 2 insertions, 1 deletions
diff --git a/incantesimi/excel_to_incantesimi.pl b/incantesimi/excel_to_incantesimi.pl
index d1c82cf..017ee23 100644
--- a/incantesimi/excel_to_incantesimi.pl
+++ b/incantesimi/excel_to_incantesimi.pl
@@ -147,6 +147,7 @@ sub latexise {
$str = latex_encode($str);
$str =~ s{(?<!\\)\. }{.\\ }g;
+ $str =~ s{(?<=[0-9L]) }{~}g;
return $str;
}
diff --git a/incantesimi/incantesimi.cmd.tex b/incantesimi/incantesimi.cmd.tex
index b294498..ef785e9 100644
--- a/incantesimi/incantesimi.cmd.tex
+++ b/incantesimi/incantesimi.cmd.tex
@@ -148,7 +148,7 @@
\newcommand{\incantesimo}[1]{%
\pgfkeys{/spells/.cd,#1}\spellcard{type=spell,
tempostr={CT: \pgfkeysvalueof{/spells/tempo}},
- source={\pgfkeysvalueof{scuola}},
+ source={\pgfkeysvalueof{/spells/scuola}},
levelstr={LVL \pgfkeysvalueof{/spells/level}},
}}