v1.7a

README.md

@@ -1,32 +1,32 @@
 #Praatalign: an interactive Praat plug-in for performing phonetic forced alignment
 
-###Version 1.7
+###Version 1.7a
 
 Praatalign is a plug-in for Praat that can be used to do forced phonetic
 alignment on speech signals and in particular free speech. Praatalign combines
 the powerful HTK toolkit with the interactivity and modularity of Praat to
 create an interactive, intuitive and extendable application. Currently
-Praatalign uses the models trained by Schiel et al. used in MAUS\[1\].
+Praatalign uses the acoustic models trained by Schiel et al. used in MAUS\[1,2\].
 
 ###Releases
 
-[Latest manual](https://github.com/dopefishh/praatalign/releases/download/v1.7/book_1.7.pdf)
+[Latest manual](https://github.com/dopefishh/praatalign/releases/download/v1.7a/book_1.7a.pdf)
 
 Latest plugin:
-[.tar.xz](https://github.com/dopefishh/praatalign/releases/download/v1.7/praatalign_1.7.tar.xz)
-[.zip](https://github.com/dopefishh/praatalign/releases/download/v1.7/praatalign_1.7.zip)
+[.tar.xz](https://github.com/dopefishh/praatalign/releases/download/v1.7a/praatalign_1.7a.tar.xz)
+[.zip](https://github.com/dopefishh/praatalign/releases/download/v1.7a/praatalign_1.7a.zip)
 
 [Older releases](https://github.com/dopefishh/praatalign/releases)
 
 ###How to cite
 
 ```tex
-@misc{praatalign1.7,
+@misc{praatalign1.7a,
 	author={Lubbers, Mart and Torreira, Francisco},
 	title={Praatalign: an interactive Praat plug-in for performing phonetic forced alignment},
 	howpublished={\url{https://github.com/dopefishh/praatalign}},
 	year={2013-2015},
-	note={Version 1.7}
+	note={Version 1.7a}
 }
 ```
 
@@ -38,3 +38,4 @@ Francisco Torreira(supervision)
 
 ###References
 1. http://www.bas.uni-muenchen.de/Bas/BasMAUS.html
+2. Schiel F. (1999): Automatic Phonetic Transcription of Non-Prompted Speech, Proc. of the ICPhS 1999. San Francisco, August 1999. pp. 607-610.

alignannotation.praat

@@ -46,28 +46,54 @@ selection_duration = selection_end - selection_start
 
 # Get the index the tiers
 selectObject: textgrid_object$
+
+phonetier_number = -1
+llhtier_number = -1
+wordtier_number = -1
+cantier_number = -1
+
+if phonetier_name$ <> ""
 @indexOfTier: phonetier_name$
-phonetier_number = indexOfTier.number
+	phonetier_number = indexOfTier.number
+endif
 
+if llhtier_name$ <> ""
 @indexOfTier: llhtier_name$
-llhtier_number = indexOfTier.number
-if indexOfTier.inserted == 1
-	phonetier_number = if phonetier_number = -1 then -1 else phonetier_number + 1 fi
+	llhtier_number = indexOfTier.number
+	if indexOfTier.inserted == 1
+		if phonetier_name$ <> ""
+			phonetier_number = phonetier_number + 1
+		endif
+	endif
 endif
 
+if wordtier_name$ <> ""
 @indexOfTier: wordtier_name$
-wordtier_number = indexOfTier.number
-if indexOfTier.inserted == 1
-	phonetier_number = if phonetier_number = -1 then -1 else phonetier_number + 1 fi
-	llhtier_number = if llhtier_number = -1 then -1 else llhtier_number + 1 fi
+	wordtier_number = indexOfTier.number
+	if indexOfTier.inserted == 1
+		if phonetier_name$ <> ""
+			phonetier_number = phonetier_number + 1
+		endif
+		if llhtier_name$ <> ""
+			llhtier_number = llhtier_number + 1
+		endif
+	endif
 endif
 
+if cantier_name$ <> ""
 @indexOfTier: cantier_name$
-cantier_number = indexOfTier.number
-if wordtier_number <> -1
-	phonetier_number = if phonetier_number = -1 then -1 else phonetier_number + 1 fi
-	llhtier_number = if llhtier_number = -1 then -1 else llhtier_number + 1 fi
-	wordtier_number = if wordtier_number = -1 then -1 else wordtier_number + 1 fi
+	cantier_number = indexOfTier.number
+	if indexOfTier.inserted == 1
+		if phonetier_name$ <> ""
+			phonetier_number = phonetier_number + 1
+		endif
+		if llhtier_name$ <> ""
+			llhtier_number = llhtier_number + 1
+		endif
+		if wordtier_name$ <> ""
+			wordtier_number = wordtier_number + 1
+		endif
+	endif
 endif
 
 # Clean up the phone tier

aligntier.praat

@@ -42,28 +42,54 @@ endwhile
 
 # Get the index the tiers
 selectObject: textgrid_object$
+
+phonetier_number = -1
+llhtier_number = -1
+wordtier_number = -1
+cantier_number = -1
+
+if phonetier_name$ <> ""
 @indexOfTier: phonetier_name$
-phonetier_number = indexOfTier.number
+	phonetier_number = indexOfTier.number
+endif
 
+if llhtier_name$ <> ""
 @indexOfTier: llhtier_name$
-llhtier_number = indexOfTier.number
-if indexOfTier.inserted == 1
-	phonetier_number = if phonetier_number = -1 then -1 else phonetier_number + 1 fi
+	llhtier_number = indexOfTier.number
+	if indexOfTier.inserted == 1
+		if phonetier_name$ <> ""
+			phonetier_number = phonetier_number + 1
+		endif
+	endif
 endif
 
+if wordtier_name$ <> ""
 @indexOfTier: wordtier_name$
-wordtier_number = indexOfTier.number
-if indexOfTier.inserted == 1
-	phonetier_number = if phonetier_number = -1 then -1 else phonetier_number + 1 fi
-	llhtier_number = if llhtier_number = -1 then -1 else llhtier_number + 1 fi
+	wordtier_number = indexOfTier.number
+	if indexOfTier.inserted == 1
+		if phonetier_name$ <> ""
+			phonetier_number = phonetier_number + 1
+		endif
+		if llhtier_name$ <> ""
+			llhtier_number = llhtier_number + 1
+		endif
+	endif
 endif
 
+if cantier_name$ <> ""
 @indexOfTier: cantier_name$
-cantier_number = indexOfTier.number
-if indexOfTier.inserted == 1
-	phonetier_number = if phonetier_number = -1 then -1 else phonetier_number + 1 fi
-	llhtier_number = if llhtier_number = -1 then -1 else llhtier_number + 1 fi
-	wordtier_number = if wordtier_number = -1 then -1 else wordtier_number + 1 fi
+	cantier_number = indexOfTier.number
+	if indexOfTier.inserted == 1
+		if phonetier_name$ <> ""
+			phonetier_number = phonetier_number + 1
+		endif
+		if llhtier_name$ <> ""
+			llhtier_number = llhtier_number + 1
+		endif
+		if wordtier_name$ <> ""
+			wordtier_number = wordtier_number + 1
+		endif
+	endif
 endif
 
 # Do the actual alignment

book/Makefile

@@ -11,13 +11,14 @@ all: book.pdf
 %.fmt: preamble.tex
 	$(LATEX) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
-%.dvi: %.tex %.fmt $(IMGS)
+%.dvi: %.tex %.fmt %.bib $(IMGS)
 	$(LATEX) $<
+	bibtex $(basename $<)
 	$(LATEX) $<
 	$(LATEX) $<
 
 %.eps: %.eps.xz
 	xz -kd $<
 
 clean:
-	$(RM) -v $(addprefix book,fmt aux dvi log toc out pdf) $(IMGS)
+	$(RM) -v $(addprefix book.,fmt aux dvi log toc out pdf bbl blg) $(IMGS)

book/book.bib

@@ -0,0 +1,7 @@
+@article{schiel1999,
+	title = {Automatic phonetic transcription of non-prompted speech},
+	url = {http://epub.ub.uni-muenchen.de/13682/1/schiel_13682.pdf},
+	urldate = {2015-10-13},
+	author = {Schiel, Florian},
+	year = {1999},
+}

book/book.tex

@@ -151,15 +151,15 @@ \subsection{Manual installation}
 \chapter{Documentation}
 \section{General information}
 With the Praatalign plugin you can currently align out of the box the data
-using Spanish, Tzeltal, English or Dutch using the models from
-MAUS\footnote{\url{http://www.bas.uni-muenchen.de/Bas/BasMAUS.html}} that are
-already included in the package. Presets for Australian English, Estonian,
-German, Hungarian, Italian, New Zealand English Polish and Portuguese at
-minimal will be added in the future. When you want a language from the above
-list implemented with priority you can always contact us. If you want other
-languages you can still contact us and it might be possible using the general
-SAMPA model. Adding your own models is also possible but this is not trivial,
-you can always contact us.
+using Spanish, Tzeltal, English or Dutch using the acoustic models from
+MAUS~\footnote{\url{http://www.bas.uni-muenchen.de/Bas/BasMAUS.html}} created
+by Schiel et al.~\cite{schiel1999} that are already included in the package.
+Presets for Australian English, Estonian, German, Hungarian, Italian, New
+Zealand English Polish and Portuguese at minimal will be added in the future.
+When you want a language from the above list implemented with priority you can
+always contact us. If you want other languages you can still contact us and it
+might be possible using the general SAMPA model. Adding your own models is also
+possible but this is not trivial, you can always contact us.
 
 Dictionary, ruleset and all other files are, and should be, encoded in
 \texttt{UTF-8}. To enforce this the plug-in changes the default behaviour of
@@ -633,7 +633,7 @@ \section{How to cite}
 	title={Praatalign: an interactive Praat plug-in for performing phonetic forced alignment},
 	howpublished={\url{https://github.com/dopefishh/praatalign}},
 	year={2013-2015},
-	note={Version 1.7}
+	note={Version 1.7a}
 }
 \end{lstlisting}
 
@@ -1090,6 +1090,9 @@ \section{Spanish phone specification}
 \newpage
 \section{Version history}
 \begin{longtable}{|p{0.22\linewidth}p{0.8\linewidth}|}
+	\hline
+	1.7a (2015-10-13) & \tabitem Fixed critical tier creation bug.\\
+	& \tabitem Added version to settings window.\\
 	\hline
 	1.7 (2015-10-08) & \tabitem More robuust tier creation.\\
 		& \tabitem Some typos fixed in the manual.\\
@@ -1199,4 +1202,7 @@ \section{Version history}
 	\caption{Version history}
 \end{longtable}
 
+\bibliographystyle{ieeetr}
+\bibliography{book}
+
 \end{document}

install.sh

@@ -30,8 +30,8 @@ scriptdir="$(cd "$(dirname "$0")" && pwd)"
 
 set -x
 mkdir -p "$dir"
-rm -r "$dir"/* || true
-cp -R "$scriptdir/"*.{py,praat} "$dir"
-cp -R "$scriptdir/"par.* "$dir"
+rm -fr "$dir"/* || true
+cp -fR "$scriptdir/"*.{py,praat} "$dir"
+cp -fR "$scriptdir/"par.* "$dir"
 set +x
 echo "Installing complete"

mkrelease.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.7
+VERSION=1.7a
 zip -9rv praatalign_$VERSION.zip *.{praat,py,md} {install,par,LICENCE}*
 tar -cvf praatalign_$VERSION.tar *.{praat,py,md} {install,par,LICENCE}*
 xz -ve praatalign_$VERSION.tar

settings.praat

@@ -64,6 +64,7 @@ endif
 
 # Spawn the option window for the user
 beginPause: "Basic options"
+	comment: "Praatalign version 1.7a"
 	comment: "Name for the output tier(may already exist)"
 	sentence: "new", new$