Merge branch 'master' of github.com:MaKeAppDev/FS-EM

.travis.yml

@@ -0,0 +1,29 @@
+services:
+  - docker
+
+before_install:
+- docker pull makeappdev/uselatex
+- docker run -it -d --name uselatex makeappdev/uselatex bash
+- docker ps -a
+- docker exec uselatex bash -c "cmake --version; pdflatex --version"
+- docker cp ./. uselatex:/
+
+script:
+- docker exec uselatex bash -c "mkdir -p build && cd build && cmake ..; make"
+- mkdir -p export
+- mkdir -p tmp
+- echo "# This branch is for deployment only" >> export/README.md
+- docker cp uselatex:build/. tmp
+- cp tmp/*.pdf export
+- cp tmp/git.id export
+
+deploy:
+  provider: pages
+  skip-cleanup: true
+  github-token: $GITHUB_TOKEN  # Set in travis-ci.org dashboard, marked secure
+  local-dir: export
+  on:
+    branch: master
+
+notifications:
+  email: false

CMakeLists.txt

@@ -4,53 +4,49 @@ project(FS NONE)
 include(UseLATEX)
 
 add_custom_target(
-	writegitid ALL
-	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/write-gitid.sh
-	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    writegitid ALL
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/write-gitid.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set(CHAPTERS
-  chapters/grundlagen.tex
-  chapters/permanentmagnete.tex
-  chapters/gleichstrommaschine.tex
-  chapters/wechselfeld.tex
-  chapters/synchronmaschine.tex
-  chapters/asynchronmaschine.tex
-	chapters/universalmaschine.tex
+    chapters/grundlagen.tex
+    chapters/permanentmagnete.tex
+    chapters/gleichstrommaschine.tex
+    chapters/wechselfeld.tex
+    chapters/synchronmaschine.tex
+    chapters/asynchronmaschine.tex
+    chapters/universalmaschine.tex
 )
 
 set(DRAWINGS
-	drawings/grundlagen/maschinen-querschnitt.tex
-	drawings/grundlagen/maschinen-querschnitt2.tex
-  drawings/permanentmagnete/gsm_querschnitt.tex
-	drawings/gleichstrommaschine/flussverlauf_phi.tex
-	drawings/gleichstrommaschine/gsnsm_esb.tex
-	drawings/gleichstrommaschine/gsrsm_esb.tex
-  drawings/gleichstrommaschine/esb_pgsm.tex
-	drawings/synchronmaschine/sm_esb.tex
-	drawings/synchronmaschine/zeiger_syn.tex
-	drawings/synchronmaschine/zeiger_syn_dq.tex
-	drawings/synchronmaschine/zeiger_syn_generatorbetrieb.tex
-	drawings/synchronmaschine/zeiger_syn_motorbetrieb.tex
-	drawings/synchronmaschine/zeiger_syn_stromortskurve.tex
-	drawings/asynchronmaschine/asm_esb.tex
-	drawings/asynchronmaschine/zeiger_asyn.tex
-	drawings/asynchronmaschine/zeiger_asyn_stromortskurve_i.tex
-	drawings/asynchronmaschine/zeiger_asyn_stromortskurve_p.tex
-	drawings/asynchronmaschine/zeiger_asyn_stromortskurve_s.tex
-  drawings/universalmaschine/esb_uvm.tex
-  drawings/universalmaschine/zeiger_uvm_stromortskurve.tex
-  drawings/universalmaschine/zeiger_uvm.tex
-)
-
-set(IMAGES
-	img/Logo.pdf
+    drawings/grundlagen/maschinen-querschnitt.tex
+    drawings/grundlagen/maschinen-querschnitt2.tex
+    drawings/permanentmagnete/gsm_querschnitt.tex
+    drawings/gleichstrommaschine/flussverlauf_phi.tex
+    drawings/gleichstrommaschine/gsnsm_esb.tex
+    drawings/gleichstrommaschine/gsrsm_esb.tex
+    drawings/gleichstrommaschine/esb_pgsm.tex
+    drawings/synchronmaschine/sm_esb.tex
+    drawings/synchronmaschine/zeiger_syn.tex
+    drawings/synchronmaschine/zeiger_syn_dq.tex
+    drawings/synchronmaschine/zeiger_syn_generatorbetrieb.tex
+    drawings/synchronmaschine/zeiger_syn_motorbetrieb.tex
+    drawings/synchronmaschine/zeiger_syn_stromortskurve.tex
+    drawings/asynchronmaschine/asm_esb.tex
+    drawings/asynchronmaschine/zeiger_asyn.tex
+    drawings/asynchronmaschine/zeiger_asyn_stromortskurve_i.tex
+    drawings/asynchronmaschine/zeiger_asyn_stromortskurve_p.tex
+    drawings/asynchronmaschine/zeiger_asyn_stromortskurve_s.tex
+    drawings/universalmaschine/esb_uvm.tex
+    drawings/universalmaschine/zeiger_uvm_stromortskurve.tex
+    drawings/universalmaschine/zeiger_uvm.tex
 )
 
 add_latex_document(
-	formelsammlung.tex
-	FORCE_PDF
-  INPUTS ${CHAPTERS} ${DRAWINGS}
-	IMAGES ${IMAGES}
-	DEPENDS writegitid
+    formelsammlung.tex
+    FORCE_PDF
+    IMAGE_DIRS img
+    INPUTS ${CHAPTERS} ${DRAWINGS}
+    DEPENDS writegitid
 )

README.md

@@ -1,17 +1,13 @@
-# Elektrische Kleinmaschinen
-[![wercker status](https://app.wercker.com/status/d4cb3c1da011db50fd8bfceb7e5932e3/s "wercker status")](https://app.wercker.com/project/bykey/d4cb3c1da011db50fd8bfceb7e5932e3)
-
+# Elektrische Kleinmaschinen
+
+[![Build Status](https://travis-ci.org/MaKeAppDev/FS-EKM.svg?branch=master)](https://travis-ci.org/MaKeAppDev/FS-EKM)
+[![Join the chat at https://gitter.im/LaTeX4Ei/Lobby](https://badges.gitter.im/LaTeX4Ei/Lobby.svg)](https://gitter.im/LaTeX4Ei/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## Formelsammlung für Latex4ei
-**Required custom Package on GitHub:** [LaTeX4Ei](https://github.com/latex4ei/latex4ei-packages)
-
-### Links
 
-Fresh Development Version: [TUM-Projekte](https://makeappdev.github.io/TUM-Projekte/)  
-Public Version: [latex4ei.de](http://latex4ei.de)
+**Required custom Package on GitHub:** [LaTeX4Ei](https://github.com/latex4ei/latex4ei-packages)
 
-## Written by
-- Hofbauer, Markus
-- Meyer, Kevin
+Public Version: [latex4ei.de](http://latex4ei.de) or [TUM-Projekte](https://makeappdev.github.io/TUM-Projekte/)
 
 --------------------------------------
 
@@ -28,12 +24,17 @@ pull from upstream:
 --------------------------------------
 
 ## Optional: Build with CMake
-Download [UseLaTeX.cmake](https://cmake.org/Wiki/CMakeUserUseLATEX) and move to `/usr/share/cmake-X.X/Modules/.`  
 
-##### Steps to build:
+Download [UseLaTeX.cmake](https://cmake.org/Wiki/CMakeUserUseLATEX) and move to `/usr/share/cmake-X.X/Modules/.`
+
 ```shell
 mkdir build
 cd build
 cmake ..
 make
 ```
+
+## Written by
+
+- Hofbauer, Markus
+- Meyer, Kevin