diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..39abf1c --- /dev/null +++ b/.classpath @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..655c712 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +target* +build* diff --git a/.project b/.project new file mode 100644 index 0000000..6aa5e77 --- /dev/null +++ b/.project @@ -0,0 +1,34 @@ + + + GuitarTeX2 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + + + 1641408443802 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..abdea9a --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..d4313d4 --- /dev/null +++ b/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..1b6e1ef --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..9e171ab --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,29 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + { + "type": "java", + "name": "Launch Current File", + "request": "launch", + "mainClass": "${file}" + }, + { + "type": "java", + "name": "Launch GuitarTeX2", + "request": "launch", + "mainClass": "guitartex2.GuitarTeX2", + "projectName": "GuitarTeX2" + }, + { + "type": "java", + "name": "Launch GuitarTeX2Convert", + "request": "launch", + "mainClass": "guitartex2.GuitarTeX2Convert", + "projectName": "GuitarTeX2" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cf117bd --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.home": "/usr/local/Cellar/openjdk/17.0.1_1" +} \ No newline at end of file diff --git a/src/guitartex2/INSTALL b/INSTALL similarity index 86% rename from src/guitartex2/INSTALL rename to INSTALL index 6dc6b75..c437df6 100644 --- a/src/guitartex2/INSTALL +++ b/INSTALL @@ -12,7 +12,7 @@ Anmerkungen verbindung. Es muss moeglich sein auf den Port 3121 zugreifen zu koennen. * Es ist eine beta Version mit einigen bekannten und unbekannten Bugs. Ich bin fuer jeden Hinweis und Bemerkung dankbar. Bitte nutzen Sie dafuer - die Sourceforge Projektseite http://sourceforge.net/projects/guitartex2 + die Sourceforge Projektseite https://github.com/workinghard/GuitarTeX2/ Notes @@ -22,7 +22,7 @@ Notes * You have to set a Reader in a preferences section * Remote server port is 3121, make sure your Firewall let it pass through * It's a beta Version with known and unknown bugs. Please report them - using a project page http://sourceforge.net/projects/guitartex2 + using a project page https://github.com/workinghard/GuitarTeX2/ Have Fun diff --git a/README b/README index 8baacbf..57c8b26 100644 --- a/README +++ b/README @@ -3,9 +3,14 @@ UPDATE: Server has moved. Please use "guitartex2.nikolai-rinas.de" instead Release Notes ============= +Version 3.4.1 +* New build pipeline with VSC and maven +* Code cleanup +* Dropped standalone mac app support + Version 3.4.0: * Code cleanup: Java 1.8 is required -* App for Mac: Embeded Java runtime. Works standalone +* App for Mac: Embedded Java runtime. Works standalone Version 3.3.1 * Defaultwerte angepasst diff --git a/doc/GuitartTeX2-documentation_de.pdf b/doc/GuitartTeX2-documentation_de.pdf new file mode 100644 index 0000000..82640a5 Binary files /dev/null and b/doc/GuitartTeX2-documentation_de.pdf differ diff --git a/src/guitartex2/doc/GuitartTeX2-documentation.tex b/doc/GuitartTeX2-documentation_de.tex similarity index 100% rename from src/guitartex2/doc/GuitartTeX2-documentation.tex rename to doc/GuitartTeX2-documentation_de.tex diff --git a/doc/GuitartTeX2-documentation_en.aux b/doc/GuitartTeX2-documentation_en.aux new file mode 100644 index 0000000..c2bd54e --- /dev/null +++ b/doc/GuitartTeX2-documentation_en.aux @@ -0,0 +1,38 @@ +\relax +\providecommand\babel@aux[2]{} +\@nameuse{bbl@beforestart} +\babel@aux{english}{} +\@writefile{toc}{\contentsline {section}{\numberline {1}Overview}{1}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Features}{1}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}Beispiel}{2}{}\protected@file@percent } +\@writefile{toc}{\contentsline {section}{\numberline {2}Installation}{4}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {2.1}Woher bekomme ich $GuitarTeX_2$}{4}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {2.2}Systemanforderungen}{4}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {2.3}Installation}{4}{}\protected@file@percent } +\@writefile{toc}{\contentsline {section}{\numberline {3}Der Editor $GuitarTeX_2$}{4}{}\protected@file@percent } +\@writefile{toc}{\contentsline {section}{\numberline {4}Unterst\"utzte Chord-Direktiven}{5}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {4.1}Spezielle Zeichen}{5}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {4.2}Seitenlayout}{5}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.2.1}Grunds"atzliches}{6}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.2.2}Optionen}{7}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.2.3}Beispiele}{7}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {4.3}Dokumentenstrukur}{9}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.3.1}title}{9}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.3.2}subtitle}{9}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.3.3}bridge}{9}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.3.4}chorus}{10}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.3.5}instr}{10}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.3.6}np}{10}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.3.7}tab}{10}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {4.4}Fonts}{12}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.4.1}font\underline {~}size}{12}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.4.2}color\underline {~}xxx}{12}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {4.5}Gitarren- und Bass-Tabulaturen}{13}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {4.6}N"utzliches}{14}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.6.1}define}{14}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.6.2}comment}{14}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.6.3}margin}{15}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsubsection}{\numberline {4.6.4}second}{15}{}\protected@file@percent } +\@writefile{toc}{\contentsline {section}{\numberline {5}\LaTeX -Kommandos und Pakete verwenden}{16}{}\protected@file@percent } +\@writefile{toc}{\contentsline {subsection}{\numberline {5.1}\LaTeX -Kommandos}{16}{}\protected@file@percent } +\gdef \@abspage@last{16} diff --git a/doc/GuitartTeX2-documentation_en.log b/doc/GuitartTeX2-documentation_en.log new file mode 100644 index 0000000..c3297bc --- /dev/null +++ b/doc/GuitartTeX2-documentation_en.log @@ -0,0 +1,667 @@ +This is pdfTeX, Version 3.141592653-2.6-1.40.22 (TeX Live 2021) (preloaded format=pdflatex 2021.4.22) 5 JAN 2022 23:07 +entering extended mode + restricted \write18 enabled. + file:line:error style messages enabled. + %&-line parsing enabled. +**GuitartTeX2-documentation_en.tex +(./GuitartTeX2-documentation_en.tex +LaTeX2e <2020-10-01> patch level 4 +L3 programming layer <2021-02-18> +(/usr/local/texlive/2021/texmf-dist/tex/latex/base/article.cls +Document Class: article 2020/04/10 v1.4m Standard LaTeX document class +(/usr/local/texlive/2021/texmf-dist/tex/latex/base/size12.clo +File: size12.clo 2020/04/10 v1.4m Standard LaTeX file (size option) +) +\c@part=\count179 +\c@section=\count180 +\c@subsection=\count181 +\c@subsubsection=\count182 +\c@paragraph=\count183 +\c@subparagraph=\count184 +\c@figure=\count185 +\c@table=\count186 +\abovecaptionskip=\skip47 +\belowcaptionskip=\skip48 +\bibindent=\dimen138 +) +(/usr/local/texlive/2021/texmf-dist/tex/latex/base/inputenc.sty +Package: inputenc 2020/08/01 v1.3d Input encoding file +\inpenc@prehook=\toks15 +\inpenc@posthook=\toks16 + +(/usr/local/texlive/2021/texmf-dist/tex/latex/base/latin1.def +File: latin1.def 2020/08/01 v1.3d Input encoding file +)) +(/usr/local/texlive/2021/texmf-dist/tex/latex/amsmath/amsmath.sty +Package: amsmath 2020/09/23 v2.17i AMS math features +\@mathmargin=\skip49 + +For additional information on amsmath, use the `?' option. +(/usr/local/texlive/2021/texmf-dist/tex/latex/amsmath/amstext.sty +Package: amstext 2000/06/29 v2.01 AMS text + +(/usr/local/texlive/2021/texmf-dist/tex/latex/amsmath/amsgen.sty +File: amsgen.sty 1999/11/30 v2.0 generic functions +\@emptytoks=\toks17 +\ex@=\dimen139 +)) +(/usr/local/texlive/2021/texmf-dist/tex/latex/amsmath/amsbsy.sty +Package: amsbsy 1999/11/29 v1.2d Bold Symbols +\pmbraise@=\dimen140 +) +(/usr/local/texlive/2021/texmf-dist/tex/latex/amsmath/amsopn.sty +Package: amsopn 2016/03/08 v2.02 operator names +) +\inf@bad=\count187 +LaTeX Info: Redefining \frac on input line 234. +\uproot@=\count188 +\leftroot@=\count189 +LaTeX Info: Redefining \overline on input line 399. +\classnum@=\count190 +\DOTSCASE@=\count191 +LaTeX Info: Redefining \ldots on input line 496. +LaTeX Info: Redefining \dots on input line 499. +LaTeX Info: Redefining \cdots on input line 620. +\Mathstrutbox@=\box47 +\strutbox@=\box48 +\big@size=\dimen141 +LaTeX Font Info: Redeclaring font encoding OML on input line 743. +LaTeX Font Info: Redeclaring font encoding OMS on input line 744. +\macc@depth=\count192 +\c@MaxMatrixCols=\count193 +\dotsspace@=\muskip16 +\c@parentequation=\count194 +\dspbrk@lvl=\count195 +\tag@help=\toks18 +\row@=\count196 +\column@=\count197 +\maxfields@=\count198 +\andhelp@=\toks19 +\eqnshift@=\dimen142 +\alignsep@=\dimen143 +\tagshift@=\dimen144 +\tagwidth@=\dimen145 +\totwidth@=\dimen146 +\lineht@=\dimen147 +\@envbody=\toks20 +\multlinegap=\skip50 +\multlinetaggap=\skip51 +\mathdisplay@stack=\toks21 +LaTeX Info: Redefining \[ on input line 2923. +LaTeX Info: Redefining \] on input line 2924. +) +(/usr/local/texlive/2021/texmf-dist/tex/generic/babel/babel.sty +Package: babel 2021/03/24 3.56 The Babel package + +(/usr/local/texlive/2021/texmf-dist/tex/generic/babel/babel.def +File: babel.def 2021/03/24 3.56 Babel common definitions +\babel@savecnt=\count199 +\U@D=\dimen148 +\l@babelnohyphens=\language87 + +(/usr/local/texlive/2021/texmf-dist/tex/generic/babel/txtbabel.def) +\bbl@readstream=\read2 +) +\bbl@dirlevel=\count266 + +(/usr/local/texlive/2021/texmf-dist/tex/generic/babel-english/english.ldf +Language: english 2017/06/06 v3.3r English support from the babel system +Package babel Info: \l@canadian = using hyphenrules for english +(babel) (\language0) on input line 102. +Package babel Info: \l@australian = using hyphenrules for ukenglish +(babel) (\language21) on input line 105. +Package babel Info: \l@newzealand = using hyphenrules for ukenglish +(babel) (\language21) on input line 108. +)) +(/usr/local/texlive/2021/texmf-dist/tex/latex/listings/listings.sty +(/usr/local/texlive/2021/texmf-dist/tex/latex/graphics/keyval.sty +Package: keyval 2014/10/28 v1.15 key=value parser (DPC) +\KV@toks@=\toks22 +) +\lst@mode=\count267 +\lst@gtempboxa=\box49 +\lst@token=\toks23 +\lst@length=\count268 +\lst@currlwidth=\dimen149 +\lst@column=\count269 +\lst@pos=\count270 +\lst@lostspace=\dimen150 +\lst@width=\dimen151 +\lst@newlines=\count271 +\lst@lineno=\count272 +\lst@maxwidth=\dimen152 + +(/usr/local/texlive/2021/texmf-dist/tex/latex/listings/lstmisc.sty +File: lstmisc.sty 2020/03/24 1.8d (Carsten Heinz) +\c@lstnumber=\count273 +\lst@skipnumbers=\count274 +\lst@framebox=\box50 +) +(/usr/local/texlive/2021/texmf-dist/tex/latex/listings/listings.cfg +File: listings.cfg 2020/03/24 1.8d listings configuration +)) +Package: listings 2020/03/24 1.8d (Carsten Heinz) + +(/usr/local/texlive/2021/texmf-dist/tex/latex/tools/verbatim.sty +Package: verbatim 2020-07-07 v1.5u LaTeX2e package for verbatim enhancements +\every@verbatim=\toks24 +\verbatim@line=\toks25 +\verbatim@in@stream=\read3 +) +(/usr/local/texlive/2021/texmf-dist/tex/latex/graphics/graphicx.sty +Package: graphicx 2020/09/09 v1.2b Enhanced LaTeX Graphics (DPC,SPQR) + +(/usr/local/texlive/2021/texmf-dist/tex/latex/graphics/graphics.sty +Package: graphics 2020/08/30 v1.4c Standard LaTeX Graphics (DPC,SPQR) + +(/usr/local/texlive/2021/texmf-dist/tex/latex/graphics/trig.sty +Package: trig 2016/01/03 v1.10 sin cos tan (DPC) +) +(/usr/local/texlive/2021/texmf-dist/tex/latex/graphics-cfg/graphics.cfg +File: graphics.cfg 2016/06/04 v1.11 sample graphics configuration +) +Package graphics Info: Driver file: pdftex.def on input line 105. + +(/usr/local/texlive/2021/texmf-dist/tex/latex/graphics-def/pdftex.def +File: pdftex.def 2020/10/05 v1.2a Graphics/color driver for pdftex +)) +\Gin@req@height=\dimen153 +\Gin@req@width=\dimen154 +) +(/usr/local/texlive/2021/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def +File: l3backend-pdftex.def 2021-03-18 L3 backend support: PDF output (pdfTeX) +\l__color_backend_stack_int=\count275 +\l__pdf_internal_box=\box51 +) +(./GuitartTeX2-documentation_en.aux) +\openout1 = `GuitartTeX2-documentation_en.aux'. + +LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 12. +LaTeX Font Info: ... okay on input line 12. +LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 12. +LaTeX Font Info: ... okay on input line 12. +LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 12. +LaTeX Font Info: ... okay on input line 12. +LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 12. +LaTeX Font Info: ... okay on input line 12. +LaTeX Font Info: Checking defaults for TS1/cmr/m/n on input line 12. +LaTeX Font Info: ... okay on input line 12. +LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 12. +LaTeX Font Info: ... okay on input line 12. +LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 12. +LaTeX Font Info: ... okay on input line 12. +\c@lstlisting=\count276 + +(/usr/local/texlive/2021/texmf-dist/tex/context/base/mkii/supp-pdf.mkii +[Loading MPS to PDF converter (version 2006.09.02).] +\scratchcounter=\count277 +\scratchdimen=\dimen155 +\scratchbox=\box52 +\nofMPsegments=\count278 +\nofMParguments=\count279 +\everyMPshowfont=\toks26 +\MPscratchCnt=\count280 +\MPscratchDim=\dimen156 +\MPnumerator=\count281 +\makeMPintoPDFobject=\count282 +\everyMPtoPDFconversion=\toks27 +) (/usr/local/texlive/2021/texmf-dist/tex/latex/epstopdf-pkg/epstopdf-base.sty +Package: epstopdf-base 2020-01-24 v2.11 Base part for package epstopdf +Package epstopdf-base Info: Redefining graphics rule for `.eps' on input line 4 +85. + +(/usr/local/texlive/2021/texmf-dist/tex/latex/latexconfig/epstopdf-sys.cfg +File: epstopdf-sys.cfg 2010/07/13 v1.3 Configuration of (r)epstopdf for TeX Liv +e +)) +Underfull \hbox (badness 10000) in paragraph at lines 15--23 + + [] + +LaTeX Font Info: Trying to load font information for OMS+cmr on input line 5 +2. +(/usr/local/texlive/2021/texmf-dist/tex/latex/base/omscmr.fd +File: omscmr.fd 2019/12/16 v2.5j Standard LaTeX font definitions +) +LaTeX Font Info: Font shape `OMS/cmr/bx/n' in size <12> not available +(Font) Font shape `OMS/cmsy/b/n' tried instead on input line 52. + +File: pics/example1.pdf Graphic file (type pdf) + +Package pdftex.def Info: pics/example1.pdf used on input line 73. +(pdftex.def) Requested size: 429.00238pt x 555.1894pt. + +Underfull \hbox (badness 10000) in paragraph at lines 49--78 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 49--78 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 49--78 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 49--78 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 49--78 + + [] + + +Overfull \hbox (39.00238pt too wide) in paragraph at lines 49--78 +[] + [] + +[1 + +{/usr/local/texlive/2021/texmf-var/fonts/map/pdftex/updmap/pdftex.map}] +[2] +Overfull \vbox (6.6894pt too high) has occurred while \output is active [] + + +[3 <./pics/example1.pdf>] +Overfull \hbox (31.3243pt too wide) in paragraph at lines 82--84 +\OT1/cmr/m/n/12 Die ak-tuelle Ver-sion bekom-men Sie im-mer auf der Download-Se +ite des $\OML/cmm/m/it/12 GuitarTeX[]$\OT1/cmr/m/n/12 - + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 101--108 + + [] + + +Overfull \hbox (12.74258pt too wide) in paragraph at lines 101--108 +\OT1/cmr/m/n/12 ist im Homev-erze-ich-nis des Be-nutzers zu finden. Sie kann na +chtr^^?aglich ver^^?andert + [] + +[4] +Underfull \hbox (badness 10000) in paragraph at lines 125--140 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 125--140 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 125--140 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 125--140 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 151--155 + + [] + +[5] +Overfull \hbox (816.15584pt too wide) in paragraph at lines 173--205 +[] + [] + +[6] +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 206--248 + + [] + +[7] +Underfull \hbox (badness 10000) in paragraph at lines 250--257 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 250--257 + + [] + +[8] +Underfull \hbox (badness 10000) in paragraph at lines 258--264 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 258--264 + + [] + +LaTeX Font Info: Font shape `OMS/cmr/m/n' in size <12> not available +(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 265. + +Underfull \hbox (badness 10000) in paragraph at lines 265--276 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 265--276 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 277--288 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 277--288 + + [] + +[9] +Underfull \hbox (badness 10000) in paragraph at lines 294--297 + + [] + + +File: pics/tabs1.pdf Graphic file (type pdf) + +Package pdftex.def Info: pics/tabs1.pdf used on input line 304. +(pdftex.def) Requested size: 426.79134pt x 552.32666pt. + +Overfull \hbox (36.79134pt too wide) in paragraph at lines 298--305 +[] + [] + +[10] +Overfull \vbox (3.82666pt too high) has occurred while \output is active [] + + +[11 <./pics/tabs1.pdf>] +Underfull \hbox (badness 10000) in paragraph at lines 310--317 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 310--317 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 310--317 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 318--324 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 338--343 + + [] + +[12] +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Overfull \hbox (5.17915pt too wide) in paragraph at lines 365--388 +\OMS/cmsy/b/n/12 f\OT1/cmr/bx/n/12 guitartab:[2;3]do [3;0]re [3;2]mi [3;3]fa $\ +OMS/cmsy/m/n/12 j$\OT1/cmr/bx/n/12 [4;0]so [4;2]la [5;0]si [5;1]do$\OMS/cmsy/m/ +n/12 j$\OMS/cmsy/b/n/12 g + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Overfull \hbox (13.32501pt too wide) in paragraph at lines 365--388 +\OMS/cmsy/b/n/12 f\OT1/cmr/bx/n/12 basstab:[2;5][2;5]$\OMS/cmsy/m/n/12 j$\OT1/c +mr/bx/n/12 [2;5][2;5]$\OMS/cmsy/m/n/12 j$\OT1/cmr/bx/n/12 [3;5][3;5]$\OMS/cmsy/ +m/n/12 j$\OT1/cmr/bx/n/12 [2;5][2;5]$\OMS/cmsy/m/n/12 j$\OT1/cmr/bx/n/12 [3;7][ +3;7]$\OMS/cmsy/m/n/12 j$\OT1/cmr/bx/n/12 [3;5][3;5]$\OMS/cmsy/m/n/12 j$\OT1/cmr +/bx/n/12 [2;5]\OMS/cmsy/b/n/12 g + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + + +Overfull \hbox (11.55823pt too wide) in paragraph at lines 365--388 +\OMS/cmsy/b/n/12 f\OT1/cmr/bx/n/12 guitartab:[2;3]&[3;5]&[4;5]C (power chord) $ +\OMS/cmsy/m/n/12 j$\OT1/cmr/bx/n/12 [2;3]&[3;2]&[4;0]&[5;1]C + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 365--388 + + [] + +[13] +Overfull \hbox (2.75983pt too wide) in paragraph at lines 390--393 +\OT1/cmr/m/n/12 Mit der Di-rek-tive de-fine k^^?onnen Sie ein Akkord-Symbol am +Ende eines St^^?uckes + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 390--393 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 401--406 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 401--406 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 407--412 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 407--412 + + [] + +[14] +Underfull \hbox (badness 10000) in paragraph at lines 413--419 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 413--419 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 420--438 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 420--438 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 440--457 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 440--457 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 440--457 + + [] + + +Underfull \hbox (badness 10000) in paragraph at lines 440--457 + + [] + +[15] [16] (./GuitartTeX2-documentation_en.aux) ) +Here is how much of TeX's memory you used: + 4039 strings out of 478994 + 57614 string characters out of 5858184 + 377111 words of memory out of 5000000 + 21499 multiletter control sequences out of 15000+600000 + 411163 words of font info for 54 fonts, out of 8000000 for 9000 + 1141 hyphenation exceptions out of 8191 + 68i,7n,74p,251b,262s stack positions out of 5000i,500n,10000p,200000b,80000s +{/usr/local/texlive/2021/texmf- +dist/fonts/enc/dvips/cm-super/cm-super-ts1.enc} +Output written on GuitartTeX2-documentation_en.pdf (16 pages, 150707 bytes). +PDF statistics: + 271 PDF objects out of 1000 (max. 8388607) + 162 compressed objects within 2 object streams + 0 named destinations out of 1000 (max. 500000) + 11 words of extra memory for PDF output out of 10000 (max. 10000000) + diff --git a/doc/GuitartTeX2-documentation_en.pdf b/doc/GuitartTeX2-documentation_en.pdf new file mode 100644 index 0000000..b6d6900 Binary files /dev/null and b/doc/GuitartTeX2-documentation_en.pdf differ diff --git a/doc/GuitartTeX2-documentation_en.synctex.gz b/doc/GuitartTeX2-documentation_en.synctex.gz new file mode 100644 index 0000000..5b28bba Binary files /dev/null and b/doc/GuitartTeX2-documentation_en.synctex.gz differ diff --git a/doc/GuitartTeX2-documentation_en.tex b/doc/GuitartTeX2-documentation_en.tex new file mode 100755 index 0000000..03707e6 --- /dev/null +++ b/doc/GuitartTeX2-documentation_en.tex @@ -0,0 +1,459 @@ +\documentclass[12pt]{article} + +\usepackage[latin1]{inputenc} +\usepackage{amsmath} +\usepackage[english]{babel} +\usepackage{listings} +\usepackage{verbatim} +\usepackage{graphicx} + +\newcommand{\ul}{\underline{~}} + +\begin{document} + + \section{Overview} + $GuitarTeX_2$ is a tool mainly for guitar players. It can generate nice looking song sheets with + guitar riffs, tabs und melodies. It uses the well known chord format with some minor additions. \\ + \\ + It's based on the idea from Martin Leclerc and Mario Dorion from Canada. They developed Chord version 3.5 in 1993. + $GuitarTeX_2$ is very similar to the original version. It uses the same syntax. The only difference is the used + language Java to parse the chord file and generate the \LaTeX source file. Usually you don't need to know + this because it's happening in the background. The output you usually see is a generated PDF. But it's helpful + to know this in case you already know \LaTeX and want to adjust something very specific. + + \subsection{Features} + \begin{itemize} + \item + Grafical user interface with integrated basic editor + \item + Prints nice looking chords, melodies, riffs + \item + Output formats \LaTeX and PDF + \item + Compatible with ChordPro-format, import if ASCII-files possible + \item + Musical notation with \LaTeX-packages MusixTeX, MusixLyr and TabDefs + \item + Flexible page layout (size, border...) + \item + Custom colors for chorus, bridge ... + \item + Optional output of chord definitions at the end of the page + \item + ASCII-tabs, guitar tabs and base tabs + \item + Generated \LaTeX files can be customized for advanced users + \end{itemize} + + \subsection{Example} + $GuitarTeX_2$ konvertiert eine Datei mit Text und Akkorden im Chord-Format in + eine \LaTeX-Datei. Ein Beispiel für eine Chord-Datei: \\ + \\ + {\bf\{title:The Manual Song\} \\ + \{st:No-one has yet claimed responsibility\} \\ + ~[D]I print verses [A7]in a [D]row, \\ + The next line gets put [A7]down be[D]low, \\ + Mumble mumble [A7]rhymes with [D]grow [G] [G\#] [A] \\ + Done this verse, now [A7sus4]on we [quietly]go! \\ + \\ + \{soc\} \\ + ~[D]This is the [Bm]manual song \\ + ~[A7]No-one really knows what's [D]goin' on \\ + ~[D]This is the [F\#m]manual song \\ + ~[A7]And now the chorus is already [D]gone \\ + \{eoc\} \\ + \\ + ~[D]The second verse is [A7]like the [D]first, \\ + The music poor, the [A7]verse is [D]worse, \\ + I wrote this since [A7]I'd get [D]sued, \\ + If I used real songs. [A7]This'll [D]do. \\ + \\ + \{c:repeat chorus\} } \\ + \\ + \includegraphics[width=1.1\textwidth]{pics/example1.pdf} + \\ + Wenn Sie sich mit \LaTeX ~auskennen, können Sie die Ausgabedatei auch manuell verändern, + bevor Sie sie in Postscript oder PDF umwandeln. Der Vorteil ist, dass Sie alle Möglichkeiten + von \LaTeX ~einschließlich der vielen Zusatzpackete wie graphics oder MusicTeX einsetzen können. + + \section{Installation} + + \subsection{Woher bekomme ich $GuitarTeX_2$} + Die aktuelle Version bekommen Sie immer auf der Download-Seite des $GuitarTeX_2$-Projektes: + http://sourceforge.net/projects/guitartex2. + + \subsection{Systemanforderungen} + $GuitarTeX_2$ ist ein Java Programm welches Betriessystemunabhägig entwickelt wurde. + Ben"otigt werden: + \begin{itemize} + \item + Java 1.4 oder höher + \item + PDF - Betrachter (z.B. Acrobat Reader, xpdf) + Bei MacOS X braucht man es nicht + \item + Internetverbindung (optinal) + \item + \LaTeX (optional) + \end{itemize} + + \subsection{Installation} + Laden sie sich das binäre Paket (GuitarTeX2.jar) herunter. Je nachdem wie sie Ihr + System konfiguriert haben, reicht es darauf zu Doppelklicken oder mit + ''java -jar GuitarTeX2.jar'' aus der Kommandozeile zu starten. \\ + \\ + Es wird beim ersten Starten eine lokale Konfigurationsdatei + angelegt. Diese ist im Homeverzeichnis des Benutzers zu finden. Sie kann nachträglich + verändert werde und wird immer beim starten zuerst ausgelesen. + + \section{Der Editor $GuitarTeX_2$} + + \section{Unterstützte Chord-Direktiven} + Direktiven sind Befehle zwischen geschweiften Klammern, die das Aussehen der erzeugten + Ausgabe steuern. Einige häufig benötigte Direktiven können durch eine Abkürzung ersetzt + werden (siehe Beispiele). $GuitarTeX_2$ bringt einige neue Direktiven mit, die das original + Chord Programm nicht kennt. + \subsection{Spezielle Zeichen} + Einige Zeichen haben in GuitarTeX eine besondere Bedeutung: + \begin{itemize} + \item + \# am Anfang einer Zeile markiert einen Kommentar. Die Zeile wird von $GuitarTeX_2$ ignoriert + \item + / darf nur in Akkorden mit Bass verwendet werden (z.B. A/E) + \end{itemize} + \subsection{Seitenlayout} + Die Direktive geometry bietet flexible Möglichkeiten, das Layout einer Seite anzupassen. + Sie benutzt das \LaTeX-Paket geometry. Die folgende Beschreibung ist ein (modifizierter) + Teil der Original-Dokumentation. + \\ + Das geometry Paket bietet viele automatische Ausrichtungen, so dass nur wenige manuelle + Angaben zum Seitenlayout erforderlich sind. In diesem Fall reicht ein einfaches \\ + \\ + {\bf\{geometry:a4paper\}} \\ + \\ + Das Setzen von Seitenrändern erfolgt mit \\ + \\ + {\bf\{geometry:margin=2.5cm\}} \\ + \\ + wenn alle Ränder einer Seite 2,5 Zentimeter betragen sollen. + Längenangaben erfolgen in + \begin{itemize} + \item + Zentimeter (cm) + \item + Millimeter (mm) + \item + Inch (in) + \item + Punkt (pt) + \end{itemize} + \subsubsection{Grunds"atzliches} + Das Seitenlayout besteht aus einer einfachen Struktur: Die Seite (paper) enthält einen + Textkörper (total-body, druckbarer Bereich) und Ränder. Der Textkörper besteht aus Kopf- + und Fußzeile, dem eigentlichen Text und (optional) den Randbemerkungen. Die vier Ränder + heißen left-margin, right-margin, top-margin und bottom-margin.\\ + \begin{itemize} + \item + paper: total-body (printable area) and margins + \item + total-body: head, body(text area), foot and marginal notes + \item + margins: left-, right-, top- and bottom-margin + \end{itemize} + Jeder Rand wird von der jeweiligen Kante der Seite aus gemessen, z.B. left-margin meint + den Abstand zwischen linker Seitenkante und dem Textkörper. Die Größen von paper, totalbody + und margins stehen in diesen Ralationen: + \begin{itemize} + \item + paperwidth = left + width + right + \item + paperheight = top + height + bottom + \end{itemize} + \subsubsection{Optionen} + Optionen der Direktive geometry: \\ + \begin{tabular}{|l|l|} + \textbf{Name} & \textbf{Bedeutung} \\ + \hline + landscape & schaltet um auf Querformat \\ + portrait & schaltet um auf Hochformat \\ + twoside & schaltet auf zweiseitige Ausgabe um. Die linken und rechen Ränder werden bei geraden + und ungeraden Seiten symmetrisch angeordnet. \\ + reversemp & Randbemerkungen erscheinen am linken Rand (statt am rechten Rand) \\ + nohead & keine Reservierung von Platz für Kopfzeilen \\ + nofoot & keine Reservierung von Platz für Fußzeilen \\ + noheadfoot & keine Reservierung von Platz für Kopf- und Fußzeilen \\ + a4paper, a5paper & spezifizert die Papiergröße, ohne Wert anzugeben \\ + paperwidth & Breite des Papiers. paperwidth=$<$paperwidth$>$ \\ + paperheight & Höhe des Papiers. paperheight=$<$paperheight$>$ \\ + width & Breite des Textkörpers. width=$<$width$>$or totalwidth=$<$width$>$. Diese Angabe + sollte nicht mit der Textbreite (textwidth) verwechselt werden. width enthält die + Textbreite und die Breite der Randbemerkungen. \\ + height & Höhe des Textkörpers (einschließlich Kopf- und Fußzeile). height=$<$height$>$ \\ + left & linker Rand. left=$<$leftmargin$>$ \\ + right & rechter Rand. right=$<$rightmargin$>$ \\ + top & oberer Rand. top=$<$topmargin$>$ \\ + bottom & unterer Rand. bottom=$<$bottommargin$>$ \\ + margin & alle Ränder. margin=$<$margin$>$ \\ + textwidth & Breite des Textes. textwidth=$<$width$>$ \\ + textheight & Höhe des Textes. textheight=$<$height$>$ \\ + marginpar & Breite der Randbemerkungen. marginpar=$<$length$>$ \\ + marginparsep & Abstand zwischen Text und Randbemerkungen. marginparsep=$<$length$>$ \\ + head & Höhe der Kopfzeile. head=$<$length$>$ \\ + headsep & Abstand zwischen Kopfzeile und Text. headsep=$<$length$>$ \\ + foot & Abstand zwischen Fußzeile und Text. foot=$<$length$>$ \\ + \end{tabular} + \subsubsection{Beispiele} + Setzen Sie die Höhe des Textkörpers auf 10in, den unteren Rand auf 2cm. Der obere + Rand wird automatisch berechnet:\\ + \\ + {\bf\{geometry:height=10in,bottom=2cm\}} \\ + \\ + oder: \\ + \\ + {\bf\{g:height=10in,bottom=2cm\}} \\ + \\ + oder: \\ + \\ + {\bf\{geometry:height=10in\} \\ + \\ + \{g:bottom:=2cm\}} \\ + \\ + Setzen Sie den linken, rechten und oberen Rand auf 3cm, 2cm und 2.5in. + Es wird keine Kopfzeile benötigt. \\ + \\ + {\bf\{geometry:left=3cm,right=2cm, nohead,top=2.5in\}} \\ + \\ + oder: \\ + \\ + {\bf\{geometry:left=3cm\} \\ + \{geometry:right=2cm\} \\ + \{geometry:nohead\} \\ + \{geometry:top=2.5in\}} \\ + \\ + oder : \\ + \\ + {\bf\{g:left=3cm,right=2cm\} \\ + \{g:nohead, top=2.5in\}} \\ + \\ + und so weiter ... \\ + Ändern Sie die Breite der Randbemerkungen auf 3cm \\ + \\ + {\bf\{geometry:marginpar=3cm\} \\ + \{geometry:marginpar=3cm, reversemp\}} \\ + \\ + lässt die Randbemerkungen am linken Rand ausgeben.\\ + Verwenden sie A5-Papier im Querformat: \\ + \\ + {\bf\{geometry:a5paper, landscape\}} \\ + \subsection{Dokumentenstrukur} + \subsubsection{title} + Der Titel eines Stückes wird durch die Direktive title markiert. Der + Titel wird zentriert mit einer vergrößerten Schrift ausgegeben. + In Dokumenten mit mehreren Stücken verursacht title einen Seitenumbruch. \\ + Beispiel:\\ + \\ + {\bf\{title:Go Down Moses\} \\ + \{t:Go Down Moses\}} \\ + \subsubsection{subtitle} + Die Direktive \textbf{subtitle} dient zur Darstellung zusätzlicher + Informationen, wie z.B. Interpret oder Komponist. \\ + Beispiel: \\ + \\ + {\bf\{subtitle:written by John Lennon / Paul McCartney\} \\ + \{st:written by John Lennon / Paul McCartney\}} \\ + \subsubsection{bridge} + Eine Bridge wird mit \{bridge\} oder \{sob\} (start of bridge) am Anfang, + und \{/bridge\} oder \{eob\} (end of bridge) am Ende markiert. Die Bridge + wird auf Farbdruckern in blau ausgegeben. Die Farbe kann mit der Direktive + color\underline{~}bridge angepasst werden (siehe Abschnitt namens color\underline{~}xxx).\\ + Beispiel: \\ + \\ + {\bf \{bridge\} \\ + I want her [Ab]everywhere [Fm] \\ + And if [Bbm]she's beside me [C7]I know I need [Fm]never care \\ + ~[Bb]But to love her [C7]is to meet her \\ + \{/bridge\}} \\ + \subsubsection{chorus} + Ein Refrain wird mit \{chorus\} oder \{soc\} (start of chorus) am Anfang und mit \{/chorus\} + oder \{eoc\} (end of chorus) am Ende markiert. Der Refrain wird auf Farbdruckern in rot + ausgegeben. Die Farbe kann mit der Direktive color\underline{~}chorus angepasst werden + (siehe Abschnitt namens color\underline{~}xxx).\\ + Beispiel: \\ + \\ + {\bf\{chorus\} \\ + Oh, I get [C]by with a little [G]help from my [D]friends \\ + Mm, I get [C]high with a little [G]help from my [D]friends \\ + Oh, I'm gonna [C]try with a little [G]help from my [D]friends \\ + \{/chorus\}} \\ + \subsubsection{instr} + Ein Instrumental-Teil wird mit \{instr\} oder \{soi\} (start of instrumental) am Anfang + und \{/instr\} oder \{eoi\} (end of instrumental) am Ende markiert. Der Instrumental-Teil + wird auf Farbdruckern in grau ausgegeben. Die Farbe kann mit der Direktive + color\underline{~}instr angepasst werden (siehe Abschnitt namens color\underline{~}xxx). + \subsubsection{np} + np steht für eine ''neue Seite'' und erzeugt einen Seitenumbruch.\\ + Beispiel: \\ + {\bf\{np\}} \\ + \subsubsection{tab} + Tabulaturen werden mit \{tab\} oder \{sot\} (start of tablature) am Anfang und \{/tab\} + oder \{eot\} (end of tablature) am Ende markiert. Tabulaturen werden auf Farbdruckern + in grün ausgegeben. Die Farbe kann mit der Direktive color\underline{~}tab directive + angepasst werden (siehe Abschnitt namens color\underline{~}xxx). Tabulaturen werden + in einer nichtproportionalen Schriftart ausgegeben.\\ + Beispiel: \\ + \includegraphics[width=15cm]{pics/tabs1.pdf} + \subsection{Fonts} + Die Direktiven zur Beeinflussung der Schriftart und -farbe können irgendwo in Ihrer Datei + stehen. Trotzdem ist es hilfreich sie am Anfang zu platzieren. Die angegebenen Werte + gelten für das ganze Dokument. + \subsubsection{font\underline{~}size} + \LaTeX ~kennt drei Schriftgrößen 10pt, 11pt and 12pt. GuitarTeX nutzt normalerweise + 11pt (Titel und Untertitel werden automatisch vergrößert). Wenn Sie z.B. 12pt + verwenden wollen, schreiben Sie:\\ + \\ + {\bf\{font\underline{~}size:12\}} \\ + \\ + Achtung: schreiben Sie nicht 12pt statt 12!\\ + \subsubsection{color\underline{~}xxx} + Mit den folgenden Direktiven können Sie die Textfarbe für Refrain, Bridge, + Instrumental-Teil Tabulaturen und zweite Stimme anpassen. Für die zweite Stimme + können Sie auch die Hintergrundfarbe ändern, so dass Sie z.B. weiße Schrift auf einem + farbigen Hintergrund verwenden können. Das erleichtert den Sängern hoffentlich + die Orientierung bei mehreren Textzeilen. \\ + Die Direktiven heißen: \\ + \begin{itemize} + \item + color\underline{~}chorus + \item + color\underline{~}bridge + \item + color\underline{~}instr + \item + color\underline{~}tab + \item + color\underline{~}second + \item + color\underline{~}second\underline{~}back + \end{itemize} + Als Parameter wird eine durch Kommas getrennte Liste von Werten zwischen null und + eins, die die Farben rot, grün und blau repräsentieren.\\ + Beispiel: \\ + \\ + {\bf\{color\underline{~}chorus:.5,.5,1\}} + \subsection{Gitarren- und Bass-Tabulaturen} + $GuitarTeX_2$ kennt zwei neue Direktiven zur Darstellung von Tabulaturen: + \begin{itemize} + \item + \{guitartab: \} für Gitarren-Tabulaturen + \item + \{basstab: \} für Bass-Tabulaturen + \end{itemize} + Jede guitartab oder basstab Direktive stellt eine Zeile mit sechs bzw vier Linien dar. + Sie können mit \{guitartab: \} oder \{basstab: \} auch leere Tabulaturen erzeugen. + Setzen Sie eine Leerzeile vor die Direktive, damit die Tabulatur am linken Rand beginnt.\\ + Die Klammern können enthalten: + \begin{itemize} + \item + normaler Text, der unterhalb der Tabulatur ausgegeben wird + \item + Noten im Format [string;fret], z.B. [2;5] für 5. Bund auf der A-Saite + \item + Taktstriche (durch das Zeichen $|$ dargestellt) + \item + Zusätzlicher Leerraum mit ''\ul{}'' + \end{itemize} + Beispiel: leere Gitarrentabulatur \\ + \\ + {\bf\{guitartab:\}} \\ + \\ + Beispiel: Eine Bass-Tabulatur mit Text \\ + \\ + {\bf\{basstab:some text\}} \\ + \\ + Beispiel: Noten, Taktstriche und Leerraum \\ + \\ + {\bf\{guitartab:[2;3][3;0][3;2][3;3]$|$[4;0]\ul\ul[4;2]\ul\ul[5;0]\ul\ul[5;1]$|$\}} \\ + \\ + Beispiel: Text unter den Noten anordnen \\ + \\ + {\bf\{guitartab:[2;3]do [3;0]re [3;2]mi [3;3]fa $|$[4;0]so [4;2]la [5;0]si [5;1]do$|$\}} \\ + \\ + Beispiel: Eine einfache Bass-Tabulatur \\ + \\ + {\bf\{basstab:[2;5][2;5]$|$[2;5][2;5]$|$[3;5][3;5]$|$[2;5][2;5]$|$[3;7][3;7]$|$[3;5][3;5]$|$[2;5]\}} \\ + \\ + Beispiel: Akkorde \\ + \\ + {\bf\{guitartab:[2;3]\&[3;5]\&[4;5]C (power chord) $|$[2;3]\&[3;2]\&[4;0]\&[5;1]C chord\}} \\ + \subsection{N"utzliches} + \subsubsection{define} + Mit der Direktive define können Sie ein Akkord-Symbol am Ende eines Stückes erstellen. + Die Direktive kann irgendwo im Stück platziert sein.\\ + define verfügt über acht Parameter:\\ + \begin{itemize} + \item + den Akkordnamen + \item + die Nummer des ersten Bundes + \item + sechs Nummern für die sechs Saiten (ein x bedeutet, dass die Saite nicht gespielt wird) + \end{itemize} + Beispiel:\\ + \\ + {\bf\{define:A 1 x n 2 2 2 n\} \\ + \{define:Cm 3 x 1 3 3 2 1\} \\ + \{define:Gm/Bb 4 3 2 2 1 x x\}} \\ + \subsubsection{comment} + Die Direktive comment fügt einen Text ein, der nicht zum eigentlichen Stück gehört. \\ + Beispiel: \\ + \\ + {\bf\{comment: repeat chorus\} \\ + \{c: repeat chorus\}} \\ + \subsubsection{margin} + Die Direktive margin erzeugt eine Randbemerkung. Diese können z.B. dazu genutzt werden, + Hinweise für den Musiker einzufügen.\\ + Beispiel: \\ + \\ + {\bf\{margin:Fade Out\} \\ + \{m:Fade Out\}} \\ + \subsubsection{second} + In einigen Stücken hat die zweite Stimme nicht nur eine andere Melodie, sondern auch + einen anderen oder versetzt gesungenen Text. Bekannte Beispiele sind "California Dreaming" + von The Mamas And The Papas und "Help" von den Beatles. Wenn Sie die zweite Stimme mit + der Direktive second markieren erscheint sie in weißer Schrift auf grauem Hintergrund. + Wegen der proportionalen Schrift müssen Sie ein wenig experimentieren, um die korrekte + Ausrichtung zwischen erster und zweiter Stimme zu erhalten.\\ + Beispiel: \\ + \\ + {\bf[G] When I was younger so much [Hm]younger than today \\ + \{second:When when I was young\} \\ + ~[Em] I never needed anybody's [C]help in [F]any [G]way \\ + \{second:I never need help in any way\} \\ + ~[G]But now these days are gone and I'm [Bm]not so self assured \\ + \{second:Now these days are gone\} \\ + ~[Em] Now I find I've changed my mind, \\ + \{second:And now I find\} \\ + I've [C]opened [F]up the [G]doors \\ + \{second:I've opened up the doors\}} \\ + \section{\LaTeX-Kommandos und Pakete verwenden} + \subsection{\LaTeX-Kommandos} + Wie in der Einführung erwähnt, brauchen Sie nichts über \LaTeX ~zu wissen, um $GuitarTeX_2$ + zu nutzen. Wenn Sie sich mit \LaTeX ~auskennen, können Sie dessen Möglichkeiten nutzen, + um Ihre Ergebnisse weiter zu verbessern. Alle Zeilen, die mit einem Backslash beginnen, + werden in die erzeute \LaTeX-Datei übernommen. Sie können das einfach mit einem Kommando + wie diesem testen: \\ + \\ + {\bf$\backslash$marginpar\{test\}} \\ + \\ + Das Ergebnis ist eine Randbemerkung mit dem Wort ''test''. + Die \LaTeX-Kommandos werden an der Stelle ausgeführt, an der sie in der Datei vorkommen. + Manche Kommandos müssen allerdings in der sog. Präambel der \LaTeX-Datei erscheinen. + Das geschieht mit der Direktive preamble:\\ + \\ + {\bf\{preamble:$\backslash$usepackage(fancyheadings)\}}\\ + \\ + Die Direktive preamble kann irgendwo im Dokument stehen. Die enthaltenen Kommandos + erscheinen in der \LaTeX-Präambel in der Reihenfolge, in der sie in der Chord-Datei stehen. + + +\end{document} diff --git a/src/guitartex2/doc/pics/example1.pdf b/doc/pics/example1.pdf similarity index 100% rename from src/guitartex2/doc/pics/example1.pdf rename to doc/pics/example1.pdf diff --git a/src/guitartex2/doc/pics/tabs1.pdf b/doc/pics/tabs1.pdf similarity index 100% rename from src/guitartex2/doc/pics/tabs1.pdf rename to doc/pics/tabs1.pdf diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a34d030 --- /dev/null +++ b/pom.xml @@ -0,0 +1,151 @@ + + + + 4.0.0 + + guitartex2.GuitarTeX2 + GuitarTeX2 + 3.4.1 + + GuitarTeX2 + + + + UTF-8 + 1.8 + 1.8 + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.1 + + + jar-with-dependencies + + + + guitartex2.GuitarTeX2 + + + ${project.artifactId}-${project.version} + false + + + + make-assembly + + package + + single + + + + + + maven-surefire-plugin + + ${argLine} + + + + org.jacoco + jacoco-maven-plugin + 0.8.3 + + + prepare-agent + + prepare-agent + + + + report + prepare-package + + report + + + + post-unit-test + test + + report + + + target/jacoco.exec + target/jacoco-ut + + + + + + target/jacoco.exec + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + 3 + true + -Xmx1024m -XX:MaxPermSize=256m + true + + + + maven-jar-plugin + 3.0.2 + + + true + + guitartex2.GuitarTeX2 + + + + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + + + diff --git a/src/guitartex2/COPYRIGHT b/src/guitartex2/COPYRIGHT deleted file mode 100644 index d511905..0000000 --- a/src/guitartex2/COPYRIGHT +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/src/guitartex2/AboutBox.java b/src/main/java/guitartex2/AboutBox.java similarity index 93% rename from src/guitartex2/AboutBox.java rename to src/main/java/guitartex2/AboutBox.java index a13ac63..b015374 100644 --- a/src/guitartex2/AboutBox.java +++ b/src/main/java/guitartex2/AboutBox.java @@ -48,8 +48,8 @@ public class AboutBox extends JFrame implements ActionListener { public AboutBox() { Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - aboutTop = new Double((screenSize.getHeight()/2) - (aboutHeight/2)).intValue(); - aboutLeft = new Double((screenSize.getWidth()/2) - (aboutWidth/2)).intValue(); + aboutTop = Double.valueOf((screenSize.getHeight()/2) - (aboutHeight/2)).intValue(); + aboutLeft = Double.valueOf((screenSize.getWidth()/2) - (aboutWidth/2)).intValue(); this.setResizable(false); resbundle = ResourceBundle.getBundle ("GuitarTeX2strings", Locale.getDefault()); @@ -67,7 +67,7 @@ public class AboutBox extends JFrame implements ActionListener { } this.getContentPane().setLayout(new BorderLayout(30, 30)); - java.net.URL imgURL = AboutBox.class.getResource("images/gitarre1.jpg"); + java.net.URL imgURL = AboutBox.class.getResource("/images/gitarre1.jpg"); ImageIcon icon = new ImageIcon(imgURL, ""); aboutLabel = new JLabel[labelCount]; diff --git a/src/guitartex2/BareBonesBrowserLaunch.java b/src/main/java/guitartex2/BareBonesBrowserLaunch.java similarity index 100% rename from src/guitartex2/BareBonesBrowserLaunch.java rename to src/main/java/guitartex2/BareBonesBrowserLaunch.java diff --git a/src/guitartex2/CmdExec.java b/src/main/java/guitartex2/CmdExec.java similarity index 95% rename from src/guitartex2/CmdExec.java rename to src/main/java/guitartex2/CmdExec.java index d45310d..28c363c 100644 --- a/src/guitartex2/CmdExec.java +++ b/src/main/java/guitartex2/CmdExec.java @@ -37,7 +37,7 @@ public class CmdExec{ } } }catch (Exception err) { - InfoBox infoBox = new InfoBox("ERR: " + err); + new InfoBox("ERR: " + err); } return ausgabe; } diff --git a/src/guitartex2/Configurations.java b/src/main/java/guitartex2/Configurations.java similarity index 99% rename from src/guitartex2/Configurations.java rename to src/main/java/guitartex2/Configurations.java index 7ab6056..70e53f8 100644 --- a/src/guitartex2/Configurations.java +++ b/src/main/java/guitartex2/Configurations.java @@ -85,7 +85,7 @@ final class Configurations { Properties defProps = new Properties(); //defProps.load(defaultPropFIS); - defProps.load(GuitarTeX2.class.getResourceAsStream(propertiesFileName)); + defProps.load(GuitarTeX2.class.getResourceAsStream("/"+propertiesFileName)); //defaultPropFIS.close(); Enumeration defElements = defProps.keys(); mProperties.load( propsFIS ); @@ -495,7 +495,7 @@ final class Configurations { mProperties.setProperty("gtxServer", defProps.getProperty("gtxServer")); mProperties.setProperty("gtxServerPort", defProps.getProperty("gtxServerPort")); } catch (Exception e) { - InfoBox infoBox = new InfoBox(e + ""); + new InfoBox(e + ""); } /* mPdfViewerField.setText(myConfiguration.getPdfViewer()); diff --git a/src/guitartex2/FileTransfer.java b/src/main/java/guitartex2/FileTransfer.java similarity index 96% rename from src/guitartex2/FileTransfer.java rename to src/main/java/guitartex2/FileTransfer.java index 7172325..a49c56b 100644 --- a/src/guitartex2/FileTransfer.java +++ b/src/main/java/guitartex2/FileTransfer.java @@ -100,7 +100,7 @@ class FileTransfer { if (length > Integer.MAX_VALUE) { // File is too large sendMsg("Filetransfer[" + fId + "]: File is too large"); - cleanTmp(myFile); + cleanTmp(myFile, in); return 1; } else { int myFileLength = (int) length; @@ -110,7 +110,7 @@ class FileTransfer { fileLengthResult = inStream.readUTF(); } catch (Exception i) { sendMsg("Filetransfer[" + fId + "]: stream error" + i); - cleanTmp(myFile); + cleanTmp(myFile, in); return 1; } if (fileLengthResult.equals(ok)) { @@ -137,7 +137,7 @@ class FileTransfer { } } else { sendMsg("Filetransfer[" + fId + "]: sending file length failed: " + fileLengthResult); - cleanTmp(myFile); + cleanTmp(myFile, in); return 1; } } @@ -174,7 +174,7 @@ class FileTransfer { outStream.writeUTF(ok); } catch (Exception i) { sendMsg("Filetransfer[" + fId + "]: stream error " + i); - cleanTmp(myFile); + cleanTmp(myFile, out); return 1; } sendMsg("Filetransfer[" + fId + "]: awaiting file..."); @@ -284,6 +284,15 @@ class FileTransfer { } } + private void cleanTmp(String fileName, RandomAccessFile file) { + try { + new File(fileName).delete(); + file.close(); + } catch (Exception e) { + sendMsg("can't clean tmp file: " + e); + } + } + private void cleanTmp(String fileName) { try { new File(fileName).delete(); diff --git a/src/guitartex2/GTXClient.java b/src/main/java/guitartex2/GTXClient.java similarity index 98% rename from src/guitartex2/GTXClient.java rename to src/main/java/guitartex2/GTXClient.java index db86cf2..7e9d743 100644 --- a/src/guitartex2/GTXClient.java +++ b/src/main/java/guitartex2/GTXClient.java @@ -136,7 +136,7 @@ public class GTXClient extends Thread{ } String texResult = din.readUTF(); if ( texResult.equals(failed)) { - InfoBox infoBox = new InfoBox(resbundle.getString("texFailed")); + new InfoBox(resbundle.getString("texFailed")); logToConsole("texin unsuccessfull"); //myStatusBox.setStatus("FEHLER!"); //myStatusBox.requestFocus(); diff --git a/src/guitartex2/GTXConsole.java b/src/main/java/guitartex2/GTXConsole.java similarity index 100% rename from src/guitartex2/GTXConsole.java rename to src/main/java/guitartex2/GTXConsole.java diff --git a/src/guitartex2/GTXParser.java b/src/main/java/guitartex2/GTXParser.java similarity index 99% rename from src/guitartex2/GTXParser.java rename to src/main/java/guitartex2/GTXParser.java index d8a6de0..c6dcfcf 100644 --- a/src/guitartex2/GTXParser.java +++ b/src/main/java/guitartex2/GTXParser.java @@ -1114,12 +1114,12 @@ public class GTXParser { + "\\makebox[0cm][l]{\\raisebox{4.5ex}{\\footnotesize{A}}}%\n" + "\\makebox[0cm][l]{\\raisebox{2.5ex}{\\footnotesize{E}}}%\n" + "~~\n" - + "\\makebox[0cm][l]{\\raisebox{13ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{11ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){130}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{13ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{11ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){\\textwidth}}}%\n" + "~}\n\n" + "\\newcommand{\\basstab}{%\n" + "\\makebox[0cm][l]{\\raisebox{8.5ex}{\\footnotesize{G}}}%\n" @@ -1127,10 +1127,10 @@ public class GTXParser { + "\\makebox[0cm][l]{\\raisebox{4.5ex}{\\footnotesize{A}}}%\n" + "\\makebox[0cm][l]{\\raisebox{2.5ex}{\\footnotesize{E}}}%\n" + "~~\n" - + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){130}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){\\textwidth}}}%\n" + "~}\n\n" + "\\newcommand{\\gtxtabs}[2]{\\makebox[0cm][l]{\\raisebox{#1}{#2}}}\n" + // define arrow symbols for harp tunes @@ -1343,12 +1343,12 @@ public class GTXParser { + "\\makebox[0cm][l]{\\raisebox{4.5ex}{\\footnotesize{A}}}%\n" + "\\makebox[0cm][l]{\\raisebox{2.5ex}{\\footnotesize{E}}}%\n" + "~~\n" - + "\\makebox[0cm][l]{\\raisebox{13ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{11ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){130}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{13ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{11ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){\\textwidth}}}%\n" + "~}\n\n" + "\\newcommand{\\basstab}{%\n" + "\\makebox[0cm][l]{\\raisebox{8.5ex}{\\footnotesize{G}}}%\n" @@ -1356,10 +1356,10 @@ public class GTXParser { + "\\makebox[0cm][l]{\\raisebox{4.5ex}{\\footnotesize{A}}}%\n" + "\\makebox[0cm][l]{\\raisebox{2.5ex}{\\footnotesize{E}}}%\n" + "~~\n" - + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){130}}}%\n" - + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){130}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{9ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{7ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{5ex}{\\line(1,0){\\textwidth}}}%\n" + + "\\makebox[0cm][l]{\\raisebox{3ex}{\\line(1,0){\\textwidth}}}%\n" + "~}\n\n" + "\\newcommand{\\gtxtabs}[2]{\\makebox[0cm][l]{\\raisebox{#1}{#2}}}\n" + // define arrow symbols for harp tunes @@ -1439,4 +1439,4 @@ public class GTXParser { } System.out.println("\n"); } -} +} \ No newline at end of file diff --git a/src/guitartex2/GTXTextConsole.java b/src/main/java/guitartex2/GTXTextConsole.java similarity index 100% rename from src/guitartex2/GTXTextConsole.java rename to src/main/java/guitartex2/GTXTextConsole.java diff --git a/src/guitartex2/GuitarTeX2.java b/src/main/java/guitartex2/GuitarTeX2.java similarity index 98% rename from src/guitartex2/GuitarTeX2.java rename to src/main/java/guitartex2/GuitarTeX2.java index eef95b2..74adc32 100644 --- a/src/guitartex2/GuitarTeX2.java +++ b/src/main/java/guitartex2/GuitarTeX2.java @@ -257,7 +257,7 @@ public class GuitarTeX2 extends JFrame { //myConf.checkConfig(); if (myConf.checkConfig() == false) { - WarningBox warningBox = new WarningBox(resbundle.getString("confFailed"), myConf.getConfProblems()); + new WarningBox(resbundle.getString("confFailed"), myConf.getConfProblems()); System.err.println("loading configuration failed!"); } consoleBox.setGTXClient(myConf); @@ -374,31 +374,31 @@ public class GuitarTeX2 extends JFrame { mActionToolBar = new JToolBar(resbundle.getString("actionToolBar")); mActionToolBar.setFloatable(false); // -- // -- New - URL mNewImageURL = GuitarTeX2.class.getResource("images/filenew.png"); + URL mNewImageURL = GuitarTeX2.class.getResource("/images/filenew.png"); mNewButton = mActionToolBar.add(mNewAction); mNewButton.setIcon(new ImageIcon(mNewImageURL)); mNewButton.setText(""); mNewButton.setToolTipText(resbundle.getString("newItem")); // -- // -- Open - URL mOpenImageURL = GuitarTeX2.class.getResource("images/fileopen.png"); + URL mOpenImageURL = GuitarTeX2.class.getResource("/images/fileopen.png"); mOpenButton = mActionToolBar.add(mOpenAction); mOpenButton.setIcon(new ImageIcon(mOpenImageURL)); mOpenButton.setText(""); mOpenButton.setToolTipText(resbundle.getString("openItem")); // -- // -- Save - URL mSaveImageURL = GuitarTeX2.class.getResource("images/filesave.png"); + URL mSaveImageURL = GuitarTeX2.class.getResource("/images/filesave.png"); mSaveButton = mActionToolBar.add(mSaveAction); mSaveButton.setIcon(new ImageIcon(mSaveImageURL)); mSaveButton.setText(""); mSaveButton.setToolTipText(resbundle.getString("saveItem")); // -- // -- SaveAs - URL mSaveAsImageURL = GuitarTeX2.class.getResource("images/filesaveas.png"); + URL mSaveAsImageURL = GuitarTeX2.class.getResource("/images/filesaveas.png"); mSaveAsButton = mActionToolBar.add(mSaveAsAction); mSaveAsButton.setIcon(new ImageIcon(mSaveAsImageURL)); mSaveAsButton.setText(""); mSaveAsButton.setToolTipText(resbundle.getString("saveAsItem")); // -- // -- GTX2TeX - URL mGTX2TeXURL = GuitarTeX2.class.getResource("images/gtx2tex.png"); + URL mGTX2TeXURL = GuitarTeX2.class.getResource("/images/gtx2tex.png"); mGtx2TeXButton = mActionToolBar.add(mGTX2TeXAction); mGtx2TeXButton.setIcon(new ImageIcon(mGTX2TeXURL)); mGtx2TeXButton.setText(""); @@ -425,7 +425,7 @@ public class GuitarTeX2 extends JFrame { //mDvi2PdfButton.setToolTipText(resbundle.getString("dvi2pdf")); //mDvi2PdfButton.setEnabled(false); // -- // -- TEX2PDF - URL mTeX2PdfURL = GuitarTeX2.class.getResource("images/tex2pdf.png"); + URL mTeX2PdfURL = GuitarTeX2.class.getResource("/images/tex2pdf.png"); mTeX2PdfButton = mActionToolBar.add(mTeX2PdfAction); mTeX2PdfButton.setIcon(new ImageIcon(mTeX2PdfURL)); mTeX2PdfButton.setText(""); @@ -473,8 +473,8 @@ public class GuitarTeX2 extends JFrame { mHarpToolBar = new JToolBar(resbundle.getString("harpToolBar")); //mHarpToolBar.setLayout(new GridLayout(2,9)); - ImageIcon upButtonIcon = createImageIcon("images/icon-up2.png"); - ImageIcon downButtonIcon = createImageIcon("images/icon-down2.png"); + ImageIcon upButtonIcon = createImageIcon("/images/icon-up2.png"); + ImageIcon downButtonIcon = createImageIcon("/images/icon-down2.png"); mHarpUp = new JToggleButton(upButtonIcon); Action pmUpAction = new mPMHarpActionClass("up"); mHarpUp.addActionListener(pmUpAction); @@ -926,7 +926,7 @@ public class GuitarTeX2 extends JFrame { mFileChanged = false; } catch (IOException ioex) { consoleBox.addText("ERR: " + ioex); - InfoBox infoBox = new InfoBox("Error: " + ioex); + new InfoBox("Error: " + ioex); } } } @@ -947,7 +947,7 @@ public class GuitarTeX2 extends JFrame { mFileChanged = false; } catch (IOException ioex) { consoleBox.addText("ERR: " + ioex); - InfoBox infoBox = new InfoBox("Error: " + ioex); + new InfoBox("Error: " + ioex); } } } diff --git a/src/guitartex2/GuitarTeX2Convert.java b/src/main/java/guitartex2/GuitarTeX2Convert.java similarity index 97% rename from src/guitartex2/GuitarTeX2Convert.java rename to src/main/java/guitartex2/GuitarTeX2Convert.java index 356a5d6..e2da69c 100644 --- a/src/guitartex2/GuitarTeX2Convert.java +++ b/src/main/java/guitartex2/GuitarTeX2Convert.java @@ -47,7 +47,7 @@ public class GuitarTeX2Convert { if (!fileName.equals("")) { File f = new File(fileName); if (f.canRead()) { - GuitarTeX2Convert guitarTeX2Convert = new GuitarTeX2Convert(f); + new GuitarTeX2Convert(f); } else { System.out.println("error: can't read file\n"); System.out.println(help); diff --git a/src/guitartex2/InfoBox.java b/src/main/java/guitartex2/InfoBox.java similarity index 100% rename from src/guitartex2/InfoBox.java rename to src/main/java/guitartex2/InfoBox.java diff --git a/src/guitartex2/PreferencesBox.java b/src/main/java/guitartex2/PreferencesBox.java similarity index 100% rename from src/guitartex2/PreferencesBox.java rename to src/main/java/guitartex2/PreferencesBox.java diff --git a/src/guitartex2/SpringUtilities.java b/src/main/java/guitartex2/SpringUtilities.java similarity index 100% rename from src/guitartex2/SpringUtilities.java rename to src/main/java/guitartex2/SpringUtilities.java diff --git a/src/guitartex2/StatusBox.java b/src/main/java/guitartex2/StatusBox.java similarity index 98% rename from src/guitartex2/StatusBox.java rename to src/main/java/guitartex2/StatusBox.java index e5dc820..67cbb0f 100644 --- a/src/guitartex2/StatusBox.java +++ b/src/main/java/guitartex2/StatusBox.java @@ -71,7 +71,7 @@ public class StatusBox extends JFrame implements ActionListener { bodyFont = new Font("SansSerif", Font.PLAIN, 10); } - java.net.URL imgURL = StatusBox.class.getResource("images/info.png"); + java.net.URL imgURL = StatusBox.class.getResource("/images/info.png"); ImageIcon icon = new ImageIcon(imgURL, ""); Panel textPanel = new Panel(new GridBagLayout()); diff --git a/src/guitartex2/UnicodeReader.java b/src/main/java/guitartex2/UnicodeReader.java similarity index 100% rename from src/guitartex2/UnicodeReader.java rename to src/main/java/guitartex2/UnicodeReader.java diff --git a/src/guitartex2/WarningBox.java b/src/main/java/guitartex2/WarningBox.java similarity index 98% rename from src/guitartex2/WarningBox.java rename to src/main/java/guitartex2/WarningBox.java index be0503f..2004778 100644 --- a/src/guitartex2/WarningBox.java +++ b/src/main/java/guitartex2/WarningBox.java @@ -143,7 +143,7 @@ public class WarningBox extends JFrame implements ActionListener { setEnabled(false); } if ( mAction.equals("mInfoAction")) { - InfoBox infoBox = new InfoBox(myInfo); + new InfoBox(myInfo); } } } diff --git a/src/guitartex2/GuitarTeX2.properties b/src/main/resources/GuitarTeX2.properties similarity index 100% rename from src/guitartex2/GuitarTeX2.properties rename to src/main/resources/GuitarTeX2.properties diff --git a/src/GuitarTeX2strings.properties b/src/main/resources/GuitarTeX2strings.properties similarity index 98% rename from src/GuitarTeX2strings.properties rename to src/main/resources/GuitarTeX2strings.properties index 6430c27..2fb0e9e 100644 --- a/src/GuitarTeX2strings.properties +++ b/src/main/resources/GuitarTeX2strings.properties @@ -125,5 +125,5 @@ warnTitle=Warning! statusTitle=Status frameConstructor=GuitarTeX2 -appVersion=Version - 3.4.0 +appVersion=Version - 3.4.1 copyright=Nikolai Rinas diff --git a/src/GuitarTeX2strings_de.properties b/src/main/resources/GuitarTeX2strings_de.properties similarity index 79% rename from src/GuitarTeX2strings_de.properties rename to src/main/resources/GuitarTeX2strings_de.properties index 46a2a10..06870af 100644 --- a/src/GuitarTeX2strings_de.properties +++ b/src/main/resources/GuitarTeX2strings_de.properties @@ -1,7 +1,7 @@ fileMenu=Datei newItem=Neu -openItem=\u00d6ffnen... -closeItem=Schlie\u00dfen +openItem=Öffnen... +closeItem=Schließen saveItem=Speichern saveAsItem=Speichern unter... templateItem=Templates @@ -14,9 +14,9 @@ mPrefs=Einstellungen undoItem= cutItem=Ausschneiden copyItem=Kopieren -pasteItem=Einf\u00fcgen -clearItem=L\u00f6schen -selectAllItem=Alles ausw\u00e4hlen +pasteItem=Einfügen +clearItem=Löschen +selectAllItem=Alles auswählen buildMenu=Erstellen gtx2tex=GTX2TeX @@ -26,8 +26,8 @@ dvi2pdf=Dvi2Pdf tex2pdf=TeX2Pdf helpMenu=Hilfe -aboutItem=\u00dcber GuitarTeX2 -aboutTitle=\u00dcber GuitarTeX2 +aboutItem=Ãœber GuitarTeX2 +aboutTitle=Ãœber GuitarTeX2 faqItem=FAQ faqURL=http://guitartex2.sourceforge.net/page7/page6/page6.html shortcutItem=Shortcuts @@ -82,7 +82,7 @@ mGuitarTab=Tabulatur mNewFile=Neue Datei -checkConn=\u00dcberpr\u00fcfe Verbindung zum Server ... +checkConn=Ãœberprüfe Verbindung zum Server ... createPdf=Erstelle PDF ... showPdf=Versuche die PDF Datei darzustellen ... @@ -91,9 +91,9 @@ wait4PdfFile=Warte auf das Ergebnis ... receivePdfFile=Empfange PDF-Datei ... receiveLogFile=Empfange Log-Datei ... confFailed=Laden von Konfigurationsdatei fehlgeschlagen! -texFailed=PDF Datei kann nicht erzeugt werden!\nBitte \u00fcberpr\u00fcfen Sie Ihr Dokument! +texFailed=PDF Datei kann nicht erzeugt werden!\nBitte Ãœberprüfen Sie Ihr Dokument! -mSaveQuestionHead=Datei wurde ver\u00e4ndert! +mSaveQuestionHead=Datei wurde verändert! mSaveQuestion=Wollen Sie die Datei speichern? prefTitle=Einstellungen @@ -110,19 +110,19 @@ mSetBook=Buch mBookAuthor=Autor mBookTitle=Titel mBookDate=Datum -mBookInclude=Einf\u00fcgen +mBookInclude=Einfügen -resetButton=Zur\u00fccksetzen +resetButton=Zurücksetzen okButton=OK cancelButton=Abbrechen quitButton=Beenden infoButton=Info -choose=Ausw\u00e4hlen +choose=Auswählen warnTitle=Warnung! statusTitle=Status frameConstructor=GuitarTeX2 -appVersion=Version - 3.4.0 +appVersion=Version - 3.4.1 copyright=Nikolai Rinas \ No newline at end of file diff --git a/src/guitartex2/images/dvipdf.png b/src/main/resources/images/dvipdf.png similarity index 100% rename from src/guitartex2/images/dvipdf.png rename to src/main/resources/images/dvipdf.png diff --git a/src/guitartex2/images/dvips.png b/src/main/resources/images/dvips.png similarity index 100% rename from src/guitartex2/images/dvips.png rename to src/main/resources/images/dvips.png diff --git a/src/guitartex2/images/filenew.png b/src/main/resources/images/filenew.png similarity index 100% rename from src/guitartex2/images/filenew.png rename to src/main/resources/images/filenew.png diff --git a/src/guitartex2/images/fileopen.png b/src/main/resources/images/fileopen.png similarity index 100% rename from src/guitartex2/images/fileopen.png rename to src/main/resources/images/fileopen.png diff --git a/src/guitartex2/images/filesave.png b/src/main/resources/images/filesave.png similarity index 100% rename from src/guitartex2/images/filesave.png rename to src/main/resources/images/filesave.png diff --git a/src/guitartex2/images/filesaveas.png b/src/main/resources/images/filesaveas.png similarity index 100% rename from src/guitartex2/images/filesaveas.png rename to src/main/resources/images/filesaveas.png diff --git a/src/guitartex2/images/gitarre1.jpg b/src/main/resources/images/gitarre1.jpg similarity index 100% rename from src/guitartex2/images/gitarre1.jpg rename to src/main/resources/images/gitarre1.jpg diff --git a/src/guitartex2/images/gtx2tex.png b/src/main/resources/images/gtx2tex.png similarity index 100% rename from src/guitartex2/images/gtx2tex.png rename to src/main/resources/images/gtx2tex.png diff --git a/src/guitartex2/images/icon-down2.png b/src/main/resources/images/icon-down2.png similarity index 100% rename from src/guitartex2/images/icon-down2.png rename to src/main/resources/images/icon-down2.png diff --git a/src/guitartex2/images/icon-up2.png b/src/main/resources/images/icon-up2.png similarity index 100% rename from src/guitartex2/images/icon-up2.png rename to src/main/resources/images/icon-up2.png diff --git a/src/guitartex2/images/icon1.jpg b/src/main/resources/images/icon1.jpg similarity index 100% rename from src/guitartex2/images/icon1.jpg rename to src/main/resources/images/icon1.jpg diff --git a/src/guitartex2/images/info.png b/src/main/resources/images/info.png similarity index 100% rename from src/guitartex2/images/info.png rename to src/main/resources/images/info.png diff --git a/src/guitartex2/images/latex.png b/src/main/resources/images/latex.png similarity index 100% rename from src/guitartex2/images/latex.png rename to src/main/resources/images/latex.png diff --git a/src/guitartex2/images/tex2pdf.png b/src/main/resources/images/tex2pdf.png similarity index 100% rename from src/guitartex2/images/tex2pdf.png rename to src/main/resources/images/tex2pdf.png